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: Unify abx500 headers in mfd/abx500

This moves all the header files related to the abx500 family into
a common include directory below mfd. From now on we place any
subchip header in that directory. Headers previously in e.g.
<linux/mfd/ab8500/gpio.h> get prefixed and are now e.g.
<linux/mfd/abx500/ab8500-gpio.h>. The top-level abstract interface
remains in <linux/mfd/abx500.h>.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Linus Walleij and committed by
Samuel Ortiz ee66e653 83051b72

+18 -18
+2 -2
arch/arm/mach-ux500/board-mop500.c
··· 19 19 #include <linux/amba/pl022.h> 20 20 #include <linux/amba/serial.h> 21 21 #include <linux/spi/spi.h> 22 - #include <linux/mfd/ab8500.h> 22 + #include <linux/mfd/abx500/ab8500.h> 23 23 #include <linux/regulator/ab8500.h> 24 24 #include <linux/mfd/tc3589x.h> 25 25 #include <linux/mfd/tps6105x.h> 26 - #include <linux/mfd/ab8500/gpio.h> 26 + #include <linux/mfd/abx500/ab8500-gpio.h> 27 27 #include <linux/leds-lp5521.h> 28 28 #include <linux/input.h> 29 29 #include <linux/smsc911x.h>
+1 -1
arch/arm/mach-ux500/board-u5500.c
··· 10 10 #include <linux/amba/bus.h> 11 11 #include <linux/irq.h> 12 12 #include <linux/i2c.h> 13 - #include <linux/mfd/ab5500/ab5500.h> 13 + #include <linux/mfd/abx500/ab5500.h> 14 14 15 15 #include <asm/mach/arch.h> 16 16 #include <asm/mach-types.h>
+1 -1
arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
··· 9 9 #define __MACH_IRQS_BOARD_MOP500_H 10 10 11 11 /* Number of AB8500 irqs is taken from header file */ 12 - #include <linux/mfd/ab8500.h> 12 + #include <linux/mfd/abx500/ab8500.h> 13 13 14 14 #define MOP500_AB8500_IRQ_BASE IRQ_BOARD_START 15 15 #define MOP500_AB8500_IRQ_END (MOP500_AB8500_IRQ_BASE \
+1 -1
drivers/input/misc/ab8500-ponkey.c
··· 12 12 #include <linux/platform_device.h> 13 13 #include <linux/input.h> 14 14 #include <linux/interrupt.h> 15 - #include <linux/mfd/ab8500.h> 15 + #include <linux/mfd/abx500/ab8500.h> 16 16 #include <linux/slab.h> 17 17 18 18 /**
+1 -1
drivers/mfd/ab5500-core.c
··· 22 22 #include <linux/irq.h> 23 23 #include <linux/interrupt.h> 24 24 #include <linux/random.h> 25 - #include <linux/mfd/ab5500/ab5500.h> 26 25 #include <linux/mfd/abx500.h> 26 + #include <linux/mfd/abx500/ab5500.h> 27 27 #include <linux/list.h> 28 28 #include <linux/bitops.h> 29 29 #include <linux/spinlock.h>
+1 -1
drivers/mfd/ab5500-debugfs.c
··· 7 7 #include <linux/module.h> 8 8 #include <linux/debugfs.h> 9 9 #include <linux/seq_file.h> 10 - #include <linux/mfd/ab5500/ab5500.h> 11 10 #include <linux/mfd/abx500.h> 11 + #include <linux/mfd/abx500/ab5500.h> 12 12 #include <linux/uaccess.h> 13 13 14 14 #include "ab5500-core.h"
+1 -1
drivers/mfd/ab8500-core.c
··· 17 17 #include <linux/platform_device.h> 18 18 #include <linux/mfd/core.h> 19 19 #include <linux/mfd/abx500.h> 20 - #include <linux/mfd/ab8500.h> 20 + #include <linux/mfd/abx500/ab8500.h> 21 21 #include <linux/regulator/ab8500.h> 22 22 23 23 /*
+1 -1
drivers/mfd/ab8500-debugfs.c
··· 13 13 #include <linux/platform_device.h> 14 14 15 15 #include <linux/mfd/abx500.h> 16 - #include <linux/mfd/ab8500.h> 16 + #include <linux/mfd/abx500/ab8500.h> 17 17 18 18 static u32 debug_bank; 19 19 static u32 debug_address;
+2 -2
drivers/mfd/ab8500-gpadc.c
··· 18 18 #include <linux/err.h> 19 19 #include <linux/slab.h> 20 20 #include <linux/list.h> 21 - #include <linux/mfd/ab8500.h> 22 21 #include <linux/mfd/abx500.h> 23 - #include <linux/mfd/ab8500/gpadc.h> 22 + #include <linux/mfd/abx500/ab8500.h> 23 + #include <linux/mfd/abx500/ab8500-gpadc.h> 24 24 25 25 /* 26 26 * GPADC register offsets
+1 -1
drivers/mfd/ab8500-i2c.c
··· 10 10 #include <linux/init.h> 11 11 #include <linux/module.h> 12 12 #include <linux/platform_device.h> 13 - #include <linux/mfd/ab8500.h> 13 + #include <linux/mfd/abx500/ab8500.h> 14 14 #include <linux/mfd/db8500-prcmu.h> 15 15 16 16 static int ab8500_i2c_write(struct ab8500 *ab8500, u16 addr, u8 data)
+2 -2
drivers/mfd/ab8500-sysctrl.c
··· 7 7 #include <linux/err.h> 8 8 #include <linux/module.h> 9 9 #include <linux/platform_device.h> 10 - #include <linux/mfd/ab8500.h> 11 10 #include <linux/mfd/abx500.h> 12 - #include <linux/mfd/ab8500/sysctrl.h> 11 + #include <linux/mfd/abx500/ab8500.h> 12 + #include <linux/mfd/abx500/ab8500-sysctrl.h> 13 13 14 14 static struct device *sysctrl_dev; 15 15
+1 -1
drivers/misc/ab8500-pwm.c
··· 8 8 #include <linux/platform_device.h> 9 9 #include <linux/slab.h> 10 10 #include <linux/pwm.h> 11 - #include <linux/mfd/ab8500.h> 12 11 #include <linux/mfd/abx500.h> 12 + #include <linux/mfd/abx500/ab8500.h> 13 13 #include <linux/module.h> 14 14 15 15 /*
+1 -1
drivers/regulator/ab8500.c
··· 16 16 #include <linux/module.h> 17 17 #include <linux/err.h> 18 18 #include <linux/platform_device.h> 19 - #include <linux/mfd/ab8500.h> 20 19 #include <linux/mfd/abx500.h> 20 + #include <linux/mfd/abx500/ab8500.h> 21 21 #include <linux/regulator/driver.h> 22 22 #include <linux/regulator/machine.h> 23 23 #include <linux/regulator/ab8500.h>
+1 -1
drivers/rtc/rtc-ab8500.c
··· 15 15 #include <linux/platform_device.h> 16 16 #include <linux/rtc.h> 17 17 #include <linux/mfd/abx500.h> 18 - #include <linux/mfd/ab8500.h> 18 + #include <linux/mfd/abx500/ab8500.h> 19 19 #include <linux/delay.h> 20 20 21 21 #define AB8500_RTC_SOFF_STAT_REG 0x00
+1 -1
drivers/usb/otg/ab8500-usb.c
··· 30 30 #include <linux/interrupt.h> 31 31 #include <linux/delay.h> 32 32 #include <linux/mfd/abx500.h> 33 - #include <linux/mfd/ab8500.h> 33 + #include <linux/mfd/abx500/ab8500.h> 34 34 35 35 #define AB8500_MAIN_WD_CTRL_REG 0x01 36 36 #define AB8500_USB_LINE_STAT_REG 0x80
include/linux/mfd/ab5500/ab5500.h include/linux/mfd/abx500/ab5500.h
include/linux/mfd/ab8500.h include/linux/mfd/abx500/ab8500.h
include/linux/mfd/ab8500/gpadc.h include/linux/mfd/abx500/ab8500-gpadc.h
include/linux/mfd/ab8500/gpio.h include/linux/mfd/abx500/ab8500-gpio.h
include/linux/mfd/ab8500/sysctrl.h include/linux/mfd/abx500/ab8500-sysctrl.h