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

Commit 812f9e9d authored May 01, 2010 by Linus Walleij Committed by Samuel Ortiz May 28, 2010

mfd: Renamed ab3100.h to abx500.h



The goal here is to make way for a more general interface for the
analog baseband chips ab3100 ab3550 ab550 and future chips.

This patch have been divided into two parts since both changing name
and content of a file is not recommended in git.

Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent d88b25be

arch/arm/mach-u300/i2c.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@
	*/		*/
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/mfd/ab3100.h>		#include <linux/mfd/abx500.h>
	#include <linux/regulator/machine.h>		#include <linux/regulator/machine.h>
	#include <linux/amba/bus.h>		#include <linux/amba/bus.h>
	#include <mach/irqs.h>		#include <mach/irqs.h>

drivers/mfd/ab3100-core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	#include <linux/debugfs.h>		#include <linux/debugfs.h>
	#include <linux/seq_file.h>		#include <linux/seq_file.h>
	#include <linux/uaccess.h>		#include <linux/uaccess.h>
	#include <linux/mfd/ab3100.h>		#include <linux/mfd/abx500.h>

	/* These are the only registers inside AB3100 used in this main file */		/* These are the only registers inside AB3100 used in this main file */

drivers/mfd/ab3100-otp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/mfd/ab3100.h>		#include <linux/mfd/abx500.h>
	#include <linux/debugfs.h>		#include <linux/debugfs.h>
	#include <linux/seq_file.h>		#include <linux/seq_file.h>

drivers/regulator/ab3100.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@
	#include <linux/delay.h>		#include <linux/delay.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/regulator/driver.h>		#include <linux/regulator/driver.h>
	#include <linux/mfd/ab3100.h>		#include <linux/mfd/abx500.h>

	/* LDO registers and some handy masking definitions for AB3100 */		/* LDO registers and some handy masking definitions for AB3100 */
	#define AB3100_LDO_A 0x40		#define AB3100_LDO_A 0x40

drivers/rtc/rtc-ab3100.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/rtc.h>		#include <linux/rtc.h>
	#include <linux/mfd/ab3100.h>		#include <linux/mfd/abx500.h>

	/* Clock rate in Hz */		/* Clock rate in Hz */
	#define AB3100_RTC_CLOCK_RATE 32768		#define AB3100_RTC_CLOCK_RATE 32768