tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mfd: twl: Move header file out of I2C realm

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Wolfram Sang and committed by
Lee Jones a2054256 569dbb88

+26 -26
+1 -1
arch/arm/mach-omap2/common.h
··· 29 29 #include <linux/irq.h> 30 30 #include <linux/delay.h> 31 31 #include <linux/i2c.h> 32 - #include <linux/i2c/twl.h> 32 + #include <linux/mfd/twl.h> 33 33 #include <linux/i2c-omap.h> 34 34 #include <linux/reboot.h> 35 35 #include <linux/irqchip/irq-omap-intc.h>
+1 -1
arch/arm/mach-omap2/omap_twl.c
··· 16 16 #include <linux/err.h> 17 17 #include <linux/io.h> 18 18 #include <linux/kernel.h> 19 - #include <linux/i2c/twl.h> 19 + #include <linux/mfd/twl.h> 20 20 21 21 #include "soc.h" 22 22 #include "voltage.h"
+1 -1
drivers/gpio/gpio-twl4030.c
··· 35 35 #include <linux/of.h> 36 36 #include <linux/irqdomain.h> 37 37 38 - #include <linux/i2c/twl.h> 38 + #include <linux/mfd/twl.h> 39 39 40 40 /* 41 41 * The GPIO "subchip" supports 18 GPIOs which can be configured as
+1 -1
drivers/iio/adc/twl4030-madc.c
··· 35 35 #include <linux/delay.h> 36 36 #include <linux/platform_device.h> 37 37 #include <linux/slab.h> 38 - #include <linux/i2c/twl.h> 38 + #include <linux/mfd/twl.h> 39 39 #include <linux/module.h> 40 40 #include <linux/stddef.h> 41 41 #include <linux/mutex.h>
+1 -1
drivers/iio/adc/twl6030-gpadc.c
··· 33 33 #include <linux/module.h> 34 34 #include <linux/platform_device.h> 35 35 #include <linux/of_platform.h> 36 - #include <linux/i2c/twl.h> 36 + #include <linux/mfd/twl.h> 37 37 #include <linux/iio/iio.h> 38 38 #include <linux/iio/sysfs.h> 39 39
+1 -1
drivers/input/keyboard/twl4030_keypad.c
··· 30 30 #include <linux/interrupt.h> 31 31 #include <linux/input.h> 32 32 #include <linux/platform_device.h> 33 - #include <linux/i2c/twl.h> 33 + #include <linux/mfd/twl.h> 34 34 #include <linux/slab.h> 35 35 #include <linux/of.h> 36 36
+1 -1
drivers/input/misc/twl4030-pwrbutton.c
··· 27 27 #include <linux/input.h> 28 28 #include <linux/interrupt.h> 29 29 #include <linux/platform_device.h> 30 - #include <linux/i2c/twl.h> 30 + #include <linux/mfd/twl.h> 31 31 32 32 #define PWR_PWRON_IRQ (1 << 0) 33 33
+1 -1
drivers/input/misc/twl4030-vibra.c
··· 28 28 #include <linux/platform_device.h> 29 29 #include <linux/of.h> 30 30 #include <linux/workqueue.h> 31 - #include <linux/i2c/twl.h> 31 + #include <linux/mfd/twl.h> 32 32 #include <linux/mfd/twl4030-audio.h> 33 33 #include <linux/input.h> 34 34 #include <linux/slab.h>
+3 -3
drivers/mfd/twl-core.c
··· 44 44 #include <linux/regulator/machine.h> 45 45 46 46 #include <linux/i2c.h> 47 - #include <linux/i2c/twl.h> 47 + #include <linux/mfd/twl.h> 48 48 49 49 /* Register descriptions for audio */ 50 50 #include <linux/mfd/twl4030-audio.h> ··· 173 173 static struct twl_mapping twl4030_map[] = { 174 174 /* 175 175 * NOTE: don't change this table without updating the 176 - * <linux/i2c/twl.h> defines for TWL4030_MODULE_* 176 + * <linux/mfd/twl.h> defines for TWL4030_MODULE_* 177 177 * so they continue to match the order in this table. 178 178 */ 179 179 ··· 344 344 static struct twl_mapping twl6030_map[] = { 345 345 /* 346 346 * NOTE: don't change this table without updating the 347 - * <linux/i2c/twl.h> defines for TWL4030_MODULE_* 347 + * <linux/mfd/twl.h> defines for TWL4030_MODULE_* 348 348 * so they continue to match the order in this table. 349 349 */ 350 350
+1 -1
drivers/mfd/twl4030-audio.c
··· 30 30 #include <linux/platform_device.h> 31 31 #include <linux/of.h> 32 32 #include <linux/of_platform.h> 33 - #include <linux/i2c/twl.h> 33 + #include <linux/mfd/twl.h> 34 34 #include <linux/mfd/core.h> 35 35 #include <linux/mfd/twl4030-audio.h> 36 36
+1 -1
drivers/mfd/twl4030-irq.c
··· 33 33 #include <linux/slab.h> 34 34 #include <linux/of.h> 35 35 #include <linux/irqdomain.h> 36 - #include <linux/i2c/twl.h> 36 + #include <linux/mfd/twl.h> 37 37 38 38 #include "twl-core.h" 39 39
+1 -1
drivers/mfd/twl4030-power.c
··· 25 25 26 26 #include <linux/module.h> 27 27 #include <linux/pm.h> 28 - #include <linux/i2c/twl.h> 28 + #include <linux/mfd/twl.h> 29 29 #include <linux/platform_device.h> 30 30 #include <linux/of.h> 31 31 #include <linux/of_device.h>
+1 -1
drivers/mfd/twl6030-irq.c
··· 35 35 #include <linux/interrupt.h> 36 36 #include <linux/irq.h> 37 37 #include <linux/kthread.h> 38 - #include <linux/i2c/twl.h> 38 + #include <linux/mfd/twl.h> 39 39 #include <linux/platform_device.h> 40 40 #include <linux/suspend.h> 41 41 #include <linux/of.h>
+1 -1
drivers/phy/ti/phy-twl4030-usb.c
··· 36 36 #include <linux/pm_runtime.h> 37 37 #include <linux/usb/musb.h> 38 38 #include <linux/usb/ulpi.h> 39 - #include <linux/i2c/twl.h> 39 + #include <linux/mfd/twl.h> 40 40 #include <linux/regulator/consumer.h> 41 41 #include <linux/err.h> 42 42 #include <linux/slab.h>
+1 -1
drivers/power/supply/twl4030_charger.c
··· 18 18 #include <linux/err.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/interrupt.h> 21 - #include <linux/i2c/twl.h> 21 + #include <linux/mfd/twl.h> 22 22 #include <linux/power_supply.h> 23 23 #include <linux/notifier.h> 24 24 #include <linux/usb/otg.h>
+1 -1
drivers/pwm/pwm-twl-led.c
··· 24 24 #include <linux/of.h> 25 25 #include <linux/platform_device.h> 26 26 #include <linux/pwm.h> 27 - #include <linux/i2c/twl.h> 27 + #include <linux/mfd/twl.h> 28 28 #include <linux/slab.h> 29 29 30 30 /*
+1 -1
drivers/pwm/pwm-twl.c
··· 21 21 #include <linux/of.h> 22 22 #include <linux/platform_device.h> 23 23 #include <linux/pwm.h> 24 - #include <linux/i2c/twl.h> 24 + #include <linux/mfd/twl.h> 25 25 #include <linux/slab.h> 26 26 27 27 /*
+1 -1
drivers/regulator/twl-regulator.c
··· 20 20 #include <linux/regulator/driver.h> 21 21 #include <linux/regulator/machine.h> 22 22 #include <linux/regulator/of_regulator.h> 23 - #include <linux/i2c/twl.h> 23 + #include <linux/mfd/twl.h> 24 24 #include <linux/delay.h> 25 25 26 26 /*
+1 -1
drivers/regulator/twl6030-regulator.c
··· 21 21 #include <linux/regulator/driver.h> 22 22 #include <linux/regulator/machine.h> 23 23 #include <linux/regulator/of_regulator.h> 24 - #include <linux/i2c/twl.h> 24 + #include <linux/mfd/twl.h> 25 25 #include <linux/delay.h> 26 26 27 27 struct twlreg_info {
+1 -1
drivers/rtc/rtc-twl.c
··· 31 31 #include <linux/interrupt.h> 32 32 #include <linux/of.h> 33 33 34 - #include <linux/i2c/twl.h> 34 + #include <linux/mfd/twl.h> 35 35 36 36 enum twl_class { 37 37 TWL_4030 = 0,
+1 -1
drivers/usb/phy/phy-twl6030-usb.c
··· 28 28 #include <linux/usb/musb.h> 29 29 #include <linux/usb/phy_companion.h> 30 30 #include <linux/phy/omap_usb.h> 31 - #include <linux/i2c/twl.h> 31 + #include <linux/mfd/twl.h> 32 32 #include <linux/regulator/consumer.h> 33 33 #include <linux/err.h> 34 34 #include <linux/slab.h>
+1 -1
drivers/video/backlight/pandora_bl.c
··· 16 16 #include <linux/delay.h> 17 17 #include <linux/fb.h> 18 18 #include <linux/backlight.h> 19 - #include <linux/i2c/twl.h> 19 + #include <linux/mfd/twl.h> 20 20 #include <linux/err.h> 21 21 22 22 #define TWL_PWM0_ON 0x00
+1 -1
drivers/watchdog/twl4030_wdt.c
··· 24 24 #include <linux/kernel.h> 25 25 #include <linux/watchdog.h> 26 26 #include <linux/platform_device.h> 27 - #include <linux/i2c/twl.h> 27 + #include <linux/mfd/twl.h> 28 28 29 29 #define TWL4030_WATCHDOG_CFG_REG_OFFS 0x3 30 30
include/linux/i2c/twl.h include/linux/mfd/twl.h
+1 -1
sound/soc/codecs/twl4030.c
··· 28 28 #include <linux/platform_device.h> 29 29 #include <linux/of.h> 30 30 #include <linux/of_gpio.h> 31 - #include <linux/i2c/twl.h> 31 + #include <linux/mfd/twl.h> 32 32 #include <linux/slab.h> 33 33 #include <linux/gpio.h> 34 34 #include <sound/core.h>