From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Belloni Subject: Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Date: Mon, 22 May 2017 11:14:50 +0200 Message-ID: <20170522091450.auxaosd7aipjbjaa@piout.net> References: <20170521220212.1404-1-wsa@the-dreams.de> <20170521220212.1404-4-wsa@the-dreams.de> Reply-To: rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: Sender: rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org Content-Disposition: inline In-Reply-To: <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, 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 List-Id: linux-gpio@vger.kernel.org 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 Acked-by: Alexandre Belloni > --- > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > > #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 > #include > > -#include > +#include > > /* > * 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > > #include > -#include > +#include > > /* Register descriptions for audio */ > #include > @@ -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 > - * defines for TWL4030_MODULE_* > + * 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 > - * defines for TWL4030_MODULE_* > + * 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > 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 > #include > > -#include > +#include > > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > #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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > -- > 2.11.0 > -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -- You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. --- You received this message because you are subscribed to the Google Groups "rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932490AbdEVJPS (ORCPT ); Mon, 22 May 2017 05:15:18 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:32774 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757922AbdEVJPJ (ORCPT ); Mon, 22 May 2017 05:15:09 -0400 Date: Mon, 22 May 2017 11:14:50 +0200 From: Alexandre Belloni To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, 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 Van Sebroeck , Guenter Roeck , Peter Ujfalusi , Jaroslav Kysela , Takashi Iwai , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-iio@vger.kernel.org, linux-input@vger.kernel.org, linux-pm@vger.kernel.org, linux-pwm@vger.kernel.org, rtc-linux@googlegroups.com, linux-usb@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-watchdog@vger.kernel.org, alsa-devel@alsa-project.org Subject: Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Message-ID: <20170522091450.auxaosd7aipjbjaa@piout.net> References: <20170521220212.1404-1-wsa@the-dreams.de> <20170521220212.1404-4-wsa@the-dreams.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170521220212.1404-4-wsa@the-dreams.de> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Alexandre Belloni > --- > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > > #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 > #include > > -#include > +#include > > /* > * 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > > #include > -#include > +#include > > /* Register descriptions for audio */ > #include > @@ -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 > - * defines for TWL4030_MODULE_* > + * 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 > - * defines for TWL4030_MODULE_* > + * 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > 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 > #include > > -#include > +#include > > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > #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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > -- > 2.11.0 > -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Sender: rtc-linux@googlegroups.com Received: from mail.free-electrons.com (mail.free-electrons.com. [62.4.15.54]) by gmr-mx.google.com with ESMTP id f23si149771wme.0.2017.05.22.02.15.01 for ; Mon, 22 May 2017 02:15:01 -0700 (PDT) Date: Mon, 22 May 2017 11:14:50 +0200 From: Alexandre Belloni To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, 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 Van Sebroeck , Guenter Roeck , Peter Ujfalusi , Jaroslav Kysela , Takashi Iwai , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-iio@vger.kernel.org, linux-input@vger.kernel.org, linux-pm@vger.kernel.org, linux-pwm@vger.kernel.org, rtc-linux@googlegroups.com, linux-usb@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-watchdog@vger.kernel.org, alsa-devel@alsa-project.org Subject: [rtc-linux] Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Message-ID: <20170522091450.auxaosd7aipjbjaa@piout.net> References: <20170521220212.1404-1-wsa@the-dreams.de> <20170521220212.1404-4-wsa@the-dreams.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" In-Reply-To: <20170521220212.1404-4-wsa@the-dreams.de> Reply-To: rtc-linux@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , 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 Acked-by: Alexandre Belloni > --- > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > > #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 > #include > > -#include > +#include > > /* > * 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > > #include > -#include > +#include > > /* Register descriptions for audio */ > #include > @@ -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 > - * defines for TWL4030_MODULE_* > + * 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 > - * defines for TWL4030_MODULE_* > + * 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > 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 > #include > > -#include > +#include > > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > #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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > -- > 2.11.0 > -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -- You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. --- You received this message because you are subscribed to the Google Groups "rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Belloni Date: Mon, 22 May 2017 09:14:50 +0000 Subject: Re: [PATCH 3/3] mfd: twl: move header file out of I2C realm Message-Id: <20170522091450.auxaosd7aipjbjaa@piout.net> List-Id: References: <20170521220212.1404-1-wsa@the-dreams.de> <20170521220212.1404-4-wsa@the-dreams.de> In-Reply-To: <20170521220212.1404-4-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, 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 Acked-by: Alexandre Belloni > --- > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > > #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 > #include > > -#include > +#include > > /* > * 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > > #include > -#include > +#include > > /* Register descriptions for audio */ > #include > @@ -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 > - * defines for TWL4030_MODULE_* > + * 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 > - * defines for TWL4030_MODULE_* > + * 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > 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 > #include > > -#include > +#include > > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > #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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > -- > 2.11.0 > -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: alexandre.belloni@free-electrons.com (Alexandre Belloni) Date: Mon, 22 May 2017 11:14:50 +0200 Subject: [PATCH 3/3] mfd: twl: move header file out of I2C realm In-Reply-To: <20170521220212.1404-4-wsa@the-dreams.de> References: <20170521220212.1404-1-wsa@the-dreams.de> <20170521220212.1404-4-wsa@the-dreams.de> Message-ID: <20170522091450.auxaosd7aipjbjaa@piout.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 Acked-by: Alexandre Belloni > --- > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > > #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 > #include > > -#include > +#include > > /* > * 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > > #include > -#include > +#include > > /* Register descriptions for audio */ > #include > @@ -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 > - * defines for TWL4030_MODULE_* > + * 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 > - * defines for TWL4030_MODULE_* > + * 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 > #include > #include > -#include > +#include > #include > #include > > 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 > #include > #include > -#include > +#include > > #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 > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > /* > 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 > #include > #include > -#include > +#include > #include > > 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 > #include > > -#include > +#include > > 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 > #include > #include > -#include > +#include > #include > #include > #include > 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 > #include > #include > -#include > +#include > #include > > #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 > #include > #include > -#include > +#include > > #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 > #include > #include > -#include > +#include > #include > #include > #include > -- > 2.11.0 > -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com