Commit a16122bc authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Samuel Ortiz
Browse files

mfd: Append subdev into 88pm860x driver 



Append backlight, led & touch subdevs into 88pm860x driver.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 5c42e8c4

drivers/mfd/88pm860x-core.c

+205 −12
Original line number Diff line number Diff line
@@ -17,6 +17,100 @@ 
#include <linux/mfd/core.h>

#include <linux/mfd/88pm860x.h>



char pm860x_backlight_name[][MFD_NAME_SIZE] = {

	"backlight-0",

	"backlight-1",

	"backlight-2",

};

EXPORT_SYMBOL(pm860x_backlight_name);



char pm860x_led_name[][MFD_NAME_SIZE] = {

	"led0-red",

	"led0-green",

	"led0-blue",

	"led1-red",

	"led1-green",

	"led1-blue",

};

EXPORT_SYMBOL(pm860x_led_name);



#define PM8606_BACKLIGHT_RESOURCE(_i, _x)		\

{							\

	.name	= pm860x_backlight_name[_i],		\

	.start	= PM8606_##_x,				\

	.end	= PM8606_##_x,				\

	.flags	= IORESOURCE_IO,			\

}



static struct resource backlight_resources[] = {

	PM8606_BACKLIGHT_RESOURCE(PM8606_BACKLIGHT1, WLED1A),

	PM8606_BACKLIGHT_RESOURCE(PM8606_BACKLIGHT2, WLED2A),

	PM8606_BACKLIGHT_RESOURCE(PM8606_BACKLIGHT3, WLED3A),

};



#define PM8606_BACKLIGHT_DEVS(_i)			\

{							\

	.name		= "88pm860x-backlight",		\

	.num_resources	= 1,				\

	.resources	= &backlight_resources[_i],	\

	.id		= _i,				\

}



static struct mfd_cell backlight_devs[] = {

	PM8606_BACKLIGHT_DEVS(PM8606_BACKLIGHT1),

	PM8606_BACKLIGHT_DEVS(PM8606_BACKLIGHT2),

	PM8606_BACKLIGHT_DEVS(PM8606_BACKLIGHT3),

};



#define PM8606_LED_RESOURCE(_i, _x)			\

{							\

	.name	= pm860x_led_name[_i],			\

	.start	= PM8606_##_x,				\

	.end	= PM8606_##_x,				\

	.flags	= IORESOURCE_IO,			\

}



static struct resource led_resources[] = {

	PM8606_LED_RESOURCE(PM8606_LED1_RED, RGB2B),

	PM8606_LED_RESOURCE(PM8606_LED1_GREEN, RGB2C),

	PM8606_LED_RESOURCE(PM8606_LED1_BLUE, RGB2D),

	PM8606_LED_RESOURCE(PM8606_LED2_RED, RGB1B),

	PM8606_LED_RESOURCE(PM8606_LED2_GREEN, RGB1C),

	PM8606_LED_RESOURCE(PM8606_LED2_BLUE, RGB1D),

};



#define PM8606_LED_DEVS(_i)				\

{							\

	.name		= "88pm860x-led",		\

	.num_resources	= 1,				\

	.resources	= &led_resources[_i],		\

	.id		= _i,				\

}



static struct mfd_cell led_devs[] = {

	PM8606_LED_DEVS(PM8606_LED1_RED),

	PM8606_LED_DEVS(PM8606_LED1_GREEN),

	PM8606_LED_DEVS(PM8606_LED1_BLUE),

	PM8606_LED_DEVS(PM8606_LED2_RED),

	PM8606_LED_DEVS(PM8606_LED2_GREEN),

	PM8606_LED_DEVS(PM8606_LED2_BLUE),

};



static struct resource touch_resources[] = {

	{

		.start	= PM8607_IRQ_PEN,

		.end	= PM8607_IRQ_PEN,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct mfd_cell touch_devs[] = {

	{

		.name		= "88pm860x-touch",

		.num_resources	= 1,

		.resources	= &touch_resources[0],

	},

};



#define PM8607_REG_RESOURCE(_start, _end)		\

{							\
@@ -25,7 +119,7 @@ 
	.flags	= IORESOURCE_IO,			\

}



static struct resource pm8607_regulator_resources[] = {

static struct resource regulator_resources[] = {

	PM8607_REG_RESOURCE(BUCK1, BUCK1),

	PM8607_REG_RESOURCE(BUCK2, BUCK2),

