Groups > linux.kernel > #1646459 > unrolled thread

[PATCH 0/3] mfd: move include files out of include/linux/i2c

Started by	Wolfram Sang <wsa@the-dreams.de>
First post	2017-05-22 00:10 +0200
Last post	2017-05-23 09:50 +0200
Articles	17 — 9 participants

Back to article view | Back to linux.kernel

  [PATCH 0/3] mfd: move include files out of include/linux/i2c Wolfram Sang <wsa@the-dreams.de> - 2017-05-22 00:10 +0200
    [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-22 00:10 +0200
      Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-05-22 11:20 +0200
      Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-05-23 01:40 +0200
      Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm Lee Jones <lee.jones@linaro.org> - 2017-05-23 09:20 +0200
    [PATCH 3/3] mfd: twl: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-22 00:10 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-22 09:30 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-05-22 11:20 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Mark Brown <broonie@kernel.org> - 2017-05-22 12:00 +0200
        Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-22 12:40 +0200
          Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Mark Brown <broonie@kernel.org> - 2017-05-22 13:20 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-05-22 12:40 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Jonathan Cameron <jic23@kernel.org> - 2017-05-22 22:40 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-05-23 01:40 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Lee Jones <lee.jones@linaro.org> - 2017-05-23 09:20 +0200
        Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Wolfram Sang <wsa@the-dreams.de> - 2017-05-23 09:30 +0200
      Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Kishon Vijay Abraham I <kishon@ti.com> - 2017-05-23 09:50 +0200

#1646459 — [PATCH 0/3] mfd: move include files out of include/linux/i2c

From	Wolfram Sang <wsa@the-dreams.de>
Date	2017-05-22 00:10 +0200
Subject	[PATCH 0/3] mfd: move include files out of include/linux/i2c
Message-ID	<tJHcZ-59Y-3@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 mfd subsystem to include/linux/mfd. Because of twl.h,
this touches quite some subsystems, but I still think it is worth it.

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):
  mfd: dm355evm_msp: move header file out of I2C realm
  mfd: tps65010: move header file out of I2C realm
  mfd: twl: move header file out of I2C realm

 arch/arm/mach-omap1/board-h2-mmc.c        | 2 +-
 arch/arm/mach-omap1/board-h2.c            | 2 +-
 arch/arm/mach-omap1/board-h3-mmc.c        | 2 +-
 arch/arm/mach-omap1/board-h3.c            | 2 +-
 arch/arm/mach-omap1/board-osk.c           | 2 +-
 arch/arm/mach-omap2/common.h              | 2 +-
 arch/arm/mach-omap2/omap_twl.c            | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris-dvs.c   | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c       | 2 +-
 drivers/gpio/gpio-twl4030.c               | 2 +-
 drivers/iio/adc/twl4030-madc.c            | 2 +-
 drivers/iio/adc/twl6030-gpadc.c           | 2 +-
 drivers/input/keyboard/twl4030_keypad.c   | 2 +-
 drivers/input/misc/dm355evm_keys.c        | 2 +-
 drivers/input/misc/twl4030-pwrbutton.c    | 2 +-
 drivers/input/misc/twl4030-vibra.c        | 2 +-
 drivers/mfd/dm355evm_msp.c                | 2 +-
 drivers/mfd/tps65010.c                    | 2 +-
 drivers/mfd/twl-core.c                    | 6 +++---
 drivers/mfd/twl4030-audio.c               | 2 +-
 drivers/mfd/twl4030-irq.c                 | 2 +-
 drivers/mfd/twl4030-power.c               | 2 +-
 drivers/mfd/twl6030-irq.c                 | 2 +-
 drivers/phy/phy-twl4030-usb.c             | 2 +-
 drivers/power/supply/twl4030_charger.c    | 2 +-
 drivers/pwm/pwm-twl-led.c                 | 2 +-
 drivers/pwm/pwm-twl.c                     | 2 +-
 drivers/regulator/twl-regulator.c         | 2 +-
 drivers/regulator/twl6030-regulator.c     | 2 +-
 drivers/rtc/rtc-dm355evm.c                | 2 +-
 drivers/rtc/rtc-twl.c                     | 2 +-
 drivers/usb/host/ohci-omap.c              | 2 +-
 drivers/usb/phy/phy-isp1301-omap.c        | 2 +-
 drivers/usb/phy/phy-twl6030-usb.c         | 2 +-
 drivers/video/backlight/pandora_bl.c      | 2 +-
 drivers/video/fbdev/omap/lcd_h3.c         | 2 +-
 drivers/watchdog/twl4030_wdt.c            | 2 +-
 include/linux/{i2c => mfd}/dm355evm_msp.h | 0
 include/linux/{i2c => mfd}/tps65010.h     | 2 +-
 include/linux/{i2c => mfd}/twl.h          | 0
 sound/soc/codecs/twl4030.c                | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)
 rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%)
 rename include/linux/{i2c => mfd}/tps65010.h (99%)
 rename include/linux/{i2c => mfd}/twl.h (100%)

-- 
2.11.0

[toc] | [next] | [standalone]

#1646460 — [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

From	Wolfram Sang <wsa@the-dreams.de>
Date	2017-05-22 00:10 +0200
Subject	[PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm
Message-ID	<tJHd0-59Y-11@gated-at.bofh.it>
In reply to	#1646459

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/misc/dm355evm_keys.c        | 2 +-
 drivers/mfd/dm355evm_msp.c                | 2 +-
 drivers/rtc/rtc-dm355evm.c                | 2 +-
 include/linux/{i2c => mfd}/dm355evm_msp.h | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%)

diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index bab256ef32b9b3..c803db64a3760d 100644
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 #include <linux/module.h>
 
 
diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 86eca614507bd8..2a2756709f22f0 100644
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -18,7 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/i2c.h>
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 
 
 /*
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
index f225cd873ff6c2..97d8259b94940f 100644
--- a/drivers/rtc/rtc-dm355evm.c
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -13,7 +13,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 #include <linux/module.h>
 
 
diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h
similarity index 100%
rename from include/linux/i2c/dm355evm_msp.h
rename to include/linux/mfd/dm355evm_msp.h
-- 
2.11.0

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

#1646642 — Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

From	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date	2017-05-22 11:20 +0200
Subject	Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm
Message-ID	<tJRFo-3IZ-31@gated-at.bofh.it>
In reply to	#1646460

On 22/05/2017 at 00:02:08 +0200, 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>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

> ---
>  drivers/input/misc/dm355evm_keys.c        | 2 +-
>  drivers/mfd/dm355evm_msp.c                | 2 +-
>  drivers/rtc/rtc-dm355evm.c                | 2 +-
>  include/linux/{i2c => mfd}/dm355evm_msp.h | 0
>  4 files changed, 3 insertions(+), 3 deletions(-)
>  rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%)
> 
> diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
> index bab256ef32b9b3..c803db64a3760d 100644
> --- a/drivers/input/misc/dm355evm_keys.c
> +++ b/drivers/input/misc/dm355evm_keys.c
> @@ -15,7 +15,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
>  
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  #include <linux/module.h>
>  
>  
> diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
> index 86eca614507bd8..2a2756709f22f0 100644
> --- a/drivers/mfd/dm355evm_msp.c
> +++ b/drivers/mfd/dm355evm_msp.c
> @@ -18,7 +18,7 @@
>  #include <linux/gpio.h>
>  #include <linux/leds.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  
>  
>  /*
> diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
> index f225cd873ff6c2..97d8259b94940f 100644
> --- a/drivers/rtc/rtc-dm355evm.c
> +++ b/drivers/rtc/rtc-dm355evm.c
> @@ -13,7 +13,7 @@
>  #include <linux/rtc.h>
>  #include <linux/platform_device.h>
>  
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  #include <linux/module.h>
>  
>  
> diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h
> similarity index 100%
> rename from include/linux/i2c/dm355evm_msp.h
> rename to include/linux/mfd/dm355evm_msp.h
> -- 
> 2.11.0
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

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

#1647486 — Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

From	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date	2017-05-23 01:40 +0200
Subject	Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm
Message-ID	<tK55D-3FX-3@gated-at.bofh.it>
In reply to	#1646460

On Mon, May 22, 2017 at 12:02:08AM +0200, 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>
> ---
>  drivers/input/misc/dm355evm_keys.c        | 2 +-

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

>  drivers/mfd/dm355evm_msp.c                | 2 +-
>  drivers/rtc/rtc-dm355evm.c                | 2 +-
>  include/linux/{i2c => mfd}/dm355evm_msp.h | 0
>  4 files changed, 3 insertions(+), 3 deletions(-)
>  rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%)
> 
> diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
> index bab256ef32b9b3..c803db64a3760d 100644
> --- a/drivers/input/misc/dm355evm_keys.c
> +++ b/drivers/input/misc/dm355evm_keys.c
> @@ -15,7 +15,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
>  
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  #include <linux/module.h>
>  
>  
> diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
> index 86eca614507bd8..2a2756709f22f0 100644
> --- a/drivers/mfd/dm355evm_msp.c
> +++ b/drivers/mfd/dm355evm_msp.c
> @@ -18,7 +18,7 @@
>  #include <linux/gpio.h>
>  #include <linux/leds.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  
>  
>  /*
> diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
> index f225cd873ff6c2..97d8259b94940f 100644
> --- a/drivers/rtc/rtc-dm355evm.c
> +++ b/drivers/rtc/rtc-dm355evm.c
> @@ -13,7 +13,7 @@
>  #include <linux/rtc.h>
>  #include <linux/platform_device.h>
>  
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  #include <linux/module.h>
>  
>  
> diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h
> similarity index 100%
> rename from include/linux/i2c/dm355evm_msp.h
> rename to include/linux/mfd/dm355evm_msp.h
> -- 
> 2.11.0
> 

-- 
Dmitry

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

#1647706 — Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

From	Lee Jones <lee.jones@linaro.org>
Date	2017-05-23 09:20 +0200
Subject	Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm
Message-ID	<tKcgN-8mw-1@gated-at.bofh.it>
In reply to	#1646460

On Mon, 22 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>
> ---
>  drivers/input/misc/dm355evm_keys.c        | 2 +-

>  drivers/mfd/dm355evm_msp.c                | 2 +-

For my own reference:
  Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
  
>  drivers/rtc/rtc-dm355evm.c                | 2 +-
>  include/linux/{i2c => mfd}/dm355evm_msp.h | 0
>  4 files changed, 3 insertions(+), 3 deletions(-)
>  rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%)
> 
> diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
> index bab256ef32b9b3..c803db64a3760d 100644
> --- a/drivers/input/misc/dm355evm_keys.c
> +++ b/drivers/input/misc/dm355evm_keys.c
> @@ -15,7 +15,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
>  
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  #include <linux/module.h>
>  
>  
> diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
> index 86eca614507bd8..2a2756709f22f0 100644
> --- a/drivers/mfd/dm355evm_msp.c
> +++ b/drivers/mfd/dm355evm_msp.c
> @@ -18,7 +18,7 @@
>  #include <linux/gpio.h>
>  #include <linux/leds.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  
>  
>  /*
> diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
> index f225cd873ff6c2..97d8259b94940f 100644
> --- a/drivers/rtc/rtc-dm355evm.c
> +++ b/drivers/rtc/rtc-dm355evm.c
> @@ -13,7 +13,7 @@
>  #include <linux/rtc.h>
>  #include <linux/platform_device.h>
>  
> -#include <linux/i2c/dm355evm_msp.h>
> +#include <linux/mfd/dm355evm_msp.h>
>  #include <linux/module.h>
>  
>  
> diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h
> similarity index 100%
> rename from include/linux/i2c/dm355evm_msp.h
> rename to include/linux/mfd/dm355evm_msp.h

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

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

#1646461 — [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Wolfram Sang <wsa@the-dreams.de>
Date	2017-05-22 00:10 +0200
Subject	[PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tJHd0-59Y-13@gated-at.bofh.it>
In reply to	#1646459

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-omap2/common.h            | 2 +-
 arch/arm/mach-omap2/omap_twl.c          | 2 +-
 drivers/gpio/gpio-twl4030.c             | 2 +-
 drivers/iio/adc/twl4030-madc.c          | 2 +-
 drivers/iio/adc/twl6030-gpadc.c         | 2 +-
 drivers/input/keyboard/twl4030_keypad.c | 2 +-
 drivers/input/misc/twl4030-pwrbutton.c  | 2 +-
 drivers/input/misc/twl4030-vibra.c      | 2 +-
 drivers/mfd/twl-core.c                  | 6 +++---
 drivers/mfd/twl4030-audio.c             | 2 +-
 drivers/mfd/twl4030-irq.c               | 2 +-
 drivers/mfd/twl4030-power.c             | 2 +-
 drivers/mfd/twl6030-irq.c               | 2 +-
 drivers/phy/phy-twl4030-usb.c           | 2 +-
 drivers/power/supply/twl4030_charger.c  | 2 +-
 drivers/pwm/pwm-twl-led.c               | 2 +-
 drivers/pwm/pwm-twl.c                   | 2 +-
 drivers/regulator/twl-regulator.c       | 2 +-
 drivers/regulator/twl6030-regulator.c   | 2 +-
 drivers/rtc/rtc-twl.c                   | 2 +-
 drivers/usb/phy/phy-twl6030-usb.c       | 2 +-
 drivers/video/backlight/pandora_bl.c    | 2 +-
 drivers/watchdog/twl4030_wdt.c          | 2 +-
 include/linux/{i2c => mfd}/twl.h        | 0
 sound/soc/codecs/twl4030.c              | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)
 rename include/linux/{i2c => mfd}/twl.h (100%)

diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 8cc6338fcb1288..b5ad7fcb80ed24 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -29,7 +29,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/i2c-omap.h>
 #include <linux/reboot.h>
 #include <linux/irqchip/irq-omap-intc.h>
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
index 1346b3ab34a5e3..295124b248ae3f 100644
--- a/arch/arm/mach-omap2/omap_twl.c
+++ b/arch/arm/mach-omap2/omap_twl.c
@@ -16,7 +16,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 
 #include "soc.h"
 #include "voltage.h"
diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
index 24f388ed46d4c4..9b511df5450eb6 100644
--- a/drivers/gpio/gpio-twl4030.c
+++ b/drivers/gpio/gpio-twl4030.c
@@ -35,7 +35,7 @@
 #include <linux/of.h>
 #include <linux/irqdomain.h>
 
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 
 /*
  * The GPIO "subchip" supports 18 GPIOs which can be configured as
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index 0c74869a540ad3..5a64eda1652061 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -35,7 +35,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/i2c/twl4030-madc.h>
 #include <linux/module.h>
 #include <linux/stddef.h>
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index becbb0aef232b9..bc0e60b9da452e 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -33,7 +33,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index 39e72b3219d8a4..f9f98ef1d98e3f 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -30,7 +30,7 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index 1c13005b228fa7..b307cca1702226 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -27,7 +27,7 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 
 #define PWR_PWRON_IRQ (1 << 0)
 
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index caa5a62c42fbe0..6c51d404874bbd 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/workqueue.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/mfd/twl4030-audio.h>
 #include <linux/input.h>
 #include <linux/slab.h>
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index c64615dca2bd33..2a09dde4ca6efc 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -44,7 +44,7 @@
 #include <linux/regulator/machine.h>
 
 #include <linux/i2c.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 
 /* Register descriptions for audio */
 #include <linux/mfd/twl4030-audio.h>
@@ -173,7 +173,7 @@ static struct twl_private *twl_priv;
 static struct twl_mapping twl4030_map[] = {
 	/*
 	 * NOTE:  don't change this table without updating the
-	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
+	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
 	 * so they continue to match the order in this table.
 	 */
 
@@ -344,7 +344,7 @@ static const struct regmap_config twl4030_regmap_config[4] = {
 static struct twl_mapping twl6030_map[] = {
 	/*
 	 * NOTE:  don't change this table without updating the
-	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
+	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
 	 * so they continue to match the order in this table.
 	 */
 
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index 0a1606480023f9..da16bf45fab43e 100644
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -30,7 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/twl4030-audio.h>
 
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index b46c0cfc27d958..86f8fd8e81e4b5 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -33,7 +33,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/irqdomain.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 
 #include "twl-core.h"
 
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index f4b2c29d77e330..6b36932263ba78 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -25,7 +25,7 @@
 
 #include <linux/module.h>
 #include <linux/pm.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 53574508a613f2..e3ec8dfa9f1ec0 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -35,7 +35,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/kthread.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
 #include <linux/of.h>
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 2990b3965460e8..28f49902760d82 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -36,7 +36,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/usb/musb.h>
 #include <linux/usb/ulpi.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
 #include <linux/slab.h>
diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 2f82d0e9ec1bf7..390bfde86ae39b 100644
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -18,7 +18,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/power_supply.h>
 #include <linux/notifier.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
index 21eff991d0e355..01153622778bad 100644
--- a/drivers/pwm/pwm-twl-led.c
+++ b/drivers/pwm/pwm-twl-led.c
@@ -24,7 +24,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/slab.h>
 
 /*
diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
index 9de617b766801b..b7a45be998153b 100644
--- a/drivers/pwm/pwm-twl.c
+++ b/drivers/pwm/pwm-twl.c
@@ -21,7 +21,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/slab.h>
 
 /*
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 6c9ec84121bde4..a4456db5849d06 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -20,7 +20,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/of_regulator.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/delay.h>
 
 /*
diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
index 56aada38788776..219cbd910dbf52 100644
--- a/drivers/regulator/twl6030-regulator.c
+++ b/drivers/regulator/twl6030-regulator.c
@@ -21,7 +21,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/of_regulator.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/delay.h>
 
 struct twlreg_info {
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index c18c39212ce680..3472e79f2b1782 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/of.h>
 
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 
 enum twl_class {
 	TWL_4030 = 0,
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 628b600b02b174..b5dc077ed7d3c6 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -28,7 +28,7 @@
 #include <linux/usb/musb.h>
 #include <linux/usb/phy_companion.h>
 #include <linux/phy/omap_usb.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
 #include <linux/slab.h>
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
index 5d8bb8b201835d..a186bc677c7d80 100644
--- a/drivers/video/backlight/pandora_bl.c
+++ b/drivers/video/backlight/pandora_bl.c
@@ -16,7 +16,7 @@
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/err.h>
 
 #define TWL_PWM0_ON		0x00
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 9bf3cc0f396106..569fe85e52da75 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -24,7 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 
 #define TWL4030_WATCHDOG_CFG_REG_OFFS	0x3
 
diff --git a/include/linux/i2c/twl.h b/include/linux/mfd/twl.h
similarity index 100%
rename from include/linux/i2c/twl.h
rename to include/linux/mfd/twl.h
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index a2104d68169d9e..bd86a2d78c5ff2 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <sound/core.h>
-- 
2.11.0

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

#1646563 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date	2017-05-22 09:30 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tJPWV-2uO-3@gated-at.bofh.it>
In reply to	#1646461

On Mon, May 22, 2017 at 12:02:10AM +0200, 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/arm/mach-omap2/common.h            | 2 +-
>  arch/arm/mach-omap2/omap_twl.c          | 2 +-
>  drivers/gpio/gpio-twl4030.c             | 2 +-
>  drivers/iio/adc/twl4030-madc.c          | 2 +-
>  drivers/iio/adc/twl6030-gpadc.c         | 2 +-
>  drivers/input/keyboard/twl4030_keypad.c | 2 +-
>  drivers/input/misc/twl4030-pwrbutton.c  | 2 +-
>  drivers/input/misc/twl4030-vibra.c      | 2 +-
>  drivers/mfd/twl-core.c                  | 6 +++---
>  drivers/mfd/twl4030-audio.c             | 2 +-
>  drivers/mfd/twl4030-irq.c               | 2 +-
>  drivers/mfd/twl4030-power.c             | 2 +-
>  drivers/mfd/twl6030-irq.c               | 2 +-
>  drivers/phy/phy-twl4030-usb.c           | 2 +-
>  drivers/power/supply/twl4030_charger.c  | 2 +-
>  drivers/pwm/pwm-twl-led.c               | 2 +-
>  drivers/pwm/pwm-twl.c                   | 2 +-
>  drivers/regulator/twl-regulator.c       | 2 +-
>  drivers/regulator/twl6030-regulator.c   | 2 +-
>  drivers/rtc/rtc-twl.c                   | 2 +-
>  drivers/usb/phy/phy-twl6030-usb.c       | 2 +-
>  drivers/video/backlight/pandora_bl.c    | 2 +-
>  drivers/watchdog/twl4030_wdt.c          | 2 +-
>  include/linux/{i2c => mfd}/twl.h        | 0
>  sound/soc/codecs/twl4030.c              | 2 +-
>  25 files changed, 26 insertions(+), 26 deletions(-)
>  rename include/linux/{i2c => mfd}/twl.h (100%)

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

#1646640 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date	2017-05-22 11:20 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tJRFo-3IZ-21@gated-at.bofh.it>
In reply to	#1646461

On 22/05/2017 at 00:02:10 +0200, 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>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

> ---
>  arch/arm/mach-omap2/common.h            | 2 +-
>  arch/arm/mach-omap2/omap_twl.c          | 2 +-
>  drivers/gpio/gpio-twl4030.c             | 2 +-
>  drivers/iio/adc/twl4030-madc.c          | 2 +-
>  drivers/iio/adc/twl6030-gpadc.c         | 2 +-
>  drivers/input/keyboard/twl4030_keypad.c | 2 +-
>  drivers/input/misc/twl4030-pwrbutton.c  | 2 +-
>  drivers/input/misc/twl4030-vibra.c      | 2 +-
>  drivers/mfd/twl-core.c                  | 6 +++---
>  drivers/mfd/twl4030-audio.c             | 2 +-
>  drivers/mfd/twl4030-irq.c               | 2 +-
>  drivers/mfd/twl4030-power.c             | 2 +-
>  drivers/mfd/twl6030-irq.c               | 2 +-
>  drivers/phy/phy-twl4030-usb.c           | 2 +-
>  drivers/power/supply/twl4030_charger.c  | 2 +-
>  drivers/pwm/pwm-twl-led.c               | 2 +-
>  drivers/pwm/pwm-twl.c                   | 2 +-
>  drivers/regulator/twl-regulator.c       | 2 +-
>  drivers/regulator/twl6030-regulator.c   | 2 +-
>  drivers/rtc/rtc-twl.c                   | 2 +-
>  drivers/usb/phy/phy-twl6030-usb.c       | 2 +-
>  drivers/video/backlight/pandora_bl.c    | 2 +-
>  drivers/watchdog/twl4030_wdt.c          | 2 +-
>  include/linux/{i2c => mfd}/twl.h        | 0
>  sound/soc/codecs/twl4030.c              | 2 +-
>  25 files changed, 26 insertions(+), 26 deletions(-)
>  rename include/linux/{i2c => mfd}/twl.h (100%)
> 
> diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
> index 8cc6338fcb1288..b5ad7fcb80ed24 100644
> --- a/arch/arm/mach-omap2/common.h
> +++ b/arch/arm/mach-omap2/common.h
> @@ -29,7 +29,7 @@
>  #include <linux/irq.h>
>  #include <linux/delay.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c-omap.h>
>  #include <linux/reboot.h>
>  #include <linux/irqchip/irq-omap-intc.h>
> diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
> index 1346b3ab34a5e3..295124b248ae3f 100644
> --- a/arch/arm/mach-omap2/omap_twl.c
> +++ b/arch/arm/mach-omap2/omap_twl.c
> @@ -16,7 +16,7 @@
>  #include <linux/err.h>
>  #include <linux/io.h>
>  #include <linux/kernel.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "soc.h"
>  #include "voltage.h"
> diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
> index 24f388ed46d4c4..9b511df5450eb6 100644
> --- a/drivers/gpio/gpio-twl4030.c
> +++ b/drivers/gpio/gpio-twl4030.c
> @@ -35,7 +35,7 @@
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /*
>   * The GPIO "subchip" supports 18 GPIOs which can be configured as
> diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
> index 0c74869a540ad3..5a64eda1652061 100644
> --- a/drivers/iio/adc/twl4030-madc.c
> +++ b/drivers/iio/adc/twl4030-madc.c
> @@ -35,7 +35,7 @@
>  #include <linux/delay.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c/twl4030-madc.h>
>  #include <linux/module.h>
>  #include <linux/stddef.h>
> diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
> index becbb0aef232b9..bc0e60b9da452e 100644
> --- a/drivers/iio/adc/twl6030-gpadc.c
> +++ b/drivers/iio/adc/twl6030-gpadc.c
> @@ -33,7 +33,7 @@
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
>  
> diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
> index 39e72b3219d8a4..f9f98ef1d98e3f 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -30,7 +30,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/input.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  
> diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
> index 1c13005b228fa7..b307cca1702226 100644
> --- a/drivers/input/misc/twl4030-pwrbutton.c
> +++ b/drivers/input/misc/twl4030-pwrbutton.c
> @@ -27,7 +27,7 @@
>  #include <linux/input.h>
>  #include <linux/interrupt.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define PWR_PWRON_IRQ (1 << 0)
>  
> diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
> index caa5a62c42fbe0..6c51d404874bbd 100644
> --- a/drivers/input/misc/twl4030-vibra.c
> +++ b/drivers/input/misc/twl4030-vibra.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/workqueue.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/twl4030-audio.h>
>  #include <linux/input.h>
>  #include <linux/slab.h>
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index c64615dca2bd33..2a09dde4ca6efc 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -44,7 +44,7 @@
>  #include <linux/regulator/machine.h>
>  
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /* Register descriptions for audio */
>  #include <linux/mfd/twl4030-audio.h>
> @@ -173,7 +173,7 @@ static struct twl_private *twl_priv;
>  static struct twl_mapping twl4030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> @@ -344,7 +344,7 @@ static const struct regmap_config twl4030_regmap_config[4] = {
>  static struct twl_mapping twl6030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
> index 0a1606480023f9..da16bf45fab43e 100644
> --- a/drivers/mfd/twl4030-audio.c
> +++ b/drivers/mfd/twl4030-audio.c
> @@ -30,7 +30,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/twl4030-audio.h>
>  
> diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
> index b46c0cfc27d958..86f8fd8e81e4b5 100644
> --- a/drivers/mfd/twl4030-irq.c
> +++ b/drivers/mfd/twl4030-irq.c
> @@ -33,7 +33,7 @@
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "twl-core.h"
>  
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index f4b2c29d77e330..6b36932263ba78 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -25,7 +25,7 @@
>  
>  #include <linux/module.h>
>  #include <linux/pm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
> index 53574508a613f2..e3ec8dfa9f1ec0 100644
> --- a/drivers/mfd/twl6030-irq.c
> +++ b/drivers/mfd/twl6030-irq.c
> @@ -35,7 +35,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/irq.h>
>  #include <linux/kthread.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/suspend.h>
>  #include <linux/of.h>
> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 2990b3965460e8..28f49902760d82 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -36,7 +36,7 @@
>  #include <linux/pm_runtime.h>
>  #include <linux/usb/musb.h>
>  #include <linux/usb/ulpi.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 2f82d0e9ec1bf7..390bfde86ae39b 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -18,7 +18,7 @@
>  #include <linux/err.h>
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/power_supply.h>
>  #include <linux/notifier.h>
>  #include <linux/usb/otg.h>
> diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
> index 21eff991d0e355..01153622778bad 100644
> --- a/drivers/pwm/pwm-twl-led.c
> +++ b/drivers/pwm/pwm-twl-led.c
> @@ -24,7 +24,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
> index 9de617b766801b..b7a45be998153b 100644
> --- a/drivers/pwm/pwm-twl.c
> +++ b/drivers/pwm/pwm-twl.c
> @@ -21,7 +21,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
> index 6c9ec84121bde4..a4456db5849d06 100644
> --- a/drivers/regulator/twl-regulator.c
> +++ b/drivers/regulator/twl-regulator.c
> @@ -20,7 +20,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  /*
> diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
> index 56aada38788776..219cbd910dbf52 100644
> --- a/drivers/regulator/twl6030-regulator.c
> +++ b/drivers/regulator/twl6030-regulator.c
> @@ -21,7 +21,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  struct twlreg_info {
> diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
> index c18c39212ce680..3472e79f2b1782 100644
> --- a/drivers/rtc/rtc-twl.c
> +++ b/drivers/rtc/rtc-twl.c
> @@ -31,7 +31,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/of.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  enum twl_class {
>  	TWL_4030 = 0,
> diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
> index 628b600b02b174..b5dc077ed7d3c6 100644
> --- a/drivers/usb/phy/phy-twl6030-usb.c
> +++ b/drivers/usb/phy/phy-twl6030-usb.c
> @@ -28,7 +28,7 @@
>  #include <linux/usb/musb.h>
>  #include <linux/usb/phy_companion.h>
>  #include <linux/phy/omap_usb.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
> index 5d8bb8b201835d..a186bc677c7d80 100644
> --- a/drivers/video/backlight/pandora_bl.c
> +++ b/drivers/video/backlight/pandora_bl.c
> @@ -16,7 +16,7 @@
>  #include <linux/delay.h>
>  #include <linux/fb.h>
>  #include <linux/backlight.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/err.h>
>  
>  #define TWL_PWM0_ON		0x00
> diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
> index 9bf3cc0f396106..569fe85e52da75 100644
> --- a/drivers/watchdog/twl4030_wdt.c
> +++ b/drivers/watchdog/twl4030_wdt.c
> @@ -24,7 +24,7 @@
>  #include <linux/kernel.h>
>  #include <linux/watchdog.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define TWL4030_WATCHDOG_CFG_REG_OFFS	0x3
>  
> diff --git a/include/linux/i2c/twl.h b/include/linux/mfd/twl.h
> similarity index 100%
> rename from include/linux/i2c/twl.h
> rename to include/linux/mfd/twl.h
> diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> index a2104d68169d9e..bd86a2d78c5ff2 100644
> --- a/sound/soc/codecs/twl4030.c
> +++ b/sound/soc/codecs/twl4030.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_gpio.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/gpio.h>
>  #include <sound/core.h>
> -- 
> 2.11.0
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

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

#1646685 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Mark Brown <broonie@kernel.org>
Date	2017-05-22 12:00 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tJSi6-44C-9@gated-at.bofh.it>
In reply to	#1646461

[Multipart message — attachments visible in raw view] — view raw

On Mon, May 22, 2017 at 12:02:10AM +0200, Wolfram Sang wrote:
> include/linux/i2c is not for client devices. Move the header file to a
> more appropriate location.

Acked-by: Mark Brown <broonie@kernel.org>

I'm missing the rest of the series and/or the cover letter...

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

#1646717 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Wolfram Sang <wsa@the-dreams.de>
Date	2017-05-22 12:40 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tJSUO-4wq-27@gated-at.bofh.it>
In reply to	#1646685

[Multipart message — attachments visible in raw view] — view raw

On Mon, May 22, 2017 at 10:52:43AM +0100, Mark Brown wrote:
> On Mon, May 22, 2017 at 12:02:10AM +0200, Wolfram Sang wrote:
> > include/linux/i2c is not for client devices. Move the header file to a
> > more appropriate location.
> 
> Acked-by: Mark Brown <broonie@kernel.org>

Thanks!

> I'm missing the rest of the series and/or the cover letter...

I meanwhile send cover letters only to all mailing lists involved. I
used to CC the individuals, too, until those messages were rejected
because the CC list grew too large :( And I really only CCed maintainers
then, no git history used.

If you were not CCed on the other patches, then you are likely not
listed as a maintainer for them?

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

#1646749 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Mark Brown <broonie@kernel.org>
Date	2017-05-22 13:20 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tJTxw-50U-5@gated-at.bofh.it>
In reply to	#1646717

[Multipart message — attachments visible in raw view] — view raw

On Mon, May 22, 2017 at 12:28:12PM +0200, Wolfram Sang wrote:

> If you were not CCed on the other patches, then you are likely not
> listed as a maintainer for them?

Right, but it does mean that the people who only get a subset of patches
are missing context for how things are expected to be handled.
Sometimes it's clear but often it isn't.

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

#1646719 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Date	2017-05-22 12:40 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tJSUO-4wq-35@gated-at.bofh.it>
In reply to	#1646461

[Multipart message — attachments visible in raw view] — view raw

Hi,

On Mon, May 22, 2017 at 12:02:10AM +0200, 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>
> ---
> [...]
>  drivers/power/supply/twl4030_charger.c  | 2 +-
> [...]

Acked-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

-- Sebastian

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

#1647357 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Jonathan Cameron <jic23@kernel.org>
Date	2017-05-22 22:40 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tK2hs-1Tl-15@gated-at.bofh.it>
In reply to	#1646461

On Mon, 22 May 2017 00:02:10 +0200
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-omap2/common.h            | 2 +-
>  arch/arm/mach-omap2/omap_twl.c          | 2 +-
>  drivers/gpio/gpio-twl4030.c             | 2 +-

>  drivers/iio/adc/twl4030-madc.c          | 2 +-
>  drivers/iio/adc/twl6030-gpadc.c         | 2 +-
Acked-by: Jonathan Cameron <jic23@kernel.org>

Thanks,
>  drivers/input/keyboard/twl4030_keypad.c | 2 +-
>  drivers/input/misc/twl4030-pwrbutton.c  | 2 +-
>  drivers/input/misc/twl4030-vibra.c      | 2 +-
>  drivers/mfd/twl-core.c                  | 6 +++---
>  drivers/mfd/twl4030-audio.c             | 2 +-
>  drivers/mfd/twl4030-irq.c               | 2 +-
>  drivers/mfd/twl4030-power.c             | 2 +-
>  drivers/mfd/twl6030-irq.c               | 2 +-
>  drivers/phy/phy-twl4030-usb.c           | 2 +-
>  drivers/power/supply/twl4030_charger.c  | 2 +-
>  drivers/pwm/pwm-twl-led.c               | 2 +-
>  drivers/pwm/pwm-twl.c                   | 2 +-
>  drivers/regulator/twl-regulator.c       | 2 +-
>  drivers/regulator/twl6030-regulator.c   | 2 +-
>  drivers/rtc/rtc-twl.c                   | 2 +-
>  drivers/usb/phy/phy-twl6030-usb.c       | 2 +-
>  drivers/video/backlight/pandora_bl.c    | 2 +-
>  drivers/watchdog/twl4030_wdt.c          | 2 +-
>  include/linux/{i2c => mfd}/twl.h        | 0
>  sound/soc/codecs/twl4030.c              | 2 +-
>  25 files changed, 26 insertions(+), 26 deletions(-)
>  rename include/linux/{i2c => mfd}/twl.h (100%)
> 
> diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
> index 8cc6338fcb1288..b5ad7fcb80ed24 100644
> --- a/arch/arm/mach-omap2/common.h
> +++ b/arch/arm/mach-omap2/common.h
> @@ -29,7 +29,7 @@
>  #include <linux/irq.h>
>  #include <linux/delay.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c-omap.h>
>  #include <linux/reboot.h>
>  #include <linux/irqchip/irq-omap-intc.h>
> diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
> index 1346b3ab34a5e3..295124b248ae3f 100644
> --- a/arch/arm/mach-omap2/omap_twl.c
> +++ b/arch/arm/mach-omap2/omap_twl.c
> @@ -16,7 +16,7 @@
>  #include <linux/err.h>
>  #include <linux/io.h>
>  #include <linux/kernel.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "soc.h"
>  #include "voltage.h"
> diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
> index 24f388ed46d4c4..9b511df5450eb6 100644
> --- a/drivers/gpio/gpio-twl4030.c
> +++ b/drivers/gpio/gpio-twl4030.c
> @@ -35,7 +35,7 @@
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /*
>   * The GPIO "subchip" supports 18 GPIOs which can be configured as
> diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
> index 0c74869a540ad3..5a64eda1652061 100644
> --- a/drivers/iio/adc/twl4030-madc.c
> +++ b/drivers/iio/adc/twl4030-madc.c
> @@ -35,7 +35,7 @@
>  #include <linux/delay.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c/twl4030-madc.h>
>  #include <linux/module.h>
>  #include <linux/stddef.h>
> diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
> index becbb0aef232b9..bc0e60b9da452e 100644
> --- a/drivers/iio/adc/twl6030-gpadc.c
> +++ b/drivers/iio/adc/twl6030-gpadc.c
> @@ -33,7 +33,7 @@
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
>  
> diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
> index 39e72b3219d8a4..f9f98ef1d98e3f 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -30,7 +30,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/input.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  
> diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
> index 1c13005b228fa7..b307cca1702226 100644
> --- a/drivers/input/misc/twl4030-pwrbutton.c
> +++ b/drivers/input/misc/twl4030-pwrbutton.c
> @@ -27,7 +27,7 @@
>  #include <linux/input.h>
>  #include <linux/interrupt.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define PWR_PWRON_IRQ (1 << 0)
>  
> diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
> index caa5a62c42fbe0..6c51d404874bbd 100644
> --- a/drivers/input/misc/twl4030-vibra.c
> +++ b/drivers/input/misc/twl4030-vibra.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/workqueue.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/twl4030-audio.h>
>  #include <linux/input.h>
>  #include <linux/slab.h>
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index c64615dca2bd33..2a09dde4ca6efc 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -44,7 +44,7 @@
>  #include <linux/regulator/machine.h>
>  
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /* Register descriptions for audio */
>  #include <linux/mfd/twl4030-audio.h>
> @@ -173,7 +173,7 @@ static struct twl_private *twl_priv;
>  static struct twl_mapping twl4030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> @@ -344,7 +344,7 @@ static const struct regmap_config twl4030_regmap_config[4] = {
>  static struct twl_mapping twl6030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
> index 0a1606480023f9..da16bf45fab43e 100644
> --- a/drivers/mfd/twl4030-audio.c
> +++ b/drivers/mfd/twl4030-audio.c
> @@ -30,7 +30,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/twl4030-audio.h>
>  
> diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
> index b46c0cfc27d958..86f8fd8e81e4b5 100644
> --- a/drivers/mfd/twl4030-irq.c
> +++ b/drivers/mfd/twl4030-irq.c
> @@ -33,7 +33,7 @@
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "twl-core.h"
>  
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index f4b2c29d77e330..6b36932263ba78 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -25,7 +25,7 @@
>  
>  #include <linux/module.h>
>  #include <linux/pm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
> index 53574508a613f2..e3ec8dfa9f1ec0 100644
> --- a/drivers/mfd/twl6030-irq.c
> +++ b/drivers/mfd/twl6030-irq.c
> @@ -35,7 +35,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/irq.h>
>  #include <linux/kthread.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/suspend.h>
>  #include <linux/of.h>
> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 2990b3965460e8..28f49902760d82 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -36,7 +36,7 @@
>  #include <linux/pm_runtime.h>
>  #include <linux/usb/musb.h>
>  #include <linux/usb/ulpi.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 2f82d0e9ec1bf7..390bfde86ae39b 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -18,7 +18,7 @@
>  #include <linux/err.h>
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/power_supply.h>
>  #include <linux/notifier.h>
>  #include <linux/usb/otg.h>
> diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
> index 21eff991d0e355..01153622778bad 100644
> --- a/drivers/pwm/pwm-twl-led.c
> +++ b/drivers/pwm/pwm-twl-led.c
> @@ -24,7 +24,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
> index 9de617b766801b..b7a45be998153b 100644
> --- a/drivers/pwm/pwm-twl.c
> +++ b/drivers/pwm/pwm-twl.c
> @@ -21,7 +21,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
> index 6c9ec84121bde4..a4456db5849d06 100644
> --- a/drivers/regulator/twl-regulator.c
> +++ b/drivers/regulator/twl-regulator.c
> @@ -20,7 +20,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  /*
> diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
> index 56aada38788776..219cbd910dbf52 100644
> --- a/drivers/regulator/twl6030-regulator.c
> +++ b/drivers/regulator/twl6030-regulator.c
> @@ -21,7 +21,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  struct twlreg_info {
> diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
> index c18c39212ce680..3472e79f2b1782 100644
> --- a/drivers/rtc/rtc-twl.c
> +++ b/drivers/rtc/rtc-twl.c
> @@ -31,7 +31,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/of.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  enum twl_class {
>  	TWL_4030 = 0,
> diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
> index 628b600b02b174..b5dc077ed7d3c6 100644
> --- a/drivers/usb/phy/phy-twl6030-usb.c
> +++ b/drivers/usb/phy/phy-twl6030-usb.c
> @@ -28,7 +28,7 @@
>  #include <linux/usb/musb.h>
>  #include <linux/usb/phy_companion.h>
>  #include <linux/phy/omap_usb.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
> index 5d8bb8b201835d..a186bc677c7d80 100644
> --- a/drivers/video/backlight/pandora_bl.c
> +++ b/drivers/video/backlight/pandora_bl.c
> @@ -16,7 +16,7 @@
>  #include <linux/delay.h>
>  #include <linux/fb.h>
>  #include <linux/backlight.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/err.h>
>  
>  #define TWL_PWM0_ON		0x00
> diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
> index 9bf3cc0f396106..569fe85e52da75 100644
> --- a/drivers/watchdog/twl4030_wdt.c
> +++ b/drivers/watchdog/twl4030_wdt.c
> @@ -24,7 +24,7 @@
>  #include <linux/kernel.h>
>  #include <linux/watchdog.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define TWL4030_WATCHDOG_CFG_REG_OFFS	0x3
>  
> diff --git a/include/linux/i2c/twl.h b/include/linux/mfd/twl.h
> similarity index 100%
> rename from include/linux/i2c/twl.h
> rename to include/linux/mfd/twl.h
> diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> index a2104d68169d9e..bd86a2d78c5ff2 100644
> --- a/sound/soc/codecs/twl4030.c
> +++ b/sound/soc/codecs/twl4030.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_gpio.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/gpio.h>
>  #include <sound/core.h>

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

#1647490 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date	2017-05-23 01:40 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tK55E-3FX-11@gated-at.bofh.it>
In reply to	#1646461

On Mon, May 22, 2017 at 12:02:10AM +0200, 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/arm/mach-omap2/common.h            | 2 +-
>  arch/arm/mach-omap2/omap_twl.c          | 2 +-
>  drivers/gpio/gpio-twl4030.c             | 2 +-
>  drivers/iio/adc/twl4030-madc.c          | 2 +-
>  drivers/iio/adc/twl6030-gpadc.c         | 2 +-
>  drivers/input/keyboard/twl4030_keypad.c | 2 +-
>  drivers/input/misc/twl4030-pwrbutton.c  | 2 +-
>  drivers/input/misc/twl4030-vibra.c      | 2 +-

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

>  drivers/mfd/twl-core.c                  | 6 +++---
>  drivers/mfd/twl4030-audio.c             | 2 +-
>  drivers/mfd/twl4030-irq.c               | 2 +-
>  drivers/mfd/twl4030-power.c             | 2 +-
>  drivers/mfd/twl6030-irq.c               | 2 +-
>  drivers/phy/phy-twl4030-usb.c           | 2 +-
>  drivers/power/supply/twl4030_charger.c  | 2 +-
>  drivers/pwm/pwm-twl-led.c               | 2 +-
>  drivers/pwm/pwm-twl.c                   | 2 +-
>  drivers/regulator/twl-regulator.c       | 2 +-
>  drivers/regulator/twl6030-regulator.c   | 2 +-
>  drivers/rtc/rtc-twl.c                   | 2 +-
>  drivers/usb/phy/phy-twl6030-usb.c       | 2 +-
>  drivers/video/backlight/pandora_bl.c    | 2 +-
>  drivers/watchdog/twl4030_wdt.c          | 2 +-
>  include/linux/{i2c => mfd}/twl.h        | 0
>  sound/soc/codecs/twl4030.c              | 2 +-
>  25 files changed, 26 insertions(+), 26 deletions(-)
>  rename include/linux/{i2c => mfd}/twl.h (100%)
> 
> diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
> index 8cc6338fcb1288..b5ad7fcb80ed24 100644
> --- a/arch/arm/mach-omap2/common.h
> +++ b/arch/arm/mach-omap2/common.h
> @@ -29,7 +29,7 @@
>  #include <linux/irq.h>
>  #include <linux/delay.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c-omap.h>
>  #include <linux/reboot.h>
>  #include <linux/irqchip/irq-omap-intc.h>
> diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
> index 1346b3ab34a5e3..295124b248ae3f 100644
> --- a/arch/arm/mach-omap2/omap_twl.c
> +++ b/arch/arm/mach-omap2/omap_twl.c
> @@ -16,7 +16,7 @@
>  #include <linux/err.h>
>  #include <linux/io.h>
>  #include <linux/kernel.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "soc.h"
>  #include "voltage.h"
> diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
> index 24f388ed46d4c4..9b511df5450eb6 100644
> --- a/drivers/gpio/gpio-twl4030.c
> +++ b/drivers/gpio/gpio-twl4030.c
> @@ -35,7 +35,7 @@
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /*
>   * The GPIO "subchip" supports 18 GPIOs which can be configured as
> diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
> index 0c74869a540ad3..5a64eda1652061 100644
> --- a/drivers/iio/adc/twl4030-madc.c
> +++ b/drivers/iio/adc/twl4030-madc.c
> @@ -35,7 +35,7 @@
>  #include <linux/delay.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c/twl4030-madc.h>
>  #include <linux/module.h>
>  #include <linux/stddef.h>
> diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
> index becbb0aef232b9..bc0e60b9da452e 100644
> --- a/drivers/iio/adc/twl6030-gpadc.c
> +++ b/drivers/iio/adc/twl6030-gpadc.c
> @@ -33,7 +33,7 @@
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
>  
> diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
> index 39e72b3219d8a4..f9f98ef1d98e3f 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -30,7 +30,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/input.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  
> diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
> index 1c13005b228fa7..b307cca1702226 100644
> --- a/drivers/input/misc/twl4030-pwrbutton.c
> +++ b/drivers/input/misc/twl4030-pwrbutton.c
> @@ -27,7 +27,7 @@
>  #include <linux/input.h>
>  #include <linux/interrupt.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define PWR_PWRON_IRQ (1 << 0)
>  
> diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
> index caa5a62c42fbe0..6c51d404874bbd 100644
> --- a/drivers/input/misc/twl4030-vibra.c
> +++ b/drivers/input/misc/twl4030-vibra.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/workqueue.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/twl4030-audio.h>
>  #include <linux/input.h>
>  #include <linux/slab.h>
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index c64615dca2bd33..2a09dde4ca6efc 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -44,7 +44,7 @@
>  #include <linux/regulator/machine.h>
>  
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /* Register descriptions for audio */
>  #include <linux/mfd/twl4030-audio.h>
> @@ -173,7 +173,7 @@ static struct twl_private *twl_priv;
>  static struct twl_mapping twl4030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> @@ -344,7 +344,7 @@ static const struct regmap_config twl4030_regmap_config[4] = {
>  static struct twl_mapping twl6030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
> index 0a1606480023f9..da16bf45fab43e 100644
> --- a/drivers/mfd/twl4030-audio.c
> +++ b/drivers/mfd/twl4030-audio.c
> @@ -30,7 +30,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/twl4030-audio.h>
>  
> diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
> index b46c0cfc27d958..86f8fd8e81e4b5 100644
> --- a/drivers/mfd/twl4030-irq.c
> +++ b/drivers/mfd/twl4030-irq.c
> @@ -33,7 +33,7 @@
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "twl-core.h"
>  
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index f4b2c29d77e330..6b36932263ba78 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -25,7 +25,7 @@
>  
>  #include <linux/module.h>
>  #include <linux/pm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
> index 53574508a613f2..e3ec8dfa9f1ec0 100644
> --- a/drivers/mfd/twl6030-irq.c
> +++ b/drivers/mfd/twl6030-irq.c
> @@ -35,7 +35,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/irq.h>
>  #include <linux/kthread.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/suspend.h>
>  #include <linux/of.h>
> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 2990b3965460e8..28f49902760d82 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -36,7 +36,7 @@
>  #include <linux/pm_runtime.h>
>  #include <linux/usb/musb.h>
>  #include <linux/usb/ulpi.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 2f82d0e9ec1bf7..390bfde86ae39b 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -18,7 +18,7 @@
>  #include <linux/err.h>
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/power_supply.h>
>  #include <linux/notifier.h>
>  #include <linux/usb/otg.h>
> diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
> index 21eff991d0e355..01153622778bad 100644
> --- a/drivers/pwm/pwm-twl-led.c
> +++ b/drivers/pwm/pwm-twl-led.c
> @@ -24,7 +24,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
> index 9de617b766801b..b7a45be998153b 100644
> --- a/drivers/pwm/pwm-twl.c
> +++ b/drivers/pwm/pwm-twl.c
> @@ -21,7 +21,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
> index 6c9ec84121bde4..a4456db5849d06 100644
> --- a/drivers/regulator/twl-regulator.c
> +++ b/drivers/regulator/twl-regulator.c
> @@ -20,7 +20,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  /*
> diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
> index 56aada38788776..219cbd910dbf52 100644
> --- a/drivers/regulator/twl6030-regulator.c
> +++ b/drivers/regulator/twl6030-regulator.c
> @@ -21,7 +21,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  struct twlreg_info {
> diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
> index c18c39212ce680..3472e79f2b1782 100644
> --- a/drivers/rtc/rtc-twl.c
> +++ b/drivers/rtc/rtc-twl.c
> @@ -31,7 +31,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/of.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  enum twl_class {
>  	TWL_4030 = 0,
> diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
> index 628b600b02b174..b5dc077ed7d3c6 100644
> --- a/drivers/usb/phy/phy-twl6030-usb.c
> +++ b/drivers/usb/phy/phy-twl6030-usb.c
> @@ -28,7 +28,7 @@
>  #include <linux/usb/musb.h>
>  #include <linux/usb/phy_companion.h>
>  #include <linux/phy/omap_usb.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
> index 5d8bb8b201835d..a186bc677c7d80 100644
> --- a/drivers/video/backlight/pandora_bl.c
> +++ b/drivers/video/backlight/pandora_bl.c
> @@ -16,7 +16,7 @@
>  #include <linux/delay.h>
>  #include <linux/fb.h>
>  #include <linux/backlight.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/err.h>
>  
>  #define TWL_PWM0_ON		0x00
> diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
> index 9bf3cc0f396106..569fe85e52da75 100644
> --- a/drivers/watchdog/twl4030_wdt.c
> +++ b/drivers/watchdog/twl4030_wdt.c
> @@ -24,7 +24,7 @@
>  #include <linux/kernel.h>
>  #include <linux/watchdog.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define TWL4030_WATCHDOG_CFG_REG_OFFS	0x3
>  
> diff --git a/include/linux/i2c/twl.h b/include/linux/mfd/twl.h
> similarity index 100%
> rename from include/linux/i2c/twl.h
> rename to include/linux/mfd/twl.h
> diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> index a2104d68169d9e..bd86a2d78c5ff2 100644
> --- a/sound/soc/codecs/twl4030.c
> +++ b/sound/soc/codecs/twl4030.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_gpio.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/gpio.h>
>  #include <sound/core.h>
> -- 
> 2.11.0
> 

-- 
Dmitry

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

#1647717 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Lee Jones <lee.jones@linaro.org>
Date	2017-05-23 09:20 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tKcgO-8mw-31@gated-at.bofh.it>
In reply to	#1646461

On Mon, 22 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/arm/mach-omap2/common.h            | 2 +-
>  arch/arm/mach-omap2/omap_twl.c          | 2 +-
>  drivers/gpio/gpio-twl4030.c             | 2 +-
>  drivers/iio/adc/twl4030-madc.c          | 2 +-
>  drivers/iio/adc/twl6030-gpadc.c         | 2 +-
>  drivers/input/keyboard/twl4030_keypad.c | 2 +-
>  drivers/input/misc/twl4030-pwrbutton.c  | 2 +-
>  drivers/input/misc/twl4030-vibra.c      | 2 +-

>  drivers/mfd/twl-core.c                  | 6 +++---
>  drivers/mfd/twl4030-audio.c             | 2 +-
>  drivers/mfd/twl4030-irq.c               | 2 +-
>  drivers/mfd/twl4030-power.c             | 2 +-
>  drivers/mfd/twl6030-irq.c               | 2 +-

For my own reference:
  Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>

I guess this will be going through the MFD tree?

>  drivers/phy/phy-twl4030-usb.c           | 2 +-
>  drivers/power/supply/twl4030_charger.c  | 2 +-
>  drivers/pwm/pwm-twl-led.c               | 2 +-
>  drivers/pwm/pwm-twl.c                   | 2 +-
>  drivers/regulator/twl-regulator.c       | 2 +-
>  drivers/regulator/twl6030-regulator.c   | 2 +-
>  drivers/rtc/rtc-twl.c                   | 2 +-
>  drivers/usb/phy/phy-twl6030-usb.c       | 2 +-
>  drivers/video/backlight/pandora_bl.c    | 2 +-
>  drivers/watchdog/twl4030_wdt.c          | 2 +-
>  include/linux/{i2c => mfd}/twl.h        | 0
>  sound/soc/codecs/twl4030.c              | 2 +-
>  25 files changed, 26 insertions(+), 26 deletions(-)
>  rename include/linux/{i2c => mfd}/twl.h (100%)
> 
> diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
> index 8cc6338fcb1288..b5ad7fcb80ed24 100644
> --- a/arch/arm/mach-omap2/common.h
> +++ b/arch/arm/mach-omap2/common.h
> @@ -29,7 +29,7 @@
>  #include <linux/irq.h>
>  #include <linux/delay.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c-omap.h>
>  #include <linux/reboot.h>
>  #include <linux/irqchip/irq-omap-intc.h>
> diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
> index 1346b3ab34a5e3..295124b248ae3f 100644
> --- a/arch/arm/mach-omap2/omap_twl.c
> +++ b/arch/arm/mach-omap2/omap_twl.c
> @@ -16,7 +16,7 @@
>  #include <linux/err.h>
>  #include <linux/io.h>
>  #include <linux/kernel.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "soc.h"
>  #include "voltage.h"
> diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
> index 24f388ed46d4c4..9b511df5450eb6 100644
> --- a/drivers/gpio/gpio-twl4030.c
> +++ b/drivers/gpio/gpio-twl4030.c
> @@ -35,7 +35,7 @@
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /*
>   * The GPIO "subchip" supports 18 GPIOs which can be configured as
> diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
> index 0c74869a540ad3..5a64eda1652061 100644
> --- a/drivers/iio/adc/twl4030-madc.c
> +++ b/drivers/iio/adc/twl4030-madc.c
> @@ -35,7 +35,7 @@
>  #include <linux/delay.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c/twl4030-madc.h>
>  #include <linux/module.h>
>  #include <linux/stddef.h>
> diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
> index becbb0aef232b9..bc0e60b9da452e 100644
> --- a/drivers/iio/adc/twl6030-gpadc.c
> +++ b/drivers/iio/adc/twl6030-gpadc.c
> @@ -33,7 +33,7 @@
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
>  
> diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
> index 39e72b3219d8a4..f9f98ef1d98e3f 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -30,7 +30,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/input.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  
> diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
> index 1c13005b228fa7..b307cca1702226 100644
> --- a/drivers/input/misc/twl4030-pwrbutton.c
> +++ b/drivers/input/misc/twl4030-pwrbutton.c
> @@ -27,7 +27,7 @@
>  #include <linux/input.h>
>  #include <linux/interrupt.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define PWR_PWRON_IRQ (1 << 0)
>  
> diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
> index caa5a62c42fbe0..6c51d404874bbd 100644
> --- a/drivers/input/misc/twl4030-vibra.c
> +++ b/drivers/input/misc/twl4030-vibra.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/workqueue.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/twl4030-audio.h>
>  #include <linux/input.h>
>  #include <linux/slab.h>
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index c64615dca2bd33..2a09dde4ca6efc 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -44,7 +44,7 @@
>  #include <linux/regulator/machine.h>
>  
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /* Register descriptions for audio */
>  #include <linux/mfd/twl4030-audio.h>
> @@ -173,7 +173,7 @@ static struct twl_private *twl_priv;
>  static struct twl_mapping twl4030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> @@ -344,7 +344,7 @@ static const struct regmap_config twl4030_regmap_config[4] = {
>  static struct twl_mapping twl6030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
> index 0a1606480023f9..da16bf45fab43e 100644
> --- a/drivers/mfd/twl4030-audio.c
> +++ b/drivers/mfd/twl4030-audio.c
> @@ -30,7 +30,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/twl4030-audio.h>
>  
> diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
> index b46c0cfc27d958..86f8fd8e81e4b5 100644
> --- a/drivers/mfd/twl4030-irq.c
> +++ b/drivers/mfd/twl4030-irq.c
> @@ -33,7 +33,7 @@
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "twl-core.h"
>  
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index f4b2c29d77e330..6b36932263ba78 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -25,7 +25,7 @@
>  
>  #include <linux/module.h>
>  #include <linux/pm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
> index 53574508a613f2..e3ec8dfa9f1ec0 100644
> --- a/drivers/mfd/twl6030-irq.c
> +++ b/drivers/mfd/twl6030-irq.c
> @@ -35,7 +35,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/irq.h>
>  #include <linux/kthread.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/suspend.h>
>  #include <linux/of.h>
> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 2990b3965460e8..28f49902760d82 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -36,7 +36,7 @@
>  #include <linux/pm_runtime.h>
>  #include <linux/usb/musb.h>
>  #include <linux/usb/ulpi.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 2f82d0e9ec1bf7..390bfde86ae39b 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -18,7 +18,7 @@
>  #include <linux/err.h>
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/power_supply.h>
>  #include <linux/notifier.h>
>  #include <linux/usb/otg.h>
> diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
> index 21eff991d0e355..01153622778bad 100644
> --- a/drivers/pwm/pwm-twl-led.c
> +++ b/drivers/pwm/pwm-twl-led.c
> @@ -24,7 +24,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
> index 9de617b766801b..b7a45be998153b 100644
> --- a/drivers/pwm/pwm-twl.c
> +++ b/drivers/pwm/pwm-twl.c
> @@ -21,7 +21,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
> index 6c9ec84121bde4..a4456db5849d06 100644
> --- a/drivers/regulator/twl-regulator.c
> +++ b/drivers/regulator/twl-regulator.c
> @@ -20,7 +20,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  /*
> diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
> index 56aada38788776..219cbd910dbf52 100644
> --- a/drivers/regulator/twl6030-regulator.c
> +++ b/drivers/regulator/twl6030-regulator.c
> @@ -21,7 +21,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  struct twlreg_info {
> diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
> index c18c39212ce680..3472e79f2b1782 100644
> --- a/drivers/rtc/rtc-twl.c
> +++ b/drivers/rtc/rtc-twl.c
> @@ -31,7 +31,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/of.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  enum twl_class {
>  	TWL_4030 = 0,
> diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
> index 628b600b02b174..b5dc077ed7d3c6 100644
> --- a/drivers/usb/phy/phy-twl6030-usb.c
> +++ b/drivers/usb/phy/phy-twl6030-usb.c
> @@ -28,7 +28,7 @@
>  #include <linux/usb/musb.h>
>  #include <linux/usb/phy_companion.h>
>  #include <linux/phy/omap_usb.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
> index 5d8bb8b201835d..a186bc677c7d80 100644
> --- a/drivers/video/backlight/pandora_bl.c
> +++ b/drivers/video/backlight/pandora_bl.c
> @@ -16,7 +16,7 @@
>  #include <linux/delay.h>
>  #include <linux/fb.h>
>  #include <linux/backlight.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/err.h>
>  
>  #define TWL_PWM0_ON		0x00
> diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
> index 9bf3cc0f396106..569fe85e52da75 100644
> --- a/drivers/watchdog/twl4030_wdt.c
> +++ b/drivers/watchdog/twl4030_wdt.c
> @@ -24,7 +24,7 @@
>  #include <linux/kernel.h>
>  #include <linux/watchdog.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define TWL4030_WATCHDOG_CFG_REG_OFFS	0x3
>  
> diff --git a/include/linux/i2c/twl.h b/include/linux/mfd/twl.h
> similarity index 100%
> rename from include/linux/i2c/twl.h
> rename to include/linux/mfd/twl.h
> diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> index a2104d68169d9e..bd86a2d78c5ff2 100644
> --- a/sound/soc/codecs/twl4030.c
> +++ b/sound/soc/codecs/twl4030.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_gpio.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/gpio.h>
>  #include <sound/core.h>

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

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

#1647720 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Wolfram Sang <wsa@the-dreams.de>
Date	2017-05-23 09:30 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tKcqu-8q9-3@gated-at.bofh.it>
In reply to	#1647717

[Multipart message — attachments visible in raw view] — view raw

> For my own reference:
>   Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> 
> I guess this will be going through the MFD tree?

I'd prefer that, yes. Thanks!

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

#1647747 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

From	Kishon Vijay Abraham I <kishon@ti.com>
Date	2017-05-23 09:50 +0200
Subject	Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm
Message-ID	<tKcJQ-65-23@gated-at.bofh.it>
In reply to	#1646461


On Monday 22 May 2017 03:32 AM, 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>

Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
>  arch/arm/mach-omap2/common.h            | 2 +-
>  arch/arm/mach-omap2/omap_twl.c          | 2 +-
>  drivers/gpio/gpio-twl4030.c             | 2 +-
>  drivers/iio/adc/twl4030-madc.c          | 2 +-
>  drivers/iio/adc/twl6030-gpadc.c         | 2 +-
>  drivers/input/keyboard/twl4030_keypad.c | 2 +-
>  drivers/input/misc/twl4030-pwrbutton.c  | 2 +-
>  drivers/input/misc/twl4030-vibra.c      | 2 +-
>  drivers/mfd/twl-core.c                  | 6 +++---
>  drivers/mfd/twl4030-audio.c             | 2 +-
>  drivers/mfd/twl4030-irq.c               | 2 +-
>  drivers/mfd/twl4030-power.c             | 2 +-
>  drivers/mfd/twl6030-irq.c               | 2 +-
>  drivers/phy/phy-twl4030-usb.c           | 2 +-
>  drivers/power/supply/twl4030_charger.c  | 2 +-
>  drivers/pwm/pwm-twl-led.c               | 2 +-
>  drivers/pwm/pwm-twl.c                   | 2 +-
>  drivers/regulator/twl-regulator.c       | 2 +-
>  drivers/regulator/twl6030-regulator.c   | 2 +-
>  drivers/rtc/rtc-twl.c                   | 2 +-
>  drivers/usb/phy/phy-twl6030-usb.c       | 2 +-
>  drivers/video/backlight/pandora_bl.c    | 2 +-
>  drivers/watchdog/twl4030_wdt.c          | 2 +-
>  include/linux/{i2c => mfd}/twl.h        | 0
>  sound/soc/codecs/twl4030.c              | 2 +-
>  25 files changed, 26 insertions(+), 26 deletions(-)
>  rename include/linux/{i2c => mfd}/twl.h (100%)
> 
> diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
> index 8cc6338fcb1288..b5ad7fcb80ed24 100644
> --- a/arch/arm/mach-omap2/common.h
> +++ b/arch/arm/mach-omap2/common.h
> @@ -29,7 +29,7 @@
>  #include <linux/irq.h>
>  #include <linux/delay.h>
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c-omap.h>
>  #include <linux/reboot.h>
>  #include <linux/irqchip/irq-omap-intc.h>
> diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
> index 1346b3ab34a5e3..295124b248ae3f 100644
> --- a/arch/arm/mach-omap2/omap_twl.c
> +++ b/arch/arm/mach-omap2/omap_twl.c
> @@ -16,7 +16,7 @@
>  #include <linux/err.h>
>  #include <linux/io.h>
>  #include <linux/kernel.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "soc.h"
>  #include "voltage.h"
> diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
> index 24f388ed46d4c4..9b511df5450eb6 100644
> --- a/drivers/gpio/gpio-twl4030.c
> +++ b/drivers/gpio/gpio-twl4030.c
> @@ -35,7 +35,7 @@
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /*
>   * The GPIO "subchip" supports 18 GPIOs which can be configured as
> diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
> index 0c74869a540ad3..5a64eda1652061 100644
> --- a/drivers/iio/adc/twl4030-madc.c
> +++ b/drivers/iio/adc/twl4030-madc.c
> @@ -35,7 +35,7 @@
>  #include <linux/delay.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/i2c/twl4030-madc.h>
>  #include <linux/module.h>
>  #include <linux/stddef.h>
> diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
> index becbb0aef232b9..bc0e60b9da452e 100644
> --- a/drivers/iio/adc/twl6030-gpadc.c
> +++ b/drivers/iio/adc/twl6030-gpadc.c
> @@ -33,7 +33,7 @@
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
>  
> diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
> index 39e72b3219d8a4..f9f98ef1d98e3f 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -30,7 +30,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/input.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  
> diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
> index 1c13005b228fa7..b307cca1702226 100644
> --- a/drivers/input/misc/twl4030-pwrbutton.c
> +++ b/drivers/input/misc/twl4030-pwrbutton.c
> @@ -27,7 +27,7 @@
>  #include <linux/input.h>
>  #include <linux/interrupt.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define PWR_PWRON_IRQ (1 << 0)
>  
> diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
> index caa5a62c42fbe0..6c51d404874bbd 100644
> --- a/drivers/input/misc/twl4030-vibra.c
> +++ b/drivers/input/misc/twl4030-vibra.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/workqueue.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/twl4030-audio.h>
>  #include <linux/input.h>
>  #include <linux/slab.h>
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index c64615dca2bd33..2a09dde4ca6efc 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -44,7 +44,7 @@
>  #include <linux/regulator/machine.h>
>  
>  #include <linux/i2c.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  /* Register descriptions for audio */
>  #include <linux/mfd/twl4030-audio.h>
> @@ -173,7 +173,7 @@ static struct twl_private *twl_priv;
>  static struct twl_mapping twl4030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> @@ -344,7 +344,7 @@ static const struct regmap_config twl4030_regmap_config[4] = {
>  static struct twl_mapping twl6030_map[] = {
>  	/*
>  	 * NOTE:  don't change this table without updating the
> -	 * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
> +	 * <linux/mfd/twl.h> defines for TWL4030_MODULE_*
>  	 * so they continue to match the order in this table.
>  	 */
>  
> diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
> index 0a1606480023f9..da16bf45fab43e 100644
> --- a/drivers/mfd/twl4030-audio.c
> +++ b/drivers/mfd/twl4030-audio.c
> @@ -30,7 +30,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/twl4030-audio.h>
>  
> diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
> index b46c0cfc27d958..86f8fd8e81e4b5 100644
> --- a/drivers/mfd/twl4030-irq.c
> +++ b/drivers/mfd/twl4030-irq.c
> @@ -33,7 +33,7 @@
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  #include <linux/irqdomain.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #include "twl-core.h"
>  
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index f4b2c29d77e330..6b36932263ba78 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -25,7 +25,7 @@
>  
>  #include <linux/module.h>
>  #include <linux/pm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
> index 53574508a613f2..e3ec8dfa9f1ec0 100644
> --- a/drivers/mfd/twl6030-irq.c
> +++ b/drivers/mfd/twl6030-irq.c
> @@ -35,7 +35,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/irq.h>
>  #include <linux/kthread.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/platform_device.h>
>  #include <linux/suspend.h>
>  #include <linux/of.h>
> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 2990b3965460e8..28f49902760d82 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -36,7 +36,7 @@
>  #include <linux/pm_runtime.h>
>  #include <linux/usb/musb.h>
>  #include <linux/usb/ulpi.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 2f82d0e9ec1bf7..390bfde86ae39b 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -18,7 +18,7 @@
>  #include <linux/err.h>
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/power_supply.h>
>  #include <linux/notifier.h>
>  #include <linux/usb/otg.h>
> diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
> index 21eff991d0e355..01153622778bad 100644
> --- a/drivers/pwm/pwm-twl-led.c
> +++ b/drivers/pwm/pwm-twl-led.c
> @@ -24,7 +24,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
> index 9de617b766801b..b7a45be998153b 100644
> --- a/drivers/pwm/pwm-twl.c
> +++ b/drivers/pwm/pwm-twl.c
> @@ -21,7 +21,7 @@
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pwm.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  
>  /*
> diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
> index 6c9ec84121bde4..a4456db5849d06 100644
> --- a/drivers/regulator/twl-regulator.c
> +++ b/drivers/regulator/twl-regulator.c
> @@ -20,7 +20,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  /*
> diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
> index 56aada38788776..219cbd910dbf52 100644
> --- a/drivers/regulator/twl6030-regulator.c
> +++ b/drivers/regulator/twl6030-regulator.c
> @@ -21,7 +21,7 @@
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/regulator/of_regulator.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/delay.h>
>  
>  struct twlreg_info {
> diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
> index c18c39212ce680..3472e79f2b1782 100644
> --- a/drivers/rtc/rtc-twl.c
> +++ b/drivers/rtc/rtc-twl.c
> @@ -31,7 +31,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/of.h>
>  
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  enum twl_class {
>  	TWL_4030 = 0,
> diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
> index 628b600b02b174..b5dc077ed7d3c6 100644
> --- a/drivers/usb/phy/phy-twl6030-usb.c
> +++ b/drivers/usb/phy/phy-twl6030-usb.c
> @@ -28,7 +28,7 @@
>  #include <linux/usb/musb.h>
>  #include <linux/usb/phy_companion.h>
>  #include <linux/phy/omap_usb.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/err.h>
>  #include <linux/slab.h>
> diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
> index 5d8bb8b201835d..a186bc677c7d80 100644
> --- a/drivers/video/backlight/pandora_bl.c
> +++ b/drivers/video/backlight/pandora_bl.c
> @@ -16,7 +16,7 @@
>  #include <linux/delay.h>
>  #include <linux/fb.h>
>  #include <linux/backlight.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/err.h>
>  
>  #define TWL_PWM0_ON		0x00
> diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
> index 9bf3cc0f396106..569fe85e52da75 100644
> --- a/drivers/watchdog/twl4030_wdt.c
> +++ b/drivers/watchdog/twl4030_wdt.c
> @@ -24,7 +24,7 @@
>  #include <linux/kernel.h>
>  #include <linux/watchdog.h>
>  #include <linux/platform_device.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  
>  #define TWL4030_WATCHDOG_CFG_REG_OFFS	0x3
>  
> diff --git a/include/linux/i2c/twl.h b/include/linux/mfd/twl.h
> similarity index 100%
> rename from include/linux/i2c/twl.h
> rename to include/linux/mfd/twl.h
> diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> index a2104d68169d9e..bd86a2d78c5ff2 100644
> --- a/sound/soc/codecs/twl4030.c
> +++ b/sound/soc/codecs/twl4030.c
> @@ -28,7 +28,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/of.h>
>  #include <linux/of_gpio.h>
> -#include <linux/i2c/twl.h>
> +#include <linux/mfd/twl.h>
>  #include <linux/slab.h>
>  #include <linux/gpio.h>
>  #include <sound/core.h>
>

[toc] | [prev] | [standalone]

csiph-web

[PATCH 0/3] mfd: move include files out of include/linux/i2c

Contents

#1646459 — [PATCH 0/3] mfd: move include files out of include/linux/i2c

#1646460 — [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

#1646642 — Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

#1647486 — Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

#1647706 — Re: [PATCH 1/3] mfd: dm355evm_msp: move header file out of I2C realm

#1646461 — [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1646563 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1646640 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1646685 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1646717 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1646749 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1646719 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1647357 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1647490 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1647717 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1647720 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm

#1647747 — Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm