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

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

mfd: Delete ab3550 driver 



The AB3550 never passed the prototype stage. Instead it was used
as a precursor to AB5500 for testing basic building blocks used
in that chip, since they had large similarities. Since AB3550 will
not see the light of day in product form and since the prototypes
are no longer used, let's delete the driver and any references to
it.

Cc: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 94be70d4

arch/arm/mach-u300/i2c.c

+1 −50
Original line number Diff line number Diff line
@@ -256,57 +256,8 @@ static struct ab3100_platform_data ab3100_plf_data = { 
};

#endif



#ifdef CONFIG_AB3550_CORE

static struct abx500_init_settings ab3550_init_settings[] = {

	{

		.bank = 0,

		.reg = AB3550_IMR1,

		.setting = 0xff

	},

	{

		.bank = 0,

		.reg = AB3550_IMR2,

		.setting = 0xff

	},

	{

		.bank = 0,

		.reg = AB3550_IMR3,

		.setting = 0xff

	},

	{

		.bank = 0,

		.reg = AB3550_IMR4,

		.setting = 0xff

	},

	{

		.bank = 0,

		.reg = AB3550_IMR5,

		/* The two most significant bits are not used */

		.setting = 0x3f

	},

};



static struct ab3550_platform_data ab3550_plf_data = {

	.irq = {

		.base = IRQ_AB3550_BASE,

		.count = (IRQ_AB3550_END - IRQ_AB3550_BASE + 1),

	},

	.dev_data = {

	},

	.init_settings = ab3550_init_settings,

	.init_settings_sz = ARRAY_SIZE(ab3550_init_settings),

};

#endif



static struct i2c_board_info __initdata bus0_i2c_board_info[] = {

#if defined(CONFIG_AB3550_CORE)

	{

		.type = "ab3550",

		.addr = 0x4A,

		.irq = IRQ_U300_IRQ0_EXT,

		.platform_data = &ab3550_plf_data,

	},

#elif defined(CONFIG_AB3100_CORE)

#ifdef CONFIG_AB3100_CORE

	{

		.type = "ab3100",

		.addr = 0x48,

arch/arm/mach-u300/include/mach/irqs.h

+0 −7
Original line number Diff line number Diff line
@@ -109,13 +109,6 @@ 
#define U300_NR_IRQS			48

#endif



#ifdef CONFIG_AB3550_CORE

#define IRQ_AB3550_BASE			(U300_NR_IRQS)

#define IRQ_AB3550_END			(IRQ_AB3550_BASE + 37)



#define NR_IRQS				(IRQ_AB3550_END + 1)

#else

#define NR_IRQS U300_NR_IRQS

#endif



#endif

drivers/mfd/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -616,20 +616,6 @@ config AB8500_GPADC 
	help

	  AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage



config AB3550_CORE

        bool "ST-Ericsson AB3550 Mixed Signal Circuit core functions"

	select MFD_CORE

	depends on I2C=y && GENERIC_HARDIRQS && ABX500_CORE

	help

	  Select this to enable the AB3550 Mixed Signal IC core

	  functionality. This connects to a AB3550 on the I2C bus

	  and expose a number of symbols needed for dependent devices

	  to read and write registers and subscribe to events from

	  this multi-functional IC. This is needed to use other features

	  of the AB3550 such as battery-backed RTC, charging control,

	  LEDs, vibrator, system power and temperature, power management

	  and ALSA sound.



config MFD_DB8500_PRCMU

	bool "ST-Ericsson DB8500 Power Reset Control Management Unit"

	depends on UX500_SOC_DB8500

drivers/mfd/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ obj-$(CONFIG_PCF50633_GPIO) += pcf50633-gpio.o 
obj-$(CONFIG_ABX500_CORE)	+= abx500-core.o

obj-$(CONFIG_AB3100_CORE)	+= ab3100-core.o

obj-$(CONFIG_AB3100_OTP)	+= ab3100-otp.o

obj-$(CONFIG_AB3550_CORE)	+= ab3550-core.o

obj-$(CONFIG_AB5500_CORE)	+= ab5500-core.o

obj-$(CONFIG_AB5500_DEBUG)	+= ab5500-debugfs.o

obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o

drivers/mfd/ab3550-core.c

deleted100644 → 0
+0 −1380

File deleted.

Preview size limit exceeded, changes collapsed.