	PM8607_REG_RESOURCE(BUCK3, BUCK3),
@@ -47,10 +141,11 @@ static struct resource pm8607_regulator_resources[] = { 
{									\

	.name		= "88pm8607-" #_name,				\

	.num_resources	= 1,						\

	.resources	= &pm8607_regulator_resources[PM8607_ID_##_id],	\

	.resources	= &regulator_resources[PM8607_ID_##_id],	\

	.id		= PM8607_ID_##_id,				\

}



static struct mfd_cell pm8607_devs[] = {

static struct mfd_cell regulator_devs[] = {

	PM8607_REG_DEVS(buck1, BUCK1),

	PM8607_REG_DEVS(buck2, BUCK2),

	PM8607_REG_DEVS(buck3, BUCK3),
@@ -192,6 +287,61 @@ int pm860x_free_irq(struct pm860x_chip *chip, int irq) 
}

EXPORT_SYMBOL(pm860x_free_irq);



static int __devinit device_gpadc_init(struct pm860x_chip *chip,

				       struct pm860x_platform_data *pdata)

{

	struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \

				: chip->companion;

	int use_gpadc = 0, data, ret;



	/* initialize GPADC without activating it */



	if (pdata && pdata->touch) {

		/* set GPADC MISC1 register */

		data = 0;

		data |= (pdata->touch->gpadc_prebias << 1)

			& PM8607_GPADC_PREBIAS_MASK;

		data |= (pdata->touch->slot_cycle << 3)

			& PM8607_GPADC_SLOT_CYCLE_MASK;

		data |= (pdata->touch->off_scale << 5)

			& PM8607_GPADC_OFF_SCALE_MASK;

		data |= (pdata->touch->sw_cal << 7)

			& PM8607_GPADC_SW_CAL_MASK;

		if (data) {

			ret = pm860x_reg_write(i2c, PM8607_GPADC_MISC1, data);

			if (ret < 0)

				goto out;

		}

		/* set tsi prebias time */

		if (pdata->touch->tsi_prebias) {

			data = pdata->touch->tsi_prebias;

			ret = pm860x_reg_write(i2c, PM8607_TSI_PREBIAS, data);

			if (ret < 0)

				goto out;

		}

		/* set prebias & prechg time of pen detect */

		data = 0;

		data |= pdata->touch->pen_prebias & PM8607_PD_PREBIAS_MASK;

		data |= (pdata->touch->pen_prechg << 5)

			& PM8607_PD_PRECHG_MASK;

		if (data) {

			ret = pm860x_reg_write(i2c, PM8607_PD_PREBIAS, data);

			if (ret < 0)

				goto out;

		}



		use_gpadc = 1;

	}



	/* turn on GPADC */

	if (use_gpadc) {

		ret = pm860x_set_bits(i2c, PM8607_GPADC_MISC1,

				      PM8607_GPADC_EN, PM8607_GPADC_EN);

	}

out:

	return ret;

}



static int __devinit device_irq_init(struct pm860x_chip *chip,

				     struct pm860x_platform_data *pdata)

{
@@ -264,14 +414,40 @@ static void __devinit device_8606_init(struct pm860x_chip *chip, 
				       struct i2c_client *i2c,

				       struct pm860x_platform_data *pdata)

{

	int ret;



	if (pdata && pdata->backlight) {

		ret = mfd_add_devices(chip->dev, 0, &backlight_devs[0],

				      ARRAY_SIZE(backlight_devs),

				      &backlight_resources[0], 0);

		if (ret < 0) {

			dev_err(chip->dev, "Failed to add backlight "

				"subdev\n");

			goto out_dev;

		}

	}



	if (pdata && pdata->led) {

		ret = mfd_add_devices(chip->dev, 0, &led_devs[0],

				      ARRAY_SIZE(led_devs),

				      &led_resources[0], 0);

		if (ret < 0) {

			dev_err(chip->dev, "Failed to add led "

				"subdev\n");

			goto out_dev;

		}

	}

	return;

out_dev:

	mfd_remove_devices(chip->dev);

	device_irq_exit(chip);

}



static void __devinit device_8607_init(struct pm860x_chip *chip,

				       struct i2c_client *i2c,

				       struct pm860x_platform_data *pdata)

{

	int i, count, data;

	int ret;

	int data, ret;



	ret = pm860x_reg_read(i2c, PM8607_CHIP_ID);

	if (ret < 0) {
@@ -311,19 +487,36 @@ static void __devinit device_8607_init(struct pm860x_chip *chip, 
		goto out;

	}



	ret = device_irq_init(chip, pdata);

	ret = device_gpadc_init(chip, pdata);

	if (ret < 0)

		goto out;



	count = ARRAY_SIZE(pm8607_devs);

	for (i = 0; i < count; i++) {

		ret = mfd_add_devices(chip->dev, i, &pm8607_devs[i],

				      1, NULL, 0);

		if (ret != 0) {

			dev_err(chip->dev, "Failed to add subdevs\n");

	ret = device_irq_init(chip, pdata);

	if (ret < 0)

		goto out;



	ret = mfd_add_devices(chip->dev, 0, &regulator_devs[0],

			      ARRAY_SIZE(regulator_devs),

			      &regulator_resources[0], 0);

	if (ret < 0) {

		dev_err(chip->dev, "Failed to add regulator subdev\n");

		goto out_dev;

	}



	if (pdata && pdata->touch) {

		ret = mfd_add_devices(chip->dev, 0, &touch_devs[0],

				      ARRAY_SIZE(touch_devs),

				      &touch_resources[0], 0);

		if (ret < 0) {

			dev_err(chip->dev, "Failed to add touch "

				"subdev\n");

			goto out_dev;

		}

	}

	return;

out_dev:

	mfd_remove_devices(chip->dev);

	device_irq_exit(chip);

out:

	return;

}

include/linux/mfd/88pm860x.h

+151 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


#include <linux/interrupt.h>



#define MFD_NAME_SIZE		(40)



enum {

	CHIP_INVALID = 0,

	CHIP_PM8606,
@@ -21,6 +23,99 @@ enum { 
	CHIP_MAX,

};



enum {

	PM8606_ID_INVALID,

	PM8606_ID_BACKLIGHT,

	PM8606_ID_LED,

	PM8606_ID_VIBRATOR,

	PM8606_ID_TOUCH,

	PM8606_ID_SOUND,

	PM8606_ID_CHARGER,

	PM8606_ID_MAX,

};



enum {

	PM8606_BACKLIGHT1 = 0,

	PM8606_BACKLIGHT2,

	PM8606_BACKLIGHT3,

};



enum {

	PM8606_LED1_RED = 0,

	PM8606_LED1_GREEN,

	PM8606_LED1_BLUE,

	PM8606_LED2_RED,

	PM8606_LED2_GREEN,

	PM8606_LED2_BLUE,

	PM8607_LED_VIBRATOR,

};





/* 8606 Registers */

#define PM8606_DCM_BOOST		(0x00)

#define PM8606_PWM			(0x01)



/* Backlight Registers */

#define PM8606_WLED1A			(0x02)

#define PM8606_WLED1B			(0x03)

#define PM8606_WLED2A			(0x04)

#define PM8606_WLED2B			(0x05)

#define PM8606_WLED3A			(0x06)

#define PM8606_WLED3B			(0x07)



/* LED Registers */

#define PM8606_RGB2A			(0x08)

#define PM8606_RGB2B			(0x09)

#define PM8606_RGB2C			(0x0A)

#define PM8606_RGB2D			(0x0B)

#define PM8606_RGB1A			(0x0C)

#define PM8606_RGB1B			(0x0D)

#define PM8606_RGB1C			(0x0E)

#define PM8606_RGB1D			(0x0F)



#define PM8606_PREREGULATORA		(0x10)

#define PM8606_PREREGULATORB		(0x11)

#define PM8606_VIBRATORA		(0x12)

#define PM8606_VIBRATORB		(0x13)

#define PM8606_VCHG			(0x14)

#define PM8606_VSYS			(0x15)

#define PM8606_MISC			(0x16)

#define PM8606_CHIP_ID			(0x17)

#define PM8606_STATUS			(0x18)

#define PM8606_FLAGS			(0x19)

#define PM8606_PROTECTA			(0x1A)

#define PM8606_PROTECTB			(0x1B)

#define PM8606_PROTECTC			(0x1C)



/* Bit definitions of PM8606 registers */

#define PM8606_DCM_500MA		(0x0)	/* current limit */

#define PM8606_DCM_750MA		(0x1)

#define PM8606_DCM_1000MA		(0x2)

#define PM8606_DCM_1250MA		(0x3)

#define PM8606_DCM_250MV		(0x0 << 2)

#define PM8606_DCM_300MV		(0x1 << 2)

#define PM8606_DCM_350MV		(0x2 << 2)

#define PM8606_DCM_400MV		(0x3 << 2)



#define PM8606_PWM_31200HZ		(0x0)

#define PM8606_PWM_15600HZ		(0x1)

#define PM8606_PWM_7800HZ		(0x2)

#define PM8606_PWM_3900HZ		(0x3)

#define PM8606_PWM_1950HZ		(0x4)

#define PM8606_PWM_976HZ		(0x5)

#define PM8606_PWM_488HZ		(0x6)

#define PM8606_PWM_244HZ		(0x7)

#define PM8606_PWM_FREQ_MASK		(0x7)



#define PM8606_WLED_ON			(1 << 0)

#define PM8606_WLED_CURRENT(x)		((x & 0x1F) << 1)



#define PM8606_LED_CURRENT(x)		(((x >> 2) & 0x07) << 5)



#define PM8606_VSYS_EN			(1 << 1)



#define PM8606_MISC_OSC_EN		(1 << 4)



enum {

	PM8607_ID_BUCK1 = 0,

	PM8607_ID_BUCK2,
@@ -91,6 +186,21 @@ enum { 
#define PM8607_SUPPLIES_EN21		(0x33)

#define PM8607_SUPPLIES_EN22		(0x34)



/* Vibrator Control Registers */

#define PM8607_VIBRATOR_SET		(0x28)

#define PM8607_VIBRATOR_PWM		(0x29)



/* GPADC Registers */

#define PM8607_GP_BIAS1			(0x4F)

#define PM8607_MEAS_EN1			(0x50)

#define PM8607_MEAS_EN2			(0x51)

#define PM8607_MEAS_EN3			(0x52)

#define PM8607_MEAS_OFF_TIME1		(0x53)

#define PM8607_MEAS_OFF_TIME2		(0x54)

#define PM8607_TSI_PREBIAS		(0x55)	/* prebias time */

#define PM8607_PD_PREBIAS		(0x56)	/* prebias time */

#define PM8607_GPADC_MISC1		(0x57)



/* RTC Control Registers */

#define PM8607_RTC1			(0xA0)

#define PM8607_RTC_COUNTER1		(0xA1)
@@ -140,6 +250,16 @@ enum { 
#define PM8607_B0_MISC1_PI2C		(1 << 3)

#define PM8607_B0_MISC1_RESET		(1 << 6)



/* bits definitions of GPADC */

#define PM8607_GPADC_EN			(1 << 0)

#define PM8607_GPADC_PREBIAS_MASK	(3 << 1)

#define PM8607_GPADC_SLOT_CYCLE_MASK	(3 << 3)	/* slow mode */

#define PM8607_GPADC_OFF_SCALE_MASK	(3 << 5)	/* GP sleep mode */

#define PM8607_GPADC_SW_CAL_MASK	(1 << 7)



#define PM8607_PD_PREBIAS_MASK		(0x1F << 0)

#define PM8607_PD_PRECHG_MASK		(7 << 5)



/* Interrupt Number in 88PM8607 */

enum {

	PM8607_IRQ_ONKEY = 0,
@@ -202,13 +322,44 @@ enum { 
	PI2C_PORT,

};



struct pm860x_backlight_pdata {

	int		id;

	int		pwm;

	int		iset;

	unsigned long	flags;

};



struct pm860x_led_pdata {

	int		id;

	int		iset;

	unsigned long	flags;

};



struct pm860x_touch_pdata {

	int		gpadc_prebias;

	int		slot_cycle;

	int		off_scale;

	int		sw_cal;

	int		tsi_prebias;	/* time, slot */

	int		pen_prebias;	/* time, slot */

	int		pen_prechg;	/* time, slot */

	unsigned long	flags;

};



struct pm860x_platform_data {

	struct pm860x_backlight_pdata	*backlight;

	struct pm860x_led_pdata		*led;

	struct pm860x_touch_pdata	*touch;



	unsigned short	companion_addr;	/* I2C address of companion chip */

	int		i2c_port;	/* Controlled by GI2C or PI2C */

	int		irq_mode;	/* Clear interrupt by read/write(0/1) */

	struct regulator_init_data *regulator[PM8607_MAX_REGULATOR];

};



extern char pm860x_backlight_name[][MFD_NAME_SIZE];

extern char pm860x_led_name[][MFD_NAME_SIZE];



extern int pm860x_reg_read(struct i2c_client *, int);

extern int pm860x_reg_write(struct i2c_client *, int, unsigned char);

extern int pm860x_bulk_read(struct i2c_client *, int, int, unsigned char *);