Skip to contentSkip to conversation

mfd: append subdevs in 88pm860x

PATCH New Haojian Zhuang 1 participant 1 message Nov 13, 2009 Multifunction devices (MFD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mfd: append subdevs in 88pm860x

Append backlight, led & touch sub devices into 88PM860x driver.

---
 drivers/mfd/88pm860x-core.c  |  200 ++++++++++++++++++++++++++++++++++++++----
 include/linux/mfd/88pm860x.h |  149 +++++++++++++++++++++++++++++++-
 2 files changed, 331 insertions(+), 18 deletions(-)
drivers/mfd/88pm860x-core.c +97 -4
index 7055c80..7c1b392 100644
@@ -17,6 +17,98 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/88pm860x.h>
 
+char pm860x_backlight_name[][MFD_NAME_SIZE] = {
+	"backlight-0",
+	"backlight-1",
+	"backlight-2",
+};
+
+char pm860x_led_name[][MFD_NAME_SIZE] = {
+	"led0-red",
+	"led0-green",
+	"led0-blue",
+	"led1-red",
+	"led1-green",
+	"led1-blue",
+};
+
+#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 +117,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 +139,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,7 +285,7 @@ int pm860x_free_irq(struct pm860x_chip *chip, int irq)
 EXPORT_SYMBOL(pm860x_free_irq);
 
 static int __devinit __88pm8607_irq_init(struct pm860x_chip *chip,
-					 struct pm8607_plat_data *pdata)
+					 struct pm860x_plat_data *pdata)
 {
 	unsigned char status_buf[INT_STATUS_NUM];
 	int irq, data, mask, ret = -EINVAL;
@@ -290,6 +383,65 @@ static void __devexit __88pm860x_irq_exit(struct

pm860x_chip *chip)
free_irq(chip->chip_irq, chip);
}

+static int __devinit __88pm8607_gpadc_init(struct pm860x_chip *chip,
+ struct pm860x_plat_data *pdata)
+{
+ int use_gpadc = 0, data, ret;
+
+ /* initialize GPADC without turn on */
+
+ if (pdata && pdata->touch) {
+ /* set GPADC MISC1 register */
+ data = 0;
+ if (pdata->touch->gpadc_prebias)
+ data |= pdata->touch->gpadc_prebias << 1;
+ if (pdata->touch->slot_cycle)
+ data |= pdata->touch->slot_cycle << 3;
+ if (pdata->touch->off_scale)
+ data |= pdata->touch->off_scale << 5;
+ if (pdata->touch->sw_cal)
+ data |= pdata->touch->sw_cal << 7;
+ if (data) {
+ ret = pm860x_reg_write(chip->parent, DESC_8607,
+ 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(chip->parent, DESC_8607,
+ PM8607_TSI_PREBIAS, data);
+ if (ret < 0)
+ goto out;
+ }
+ /* set prebias & prechg time of pen detect */
+ data = 0;
+ if (pdata->touch->pen_prebias)
+ data |= pdata->touch->pen_prebias;
+ if (pdata->touch->pen_prechg)
+ data |= pdata->touch->pen_prechg << 5;
+ if (data) {
+ ret = pm860x_reg_write(chip->parent, DESC_8607,
+ PM8607_PD_PREBIAS, data);
+ if (ret < 0)
+ goto out;
+ }
+
+ use_gpadc = 1;
+ }
+
+ /* turn on GPADC */
+ if (use_gpadc) {
+ ret = pm860x_set_bits(chip->parent, DESC_8607,
+ PM8607_GPADC_MISC1,
+ PM8607_GPADC_EN,
+ PM8607_GPADC_EN);
+ }
+out:
+ return ret;
+}
+
static int __devinit __88pm8606_init(struct pm860x_chip *chip, void *pdata) {
chip->parent = &mixed_chip;
@@ -300,7 +452,7 @@ static int __devinit __88pm8606_init(struct pm860x_chip *chip, void *pdata)
}

static int __devinit __88pm8607_init(struct pm860x_chip *chip,
- struct pm8607_plat_data *pdata)
+ struct pm860x_plat_data *pdata)
{
int data = 0, ret = 0;

@@ -352,6 +504,10 @@ static int __devinit __88pm8607_init(struct pm860x_chip *chip,
}
}

+ ret = __88pm8607_gpadc_init(chip, pdata);
+ if (ret < 0)
+ goto out;
+
ret = __88pm8607_irq_init(chip, pdata);
if (ret < 0)
goto out;
@@ -359,9 +515,9 @@ out:
return ret;
}

-int __devinit pm860x_device_init(struct pm860x_chip *chip, void *pdata) +int __devinit pm860x_device_init(struct pm860x_chip *chip,
+ struct pm860x_plat_data *pdata)
{
- int i, count;
int ret = -EINVAL;

/* Mixed chip isn't initialized yet. */
@@ -369,23 +525,35 @@ int __devinit pm860x_device_init(struct pm860x_chip *chip, void *pdata)
mutex_init(&mixed_chip.io_lock);

if (!strcmp(chip->id.name, "88PM8607")) {
- ret = __88pm8607_init(chip, (struct pm8607_plat_data *)pdata);
+ ret = __88pm8607_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");
- goto out;
- }
+ mfd_add_devices(chip->dev, 0, &regulator_devs[0],
+ ARRAY_SIZE(regulator_devs),
+ &regulator_resources[0], 0);
+
+ if (pdata && pdata->touch) {
+ mfd_add_devices(chip->dev, 0, &touch_devs[0],
+ ARRAY_SIZE(touch_devs),
+ &touch_resources[0], 0);
}
} else if (!strcmp(chip->id.name, "88PM8606")) {
ret = __88pm8606_init(chip, pdata); if (ret < 0)
goto out;
+
+ if (pdata && pdata->backlight) {
+ mfd_add_devices(chip->dev, 0, &backlight_devs[0],
+ ARRAY_SIZE(backlight_devs),
+ &backlight_resources[0], 0);
+ }
+
+ if (pdata && pdata->led) {
+ mfd_add_devices(chip->dev, 0, &led_devs[0],
+ ARRAY_SIZE(led_devs),
+ &led_resources[0], 0);
+ }
}
out:
return ret;

include/linux/mfd/88pm860x.h +147 -2

179 lines not on this page · raw message

Signature · 1 line
1.5.6.5