[PATCH 1/7] i2c: i2c-gpio: move header to platform_data

Greg Ungerer gerg at uclinux.org
Mon May 14 16:03:08 PDT 2018


Hi Wolfram,

On 15/05/18 07:37, Wolfram Sang wrote:
>>   arch/arm/mach-ks8695/board-acs5k.c               | 2 +-
>>   arch/arm/mach-sa1100/simpad.c                    | 2 +-
>>   arch/mips/alchemy/board-gpr.c                    | 2 +-
> 
> Those still need acks...
> 
>> diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c
>> index 937eb1d47e7b..ef835d82cdb9 100644
>> --- a/arch/arm/mach-ks8695/board-acs5k.c
>> +++ b/arch/arm/mach-ks8695/board-acs5k.c
>> @@ -19,7 +19,7 @@
>>   #include <linux/gpio/machine.h>
>>   #include <linux/i2c.h>
>>   #include <linux/i2c-algo-bit.h>
>> -#include <linux/i2c-gpio.h>
>> +#include <linux/platform_data/i2c-gpio.h>
>>   #include <linux/platform_data/pca953x.h>
>>   
>>   #include <linux/mtd/mtd.h>
> 
> ...
> 
>> diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
>> index ace010479eb6..49a61e6f3c5f 100644
>> --- a/arch/arm/mach-sa1100/simpad.c
>> +++ b/arch/arm/mach-sa1100/simpad.c
>> @@ -37,7 +37,7 @@
>>   #include <linux/input.h>
>>   #include <linux/gpio_keys.h>
>>   #include <linux/leds.h>
>> -#include <linux/i2c-gpio.h>
>> +#include <linux/platform_data/i2c-gpio.h>
>>   
>>   #include "generic.h"
>>   
>> diff --git a/arch/mips/alchemy/board-gpr.c b/arch/mips/alchemy/board-gpr.c
>> index 4e79dbd54a33..fa75d75b5ba9 100644
>> --- a/arch/mips/alchemy/board-gpr.c
>> +++ b/arch/mips/alchemy/board-gpr.c
>> @@ -29,7 +29,7 @@
>>   #include <linux/leds.h>
>>   #include <linux/gpio.h>
>>   #include <linux/i2c.h>
>> -#include <linux/i2c-gpio.h>
>> +#include <linux/platform_data/i2c-gpio.h>
>>   #include <linux/gpio/machine.h>
>>   #include <asm/bootinfo.h>
>>   #include <asm/idle.h>
> 
> ... and this was the shortened diff for those.
> 
> Greg, Russell, Ralf, James? Is it okay if I take this via my tree?

Yes, I have no problem with that for the ks8695 part.

Acked-by: Greg Ungerer <gerg at uclinux.org>

Thanks
Greg


> Thanks,
> 
>     Wolfram
> 



More information about the linux-arm-kernel mailing list