aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/88pm860x-core.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2012-09-17 00:19:07 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-19 06:39:13 -0400
commitff13e9e256d49a478b34da3dc380af41e0b9175f (patch)
tree2fbcc51221cd758c1805f9d2778084cc4530c8d0 /drivers/mfd/88pm860x-core.c
parente7a7810ae08bfca5cb2cad8a8d55c16f299cc3fe (diff)
mfd: 88pm860x: Avoid to check resource for preg regulator
Since PREG regulator is the only one regulator in 88PM8606, and other regulators are in 88PM8607. Checking resource as identifying regulator is not a good way. We can use NULL resource to indentify PREG regulator. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/88pm860x-core.c')
-rw-r--r--drivers/mfd/88pm860x-core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index ad966c413087..8bf7622300f4 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -150,10 +150,6 @@ static struct resource charger_resources[] __devinitdata = {
150 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, 150 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,},
151}; 151};
152 152
153static struct resource preg_resources[] __devinitdata = {
154 {PM8606_ID_PREG, PM8606_ID_PREG, "preg", IORESOURCE_REG,},
155};
156
157static struct resource rtc_resources[] __devinitdata = { 153static struct resource rtc_resources[] __devinitdata = {
158 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,}, 154 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},
159}; 155};
@@ -960,10 +956,8 @@ static void __devinit device_power_init(struct pm860x_chip *chip,
960 956
961 power_devs[2].platform_data = &preg_init_data; 957 power_devs[2].platform_data = &preg_init_data;
962 power_devs[2].pdata_size = sizeof(struct regulator_init_data); 958 power_devs[2].pdata_size = sizeof(struct regulator_init_data);
963 power_devs[2].num_resources = ARRAY_SIZE(preg_resources);
964 power_devs[2].resources = &preg_resources[0],
965 ret = mfd_add_devices(chip->dev, 0, &power_devs[2], 1, 959 ret = mfd_add_devices(chip->dev, 0, &power_devs[2], 1,
966 &preg_resources[0], chip->irq_base, NULL); 960 NULL, chip->irq_base, NULL);
967 if (ret < 0) 961 if (ret < 0)
968 dev_err(chip->dev, "Failed to add preg subdev\n"); 962 dev_err(chip->dev, "Failed to add preg subdev\n");
969} 963}