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

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

mfd: ti-lmu: Remove LM3532 backlight driver references 



Remove the LM3532 backlight driver references from the ti-lmu
code as dedicated driver support is available.

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

drivers/mfd/ti-lmu.c

+0 −11
Original line number Diff line number Diff line
@@ -54,14 +54,6 @@ static void ti_lmu_disable_hw(void *data) 
		gpiod_set_value(lmu->en_gpio, 0);

}



static const struct mfd_cell lm3532_devices[] = {

	{

		.name          = "ti-lmu-backlight",

		.id            = LM3532,

		.of_compatible = "ti,lm3532-backlight",

	},

};



#define LM363X_REGULATOR(_id)			\

{						\

	.name          = "lm363x-regulator",	\
@@ -141,7 +133,6 @@ static const struct ti_lmu_data chip##_data = \ 
	.max_register = max_reg,		\

}						\



TI_LMU_DATA(lm3532, LM3532_MAX_REG);

TI_LMU_DATA(lm3631, LM3631_MAX_REG);

TI_LMU_DATA(lm3632, LM3632_MAX_REG);

TI_LMU_DATA(lm3633, LM3633_MAX_REG);
@@ -211,7 +202,6 @@ static int ti_lmu_probe(struct i2c_client *cl, const struct i2c_device_id *id) 
}



static const struct of_device_id ti_lmu_of_match[] = {

	{ .compatible = "ti,lm3532", .data = &lm3532_data },

	{ .compatible = "ti,lm3631", .data = &lm3631_data },

	{ .compatible = "ti,lm3632", .data = &lm3632_data },

	{ .compatible = "ti,lm3633", .data = &lm3633_data },
@@ -222,7 +212,6 @@ static const struct of_device_id ti_lmu_of_match[] = { 
MODULE_DEVICE_TABLE(of, ti_lmu_of_match);



static const struct i2c_device_id ti_lmu_ids[] = {

	{ "lm3532", LM3532 },

	{ "lm3631", LM3631 },

	{ "lm3632", LM3632 },

	{ "lm3633", LM3633 },

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

+0 −44
Original line number Diff line number Diff line
@@ -15,50 +15,6 @@ 


#include <linux/bitops.h>



/* LM3532 */

#define LM3532_REG_OUTPUT_CFG			0x10

#define LM3532_ILED1_CFG_MASK			0x03

#define LM3532_ILED2_CFG_MASK			0x0C

#define LM3532_ILED3_CFG_MASK			0x30

#define LM3532_ILED1_CFG_SHIFT			0

#define LM3532_ILED2_CFG_SHIFT			2

#define LM3532_ILED3_CFG_SHIFT			4



#define LM3532_REG_RAMPUP			0x12

#define LM3532_REG_RAMPDN			LM3532_REG_RAMPUP

#define LM3532_RAMPUP_MASK			0x07

#define LM3532_RAMPUP_SHIFT			0

#define LM3532_RAMPDN_MASK			0x38

#define LM3532_RAMPDN_SHIFT			3



#define LM3532_REG_ENABLE			0x1D



#define LM3532_REG_PWM_A_CFG			0x13

#define LM3532_PWM_A_MASK			0x05	/* zone 0 */

#define LM3532_PWM_ZONE_0			BIT(2)



#define LM3532_REG_PWM_B_CFG			0x14

#define LM3532_PWM_B_MASK			0x09	/* zone 1 */

#define LM3532_PWM_ZONE_1			BIT(3)



#define LM3532_REG_PWM_C_CFG			0x15

#define LM3532_PWM_C_MASK			0x11	/* zone 2 */

#define LM3532_PWM_ZONE_2			BIT(4)



#define LM3532_REG_ZONE_CFG_A			0x16

#define LM3532_REG_ZONE_CFG_B			0x18

#define LM3532_REG_ZONE_CFG_C			0x1A

#define LM3532_ZONE_MASK			(BIT(2) | BIT(3) | BIT(4))

#define LM3532_ZONE_0				0

#define LM3532_ZONE_1				BIT(2)

#define LM3532_ZONE_2				BIT(3)



#define LM3532_REG_BRT_A			0x70	/* zone 0 */

#define LM3532_REG_BRT_B			0x76	/* zone 1 */

#define LM3532_REG_BRT_C			0x7C	/* zone 2 */



#define LM3532_MAX_REG				0x7E



/* LM3631 */

#define LM3631_REG_DEVCTRL			0x00

#define LM3631_LCD_EN_MASK			BIT(1)

include/linux/mfd/ti-lmu.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#define LMU_EVENT_MONITOR_DONE		0x01



enum ti_lmu_id {

	LM3532,

	LM3631,

	LM3632,

	LM3633,