Skip to content

Commit

Permalink
ARM: Fix i2c-gpio GPIO descriptor tables
Browse files Browse the repository at this point in the history 
I used bad names in my clumsiness when rewriting many board
files to use GPIO descriptors instead of platform data. A few
had the platform_device ID set to -1 which would indeed give
the device name "i2c-gpio".

But several had it set to >=0 which gives the names
"i2c-gpio.0", "i2c-gpio.1" ...

Fix the offending instances in the ARM tree. Sorry for the
mess.

Fixes: b2e6355 ("i2c: gpio: Convert to use descriptors")
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Simon Guinot <simon.guinot@sequanux.org>
Reported-by: Simon Guinot <simon.guinot@sequanux.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Linus Walleij authored and Olof Johansson committed May 26, 2018
1 parent 0ec46ab commit f59c303
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-ep93xx/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr)

/* All EP93xx devices use the same two GPIO pins for I2C bit-banging */
static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
/* Use local offsets on gpiochip/port "G" */
GPIO_LOOKUP_IDX("G", 1, NULL, 0,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/avila-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static struct platform_device avila_flash = {
};

static struct gpiod_lookup_table avila_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", AVILA_SDA_PIN,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/dsmg600-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static struct platform_device dsmg600_flash = {
};

static struct gpiod_lookup_table dsmg600_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", DSMG600_SDA_PIN,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/fsg-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static struct platform_device fsg_flash = {
};

static struct gpiod_lookup_table fsg_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", FSG_SDA_PIN,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/ixdp425-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static struct platform_device ixdp425_flash_nand = {
#endif /* CONFIG_MTD_NAND_PLATFORM */

static struct gpiod_lookup_table ixdp425_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", IXDP425_SDA_PIN,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/nas100d-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static struct platform_device nas100d_leds = {
};

static struct gpiod_lookup_table nas100d_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NAS100D_SDA_PIN,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/nslu2-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static struct platform_device nslu2_flash = {
};

static struct gpiod_lookup_table nslu2_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NSLU2_SDA_PIN,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/palmz72.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ static struct soc_camera_link palmz72_iclink = {
};

static struct gpiod_lookup_table palmz72_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("gpio-pxa", 118, NULL, 0,
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/viper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ static struct platform_device smc91x_device = {

/* i2c */
static struct gpiod_lookup_table viper_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.1",
.table = {
GPIO_LOOKUP_IDX("gpio-pxa", VIPER_RTC_I2C_SDA_GPIO,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down Expand Up @@ -789,7 +789,7 @@ static int __init viper_tpm_setup(char *str)
__setup("tpm=", viper_tpm_setup);

struct gpiod_lookup_table viper_tpm_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.2",
.table = {
GPIO_LOOKUP_IDX("gpio-pxa", VIPER_TPM_I2C_SDA_GPIO,
NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/simpad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ static struct platform_device simpad_gpio_leds = {
* i2c
*/
static struct gpiod_lookup_table simpad_i2c_gpiod_table = {
.dev_id = "i2c-gpio",
.dev_id = "i2c-gpio.0",
.table = {
GPIO_LOOKUP_IDX("gpio", 21, NULL, 0,
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
Expand Down

0 comments on commit f59c303

Please sign in to comment.