Commit f7ea2dc5 authored by Christoph Egger's avatar Christoph Egger Committed by Samuel Ortiz
Browse files

mfd: Remove leftover from discontinued TWL4030 battery patch 



The TWL4030_BCI_BATTERY config option originates from a patch to the
omap git tree. However inclusion in linux was seemingly rejected and
the functionality nears inclusion under a different name so this
removes the bits of the old version that made it into the mainline
kernel again.

Signed-off-by: default avatarChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent ca229f1b

drivers/mfd/twl-core.c

+0 −19
Original line number Diff line number Diff line
@@ -58,13 +58,6 @@ 


#define DRIVER_NAME			"twl"



#if defined(CONFIG_TWL4030_BCI_BATTERY) || \

	defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)

#define twl_has_bci()		true

#else

#define twl_has_bci()		false

#endif



#if defined(CONFIG_KEYBOARD_TWL4030) || defined(CONFIG_KEYBOARD_TWL4030_MODULE)

#define twl_has_keypad()	true

#else
@@ -588,18 +581,6 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) 
	struct device	*child;

	unsigned sub_chip_id;



	if (twl_has_bci() && pdata->bci &&

	    !(features & (TPS_SUBSET | TWL5031))) {

		child = add_child(3, "twl4030_bci",

				pdata->bci, sizeof(*pdata->bci),

				false,

				/* irq0 = CHG_PRES, irq1 = BCI */

				pdata->irq_base + BCI_PRES_INTR_OFFSET,

				pdata->irq_base + BCI_INTR_OFFSET);

		if (IS_ERR(child))

			return PTR_ERR(child);

	}



	if (twl_has_gpio() && pdata->gpio) {

		child = add_child(SUB_CHIP_ID1, "twl4030_gpio",

				pdata->gpio, sizeof(*pdata->gpio),

include/linux/i2c/twl.h

+1 −6
Original line number Diff line number Diff line
@@ -605,12 +605,7 @@ int twl4030_sih_setup(int module); 
#define TWL4030_VAUX3_DEV_GRP		0x1F

#define TWL4030_VAUX3_DEDICATED		0x22



#if defined(CONFIG_TWL4030_BCI_BATTERY) || \

	defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)

	extern int twl4030charger_usb_en(int enable);

#else

static inline int twl4030charger_usb_en(int enable) { return 0; }

#endif



/*----------------------------------------------------------------------*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE