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

Commit b86b9ba5 authored by Dan Murphy's avatar Dan Murphy Committed by Jacek Anaszewski
Browse files

mfd: ti-lmu: Remove support for LM3697 



Remove support for the LM3697 from the ti-lmu driver in favor
of a dedicated LED driver.

Signed-off-by: default avatarDan Murphy <dmurphy@ti.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
parent 1372bbe6

drivers/mfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ config MFD_TI_LMU 
	help

	  Say yes here to enable support for TI LMU chips.



	  TI LMU MFD supports LM3532, LM3631, LM3632, LM3633, LM3695 and LM3697.

	  TI LMU MFD supports LM3532, LM3631, LM3632, LM3633, and LM3695.

	  It consists of backlight, LED and regulator driver.

	  It provides consistent device controls for lighting functions.

drivers/mfd/ti-lmu.c

+0 −17
Original line number Diff line number Diff line
@@ -111,20 +111,6 @@ static const struct mfd_cell lm3695_devices[] = { 
	},

};



static const struct mfd_cell lm3697_devices[] = {

	{

		.name          = "ti-lmu-backlight",

		.id            = LM3697,

		.of_compatible = "ti,lm3697-backlight",

	},

	/* Monitoring driver for open/short circuit detection */

	{

		.name          = "ti-lmu-fault-monitor",

		.id            = LM3697,

		.of_compatible = "ti,lm3697-fault-monitor",

	},

};



#define TI_LMU_DATA(chip, max_reg)		\

static const struct ti_lmu_data chip##_data =	\

{						\
@@ -137,7 +123,6 @@ TI_LMU_DATA(lm3631, LM3631_MAX_REG); 
TI_LMU_DATA(lm3632, LM3632_MAX_REG);

TI_LMU_DATA(lm3633, LM3633_MAX_REG);

TI_LMU_DATA(lm3695, LM3695_MAX_REG);

TI_LMU_DATA(lm3697, LM3697_MAX_REG);



static int ti_lmu_probe(struct i2c_client *cl, const struct i2c_device_id *id)

{
@@ -206,7 +191,6 @@ static const struct of_device_id ti_lmu_of_match[] = { 
	{ .compatible = "ti,lm3632", .data = &lm3632_data },

	{ .compatible = "ti,lm3633", .data = &lm3633_data },

	{ .compatible = "ti,lm3695", .data = &lm3695_data },

	{ .compatible = "ti,lm3697", .data = &lm3697_data },

	{ }

};

MODULE_DEVICE_TABLE(of, ti_lmu_of_match);
@@ -216,7 +200,6 @@ static const struct i2c_device_id ti_lmu_ids[] = { 
	{ "lm3632", LM3632 },

	{ "lm3633", LM3633 },

	{ "lm3695", LM3695 },

	{ "lm3697", LM3697 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, ti_lmu_ids);

include/linux/mfd/ti-lmu-register.h

+0 −44
Original line number Diff line number Diff line
@@ -189,48 +189,4 @@ 
#define LM3695_REG_BRT_MSB			0x14



#define LM3695_MAX_REG				0x14



/* LM3697 */

#define LM3697_REG_HVLED_OUTPUT_CFG		0x10

#define LM3697_HVLED1_CFG_MASK			BIT(0)

#define LM3697_HVLED2_CFG_MASK			BIT(1)

#define LM3697_HVLED3_CFG_MASK			BIT(2)

#define LM3697_HVLED1_CFG_SHIFT			0

#define LM3697_HVLED2_CFG_SHIFT			1

#define LM3697_HVLED3_CFG_SHIFT			2



#define LM3697_REG_BL0_RAMP			0x11

#define LM3697_REG_BL1_RAMP			0x12

#define LM3697_RAMPUP_MASK			0xF0

#define LM3697_RAMPUP_SHIFT			4

#define LM3697_RAMPDN_MASK			0x0F

#define LM3697_RAMPDN_SHIFT			0



#define LM3697_REG_RAMP_CONF			0x14

#define LM3697_RAMP_MASK			0x0F

#define LM3697_RAMP_EACH			0x05



#define LM3697_REG_PWM_CFG			0x1C

#define LM3697_PWM_A_MASK			BIT(0)

#define LM3697_PWM_B_MASK			BIT(1)



#define LM3697_REG_IMAX_A			0x17

#define LM3697_REG_IMAX_B			0x18



#define LM3697_REG_FEEDBACK_ENABLE		0x19



#define LM3697_REG_BRT_A_LSB			0x20

#define LM3697_REG_BRT_A_MSB			0x21

#define LM3697_REG_BRT_B_LSB			0x22

#define LM3697_REG_BRT_B_MSB			0x23



#define LM3697_REG_ENABLE			0x24



#define LM3697_REG_OPEN_FAULT_STATUS		0xB0



#define LM3697_REG_SHORT_FAULT_STATUS		0xB2



#define LM3697_REG_MONITOR_ENABLE		0xB4



#define LM3697_MAX_REG				0xB4

#endif

include/linux/mfd/ti-lmu.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ enum ti_lmu_id { 
	LM3632,

	LM3633,

	LM3695,

	LM3697,

	LMU_MAX_ID,

};