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

Commit 7840487c authored by Bo Shen's avatar Bo Shen Committed by Nicolas Ferre
Browse files

ARM: at91/i2c: change id to let i2c-gpio work 



The i2c core driver will turn the platform device ID to busnum
When using platfrom device ID as -1, it means dynamically assigned
the busnum. When writing code, we need to make sure the busnum,
and call i2c_register_board_info(int busnum, ...) to register device
if using -1, we do not know the value of busnum

In order to solve this issue, set the platform device ID as a fix number
Here using 0 to match the busnum used in i2c_regsiter_board_info()

Signed-off-by: default avatarBo Shen <voice.shen@atmel.com>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Cc: stable <stable@vger.kernel.org> [very long time]
parent b6edfbea

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static struct i2c_gpio_platform_data pdata = { 


static struct platform_device at91rm9200_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.id			= 0,

	.dev.platform_data	= &pdata,

};

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static struct i2c_gpio_platform_data pdata = { 


static struct platform_device at91sam9260_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.id			= 0,

	.dev.platform_data	= &pdata,

};

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static struct i2c_gpio_platform_data pdata = { 


static struct platform_device at91sam9261_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.id			= 0,

	.dev.platform_data	= &pdata,

};

arch/arm/mach-at91/at91sam9263_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static struct i2c_gpio_platform_data pdata = { 


static struct platform_device at91sam9263_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.id			= 0,

	.dev.platform_data	= &pdata,

};

arch/arm/mach-at91/at91sam9rl_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static struct i2c_gpio_platform_data pdata = { 


static struct platform_device at91sam9rl_twi_device = {

	.name			= "i2c-gpio",

	.id			= -1,

	.id			= 0,

	.dev.platform_data	= &pdata,

};