| From 7840487cd6298f9f931103b558290d8d98d41c49 Mon Sep 17 00:00:00 2001 |
| From: Bo Shen <voice.shen@atmel.com> |
| Date: Mon, 15 Oct 2012 17:30:27 +0800 |
| Subject: ARM: at91/i2c: change id to let i2c-gpio work |
| |
| From: Bo Shen <voice.shen@atmel.com> |
| |
| commit 7840487cd6298f9f931103b558290d8d98d41c49 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: Bo Shen <voice.shen@atmel.com> |
| Acked-by: Jean Delvare <khali@linux-fr.org> |
| Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> |
| Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
| Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-at91/at91rm9200_devices.c | 2 +- |
| arch/arm/mach-at91/at91sam9260_devices.c | 2 +- |
| arch/arm/mach-at91/at91sam9261_devices.c | 2 +- |
| arch/arm/mach-at91/at91sam9263_devices.c | 2 +- |
| arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- |
| 5 files changed, 5 insertions(+), 5 deletions(-) |
| |
| --- a/arch/arm/mach-at91/at91rm9200_devices.c |
| +++ b/arch/arm/mach-at91/at91rm9200_devices.c |
| @@ -463,7 +463,7 @@ static struct i2c_gpio_platform_data pda |
| |
| static struct platform_device at91rm9200_twi_device = { |
| .name = "i2c-gpio", |
| - .id = -1, |
| + .id = 0, |
| .dev.platform_data = &pdata, |
| }; |
| |
| --- a/arch/arm/mach-at91/at91sam9260_devices.c |
| +++ b/arch/arm/mach-at91/at91sam9260_devices.c |
| @@ -471,7 +471,7 @@ static struct i2c_gpio_platform_data pda |
| |
| static struct platform_device at91sam9260_twi_device = { |
| .name = "i2c-gpio", |
| - .id = -1, |
| + .id = 0, |
| .dev.platform_data = &pdata, |
| }; |
| |
| --- a/arch/arm/mach-at91/at91sam9261_devices.c |
| +++ b/arch/arm/mach-at91/at91sam9261_devices.c |
| @@ -285,7 +285,7 @@ static struct i2c_gpio_platform_data pda |
| |
| static struct platform_device at91sam9261_twi_device = { |
| .name = "i2c-gpio", |
| - .id = -1, |
| + .id = 0, |
| .dev.platform_data = &pdata, |
| }; |
| |
| --- a/arch/arm/mach-at91/at91sam9263_devices.c |
| +++ b/arch/arm/mach-at91/at91sam9263_devices.c |
| @@ -542,7 +542,7 @@ static struct i2c_gpio_platform_data pda |
| |
| static struct platform_device at91sam9263_twi_device = { |
| .name = "i2c-gpio", |
| - .id = -1, |
| + .id = 0, |
| .dev.platform_data = &pdata, |
| }; |
| |
| --- a/arch/arm/mach-at91/at91sam9rl_devices.c |
| +++ b/arch/arm/mach-at91/at91sam9rl_devices.c |
| @@ -314,7 +314,7 @@ static struct i2c_gpio_platform_data pda |
| |
| static struct platform_device at91sam9rl_twi_device = { |
| .name = "i2c-gpio", |
| - .id = -1, |
| + .id = 0, |
| .dev.platform_data = &pdata, |
| }; |
| |
