* [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
@ 2018-04-19 20:00 ` Wolfram Sang
2018-04-19 20:25 ` Tony Lindgren
` (4 more replies)
2018-04-19 20:00 ` [PATCH 2/7] i2c: i2c-mux-gpio: " Wolfram Sang
` (6 subsequent siblings)
7 siblings, 5 replies; 21+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Greg Ungerer, Russell King, Aaro Koskinen,
Tony Lindgren, Sergey Lapin, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Ralf Baechle, James Hogan, Haavard Skinnemoen,
Jonathan Corbet, Mauro Carvalho Chehab, Lee Jones, linux-kernel,
linux-arm-kernel, linux-omap, linux-mips, linux-media
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%)
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
--
2.11.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
@ 2018-04-19 20:25 ` Tony Lindgren
2018-04-20 8:05 ` Lee Jones
` (3 subsequent siblings)
4 siblings, 0 replies; 21+ messages in thread
From: Tony Lindgren @ 2018-04-19 20:25 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-i2c, Greg Ungerer, Russell King, Aaro Koskinen,
Sergey Lapin, Daniel Mack, Haojian Zhuang, Robert Jarzmik,
Ralf Baechle, James Hogan, Haavard Skinnemoen, Jonathan Corbet,
Mauro Carvalho Chehab, Lee Jones, linux-kernel, linux-arm-kernel,
linux-omap, linux-mips, linux-media
* 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>
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
2018-04-19 20:25 ` Tony Lindgren
@ 2018-04-20 8:05 ` Lee Jones
2018-04-20 19:23 ` Robert Jarzmik
` (2 subsequent siblings)
4 siblings, 0 replies; 21+ messages in thread
From: Lee Jones @ 2018-04-20 8:05 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-i2c, Greg Ungerer, Russell King, Aaro Koskinen,
Tony Lindgren, Sergey Lapin, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Ralf Baechle, James Hogan, Haavard Skinnemoen,
Jonathan Corbet, Mauro Carvalho Chehab, linux-kernel,
linux-arm-kernel, linux-omap, linux-mips, linux-media
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>
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
2018-04-19 20:25 ` Tony Lindgren
2018-04-20 8:05 ` Lee Jones
@ 2018-04-20 19:23 ` Robert Jarzmik
2018-05-05 13:26 ` Mauro Carvalho Chehab
2018-05-14 21:37 ` Wolfram Sang
4 siblings, 0 replies; 21+ messages in thread
From: Robert Jarzmik @ 2018-04-20 19:23 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-i2c, Greg Ungerer, Russell King, Aaro Koskinen,
Tony Lindgren, Sergey Lapin, Daniel Mack, Haojian Zhuang,
Ralf Baechle, James Hogan, Haavard Skinnemoen, Jonathan Corbet,
Mauro Carvalho Chehab, Lee Jones, linux-kernel, linux-arm-kernel,
linux-omap, linux-mips, linux-media
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
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
` (2 preceding siblings ...)
2018-04-20 19:23 ` Robert Jarzmik
@ 2018-05-05 13:26 ` Mauro Carvalho Chehab
2018-05-14 21:37 ` Wolfram Sang
4 siblings, 0 replies; 21+ messages in thread
From: Mauro Carvalho Chehab @ 2018-05-05 13:26 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-i2c, Greg Ungerer, Russell King, Aaro Koskinen,
Tony Lindgren, Sergey Lapin, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Ralf Baechle, James Hogan, Haavard Skinnemoen,
Jonathan Corbet, Mauro Carvalho Chehab, Lee Jones, linux-kernel,
linux-arm-kernel, linux-omap, linux-mips, linux-media
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
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
` (3 preceding siblings ...)
2018-05-05 13:26 ` Mauro Carvalho Chehab
@ 2018-05-14 21:37 ` Wolfram Sang
2018-05-14 21:42 ` James Hogan
2018-05-14 23:03 ` Greg Ungerer
4 siblings, 2 replies; 21+ messages in thread
From: Wolfram Sang @ 2018-05-14 21:37 UTC (permalink / raw)
To: linux-i2c
Cc: Greg Ungerer, Russell King, Aaro Koskinen, Tony Lindgren,
Sergey Lapin, Daniel Mack, Haojian Zhuang, Robert Jarzmik,
Ralf Baechle, James Hogan, Haavard Skinnemoen, Jonathan Corbet,
Mauro Carvalho Chehab, Lee Jones, linux-kernel, linux-arm-kernel,
linux-omap, linux-mips, linux-media
[-- Attachment #1: Type: text/plain, Size: 1762 bytes --]
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-05-14 21:37 ` Wolfram Sang
@ 2018-05-14 21:42 ` James Hogan
2018-05-14 23:03 ` Greg Ungerer
1 sibling, 0 replies; 21+ messages in thread
From: James Hogan @ 2018-05-14 21:42 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-i2c, Greg Ungerer, Russell King, Aaro Koskinen,
Tony Lindgren, Sergey Lapin, Daniel Mack, Haojian Zhuang,
Robert Jarzmik, Ralf Baechle, Haavard Skinnemoen,
Jonathan Corbet, Mauro Carvalho Chehab, Lee Jones, linux-kernel,
linux-arm-kernel, linux-omap, linux-mips, linux-media
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/7] i2c: i2c-gpio: move header to platform_data
2018-05-14 21:37 ` Wolfram Sang
2018-05-14 21:42 ` James Hogan
@ 2018-05-14 23:03 ` Greg Ungerer
1 sibling, 0 replies; 21+ messages in thread
From: Greg Ungerer @ 2018-05-14 23:03 UTC (permalink / raw)
To: Wolfram Sang, linux-i2c
Cc: Russell King, Aaro Koskinen, Tony Lindgren, Sergey Lapin,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Ralf Baechle,
James Hogan, Haavard Skinnemoen, Jonathan Corbet,
Mauro Carvalho Chehab, Lee Jones, linux-kernel, linux-arm-kernel,
linux-omap, linux-mips, linux-media
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
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 2/7] i2c: i2c-mux-gpio: move header to platform_data
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
@ 2018-04-19 20:00 ` Wolfram Sang
2018-04-20 5:25 ` Peter Korsgaard
2018-04-19 20:00 ` [PATCH 3/7] i2c: i2c-ocores: " Wolfram Sang
` (5 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Peter Korsgaard, Peter Rosin, Jonathan Corbet,
Jean Delvare, linux-doc, linux-kernel
This header only contains platform_data. Move it to the proper directory.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
Documentation/i2c/muxes/i2c-mux-gpio | 4 ++--
MAINTAINERS | 2 +-
drivers/i2c/busses/i2c-i801.c | 2 +-
drivers/i2c/muxes/i2c-mux-gpio.c | 2 +-
include/linux/{ => platform_data}/i2c-mux-gpio.h | 0
5 files changed, 5 insertions(+), 5 deletions(-)
rename include/linux/{ => platform_data}/i2c-mux-gpio.h (100%)
diff --git a/Documentation/i2c/muxes/i2c-mux-gpio b/Documentation/i2c/muxes/i2c-mux-gpio
index 7a8d7d261632..893ecdfe6e43 100644
--- a/Documentation/i2c/muxes/i2c-mux-gpio
+++ b/Documentation/i2c/muxes/i2c-mux-gpio
@@ -30,12 +30,12 @@ i2c-mux-gpio uses the platform bus, so you need to provide a struct
platform_device with the platform_data pointing to a struct
i2c_mux_gpio_platform_data with the I2C adapter number of the master
bus, the number of bus segments to create and the GPIO pins used
-to control it. See include/linux/i2c-mux-gpio.h for details.
+to control it. See include/linux/platform_data/i2c-mux-gpio.h for details.
E.G. something like this for a MUX providing 4 bus segments
controlled through 3 GPIO pins:
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
#include <linux/platform_device.h>
static const unsigned myboard_gpiomux_gpios[] = {
diff --git a/MAINTAINERS b/MAINTAINERS
index 7aad64b62102..44b4bb5cf94e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5879,7 +5879,7 @@ M: Peter Korsgaard <peter.korsgaard@barco.com>
L: linux-i2c@vger.kernel.org
S: Supported
F: drivers/i2c/muxes/i2c-mux-gpio.c
-F: include/linux/i2c-mux-gpio.h
+F: include/linux/platform_data/i2c-mux-gpio.h
F: Documentation/i2c/muxes/i2c-mux-gpio
GENERIC HDLC (WAN) DRIVERS
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index e0d59e9ff3c6..bff160d1ce3f 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -106,7 +106,7 @@
#if IS_ENABLED(CONFIG_I2C_MUX_GPIO) && defined CONFIG_DMI
#include <linux/gpio.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
#endif
/* I801 SMBus address offsets */
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 1a9973ede443..15a7cc0459fb 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -10,7 +10,7 @@
#include <linux/i2c.h>
#include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/include/linux/i2c-mux-gpio.h b/include/linux/platform_data/i2c-mux-gpio.h
similarity index 100%
rename from include/linux/i2c-mux-gpio.h
rename to include/linux/platform_data/i2c-mux-gpio.h
--
2.11.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 3/7] i2c: i2c-ocores: move header to platform_data
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
2018-04-19 20:00 ` [PATCH 2/7] i2c: i2c-mux-gpio: " Wolfram Sang
@ 2018-04-19 20:00 ` Wolfram Sang
2018-04-20 8:05 ` Lee Jones
2018-04-19 20:00 ` [PATCH 4/7] i2c: i2c-omap: " Wolfram Sang
` (4 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Peter Korsgaard, Jonathan Corbet, Lee Jones,
linux-doc, linux-kernel
This header only contains platform_data. Move it to the proper directory.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
Documentation/i2c/busses/i2c-ocores | 2 +-
drivers/i2c/busses/i2c-ocores.c | 2 +-
drivers/mfd/timberdale.c | 2 +-
include/linux/{ => platform_data}/i2c-ocores.h | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename include/linux/{ => platform_data}/i2c-ocores.h (100%)
diff --git a/Documentation/i2c/busses/i2c-ocores b/Documentation/i2c/busses/i2c-ocores
index c269aaa2f26a..c12fa9d3b050 100644
--- a/Documentation/i2c/busses/i2c-ocores
+++ b/Documentation/i2c/busses/i2c-ocores
@@ -18,7 +18,7 @@ Usage
i2c-ocores uses the platform bus, so you need to provide a struct
platform_device with the base address and interrupt number. The
dev.platform_data of the device should also point to a struct
-ocores_i2c_platform_data (see linux/i2c-ocores.h) describing the
+ocores_i2c_platform_data (see linux/platform_data/i2c-ocores.h) describing the
distance between registers and the input clock speed.
There is also a possibility to attach a list of i2c_board_info which
the i2c-ocores driver will add to the bus upon creation.
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 8c42ca7107b2..d7da9adf7ee1 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -21,7 +21,7 @@
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/wait.h>
-#include <linux/i2c-ocores.h>
+#include <linux/platform_data/i2c-ocores.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/log2.h>
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index cd4a6d7d6750..118d7ef727e6 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -30,7 +30,7 @@
#include <linux/timb_gpio.h>
#include <linux/i2c.h>
-#include <linux/i2c-ocores.h>
+#include <linux/platform_data/i2c-ocores.h>
#include <linux/i2c-xiic.h>
#include <linux/spi/spi.h>
diff --git a/include/linux/i2c-ocores.h b/include/linux/platform_data/i2c-ocores.h
similarity index 100%
rename from include/linux/i2c-ocores.h
rename to include/linux/platform_data/i2c-ocores.h
--
2.11.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 3/7] i2c: i2c-ocores: move header to platform_data
2018-04-19 20:00 ` [PATCH 3/7] i2c: i2c-ocores: " Wolfram Sang
@ 2018-04-20 8:05 ` Lee Jones
0 siblings, 0 replies; 21+ messages in thread
From: Lee Jones @ 2018-04-20 8:05 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-i2c, Peter Korsgaard, Jonathan Corbet, linux-doc, linux-kernel
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>
> ---
> Documentation/i2c/busses/i2c-ocores | 2 +-
> drivers/i2c/busses/i2c-ocores.c | 2 +-
> drivers/mfd/timberdale.c | 2 +-
> include/linux/{ => platform_data}/i2c-ocores.h | 0
> 4 files changed, 3 insertions(+), 3 deletions(-)
> rename include/linux/{ => platform_data}/i2c-ocores.h (100%)
Acked-by: Lee Jones <lee.jones@linaro.org>
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 4/7] i2c: i2c-omap: move header to platform_data
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
` (2 preceding siblings ...)
2018-04-19 20:00 ` [PATCH 3/7] i2c: i2c-ocores: " Wolfram Sang
@ 2018-04-19 20:00 ` Wolfram Sang
2018-04-19 20:25 ` Tony Lindgren
2018-04-19 20:00 ` [PATCH 5/7] i2c: i2c-pca-platform: " Wolfram Sang
` (3 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Aaro Koskinen, Tony Lindgren, Russell King,
Paul Walmsley, Benoît Cousson, linux-kernel, linux-omap,
linux-arm-kernel
This header only contains platform_data. Move it to the proper directory.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
MAINTAINERS | 4 ++--
arch/arm/mach-omap1/common.h | 2 +-
arch/arm/mach-omap1/i2c.c | 2 +-
arch/arm/mach-omap2/common.h | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +-
drivers/i2c/busses/i2c-omap.c | 2 +-
include/linux/{ => platform_data}/i2c-omap.h | 0
13 files changed, 13 insertions(+), 13 deletions(-)
rename include/linux/{ => platform_data}/i2c-omap.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 44b4bb5cf94e..c4b6d379423e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10235,7 +10235,7 @@ F: arch/arm/mach-omap1/
F: arch/arm/plat-omap/
F: arch/arm/configs/omap1_defconfig
F: drivers/i2c/busses/i2c-omap.c
-F: include/linux/i2c-omap.h
+F: include/linux/platform_data/i2c-omap.h
OMAP2+ SUPPORT
M: Tony Lindgren <tony@atomide.com>
@@ -10267,7 +10267,7 @@ F: drivers/regulator/tps65218-regulator.c
F: drivers/regulator/tps65910-regulator.c
F: drivers/regulator/twl-regulator.c
F: drivers/regulator/twl6030-regulator.c
-F: include/linux/i2c-omap.h
+F: include/linux/platform_data/i2c-omap.h
ONION OMEGA2+ BOARD
M: Harvey Hunt <harveyhuntnexus@gmail.com>
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index d83ff257eaa8..c6537d2c2859 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -27,7 +27,7 @@
#define __ARCH_ARM_MACH_OMAP1_COMMON_H
#include <linux/mtd/mtd.h>
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/reboot.h>
#include <asm/exception.h>
diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c
index 5bdf3c4190f9..9250f263ac51 100644
--- a/arch/arm/mach-omap1/i2c.c
+++ b/arch/arm/mach-omap1/i2c.c
@@ -20,7 +20,7 @@
*/
#include <linux/i2c.h>
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <mach/mux.h>
#include "soc.h"
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index fbe0b78bf489..ed1a7e2f176a 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -30,7 +30,7 @@
#include <linux/delay.h>
#include <linux/i2c.h>
#include <linux/mfd/twl.h>
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/reboot.h>
#include <linux/irqchip/irq-omap-intc.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index fe66cf247874..d684fac8f592 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -13,7 +13,7 @@
* XXX these should be marked initdata for multi-OMAP kernels
*/
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/omap-dma.h>
#include "omap_hwmod.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 74eefd30518c..abef9f6f9bf5 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -13,7 +13,7 @@
* XXX these should be marked initdata for multi-OMAP kernels
*/
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/omap-dma.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 53e1ac3724f2..c9483bc06228 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include "omap_hwmod.h"
#include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 23336b6c7125..9c0953de24da 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -15,7 +15,7 @@
* XXX these should be marked initdata for multi-OMAP kernels
*/
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/power/smartreflex.h>
#include <linux/platform_data/hsmmc-omap.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index e4f8ae9cd637..9e4b4243fec7 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -23,7 +23,7 @@
#include <linux/io.h>
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/power/smartreflex.h>
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/omap-dma.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index c72cd84b07ec..890c789485d3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -20,7 +20,7 @@
#include <linux/io.h>
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/power/smartreflex.h>
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/omap-dma.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 62352d1e6361..56b141fce973 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -20,7 +20,7 @@
#include <linux/io.h>
#include <linux/platform_data/hsmmc-omap.h>
#include <linux/power/smartreflex.h>
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/omap-dma.h>
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index b9172f08fd05..65d06a819307 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -36,7 +36,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/slab.h>
-#include <linux/i2c-omap.h>
+#include <linux/platform_data/i2c-omap.h>
#include <linux/pm_runtime.h>
#include <linux/pinctrl/consumer.h>
diff --git a/include/linux/i2c-omap.h b/include/linux/platform_data/i2c-omap.h
similarity index 100%
rename from include/linux/i2c-omap.h
rename to include/linux/platform_data/i2c-omap.h
--
2.11.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 5/7] i2c: i2c-pca-platform: move header to platform_data
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
` (3 preceding siblings ...)
2018-04-19 20:00 ` [PATCH 4/7] i2c: i2c-omap: " Wolfram Sang
@ 2018-04-19 20:00 ` Wolfram Sang
2018-04-19 20:00 ` [PATCH 6/7] i2c: i2c-xiic: " Wolfram Sang
` (2 subsequent siblings)
7 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Yoshinori Sato, Rich Felker, linux-sh, linux-kernel
This header only contains platform_data. Move it to the proper directory.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
arch/sh/boards/board-sh7785lcr.c | 2 +-
drivers/i2c/busses/i2c-pca-platform.c | 2 +-
include/linux/{ => platform_data}/i2c-pca-platform.h | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/linux/{ => platform_data}/i2c-pca-platform.h (100%)
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index d7d232dea33e..3cba60ff7aab 100644
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -17,7 +17,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/i2c.h>
-#include <linux/i2c-pca-platform.h>
+#include <linux/platform_data/i2c-pca-platform.h>
#include <linux/i2c-algo-pca.h>
#include <linux/usb/r8a66597.h>
#include <linux/sh_intc.h>
diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index bc2707ffd409..de3fe6e828cb 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -20,7 +20,7 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/i2c-algo-pca.h>
-#include <linux/i2c-pca-platform.h>
+#include <linux/platform_data/i2c-pca-platform.h>
#include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/io.h>
diff --git a/include/linux/i2c-pca-platform.h b/include/linux/platform_data/i2c-pca-platform.h
similarity index 100%
rename from include/linux/i2c-pca-platform.h
rename to include/linux/platform_data/i2c-pca-platform.h
--
2.11.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 6/7] i2c: i2c-xiic: move header to platform_data
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
` (4 preceding siblings ...)
2018-04-19 20:00 ` [PATCH 5/7] i2c: i2c-pca-platform: " Wolfram Sang
@ 2018-04-19 20:00 ` Wolfram Sang
2018-04-20 8:05 ` Lee Jones
2018-04-19 20:00 ` [PATCH 7/7] i2c: pnx: move header into the driver Wolfram Sang
2018-05-17 14:32 ` [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
7 siblings, 1 reply; 21+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c; +Cc: Wolfram Sang, Lee Jones, linux-kernel
This header only contains platform_data. Move it to the proper directory.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
drivers/i2c/busses/i2c-xiic.c | 2 +-
drivers/mfd/timberdale.c | 2 +-
include/linux/{ => platform_data}/i2c-xiic.h | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/linux/{ => platform_data}/i2c-xiic.h (100%)
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index c80527816ad0..0ff36f6d7a57 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -33,7 +33,7 @@
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/wait.h>
-#include <linux/i2c-xiic.h>
+#include <linux/platform_data/i2c-xiic.h>
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/of.h>
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 118d7ef727e6..33abf5a79f2b 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -31,7 +31,7 @@
#include <linux/i2c.h>
#include <linux/platform_data/i2c-ocores.h>
-#include <linux/i2c-xiic.h>
+#include <linux/platform_data/i2c-xiic.h>
#include <linux/spi/spi.h>
#include <linux/spi/xilinx_spi.h>
diff --git a/include/linux/i2c-xiic.h b/include/linux/platform_data/i2c-xiic.h
similarity index 100%
rename from include/linux/i2c-xiic.h
rename to include/linux/platform_data/i2c-xiic.h
--
2.11.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 6/7] i2c: i2c-xiic: move header to platform_data
2018-04-19 20:00 ` [PATCH 6/7] i2c: i2c-xiic: " Wolfram Sang
@ 2018-04-20 8:05 ` Lee Jones
0 siblings, 0 replies; 21+ messages in thread
From: Lee Jones @ 2018-04-20 8:05 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c, linux-kernel
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>
> ---
> drivers/i2c/busses/i2c-xiic.c | 2 +-
> drivers/mfd/timberdale.c | 2 +-
> include/linux/{ => platform_data}/i2c-xiic.h | 0
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename include/linux/{ => platform_data}/i2c-xiic.h (100%)
Acked-by: Lee Jones <lee.jones@linaro.org>
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 7/7] i2c: pnx: move header into the driver
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
` (5 preceding siblings ...)
2018-04-19 20:00 ` [PATCH 6/7] i2c: i2c-xiic: " Wolfram Sang
@ 2018-04-19 20:00 ` Wolfram Sang
2018-04-19 20:49 ` Vladimir Zapolskiy
2018-05-17 14:32 ` [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
7 siblings, 1 reply; 21+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Vladimir Zapolskiy, Sylvain Lemieux, linux-kernel,
linux-arm-kernel
There are no platform_data users anymore. Move the structs into the
driver.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
drivers/i2c/busses/i2c-pnx.c | 21 ++++++++++++++++++++-
include/linux/i2c-pnx.h | 38 --------------------------------------
2 files changed, 20 insertions(+), 39 deletions(-)
delete mode 100644 include/linux/i2c-pnx.h
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index a542041df0cd..6e0e546ef83f 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -18,7 +18,6 @@
#include <linux/timer.h>
#include <linux/completion.h>
#include <linux/platform_device.h>
-#include <linux/i2c-pnx.h>
#include <linux/io.h>
#include <linux/err.h>
#include <linux/clk.h>
@@ -29,6 +28,26 @@
#define I2C_PNX_SPEED_KHZ_DEFAULT 100
#define I2C_PNX_REGION_SIZE 0x100
+struct i2c_pnx_mif {
+ int ret; /* Return value */
+ int mode; /* Interface mode */
+ struct completion complete; /* I/O completion */
+ struct timer_list timer; /* Timeout */
+ u8 * buf; /* Data buffer */
+ int len; /* Length of data buffer */
+ int order; /* RX Bytes to order via TX */
+};
+
+struct i2c_pnx_algo_data {
+ void __iomem *ioaddr;
+ struct i2c_pnx_mif mif;
+ int last;
+ struct clk *clk;
+ struct i2c_adapter adapter;
+ int irq;
+ u32 timeout;
+};
+
enum {
mstatus_tdi = 0x00000001,
mstatus_afi = 0x00000002,
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
deleted file mode 100644
index 5388326fbbff..000000000000
--- a/include/linux/i2c-pnx.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Header file for I2C support on PNX010x/4008.
- *
- * Author: Dennis Kovalev <dkovalev@ru.mvista.com>
- *
- * 2004-2006 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#ifndef __I2C_PNX_H__
-#define __I2C_PNX_H__
-
-struct platform_device;
-struct clk;
-
-struct i2c_pnx_mif {
- int ret; /* Return value */
- int mode; /* Interface mode */
- struct completion complete; /* I/O completion */
- struct timer_list timer; /* Timeout */
- u8 * buf; /* Data buffer */
- int len; /* Length of data buffer */
- int order; /* RX Bytes to order via TX */
-};
-
-struct i2c_pnx_algo_data {
- void __iomem *ioaddr;
- struct i2c_pnx_mif mif;
- int last;
- struct clk *clk;
- struct i2c_adapter adapter;
- int irq;
- u32 timeout;
-};
-
-#endif /* __I2C_PNX_H__ */
--
2.11.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 0/7] i2c: clean up include/linux/i2c-*
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
` (6 preceding siblings ...)
2018-04-19 20:00 ` [PATCH 7/7] i2c: pnx: move header into the driver Wolfram Sang
@ 2018-05-17 14:32 ` Wolfram Sang
7 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2018-05-17 14:32 UTC (permalink / raw)
To: linux-i2c
Cc: linux-arm-kernel, linux-doc, linux-kernel, linux-media,
linux-mips, linux-omap, linux-sh
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
On Thu, Apr 19, 2018 at 10:00:06PM +0200, Wolfram Sang wrote:
> Move all plain platform_data includes to the platform_data-dir
> (except for i2c-pnx which can be moved into the driver itself).
>
> My preference is to take these patches via the i2c tree. I can provide an
> immutable branch if needed. But we can also discuss those going in via
> arch-trees if dependencies are against us.
All applied to for-next!
The immutable branch is here:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/platform_data-immutable
Thanks,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread