Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1646438 > unrolled thread

[PATCH 0/4] input: move include files out of include/linux/i2c

Started byWolfram Sang <wsa@the-dreams.de>
First post2017-05-21 22:50 +0200
Last post2017-05-21 22:50 +0200
Articles 7 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/4] input: move include files out of include/linux/i2c Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:50 +0200
    [PATCH 2/4] input: mcs: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:50 +0200
    [PATCH 4/4] input: tsc2007: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:50 +0200
      Re: [PATCH 4/4] input: tsc2007: move header file out of I2C realm Lee Jones <lee.jones@linaro.org> - 2017-05-22 09:50 +0200
        Re: [PATCH 4/4] input: tsc2007: move header file out of I2C realm Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-05-22 23:00 +0200
    [PATCH 1/4] input: lm8323: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:50 +0200
    [PATCH 3/4] input: mms114: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-21 22:50 +0200

#1646438 — [PATCH 0/4] input: move include files out of include/linux/i2c

FromWolfram Sang <wsa@the-dreams.de>
Date2017-05-21 22:50 +0200
Subject[PATCH 0/4] input: move include files out of include/linux/i2c
Message-ID<tJFXz-4dN-5@gated-at.bofh.it>
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, for the input subsystem to include/linux/input. If you prefer
include/linux/platform_data, because that is what most of the moved include
files contain, let me know. Note that some files don't seem to have upstream
users in board code, so they maybe could even be removed? I didn't check for
that now, but I did it for one i2c master driver recently. So, it may be
possible.

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 (4):
  input: lm8323: move header file out of I2C realm
  input: mcs: move header file out of I2C realm
  input: mms114: move header file out of I2C realm
  input: tsc2007: move header file out of I2C realm

 arch/sh/boards/mach-ecovec24/setup.c     | 2 +-
 drivers/input/keyboard/lm8323.c          | 2 +-
 drivers/input/keyboard/mcs_touchkey.c    | 2 +-
 drivers/input/touchscreen/mcs5000_ts.c   | 2 +-
 drivers/input/touchscreen/mms114.c       | 2 +-
 drivers/input/touchscreen/tsc2007_core.c | 2 +-
 drivers/mfd/timberdale.c                 | 2 +-
 include/linux/{i2c => input}/lm8323.h    | 0
 include/linux/{i2c => input}/mcs.h       | 0
 include/linux/{i2c => input}/mms114.h    | 0
 include/linux/{i2c => input}/tsc2007.h   | 2 +-
 11 files changed, 8 insertions(+), 8 deletions(-)
 rename include/linux/{i2c => input}/lm8323.h (100%)
 rename include/linux/{i2c => input}/mcs.h (100%)
 rename include/linux/{i2c => input}/mms114.h (100%)
 rename include/linux/{i2c => input}/tsc2007.h (95%)

-- 
2.11.0

[toc] | [next] | [standalone]

#1646439 — [PATCH 2/4] input: mcs: move header file out of I2C realm

FromWolfram Sang <wsa@the-dreams.de>
Date2017-05-21 22:50 +0200
Subject[PATCH 2/4] input: mcs: move header file out of I2C realm
Message-ID<tJFXz-4dN-7@gated-at.bofh.it>
In reply to#1646438
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>
---
 drivers/input/keyboard/mcs_touchkey.c  | 2 +-
 drivers/input/touchscreen/mcs5000_ts.c | 2 +-
 include/linux/{i2c => input}/mcs.h     | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{i2c => input}/mcs.h (100%)

diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
index 31090d71a685d1..7781ca28c54190 100644
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c
@@ -13,7 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/i2c/mcs.h>
+#include <linux/input/mcs.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/irq.h>
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index 90fc07dc98a6bb..53f45ea161192b 100644
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -15,7 +15,7 @@
 
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/i2c/mcs.h>
+#include <linux/input/mcs.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/irq.h>
diff --git a/include/linux/i2c/mcs.h b/include/linux/input/mcs.h
similarity index 100%
rename from include/linux/i2c/mcs.h
rename to include/linux/input/mcs.h
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1646440 — [PATCH 4/4] input: tsc2007: move header file out of I2C realm

FromWolfram Sang <wsa@the-dreams.de>
Date2017-05-21 22:50 +0200
Subject[PATCH 4/4] input: tsc2007: move header file out of I2C realm
Message-ID<tJFXA-4dN-13@gated-at.bofh.it>
In reply to#1646438
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/sh/boards/mach-ecovec24/setup.c     | 2 +-
 drivers/input/touchscreen/tsc2007_core.c | 2 +-
 drivers/mfd/timberdale.c                 | 2 +-
 include/linux/{i2c => input}/tsc2007.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename include/linux/{i2c => input}/tsc2007.h (95%)

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 6d612792f6b8ec..efca883d3466cc 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -24,7 +24,7 @@
 #include <linux/usb/r8a66597.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/i2c.h>
-#include <linux/i2c/tsc2007.h>
+#include <linux/input/tsc2007.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/sh_msiof.h>
 #include <linux/spi/mmc_spi.h>
diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
index fc7384936011dc..b680b942e4abde 100644
--- a/drivers/input/touchscreen/tsc2007_core.c
+++ b/drivers/input/touchscreen/tsc2007_core.c
@@ -25,7 +25,7 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/i2c/tsc2007.h>
+#include <linux/input/tsc2007.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include "tsc2007.h"
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index c9339f85359b74..84523b630e2fdf 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -32,7 +32,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-ocores.h>
 #include <linux/i2c-xiic.h>
-#include <linux/i2c/tsc2007.h>
+#include <linux/input/tsc2007.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/xilinx_spi.h>
diff --git a/include/linux/i2c/tsc2007.h b/include/linux/input/tsc2007.h
similarity index 95%
rename from include/linux/i2c/tsc2007.h
rename to include/linux/input/tsc2007.h
index 4f35b6ad3889fa..c7b7eb024328d5 100644
--- a/include/linux/i2c/tsc2007.h
+++ b/include/linux/input/tsc2007.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_I2C_TSC2007_H
 #define __LINUX_I2C_TSC2007_H
 
-/* linux/i2c/tsc2007.h */
+/* linux/input/tsc2007.h */
 
 struct tsc2007_platform_data {
 	u16	model;				/* 2007. */
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1646580 — Re: [PATCH 4/4] input: tsc2007: move header file out of I2C realm

FromLee Jones <lee.jones@linaro.org>
Date2017-05-22 09:50 +0200
SubjectRe: [PATCH 4/4] input: tsc2007: move header file out of I2C realm
Message-ID<tJQgi-2Cc-19@gated-at.bofh.it>
In reply to#1646440
On Sun, 21 May 2017, Wolfram Sang 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/sh/boards/mach-ecovec24/setup.c     | 2 +-
>  drivers/input/touchscreen/tsc2007_core.c | 2 +-
>  drivers/mfd/timberdale.c                 | 2 +-

Acked-by: Lee Jones <lee.jones@linaro.org>

>  include/linux/{i2c => input}/tsc2007.h   | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>  rename include/linux/{i2c => input}/tsc2007.h (95%)
> 
> diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
> index 6d612792f6b8ec..efca883d3466cc 100644
> --- a/arch/sh/boards/mach-ecovec24/setup.c
> +++ b/arch/sh/boards/mach-ecovec24/setup.c
> @@ -24,7 +24,7 @@
>  #include <linux/usb/r8a66597.h>
>  #include <linux/usb/renesas_usbhs.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/tsc2007.h>
> +#include <linux/input/tsc2007.h>
>  #include <linux/spi/spi.h>
>  #include <linux/spi/sh_msiof.h>
>  #include <linux/spi/mmc_spi.h>
> diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
> index fc7384936011dc..b680b942e4abde 100644
> --- a/drivers/input/touchscreen/tsc2007_core.c
> +++ b/drivers/input/touchscreen/tsc2007_core.c
> @@ -25,7 +25,7 @@
>  #include <linux/input.h>
>  #include <linux/interrupt.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/tsc2007.h>
> +#include <linux/input/tsc2007.h>
>  #include <linux/of_device.h>
>  #include <linux/of_gpio.h>
>  #include "tsc2007.h"
> diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
> index c9339f85359b74..84523b630e2fdf 100644
> --- a/drivers/mfd/timberdale.c
> +++ b/drivers/mfd/timberdale.c
> @@ -32,7 +32,7 @@
>  #include <linux/i2c.h>
>  #include <linux/i2c-ocores.h>
>  #include <linux/i2c-xiic.h>
> -#include <linux/i2c/tsc2007.h>
> +#include <linux/input/tsc2007.h>
>  
>  #include <linux/spi/spi.h>
>  #include <linux/spi/xilinx_spi.h>
> diff --git a/include/linux/i2c/tsc2007.h b/include/linux/input/tsc2007.h
> similarity index 95%
> rename from include/linux/i2c/tsc2007.h
> rename to include/linux/input/tsc2007.h
> index 4f35b6ad3889fa..c7b7eb024328d5 100644
> --- a/include/linux/i2c/tsc2007.h
> +++ b/include/linux/input/tsc2007.h
> @@ -1,7 +1,7 @@
>  #ifndef __LINUX_I2C_TSC2007_H
>  #define __LINUX_I2C_TSC2007_H
>  
> -/* linux/i2c/tsc2007.h */
> +/* linux/input/tsc2007.h */
>  
>  struct tsc2007_platform_data {
>  	u16	model;				/* 2007. */

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[toc] | [prev] | [next] | [standalone]

#1647383 — Re: [PATCH 4/4] input: tsc2007: move header file out of I2C realm

FromDmitry Torokhov <dmitry.torokhov@gmail.com>
Date2017-05-22 23:00 +0200
SubjectRe: [PATCH 4/4] input: tsc2007: move header file out of I2C realm
Message-ID<tK2AO-1ZI-25@gated-at.bofh.it>
In reply to#1646580
On Mon, May 22, 2017 at 08:41:05AM +0100, Lee Jones wrote:
> On Sun, 21 May 2017, Wolfram Sang 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/sh/boards/mach-ecovec24/setup.c     | 2 +-
> >  drivers/input/touchscreen/tsc2007_core.c | 2 +-
> >  drivers/mfd/timberdale.c                 | 2 +-
> 
> Acked-by: Lee Jones <lee.jones@linaro.org>
> 
> >  include/linux/{i2c => input}/tsc2007.h   | 2 +-
> >  4 files changed, 4 insertions(+), 4 deletions(-)
> >  rename include/linux/{i2c => input}/tsc2007.h (95%)

This should really go into include/linux/platform_data/, not into
input/, for the same reason you are moving it out of i2c. I'd also like
to get rid of platform data for tsc2007 altogether...

I guess I'll take it (moving to platform_data/) so I can work on generic
properties...

Thanks.

-- 
Dmitry

[toc] | [prev] | [next] | [standalone]

#1646442 — [PATCH 1/4] input: lm8323: move header file out of I2C realm

FromWolfram Sang <wsa@the-dreams.de>
Date2017-05-21 22:50 +0200
Subject[PATCH 1/4] input: lm8323: move header file out of I2C realm
Message-ID<tJFXA-4dN-23@gated-at.bofh.it>
In reply to#1646438
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>
---
 drivers/input/keyboard/lm8323.c       | 2 +-
 include/linux/{i2c => input}/lm8323.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename include/linux/{i2c => input}/lm8323.h (100%)

diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 21bea52d436579..53fc226e589048 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -31,7 +31,7 @@
 #include <linux/input.h>
 #include <linux/leds.h>
 #include <linux/pm.h>
-#include <linux/i2c/lm8323.h>
+#include <linux/input/lm8323.h>
 #include <linux/slab.h>
 
 /* Commands to send to the chip. */
diff --git a/include/linux/i2c/lm8323.h b/include/linux/input/lm8323.h
similarity index 100%
rename from include/linux/i2c/lm8323.h
rename to include/linux/input/lm8323.h
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1646444 — [PATCH 3/4] input: mms114: move header file out of I2C realm

FromWolfram Sang <wsa@the-dreams.de>
Date2017-05-21 22:50 +0200
Subject[PATCH 3/4] input: mms114: move header file out of I2C realm
Message-ID<tJFXA-4dN-29@gated-at.bofh.it>
In reply to#1646438
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>
---
 drivers/input/touchscreen/mms114.c    | 2 +-
 include/linux/{i2c => input}/mms114.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename include/linux/{i2c => input}/mms114.h (100%)

diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c
index 1fafc9f57af6c7..0a0425e9c29c3d 100644
--- a/drivers/input/touchscreen/mms114.c
+++ b/drivers/input/touchscreen/mms114.c
@@ -11,7 +11,7 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/i2c.h>
-#include <linux/i2c/mms114.h>
+#include <linux/input/mms114.h>
 #include <linux/input/mt.h>
 #include <linux/interrupt.h>
 #include <linux/regulator/consumer.h>
diff --git a/include/linux/i2c/mms114.h b/include/linux/input/mms114.h
similarity index 100%
rename from include/linux/i2c/mms114.h
rename to include/linux/input/mms114.h
-- 
2.11.0

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web