Commit c5cb6b2d authored by Bo Shen's avatar Bo Shen Committed by Ben Hutchings

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

commit 7840487c upstream.

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>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 51e7f9ff
...@@ -462,7 +462,7 @@ static struct i2c_gpio_platform_data pdata = { ...@@ -462,7 +462,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91rm9200_twi_device = { static struct platform_device at91rm9200_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
......
...@@ -467,7 +467,7 @@ static struct i2c_gpio_platform_data pdata = { ...@@ -467,7 +467,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9260_twi_device = { static struct platform_device at91sam9260_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
......
...@@ -284,7 +284,7 @@ static struct i2c_gpio_platform_data pdata = { ...@@ -284,7 +284,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9261_twi_device = { static struct platform_device at91sam9261_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
......
...@@ -540,7 +540,7 @@ static struct i2c_gpio_platform_data pdata = { ...@@ -540,7 +540,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9263_twi_device = { static struct platform_device at91sam9263_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
......
...@@ -319,7 +319,7 @@ static struct i2c_gpio_platform_data pdata = { ...@@ -319,7 +319,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9rl_twi_device = { static struct platform_device at91sam9rl_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment