Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f59c303b authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

ARM: Fix i2c-gpio GPIO descriptor tables 



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: b2e63555 ("i2c: gpio: Convert to use descriptors")
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Simon Guinot <simon.guinot@sequanux.org>
Reported-by: default avatarSimon Guinot <simon.guinot@sequanux.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 0ec46ab6

arch/arm/mach-ep93xx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-ixp4xx/avila-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-ixp4xx/dsmg600-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-ixp4xx/fsg-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-ixp4xx/ixdp425-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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),