* [PATCH 0/7] i2c: clean up include/linux/i2c-*
@ 2018-04-19 20:00 Wolfram Sang
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
2018-05-17 14:32 ` [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
0 siblings, 2 replies; 10+ messages in thread
From: Wolfram Sang @ 2018-04-19 20:00 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, linux-arm-kernel, linux-doc, linux-kernel,
linux-media, linux-mips, linux-omap, linux-sh
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.
The current branch can be found here:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/platform_data
and buildbot had no complaints.
Looking forward to comments or Acks, Revs...
Kind regards,
Wolfram
Wolfram Sang (7):
i2c: i2c-gpio: move header to platform_data
i2c: i2c-mux-gpio: move header to platform_data
i2c: i2c-ocores: move header to platform_data
i2c: i2c-omap: move header to platform_data
i2c: i2c-pca-platform: move header to platform_data
i2c: i2c-xiic: move header to platform_data
i2c: pnx: move header into the driver
Documentation/i2c/busses/i2c-ocores | 2 +-
Documentation/i2c/muxes/i2c-mux-gpio | 4 +--
MAINTAINERS | 8 ++---
arch/arm/mach-ks8695/board-acs5k.c | 2 +-
arch/arm/mach-omap1/board-htcherald.c | 2 +-
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 +-
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 +-
arch/sh/boards/board-sh7785lcr.c | 2 +-
drivers/i2c/busses/i2c-gpio.c | 2 +-
drivers/i2c/busses/i2c-i801.c | 2 +-
drivers/i2c/busses/i2c-ocores.c | 2 +-
drivers/i2c/busses/i2c-omap.c | 2 +-
drivers/i2c/busses/i2c-pca-platform.c | 2 +-
drivers/i2c/busses/i2c-pnx.c | 21 +++++++++++-
drivers/i2c/busses/i2c-xiic.c | 2 +-
drivers/i2c/muxes/i2c-mux-gpio.c | 2 +-
drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +-
drivers/mfd/sm501.c | 2 +-
drivers/mfd/timberdale.c | 4 +--
include/linux/i2c-pnx.h | 38 ----------------------
include/linux/{ => platform_data}/i2c-gpio.h | 0
include/linux/{ => platform_data}/i2c-mux-gpio.h | 0
include/linux/{ => platform_data}/i2c-ocores.h | 0
include/linux/{ => platform_data}/i2c-omap.h | 0
.../linux/{ => platform_data}/i2c-pca-platform.h | 0
include/linux/{ => platform_data}/i2c-xiic.h | 0
38 files changed, 55 insertions(+), 74 deletions(-)
delete mode 100644 include/linux/i2c-pnx.h
rename include/linux/{ => platform_data}/i2c-gpio.h (100%)
rename include/linux/{ => platform_data}/i2c-mux-gpio.h (100%)
rename include/linux/{ => platform_data}/i2c-ocores.h (100%)
rename include/linux/{ => platform_data}/i2c-omap.h (100%)
rename include/linux/{ => platform_data}/i2c-pca-platform.h (100%)
rename include/linux/{ => platform_data}/i2c-xiic.h (100%)
--
2.11.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [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-05-17 14:32 ` [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
1 sibling, 5 replies; 10+ 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] 10+ 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; 10+ 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] 10+ 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; 10+ 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] 10+ 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; 10+ 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] 10+ 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; 10+ 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] 10+ 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; 10+ 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] 10+ 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; 10+ 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] 10+ 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; 10+ 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] 10+ 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
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
@ 2018-05-17 14:32 ` Wolfram Sang
1 sibling, 0 replies; 10+ 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] 10+ messages in thread
end of thread, other threads:[~2018-05-17 14:32 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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: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
2018-05-14 21:42 ` James Hogan
2018-05-14 23:03 ` Greg Ungerer
2018-05-17 14:32 ` [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox