* [PATCH 0/3] mfd: move include files out of include/linux/i2c
@ 2017-05-21 22:02 Wolfram Sang
2017-05-21 22:02 ` [PATCH 2/3] mfd: tps65010: move header file out of I2C realm Wolfram Sang
[not found] ` <20170521220212.1404-1-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
0 siblings, 2 replies; 32+ messages in thread
From: Wolfram Sang @ 2017-05-21 22:02 UTC (permalink / raw)
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA
Cc: Wolfram Sang, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-iio-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
linux-pm-u79uwXL29TY76Z2rM5mHXA, linux-pwm-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
rtc-linux-/JYPxA39Uh5TLH3MbocFFw
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
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-05-21 22:02 [PATCH 0/3] mfd: move include files out of include/linux/i2c Wolfram Sang @ 2017-05-21 22:02 ` Wolfram Sang 2017-05-22 7:24 ` Greg Kroah-Hartman ` (3 more replies) [not found] ` <20170521220212.1404-1-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> 1 sibling, 4 replies; 32+ messages in thread From: Wolfram Sang @ 2017-05-21 22:02 UTC (permalink / raw) To: linux-arm-kernel include/linux/i2c is not for client devices. Move the header file to a more appropriate location. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> --- arch/arm/mach-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-s3c24xx/mach-osiris-dvs.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- drivers/mfd/tps65010.c | 2 +- drivers/usb/host/ohci-omap.c | 2 +- drivers/usb/phy/phy-isp1301-omap.c | 2 +- drivers/video/fbdev/omap/lcd_h3.c | 2 +- include/linux/{i2c => mfd}/tps65010.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename include/linux/{i2c => mfd}/tps65010.h (99%) diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c index 357be2debc9da8..91bda9c802ff38 100644 --- a/arch/arm/mach-omap1/board-h2-mmc.c +++ b/arch/arm/mach-omap1/board-h2-mmc.c @@ -14,7 +14,7 @@ #include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/platform_data/gpio-omap.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include "board-h2.h" #include "mmc.h" diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 675254ee4b1e93..dece47d76282ac 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -28,7 +28,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/input.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include <linux/smc91x.h> #include <linux/omapfb.h> #include <linux/platform_data/gpio-omap.h> diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c index 4f58bfa5e7549e..692c267a9a9052 100644 --- a/arch/arm/mach-omap1/board-h3-mmc.c +++ b/arch/arm/mach-omap1/board-h3-mmc.c @@ -14,7 +14,7 @@ #include <linux/gpio.h> #include <linux/platform_device.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include "common.h" #include "board-h3.h" diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index e62f9d454f1005..6d32beeb2d8857 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -28,7 +28,7 @@ #include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/spi/spi.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include <linux/smc91x.h> #include <linux/omapfb.h> #include <linux/platform_data/gpio-omap.h> diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 4dfb995048103b..f20361b8ffb6e0 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -38,7 +38,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/omap1_bl.h> diff --git a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c index 262ab07447483a..6cac7da15e2b0d 100644 --- a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c +++ b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c @@ -17,7 +17,7 @@ #include <linux/cpufreq.h> #include <linux/gpio.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include <plat/cpu-freq.h> #include <mach/gpio-samsung.h> diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c index 70b0eb7d31347f..64b1a0b7b803a1 100644 --- a/arch/arm/mach-s3c24xx/mach-osiris.c +++ b/arch/arm/mach-s3c24xx/mach-osiris.c @@ -24,7 +24,7 @@ #include <linux/io.h> #include <linux/platform_device.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c index d829a6131f09e5..2ab67386b4ef1e 100644 --- a/drivers/mfd/tps65010.c +++ b/drivers/mfd/tps65010.c @@ -32,7 +32,7 @@ #include <linux/mutex.h> #include <linux/platform_device.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include <linux/gpio/driver.h> diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index a4d814b7f38066..91393ec7d8503c 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -53,7 +53,7 @@ #define DRIVER_DESC "OHCI OMAP driver" #ifdef CONFIG_TPS65010 -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #else #define LOW 0 diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c index 042c5a8fd423d8..c6052c814bcc24 100644 --- a/drivers/usb/phy/phy-isp1301-omap.c +++ b/drivers/usb/phy/phy-isp1301-omap.c @@ -96,7 +96,7 @@ struct isp1301 { #if IS_REACHABLE(CONFIG_TPS65010) -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #else diff --git a/drivers/video/fbdev/omap/lcd_h3.c b/drivers/video/fbdev/omap/lcd_h3.c index 9d2da146813ef0..796f4634c4c6f1 100644 --- a/drivers/video/fbdev/omap/lcd_h3.c +++ b/drivers/video/fbdev/omap/lcd_h3.c @@ -21,7 +21,7 @@ #include <linux/module.h> #include <linux/platform_device.h> -#include <linux/i2c/tps65010.h> +#include <linux/mfd/tps65010.h> #include <linux/gpio.h> #include "omapfb.h" diff --git a/include/linux/i2c/tps65010.h b/include/linux/mfd/tps65010.h similarity index 99% rename from include/linux/i2c/tps65010.h rename to include/linux/mfd/tps65010.h index 08aa92278d71cd..a1fb9bc5311de4 100644 --- a/include/linux/i2c/tps65010.h +++ b/include/linux/mfd/tps65010.h @@ -1,4 +1,4 @@ -/* linux/i2c/tps65010.h +/* linux/mfd/tps65010.h * * Functions to access TPS65010 power management device. * -- 2.11.0 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-05-21 22:02 ` [PATCH 2/3] mfd: tps65010: move header file out of I2C realm Wolfram Sang @ 2017-05-22 7:24 ` Greg Kroah-Hartman 2017-05-22 7:34 ` Krzysztof Kozlowski ` (2 subsequent siblings) 3 siblings, 0 replies; 32+ messages in thread From: Greg Kroah-Hartman @ 2017-05-22 7:24 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 22, 2017 at 12:02:09AM +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-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-s3c24xx/mach-osiris-dvs.c | 2 +- > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- > drivers/mfd/tps65010.c | 2 +- > drivers/usb/host/ohci-omap.c | 2 +- > drivers/usb/phy/phy-isp1301-omap.c | 2 +- > drivers/video/fbdev/omap/lcd_h3.c | 2 +- > include/linux/{i2c => mfd}/tps65010.h | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > rename include/linux/{i2c => mfd}/tps65010.h (99%) Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-05-21 22:02 ` [PATCH 2/3] mfd: tps65010: move header file out of I2C realm Wolfram Sang 2017-05-22 7:24 ` Greg Kroah-Hartman @ 2017-05-22 7:34 ` Krzysztof Kozlowski 2017-05-23 7:18 ` Lee Jones 2017-05-29 9:19 ` Bartlomiej Zolnierkiewicz 3 siblings, 0 replies; 32+ messages in thread From: Krzysztof Kozlowski @ 2017-05-22 7:34 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 22, 2017 at 12:02 AM, 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-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-s3c24xx/mach-osiris-dvs.c | 2 +- > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- For s3c24xx: Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof > drivers/mfd/tps65010.c | 2 +- > drivers/usb/host/ohci-omap.c | 2 +- > drivers/usb/phy/phy-isp1301-omap.c | 2 +- > drivers/video/fbdev/omap/lcd_h3.c | 2 +- > include/linux/{i2c => mfd}/tps65010.h | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > rename include/linux/{i2c => mfd}/tps65010.h (99%) ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-05-21 22:02 ` [PATCH 2/3] mfd: tps65010: move header file out of I2C realm Wolfram Sang 2017-05-22 7:24 ` Greg Kroah-Hartman 2017-05-22 7:34 ` Krzysztof Kozlowski @ 2017-05-23 7:18 ` Lee Jones 2017-08-13 13:34 ` Wolfram Sang 2017-05-29 9:19 ` Bartlomiej Zolnierkiewicz 3 siblings, 1 reply; 32+ messages in thread From: Lee Jones @ 2017-05-23 7:18 UTC (permalink / raw) To: linux-arm-kernel 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-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-s3c24xx/mach-osiris-dvs.c | 2 +- > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- > drivers/mfd/tps65010.c | 2 +- For my own reference: Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > drivers/usb/host/ohci-omap.c | 2 +- > drivers/usb/phy/phy-isp1301-omap.c | 2 +- > drivers/video/fbdev/omap/lcd_h3.c | 2 +- > include/linux/{i2c => mfd}/tps65010.h | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > rename include/linux/{i2c => mfd}/tps65010.h (99%) > > diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c > index 357be2debc9da8..91bda9c802ff38 100644 > --- a/arch/arm/mach-omap1/board-h2-mmc.c > +++ b/arch/arm/mach-omap1/board-h2-mmc.c > @@ -14,7 +14,7 @@ > #include <linux/gpio.h> > #include <linux/platform_device.h> > #include <linux/platform_data/gpio-omap.h> > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > > #include "board-h2.h" > #include "mmc.h" > diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c > index 675254ee4b1e93..dece47d76282ac 100644 > --- a/arch/arm/mach-omap1/board-h2.c > +++ b/arch/arm/mach-omap1/board-h2.c > @@ -28,7 +28,7 @@ > #include <linux/mtd/partitions.h> > #include <linux/mtd/physmap.h> > #include <linux/input.h> > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > #include <linux/smc91x.h> > #include <linux/omapfb.h> > #include <linux/platform_data/gpio-omap.h> > diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c > index 4f58bfa5e7549e..692c267a9a9052 100644 > --- a/arch/arm/mach-omap1/board-h3-mmc.c > +++ b/arch/arm/mach-omap1/board-h3-mmc.c > @@ -14,7 +14,7 @@ > #include <linux/gpio.h> > #include <linux/platform_device.h> > > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > > #include "common.h" > #include "board-h3.h" > diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c > index e62f9d454f1005..6d32beeb2d8857 100644 > --- a/arch/arm/mach-omap1/board-h3.c > +++ b/arch/arm/mach-omap1/board-h3.c > @@ -28,7 +28,7 @@ > #include <linux/mtd/physmap.h> > #include <linux/input.h> > #include <linux/spi/spi.h> > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > #include <linux/smc91x.h> > #include <linux/omapfb.h> > #include <linux/platform_data/gpio-omap.h> > diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c > index 4dfb995048103b..f20361b8ffb6e0 100644 > --- a/arch/arm/mach-omap1/board-osk.c > +++ b/arch/arm/mach-omap1/board-osk.c > @@ -38,7 +38,7 @@ > #include <linux/mtd/mtd.h> > #include <linux/mtd/partitions.h> > #include <linux/mtd/physmap.h> > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > #include <linux/platform_data/gpio-omap.h> > #include <linux/platform_data/omap1_bl.h> > > diff --git a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c > index 262ab07447483a..6cac7da15e2b0d 100644 > --- a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c > +++ b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c > @@ -17,7 +17,7 @@ > #include <linux/cpufreq.h> > #include <linux/gpio.h> > > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > > #include <plat/cpu-freq.h> > #include <mach/gpio-samsung.h> > diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c > index 70b0eb7d31347f..64b1a0b7b803a1 100644 > --- a/arch/arm/mach-s3c24xx/mach-osiris.c > +++ b/arch/arm/mach-s3c24xx/mach-osiris.c > @@ -24,7 +24,7 @@ > #include <linux/io.h> > #include <linux/platform_device.h> > > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c > index d829a6131f09e5..2ab67386b4ef1e 100644 > --- a/drivers/mfd/tps65010.c > +++ b/drivers/mfd/tps65010.c > @@ -32,7 +32,7 @@ > #include <linux/mutex.h> > #include <linux/platform_device.h> > > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > > #include <linux/gpio/driver.h> > > diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c > index a4d814b7f38066..91393ec7d8503c 100644 > --- a/drivers/usb/host/ohci-omap.c > +++ b/drivers/usb/host/ohci-omap.c > @@ -53,7 +53,7 @@ > #define DRIVER_DESC "OHCI OMAP driver" > > #ifdef CONFIG_TPS65010 > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > #else > > #define LOW 0 > diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c > index 042c5a8fd423d8..c6052c814bcc24 100644 > --- a/drivers/usb/phy/phy-isp1301-omap.c > +++ b/drivers/usb/phy/phy-isp1301-omap.c > @@ -96,7 +96,7 @@ struct isp1301 { > > #if IS_REACHABLE(CONFIG_TPS65010) > > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > > #else > > diff --git a/drivers/video/fbdev/omap/lcd_h3.c b/drivers/video/fbdev/omap/lcd_h3.c > index 9d2da146813ef0..796f4634c4c6f1 100644 > --- a/drivers/video/fbdev/omap/lcd_h3.c > +++ b/drivers/video/fbdev/omap/lcd_h3.c > @@ -21,7 +21,7 @@ > > #include <linux/module.h> > #include <linux/platform_device.h> > -#include <linux/i2c/tps65010.h> > +#include <linux/mfd/tps65010.h> > #include <linux/gpio.h> > > #include "omapfb.h" > diff --git a/include/linux/i2c/tps65010.h b/include/linux/mfd/tps65010.h > similarity index 99% > rename from include/linux/i2c/tps65010.h > rename to include/linux/mfd/tps65010.h > index 08aa92278d71cd..a1fb9bc5311de4 100644 > --- a/include/linux/i2c/tps65010.h > +++ b/include/linux/mfd/tps65010.h > @@ -1,4 +1,4 @@ > -/* linux/i2c/tps65010.h > +/* linux/mfd/tps65010.h > * > * Functions to access TPS65010 power management device. > * -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-05-23 7:18 ` Lee Jones @ 2017-08-13 13:34 ` Wolfram Sang 2017-08-14 6:43 ` Lee Jones 0 siblings, 1 reply; 32+ messages in thread From: Wolfram Sang @ 2017-08-13 13:34 UTC (permalink / raw) To: linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 846 bytes --] On Tue, May 23, 2017 at 08:18:19AM +0100, Lee Jones wrote: > 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-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-s3c24xx/mach-osiris-dvs.c | 2 +- > > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- > > > drivers/mfd/tps65010.c | 2 +- > > For my own reference: > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> Same here: ok for 4.14 or something needed? [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-08-13 13:34 ` Wolfram Sang @ 2017-08-14 6:43 ` Lee Jones 2017-08-14 8:44 ` Lee Jones 0 siblings, 1 reply; 32+ messages in thread From: Lee Jones @ 2017-08-14 6:43 UTC (permalink / raw) To: linux-arm-kernel On Sun, 13 Aug 2017, Wolfram Sang wrote: > On Tue, May 23, 2017 at 08:18:19AM +0100, Lee Jones wrote: > > 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-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-s3c24xx/mach-osiris-dvs.c | 2 +- > > > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- > > > > > drivers/mfd/tps65010.c | 2 +- > > > > For my own reference: > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > > Same here: ok for 4.14 or something needed? Can this patch be applied on its own, or does it have dependencies? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-08-14 6:43 ` Lee Jones @ 2017-08-14 8:44 ` Lee Jones 2017-08-14 16:21 ` Tony Lindgren 0 siblings, 1 reply; 32+ messages in thread From: Lee Jones @ 2017-08-14 8:44 UTC (permalink / raw) To: linux-arm-kernel On Mon, 14 Aug 2017, Lee Jones wrote: > On Sun, 13 Aug 2017, Wolfram Sang wrote: > > > On Tue, May 23, 2017 at 08:18:19AM +0100, Lee Jones wrote: > > > 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-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-s3c24xx/mach-osiris-dvs.c | 2 +- > > > > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- > > > > > > > drivers/mfd/tps65010.c | 2 +- > > > > > > For my own reference: > > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > > > > Same here: ok for 4.14 or something needed? > > Can this patch be applied on its own, or does it have dependencies? Even if it doesn't, it still requires Acks. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-08-14 8:44 ` Lee Jones @ 2017-08-14 16:21 ` Tony Lindgren 2017-08-14 16:29 ` Wolfram Sang 0 siblings, 1 reply; 32+ messages in thread From: Tony Lindgren @ 2017-08-14 16:21 UTC (permalink / raw) To: linux-arm-kernel * Lee Jones <lee.jones@linaro.org> [170814 01:44]: > On Mon, 14 Aug 2017, Lee Jones wrote: > > > On Sun, 13 Aug 2017, Wolfram Sang wrote: > > > > > On Tue, May 23, 2017 at 08:18:19AM +0100, Lee Jones wrote: > > > > 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-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-s3c24xx/mach-osiris-dvs.c | 2 +- > > > > > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- > > > > > > > > > drivers/mfd/tps65010.c | 2 +- > > > > > > > > For my own reference: > > > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > > > > > > Same here: ok for 4.14 or something needed? > > > > Can this patch be applied on its own, or does it have dependencies? > > Even if it doesn't, it still requires Acks. As long as this has been compile tested with omap1_defconfig: Acked-by: Tony Lindgren <tony@atomide.com> Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-08-14 16:21 ` Tony Lindgren @ 2017-08-14 16:29 ` Wolfram Sang 0 siblings, 0 replies; 32+ messages in thread From: Wolfram Sang @ 2017-08-14 16:29 UTC (permalink / raw) To: linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 300 bytes --] > > Even if it doesn't, it still requires Acks. > > As long as this has been compile tested with omap1_defconfig: > > Acked-by: Tony Lindgren <tony@atomide.com> Hah, just in time. I was about to send out the new version, thanks! :D buildbot did test it and I did compile tests, too. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] mfd: tps65010: move header file out of I2C realm 2017-05-21 22:02 ` [PATCH 2/3] mfd: tps65010: move header file out of I2C realm Wolfram Sang ` (2 preceding siblings ...) 2017-05-23 7:18 ` Lee Jones @ 2017-05-29 9:19 ` Bartlomiej Zolnierkiewicz 3 siblings, 0 replies; 32+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2017-05-29 9:19 UTC (permalink / raw) To: linux-arm-kernel On Monday, May 22, 2017 12:02:09 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: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > --- > 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-s3c24xx/mach-osiris-dvs.c | 2 +- > arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- > drivers/mfd/tps65010.c | 2 +- > drivers/usb/host/ohci-omap.c | 2 +- > drivers/usb/phy/phy-isp1301-omap.c | 2 +- > drivers/video/fbdev/omap/lcd_h3.c | 2 +- > include/linux/{i2c => mfd}/tps65010.h | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > rename include/linux/{i2c => mfd}/tps65010.h (99%) Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics ^ permalink raw reply [flat|nested] 32+ messages in thread
[parent not found: <20170521220212.1404-1-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>]
* [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-1-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> @ 2017-05-21 22:02 ` Wolfram Sang [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> 2017-05-22 20:34 ` Jonathan Cameron 0 siblings, 2 replies; 32+ messages in thread From: Wolfram Sang @ 2017-05-21 22:02 UTC (permalink / raw) To: linux-i2c-u79uwXL29TY76Z2rM5mHXA Cc: Wolfram Sang, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartl 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 ^ permalink raw reply related [flat|nested] 32+ messages in thread
[parent not found: <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>]
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> @ 2017-05-22 7:25 ` Greg Kroah-Hartman 2017-05-22 9:14 ` Alexandre Belloni ` (7 subsequent siblings) 8 siblings, 0 replies; 32+ messages in thread From: Greg Kroah-Hartman @ 2017-05-22 7:25 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz, Wim 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> ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> 2017-05-22 7:25 ` Greg Kroah-Hartman @ 2017-05-22 9:14 ` Alexandre Belloni 2017-05-22 9:52 ` Mark Brown ` (6 subsequent siblings) 8 siblings, 0 replies; 32+ messages in thread From: Alexandre Belloni @ 2017-05-22 9:14 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz, Wim 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 ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> 2017-05-22 7:25 ` Greg Kroah-Hartman 2017-05-22 9:14 ` Alexandre Belloni @ 2017-05-22 9:52 ` Mark Brown 2017-05-22 10:28 ` Wolfram Sang 2017-05-22 10:27 ` Sebastian Reichel ` (5 subsequent siblings) 8 siblings, 1 reply; 32+ messages in thread From: Mark Brown @ 2017-05-22 9:52 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz [-- Attachment #1: Type: text/plain, Size: 270 bytes --] 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... [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-05-22 9:52 ` Mark Brown @ 2017-05-22 10:28 ` Wolfram Sang 2017-05-22 11:12 ` Mark Brown 0 siblings, 1 reply; 32+ messages in thread From: Wolfram Sang @ 2017-05-22 10:28 UTC (permalink / raw) To: Mark Brown Cc: linux-i2c, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Dani [-- Attachment #1: Type: text/plain, Size: 710 bytes --] 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? [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-05-22 10:28 ` Wolfram Sang @ 2017-05-22 11:12 ` Mark Brown 0 siblings, 0 replies; 32+ messages in thread From: Mark Brown @ 2017-05-22 11:12 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Dani [-- Attachment #1: Type: text/plain, Size: 345 bytes --] 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. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> ` (2 preceding siblings ...) 2017-05-22 9:52 ` Mark Brown @ 2017-05-22 10:27 ` Sebastian Reichel 2017-05-22 23:37 ` Dmitry Torokhov ` (4 subsequent siblings) 8 siblings, 0 replies; 32+ messages in thread From: Sebastian Reichel @ 2017-05-22 10:27 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-fbdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Linus Walleij, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, Wim Van Sebroeck, Thierry Reding, Alexandre Belloni, Peter Meerwald-Stadler, Lee Jones, Alexandre Courbot, Daniel Thompson, Lars-Peter Clausen, Bartlomiej Zolnierkiewicz, Russell King, Kishon Vijay Abraham I, linux-iio-u79uwXL29TY76Z2rM5mHXA, linux-omap-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, Guenter Roeck, linux-pwm-u79uwXL29TY76Z2rM5mHXA, linux-watchdog-u79uwXL29TY76Z2rM5mHXA, rtc-linux-/JYPxA39Uh5TLH3MbocFFw, Felipe Balbi <bal> [-- Attachment #1: Type: text/plain, Size: 388 bytes --] 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> ` (3 preceding siblings ...) 2017-05-22 10:27 ` Sebastian Reichel @ 2017-05-22 23:37 ` Dmitry Torokhov 2017-05-23 7:16 ` Lee Jones ` (3 subsequent siblings) 8 siblings, 0 replies; 32+ messages in thread From: Dmitry Torokhov @ 2017-05-22 23:37 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz, Wim 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 ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> ` (4 preceding siblings ...) 2017-05-22 23:37 ` Dmitry Torokhov @ 2017-05-23 7:16 ` Lee Jones 2017-05-23 7:21 ` Wolfram Sang 2017-05-23 7:54 ` Kishon Vijay Abraham I ` (2 subsequent siblings) 8 siblings, 1 reply; 32+ messages in thread From: Lee Jones @ 2017-05-23 7:16 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz 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 ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-05-23 7:16 ` Lee Jones @ 2017-05-23 7:21 ` Wolfram Sang 0 siblings, 0 replies; 32+ messages in thread From: Wolfram Sang @ 2017-05-23 7:21 UTC (permalink / raw) To: Lee Jones Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz [-- Attachment #1: Type: text/plain, Size: 174 bytes --] > 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! [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> ` (5 preceding siblings ...) 2017-05-23 7:16 ` Lee Jones @ 2017-05-23 7:54 ` Kishon Vijay Abraham I 2017-05-29 9:20 ` Bartlomiej Zolnierkiewicz 2017-07-06 6:44 ` Thierry Reding 8 siblings, 0 replies; 32+ messages in thread From: Kishon Vijay Abraham I @ 2017-05-23 7:54 UTC (permalink / raw) To: Wolfram Sang, linux-i2c-u79uwXL29TY76Z2rM5mHXA Cc: Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo 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> > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> ` (6 preceding siblings ...) 2017-05-23 7:54 ` Kishon Vijay Abraham I @ 2017-05-29 9:20 ` Bartlomiej Zolnierkiewicz 2017-07-06 6:44 ` Thierry Reding 8 siblings, 0 replies; 32+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2017-05-29 9:20 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Wim Van Sebroeck <wim@ On Monday, May 22, 2017 12:02:10 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: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.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%) Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> ` (7 preceding siblings ...) 2017-05-29 9:20 ` Bartlomiej Zolnierkiewicz @ 2017-07-06 6:44 ` Thierry Reding [not found] ` <20170706064453.GH16144-m5CkvRiFyV9wFLYp8hBm2A@public.gmane.org> 8 siblings, 1 reply; 32+ messages in thread From: Thierry Reding @ 2017-07-06 6:44 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz, Wi [-- Attachment #1: Type: text/plain, Size: 1800 bytes --] 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%) I didn't see this get applied yet, so just in case anyone was waiting for me (this is trivial, so I don't think there's a need): Acked-by: Thierry Reding <thierry.reding@gmail.com> [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
[parent not found: <20170706064453.GH16144-m5CkvRiFyV9wFLYp8hBm2A@public.gmane.org>]
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170706064453.GH16144-m5CkvRiFyV9wFLYp8hBm2A@public.gmane.org> @ 2017-07-06 7:03 ` Lee Jones 2017-08-13 13:37 ` Wolfram Sang 0 siblings, 1 reply; 32+ messages in thread From: Lee Jones @ 2017-07-06 7:03 UTC (permalink / raw) To: Thierry Reding Cc: Wolfram Sang, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz, Wi On Thu, 06 Jul 2017, Thierry Reding 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. > > > > 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%) > > I didn't see this get applied yet, so just in case anyone was waiting > for me (this is trivial, so I don't think there's a need): You're not the last. :) -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-07-06 7:03 ` Lee Jones @ 2017-08-13 13:37 ` Wolfram Sang 2017-08-14 6:42 ` Lee Jones 0 siblings, 1 reply; 32+ messages in thread From: Wolfram Sang @ 2017-08-13 13:37 UTC (permalink / raw) To: Lee Jones Cc: Thierry Reding, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz [-- Attachment #1: Type: text/plain, Size: 2123 bytes --] On Thu, Jul 06, 2017 at 08:03:52AM +0100, Lee Jones wrote: > On Thu, 06 Jul 2017, Thierry Reding 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. > > > > > > 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%) > > > > I didn't see this get applied yet, so just in case anyone was waiting > > for me (this is trivial, so I don't think there's a need): > > You're not the last. :) Given the triviality of the change for non-MFD subsystems, can we apply this for 4.14? [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-08-13 13:37 ` Wolfram Sang @ 2017-08-14 6:42 ` Lee Jones 2017-08-14 8:43 ` Wolfram Sang 0 siblings, 1 reply; 32+ messages in thread From: Lee Jones @ 2017-08-14 6:42 UTC (permalink / raw) To: Wolfram Sang Cc: Thierry Reding, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz On Sun, 13 Aug 2017, Wolfram Sang wrote: > On Thu, Jul 06, 2017 at 08:03:52AM +0100, Lee Jones wrote: > > On Thu, 06 Jul 2017, Thierry Reding 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. > > > > > > > > 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%) > > > > > > I didn't see this get applied yet, so just in case anyone was waiting > > > for me (this is trivial, so I don't think there's a need): > > > > You're not the last. :) > > Given the triviality of the change for non-MFD subsystems, can we apply > this for 4.14? I can't apply anything without Acks for *all* of the subsystems above. As you well know, it is the submitters responsibility to obtain them. My suggestion would be to collect the Acks you've received up until this point and identify which SS's are still lacking in change log section of a RESEND. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-08-14 6:42 ` Lee Jones @ 2017-08-14 8:43 ` Wolfram Sang 2017-08-14 16:22 ` Tony Lindgren 0 siblings, 1 reply; 32+ messages in thread From: Wolfram Sang @ 2017-08-14 8:43 UTC (permalink / raw) To: Lee Jones Cc: Thierry Reding, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz [-- Attachment #1: Type: text/plain, Size: 511 bytes --] > > Given the triviality of the change for non-MFD subsystems, can we apply > > this for 4.14? > > I can't apply anything without Acks for *all* of the subsystems above. Well, there are cases when you can. Those should be exceptions and well justified, of course. > My suggestion would be to collect the Acks you've received up until > this point and identify which SS's are still lacking in change log > section of a RESEND. I agree, though, that I can try a second round to get the acks. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-08-14 8:43 ` Wolfram Sang @ 2017-08-14 16:22 ` Tony Lindgren [not found] ` <20170814162219.GX8569-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 0 siblings, 1 reply; 32+ messages in thread From: Tony Lindgren @ 2017-08-14 16:22 UTC (permalink / raw) To: Wolfram Sang Cc: Lee Jones, Thierry Reding, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel Thompson, Jingoo Han, Bartlomiej Zolnierkiewicz * Wolfram Sang <wsa@the-dreams.de> [170814 01:43]: > > > > Given the triviality of the change for non-MFD subsystems, can we apply > > > this for 4.14? > > > > I can't apply anything without Acks for *all* of the subsystems above. > > Well, there are cases when you can. Those should be exceptions and well > justified, of course. > > > My suggestion would be to collect the Acks you've received up until > > this point and identify which SS's are still lacking in change log > > section of a RESEND. > > I agree, though, that I can try a second round to get the acks. As long as it's been compile tested with omap2plus_defconfig: Acked-by: Tony Lindgren <tony@atomide.com> ^ permalink raw reply [flat|nested] 32+ messages in thread
[parent not found: <20170814162219.GX8569-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>]
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <20170814162219.GX8569-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> @ 2017-08-14 16:27 ` Daniel Thompson [not found] ` <c5e65e34-f308-f601-ba0b-d96792591727-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 0 siblings, 1 reply; 32+ messages in thread From: Daniel Thompson @ 2017-08-14 16:27 UTC (permalink / raw) To: Tony Lindgren, Wolfram Sang Cc: Lee Jones, Thierry Reding, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Jingoo Han, Bartlomiej Zolnierkiewicz, Wim Van Sebroeck, Guenter On 14/08/17 17:22, Tony Lindgren wrote: > * Wolfram Sang <wsa@the-dreams.de> [170814 01:43]: >> >>>> Given the triviality of the change for non-MFD subsystems, can we apply >>>> this for 4.14? >>> >>> I can't apply anything without Acks for *all* of the subsystems above. >> >> Well, there are cases when you can. Those should be exceptions and well >> justified, of course. >> >>> My suggestion would be to collect the Acks you've received up until >>> this point and identify which SS's are still lacking in change log >>> section of a RESEND. >> >> I agree, though, that I can try a second round to get the acks. > > As long as it's been compile tested with omap2plus_defconfig: > > Acked-by: Tony Lindgren <tony@atomide.com> Don't recall if I sent an ack before but I do remember the patch... so from a backlight PoV: Acked-by: Daniel Thompson <daniel.thompson@linaro.org> ^ permalink raw reply [flat|nested] 32+ messages in thread
[parent not found: <c5e65e34-f308-f601-ba0b-d96792591727-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm [not found] ` <c5e65e34-f308-f601-ba0b-d96792591727-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> @ 2017-08-14 16:32 ` Wolfram Sang 0 siblings, 0 replies; 32+ messages in thread From: Wolfram Sang @ 2017-08-14 16:32 UTC (permalink / raw) To: Daniel Thompson Cc: Tony Lindgren, Lee Jones, Thierry Reding, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Russell King, Linus Walleij, Alexandre Courbot, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Kishon Vijay Abraham I, Sebastian Reichel, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Jingoo Han, Bartlomiej Zolnierkiewicz, Wim [-- Attachment #1: Type: text/plain, Size: 74 bytes --] > Acked-by: Daniel Thompson <daniel.thompson@linaro.org> Added, thanks! [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm 2017-05-21 22:02 ` [PATCH 3/3] mfd: twl: " Wolfram Sang [not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> @ 2017-05-22 20:34 ` Jonathan Cameron 1 sibling, 0 replies; 32+ messages in thread From: Jonathan Cameron @ 2017-05-22 20:34 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c, Tony Lindgren, Russell King, Linus Walleij, Alexandre Courbot, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler, Dmitry Torokhov, Lee Jones, Kishon Vijay Abraham I, Sebastian Reichel, Thierry Reding, Liam Girdwood, Mark Brown, Alessandro Zummo, Alexandre Belloni, Felipe Balbi, Greg Kroah-Hartman, Daniel 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> ^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2017-08-14 16:32 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-21 22:02 [PATCH 0/3] mfd: move include files out of include/linux/i2c Wolfram Sang
2017-05-21 22:02 ` [PATCH 2/3] mfd: tps65010: move header file out of I2C realm Wolfram Sang
2017-05-22 7:24 ` Greg Kroah-Hartman
2017-05-22 7:34 ` Krzysztof Kozlowski
2017-05-23 7:18 ` Lee Jones
2017-08-13 13:34 ` Wolfram Sang
2017-08-14 6:43 ` Lee Jones
2017-08-14 8:44 ` Lee Jones
2017-08-14 16:21 ` Tony Lindgren
2017-08-14 16:29 ` Wolfram Sang
2017-05-29 9:19 ` Bartlomiej Zolnierkiewicz
[not found] ` <20170521220212.1404-1-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
2017-05-21 22:02 ` [PATCH 3/3] mfd: twl: " Wolfram Sang
[not found] ` <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
2017-05-22 7:25 ` Greg Kroah-Hartman
2017-05-22 9:14 ` Alexandre Belloni
2017-05-22 9:52 ` Mark Brown
2017-05-22 10:28 ` Wolfram Sang
2017-05-22 11:12 ` Mark Brown
2017-05-22 10:27 ` Sebastian Reichel
2017-05-22 23:37 ` Dmitry Torokhov
2017-05-23 7:16 ` Lee Jones
2017-05-23 7:21 ` Wolfram Sang
2017-05-23 7:54 ` Kishon Vijay Abraham I
2017-05-29 9:20 ` Bartlomiej Zolnierkiewicz
2017-07-06 6:44 ` Thierry Reding
[not found] ` <20170706064453.GH16144-m5CkvRiFyV9wFLYp8hBm2A@public.gmane.org>
2017-07-06 7:03 ` Lee Jones
2017-08-13 13:37 ` Wolfram Sang
2017-08-14 6:42 ` Lee Jones
2017-08-14 8:43 ` Wolfram Sang
2017-08-14 16:22 ` Tony Lindgren
[not found] ` <20170814162219.GX8569-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2017-08-14 16:27 ` Daniel Thompson
[not found] ` <c5e65e34-f308-f601-ba0b-d96792591727-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-08-14 16:32 ` Wolfram Sang
2017-05-22 20:34 ` Jonathan Cameron
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).