Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee66e653 authored by Linus Walleij's avatar Linus Walleij Committed by Samuel Ortiz
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 83051b72

arch/arm/mach-ux500/board-mop500.c

+2 −2
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 
#include <linux/amba/pl022.h>

#include <linux/amba/serial.h>

#include <linux/spi/spi.h>

#include <linux/mfd/ab8500.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/regulator/ab8500.h>

#include <linux/mfd/tc3589x.h>

#include <linux/mfd/tps6105x.h>

#include <linux/mfd/ab8500/gpio.h>

#include <linux/mfd/abx500/ab8500-gpio.h>

#include <linux/leds-lp5521.h>

#include <linux/input.h>

#include <linux/smsc911x.h>

arch/arm/mach-ux500/board-u5500.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/amba/bus.h>

#include <linux/irq.h>

#include <linux/i2c.h>

#include <linux/mfd/ab5500/ab5500.h>

#include <linux/mfd/abx500/ab5500.h>



#include <asm/mach/arch.h>

#include <asm/mach-types.h>

arch/arm/mach-ux500/include/mach/irqs-board-mop500.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define __MACH_IRQS_BOARD_MOP500_H



/* Number of AB8500 irqs is taken from header file */

#include <linux/mfd/ab8500.h>

#include <linux/mfd/abx500/ab8500.h>



#define MOP500_AB8500_IRQ_BASE		IRQ_BOARD_START

#define MOP500_AB8500_IRQ_END		(MOP500_AB8500_IRQ_BASE \

drivers/input/misc/ab8500-ponkey.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/interrupt.h>

#include <linux/mfd/ab8500.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/slab.h>



/**

drivers/mfd/ab5500-core.c

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/random.h>

#include <linux/mfd/ab5500/ab5500.h>

#include <linux/mfd/abx500.h>

#include <linux/mfd/abx500/ab5500.h>

#include <linux/list.h>

#include <linux/bitops.h>

#include <linux/spinlock.h>