[PATCH 6/8] ARM: at91/i2c: change id to let i2c-gpio work

[ludovic.desroches]

Le 10/24/2012 05:33 PM, Nicolas Ferre a écrit :
> From: Bo Shen <voice.shen at atmel.com>
>
> 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 at atmel.com>
> Acked-by: Jean Delvare <khali at linux-fr.org>
> Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>

Acked-By: Ludovic Desroches <ludovic.desroches at atmel.com>

> Cc: stable <stable at vger.kernel.org> [very long time]
> ---
>   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(-)
>
> diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
> index a563189..7cd8053 100644
> --- a/arch/arm/mach-at91/at91rm9200_devices.c
> +++ b/arch/arm/mach-at91/at91rm9200_devices.c
> @@ -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,
>   };
>
> diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
> index a76b868..44385a4 100644
> --- a/arch/arm/mach-at91/at91sam9260_devices.c
> +++ b/arch/arm/mach-at91/at91sam9260_devices.c
> @@ -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,
>   };
>
> diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
> index 9752f17..0256a00 100644
> --- 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 pdata = {
>
>   static struct platform_device at91sam9261_twi_device = {
>   	.name			= "i2c-gpio",
> -	.id			= -1,
> +	.id			= 0,
>   	.dev.platform_data	= &pdata,
>   };
>
> diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
> index 8dde220..23b6384 100644
> --- a/arch/arm/mach-at91/at91sam9263_devices.c
> +++ b/arch/arm/mach-at91/at91sam9263_devices.c
> @@ -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,
>   };
>
> diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
> index d6ca054..3d2c81d 100644
> --- 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 pdata = {
>
>   static struct platform_device at91sam9rl_twi_device = {
>   	.name			= "i2c-gpio",
> -	.id			= -1,
> +	.id			= 0,
>   	.dev.platform_data	= &pdata,
>   };
>
>