| Message ID | 20180419200015.15095-2-wsa@the-dreams.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: clean up include/linux/i2c-* | expand |
* Wolfram Sang <wsa@the-dreams.de> [180419 20:02]: > This header only contains platform_data. Move it to the proper directory. Acked-by: Tony Lindgren <tony@atomide.com>
On Thu, 19 Apr 2018, Wolfram Sang wrote: > This header only contains platform_data. Move it to the proper directory. > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > --- > MAINTAINERS | 2 +- > arch/arm/mach-ks8695/board-acs5k.c | 2 +- > arch/arm/mach-omap1/board-htcherald.c | 2 +- > arch/arm/mach-pxa/palmz72.c | 2 +- > arch/arm/mach-pxa/viper.c | 2 +- > arch/arm/mach-sa1100/simpad.c | 2 +- > arch/mips/alchemy/board-gpr.c | 2 +- > drivers/i2c/busses/i2c-gpio.c | 2 +- > drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- > drivers/mfd/sm501.c | 2 +- > include/linux/{ => platform_data}/i2c-gpio.h | 0 > 11 files changed, 10 insertions(+), 10 deletions(-) > rename include/linux/{ => platform_data}/i2c-gpio.h (100%) Acked-by: Lee Jones <lee.jones@linaro.org>
Wolfram Sang <wsa@the-dreams.de> writes: > This header only contains platform_data. Move it to the proper directory. > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> For mach-pxa: Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Take it through your tree, no problem for the pxa part. Cheers. -- Robert
Em Thu, 19 Apr 2018 22:00:07 +0200 Wolfram Sang <wsa@the-dreams.de> escreveu: > This header only contains platform_data. Move it to the proper directory. > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > --- > MAINTAINERS | 2 +- > arch/arm/mach-ks8695/board-acs5k.c | 2 +- > arch/arm/mach-omap1/board-htcherald.c | 2 +- > arch/arm/mach-pxa/palmz72.c | 2 +- > arch/arm/mach-pxa/viper.c | 2 +- > arch/arm/mach-sa1100/simpad.c | 2 +- > arch/mips/alchemy/board-gpr.c | 2 +- > drivers/i2c/busses/i2c-gpio.c | 2 +- > drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > drivers/mfd/sm501.c | 2 +- > include/linux/{ => platform_data}/i2c-gpio.h | 0 > 11 files changed, 10 insertions(+), 10 deletions(-) > rename include/linux/{ => platform_data}/i2c-gpio.h (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 0a1410d5a621..7aad64b62102 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -5872,7 +5872,7 @@ GENERIC GPIO I2C DRIVER > M: Haavard Skinnemoen <hskinnemoen@gmail.com> > S: Supported > F: drivers/i2c/busses/i2c-gpio.c > -F: include/linux/i2c-gpio.h > +F: include/linux/platform_data/i2c-gpio.h > > GENERIC GPIO I2C MULTIPLEXER DRIVER > M: Peter Korsgaard <peter.korsgaard@barco.com> > 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-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c > index 67d46690a56e..da8f3fc3180f 100644 > --- a/arch/arm/mach-omap1/board-htcherald.c > +++ b/arch/arm/mach-omap1/board-htcherald.c > @@ -31,7 +31,7 @@ > #include <linux/gpio.h> > #include <linux/gpio_keys.h> > #include <linux/i2c.h> > -#include <linux/i2c-gpio.h> > +#include <linux/platform_data/i2c-gpio.h> > #include <linux/htcpld.h> > #include <linux/leds.h> > #include <linux/spi/spi.h> > diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c > index 5877e547cecd..c053c8ce1586 100644 > --- a/arch/arm/mach-pxa/palmz72.c > +++ b/arch/arm/mach-pxa/palmz72.c > @@ -30,7 +30,7 @@ > #include <linux/wm97xx.h> > #include <linux/power_supply.h> > #include <linux/usb/gpio_vbus.h> > -#include <linux/i2c-gpio.h> > +#include <linux/platform_data/i2c-gpio.h> > #include <linux/gpio/machine.h> > > #include <asm/mach-types.h> > diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c > index 90d0f277de55..39e05b7008d8 100644 > --- a/arch/arm/mach-pxa/viper.c > +++ b/arch/arm/mach-pxa/viper.c > @@ -35,7 +35,7 @@ > #include <linux/sched.h> > #include <linux/gpio.h> > #include <linux/jiffies.h> > -#include <linux/i2c-gpio.h> > +#include <linux/platform_data/i2c-gpio.h> > #include <linux/gpio/machine.h> > #include <linux/platform_data/i2c-pxa.h> > #include <linux/serial_8250.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> > diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c > index 58abb3eced58..005e6e0330c2 100644 > --- a/drivers/i2c/busses/i2c-gpio.c > +++ b/drivers/i2c/busses/i2c-gpio.c > @@ -11,7 +11,7 @@ > #include <linux/delay.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/init.h> > #include <linux/module.h> > #include <linux/slab.h> > diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c > index 816f4b6a7b8e..d9f0dd0d3525 100644 > --- a/drivers/media/platform/marvell-ccic/mmp-driver.c > +++ b/drivers/media/platform/marvell-ccic/mmp-driver.c > @@ -12,7 +12,7 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/i2c.h> > -#include <linux/i2c-gpio.h> > +#include <linux/platform_data/i2c-gpio.h> > #include <linux/interrupt.h> > #include <linux/spinlock.h> > #include <linux/slab.h> > diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c > index ad774161a22d..66af659b01b2 100644 > --- a/drivers/mfd/sm501.c > +++ b/drivers/mfd/sm501.c > @@ -19,7 +19,7 @@ > #include <linux/device.h> > #include <linux/platform_device.h> > #include <linux/pci.h> > -#include <linux/i2c-gpio.h> > +#include <linux/platform_data/i2c-gpio.h> > #include <linux/gpio/machine.h> > #include <linux/slab.h> > > diff --git a/include/linux/i2c-gpio.h b/include/linux/platform_data/i2c-gpio.h > similarity index 100% > rename from include/linux/i2c-gpio.h > rename to include/linux/platform_data/i2c-gpio.h Thanks, Mauro
> 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? Thanks, Wolfram
On Mon, May 14, 2018 at 11:37:20PM +0200, Wolfram Sang wrote: > > 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> Acked-by: James Hogan <jhogan@kernel.org> Cheers James
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@uclinux.org> Thanks Greg > Thanks, > > Wolfram >
diff --git a/MAINTAINERS b/MAINTAINERS index 0a1410d5a621..7aad64b62102 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5872,7 +5872,7 @@ GENERIC GPIO I2C DRIVER M: Haavard Skinnemoen <hskinnemoen@gmail.com> S: Supported F: drivers/i2c/busses/i2c-gpio.c -F: include/linux/i2c-gpio.h +F: include/linux/platform_data/i2c-gpio.h GENERIC GPIO I2C MULTIPLEXER DRIVER M: Peter Korsgaard <peter.korsgaard@barco.com> 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-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 67d46690a56e..da8f3fc3180f 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -31,7 +31,7 @@ #include <linux/gpio.h> #include <linux/gpio_keys.h> #include <linux/i2c.h> -#include <linux/i2c-gpio.h> +#include <linux/platform_data/i2c-gpio.h> #include <linux/htcpld.h> #include <linux/leds.h> #include <linux/spi/spi.h> diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c index 5877e547cecd..c053c8ce1586 100644 --- a/arch/arm/mach-pxa/palmz72.c +++ b/arch/arm/mach-pxa/palmz72.c @@ -30,7 +30,7 @@ #include <linux/wm97xx.h> #include <linux/power_supply.h> #include <linux/usb/gpio_vbus.h> -#include <linux/i2c-gpio.h> +#include <linux/platform_data/i2c-gpio.h> #include <linux/gpio/machine.h> #include <asm/mach-types.h> diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 90d0f277de55..39e05b7008d8 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c @@ -35,7 +35,7 @@ #include <linux/sched.h> #include <linux/gpio.h> #include <linux/jiffies.h> -#include <linux/i2c-gpio.h> +#include <linux/platform_data/i2c-gpio.h> #include <linux/gpio/machine.h> #include <linux/platform_data/i2c-pxa.h> #include <linux/serial_8250.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> diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 58abb3eced58..005e6e0330c2 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -11,7 +11,7 @@ #include <linux/delay.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/init.h> #include <linux/module.h> #include <linux/slab.h> diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c index 816f4b6a7b8e..d9f0dd0d3525 100644 --- a/drivers/media/platform/marvell-ccic/mmp-driver.c +++ b/drivers/media/platform/marvell-ccic/mmp-driver.c @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/i2c.h> -#include <linux/i2c-gpio.h> +#include <linux/platform_data/i2c-gpio.h> #include <linux/interrupt.h> #include <linux/spinlock.h> #include <linux/slab.h> diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index ad774161a22d..66af659b01b2 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c @@ -19,7 +19,7 @@ #include <linux/device.h> #include <linux/platform_device.h> #include <linux/pci.h> -#include <linux/i2c-gpio.h> +#include <linux/platform_data/i2c-gpio.h> #include <linux/gpio/machine.h> #include <linux/slab.h> diff --git a/include/linux/i2c-gpio.h b/include/linux/platform_data/i2c-gpio.h similarity index 100% rename from include/linux/i2c-gpio.h rename to include/linux/platform_data/i2c-gpio.h
This header only contains platform_data. Move it to the proper directory. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> --- MAINTAINERS | 2 +- arch/arm/mach-ks8695/board-acs5k.c | 2 +- arch/arm/mach-omap1/board-htcherald.c | 2 +- arch/arm/mach-pxa/palmz72.c | 2 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-sa1100/simpad.c | 2 +- arch/mips/alchemy/board-gpr.c | 2 +- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- drivers/mfd/sm501.c | 2 +- include/linux/{ => platform_data}/i2c-gpio.h | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename include/linux/{ => platform_data}/i2c-gpio.h (100%)