* [PATCH 0/3] gpio: move include files out of include/linux/i2c
@ 2017-05-21 21:57 Wolfram Sang
2017-05-21 21:57 ` [PATCH 1/3] gpio: max732x: move header file out of I2C realm Wolfram Sang
2017-05-21 21:57 ` [PATCH 2/3] gpio: pcf857x: " Wolfram Sang
0 siblings, 2 replies; 6+ messages in thread
From: Wolfram Sang @ 2017-05-21 21:57 UTC (permalink / raw)
To: linux-arm-kernel
It doesn't make sense to use include/linux/i2c for client drivers which may in
fact rather be hwmon or input or whatever devices. As a result, I want to
deprecate include/linux/i2c for good. This series moves the include files to a
better location, largely include/linux/platform_data because that is what most
of the moved include files contain.
I prefer the series to go upstream via the subsystem tree; if you prefer that I
take it via I2C, just let me know.
No runtime testing because of no HW, but buildbot is happy with this series at
least. A branch can be found here:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/platform_data
Thanks and kind regards,
Wolfram
Wolfram Sang (3):
gpio: max732x: move header file out of I2C realm
gpio: pcf857x: move header file out of I2C realm
gpio: adp5588: move header file out of I2C realm
arch/arm/mach-davinci/board-da830-evm.c | 2 +-
arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
arch/arm/mach-pxa/balloon3.c | 2 +-
arch/arm/mach-pxa/littleton.c | 2 +-
arch/arm/mach-pxa/stargate2.c | 2 +-
arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
arch/mips/ath79/mach-pb44.c | 2 +-
drivers/gpio/gpio-adp5588.c | 2 +-
drivers/gpio/gpio-max732x.c | 2 +-
drivers/gpio/gpio-pcf857x.c | 2 +-
drivers/input/keyboard/adp5588-keys.c | 2 +-
include/linux/{i2c => platform_data}/adp5588.h | 0
include/linux/{i2c => platform_data}/max732x.h | 0
include/linux/{i2c => platform_data}/pcf857x.h | 0
15 files changed, 12 insertions(+), 12 deletions(-)
rename include/linux/{i2c => platform_data}/adp5588.h (100%)
rename include/linux/{i2c => platform_data}/max732x.h (100%)
rename include/linux/{i2c => platform_data}/pcf857x.h (100%)
--
2.11.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] gpio: max732x: move header file out of I2C realm
2017-05-21 21:57 [PATCH 0/3] gpio: move include files out of include/linux/i2c Wolfram Sang
@ 2017-05-21 21:57 ` Wolfram Sang
2017-05-23 9:34 ` Linus Walleij
2017-05-21 21:57 ` [PATCH 2/3] gpio: pcf857x: " Wolfram Sang
1 sibling, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2017-05-21 21:57 UTC (permalink / raw)
To: linux-arm-kernel
include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
arch/arm/mach-pxa/littleton.c | 2 +-
drivers/gpio/gpio-max732x.c | 2 +-
include/linux/{i2c => platform_data}/max732x.h | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/linux/{i2c => platform_data}/max732x.h (100%)
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index 051c554776a6e7..fae38fdc8d8e56 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -27,7 +27,7 @@
#include <linux/i2c.h>
#include <linux/leds.h>
#include <linux/mfd/da903x.h>
-#include <linux/i2c/max732x.h>
+#include <linux/platform_data/max732x.h>
#include <linux/i2c/pxa-i2c.h>
#include <asm/types.h>
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 4ea4c6a1313b13..7f4d26ce5f231a 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -20,7 +20,7 @@
#include <linux/gpio/driver.h>
#include <linux/interrupt.h>
#include <linux/i2c.h>
-#include <linux/i2c/max732x.h>
+#include <linux/platform_data/max732x.h>
#include <linux/of.h>
diff --git a/include/linux/i2c/max732x.h b/include/linux/platform_data/max732x.h
similarity index 100%
rename from include/linux/i2c/max732x.h
rename to include/linux/platform_data/max732x.h
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] gpio: pcf857x: move header file out of I2C realm
2017-05-21 21:57 [PATCH 0/3] gpio: move include files out of include/linux/i2c Wolfram Sang
2017-05-21 21:57 ` [PATCH 1/3] gpio: max732x: move header file out of I2C realm Wolfram Sang
@ 2017-05-21 21:57 ` Wolfram Sang
2017-05-23 9:35 ` Linus Walleij
1 sibling, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2017-05-21 21:57 UTC (permalink / raw)
To: linux-arm-kernel
include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
arch/arm/mach-davinci/board-da830-evm.c | 2 +-
arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
arch/arm/mach-pxa/balloon3.c | 2 +-
arch/arm/mach-pxa/stargate2.c | 2 +-
arch/mips/ath79/mach-pb44.c | 2 +-
drivers/gpio/gpio-pcf857x.c | 2 +-
include/linux/{i2c => platform_data}/pcf857x.h | 0
8 files changed, 7 insertions(+), 7 deletions(-)
rename include/linux/{i2c => platform_data}/pcf857x.h (100%)
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 58075627c6df3e..f673cd7a676658 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -17,7 +17,7 @@
#include <linux/gpio/machine.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
-#include <linux/i2c/pcf857x.h>
+#include <linux/platform_data/pcf857x.h>
#include <linux/platform_data/at24.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 20f1874a5657e2..70e00dbeec9694 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -14,7 +14,7 @@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
-#include <linux/i2c/pcf857x.h>
+#include <linux/platform_data/pcf857x.h>
#include <linux/platform_data/at24.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index cb176826d1cbe4..ca69d0b96a4f07 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -23,7 +23,7 @@
#include <linux/platform_device.h>
#include <linux/i2c.h>
#include <linux/platform_data/at24.h>
-#include <linux/i2c/pcf857x.h>
+#include <linux/platform_data/pcf857x.h>
#include <media/i2c/tvp514x.h>
#include <media/i2c/adv7343.h>
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index d452a49c039647..1467c1d1e54194 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -27,7 +27,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/types.h>
-#include <linux/i2c/pcf857x.h>
+#include <linux/platform_data/pcf857x.h>
#include <linux/i2c/pxa-i2c.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 7b6610e9dae46c..2d45d18b1a5e0a 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -26,7 +26,7 @@
#include <linux/mtd/partitions.h>
#include <linux/i2c/pxa-i2c.h>
-#include <linux/i2c/pcf857x.h>
+#include <linux/platform_data/pcf857x.h>
#include <linux/platform_data/at24.h>
#include <linux/smc91x.h>
#include <linux/gpio.h>
diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c
index 67b980d94fb7aa..be78298dffb4f3 100644
--- a/arch/mips/ath79/mach-pb44.c
+++ b/arch/mips/ath79/mach-pb44.c
@@ -12,7 +12,7 @@
#include <linux/platform_device.h>
#include <linux/i2c.h>
#include <linux/i2c-gpio.h>
-#include <linux/i2c/pcf857x.h>
+#include <linux/platform_data/pcf857x.h>
#include "machtypes.h"
#include "dev-gpio-buttons.h"
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 8ddf9302ce3b07..a4fd78b9c0e4e3 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -20,7 +20,7 @@
#include <linux/gpio.h>
#include <linux/i2c.h>
-#include <linux/i2c/pcf857x.h>
+#include <linux/platform_data/pcf857x.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/irqdomain.h>
diff --git a/include/linux/i2c/pcf857x.h b/include/linux/platform_data/pcf857x.h
similarity index 100%
rename from include/linux/i2c/pcf857x.h
rename to include/linux/platform_data/pcf857x.h
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] gpio: pcf857x: move header file out of I2C realm
2017-05-21 21:57 ` [PATCH 2/3] gpio: pcf857x: " Wolfram Sang
@ 2017-05-23 9:35 ` Linus Walleij
2017-05-25 8:52 ` Sekhar Nori
0 siblings, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2017-05-23 9:35 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, May 21, 2017 at 11:57 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> include/linux/i2c is not for client devices. Move the header file to a
> more appropriate location.
>
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> ---
> arch/arm/mach-davinci/board-da830-evm.c | 2 +-
> arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
> arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
> arch/arm/mach-pxa/balloon3.c | 2 +-
> arch/arm/mach-pxa/stargate2.c | 2 +-
> arch/mips/ath79/mach-pb44.c | 2 +-
> drivers/gpio/gpio-pcf857x.c | 2 +-
> include/linux/{i2c => platform_data}/pcf857x.h | 0
> 8 files changed, 7 insertions(+), 7 deletions(-)
> rename include/linux/{i2c => platform_data}/pcf857x.h (100%)
Patch applied.
BTW ARM SoC maintainers be warned, I optimistically assume this will
not collide with any ARM SoC work...
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/3] gpio: pcf857x: move header file out of I2C realm
2017-05-23 9:35 ` Linus Walleij
@ 2017-05-25 8:52 ` Sekhar Nori
0 siblings, 0 replies; 6+ messages in thread
From: Sekhar Nori @ 2017-05-25 8:52 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
On Tuesday 23 May 2017 03:05 PM, Linus Walleij wrote:
> On Sun, May 21, 2017 at 11:57 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
>> include/linux/i2c is not for client devices. Move the header file to a
>> more appropriate location.
>>
>> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
>> ---
>> arch/arm/mach-davinci/board-da830-evm.c | 2 +-
>> arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
>> arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
>> arch/arm/mach-pxa/balloon3.c | 2 +-
>> arch/arm/mach-pxa/stargate2.c | 2 +-
>> arch/mips/ath79/mach-pb44.c | 2 +-
>> drivers/gpio/gpio-pcf857x.c | 2 +-
>> include/linux/{i2c => platform_data}/pcf857x.h | 0
>> 8 files changed, 7 insertions(+), 7 deletions(-)
>> rename include/linux/{i2c => platform_data}/pcf857x.h (100%)
>
> Patch applied.
>
> BTW ARM SoC maintainers be warned, I optimistically assume this will
> not collide with any ARM SoC work...
Thanks for the heads-up. The mach-davinci part does not clash with
anything I have queued. I added this patch to a branch of my tree which
I merge together but don't sent upstream. So I will know if I end up
queuing anything which clashes.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-05-25 8:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-21 21:57 [PATCH 0/3] gpio: move include files out of include/linux/i2c Wolfram Sang
2017-05-21 21:57 ` [PATCH 1/3] gpio: max732x: move header file out of I2C realm Wolfram Sang
2017-05-23 9:34 ` Linus Walleij
2017-05-21 21:57 ` [PATCH 2/3] gpio: pcf857x: " Wolfram Sang
2017-05-23 9:35 ` Linus Walleij
2017-05-25 8:52 ` Sekhar Nori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).