mfd: pm8018-core: use pm8xxx-regulator instead of pm8018-regulator
Change the pm8018-core driver so that it registers devices for
the pm8xxx-regulator driver instead of for the pm8018-regulator
driver.
This necessitates changing board file platform data for existing
PMIC 8018 regulators so that additional pm8xxx-regulator data is
properly specified.
Change-Id: I3f64f756a6c48c0dd1684f8d8e98a6fa8dddd6ca
Signed-off-by: David Collins <collinsd@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-9615-regulator.c b/arch/arm/mach-msm/board-9615-regulator.c
index 7cf4a8c..14e84a6 100644
--- a/arch/arm/mach-msm/board-9615-regulator.c
+++ b/arch/arm/mach-msm/board-9615-regulator.c
@@ -11,7 +11,7 @@
* GNU General Public License for more details.
*/
-#include <linux/regulator/pm8018-regulator.h>
+#include <linux/regulator/pm8xxx-regulator.h>
#include <linux/regulator/gpio-regulator.h>
#include <mach/rpm-regulator.h>
@@ -91,9 +91,9 @@
REGULATOR_SUPPLY("sdc_vdd", "msm_sdcc.1"),
};
-#define PM8018_VREG_INIT(_id, _min_uV, _max_uV, _modes, _ops, _apply_uV, \
- _pull_down, _always_on, _supply_regulator, \
- _system_uA, _enable_time) \
+#define PM8XXX_VREG_INIT(_id, _name, _min_uV, _max_uV, _modes, _ops, \
+ _apply_uV, _pull_down, _always_on, _supply_regulator, \
+ _system_uA, _enable_time, _reg_id) \
{ \
.init_data = { \
.constraints = { \
@@ -104,63 +104,67 @@
.input_uV = _max_uV, \
.apply_uV = _apply_uV, \
.always_on = _always_on, \
+ .name = _name, \
}, \
.num_consumer_supplies = \
ARRAY_SIZE(vreg_consumers_##_id), \
.consumer_supplies = vreg_consumers_##_id, \
.supply_regulator = _supply_regulator, \
}, \
- .id = PM8018_VREG_ID_##_id, \
+ .id = _reg_id, \
.pull_down_enable = _pull_down, \
.system_uA = _system_uA, \
.enable_time = _enable_time, \
}
-#define PM8018_VREG_INIT_LDO(_id, _always_on, _pull_down, _min_uV, _max_uV, \
- _enable_time, _supply_regulator, _system_uA) \
- PM8018_VREG_INIT(_id, _min_uV, _max_uV, REGULATOR_MODE_NORMAL \
+#define PM8XXX_LDO(_id, _name, _always_on, _pull_down, _min_uV, _max_uV, \
+ _enable_time, _supply_regulator, _system_uA, _reg_id) \
+ PM8XXX_VREG_INIT(_id, _name, _min_uV, _max_uV, REGULATOR_MODE_NORMAL \
| REGULATOR_MODE_IDLE, REGULATOR_CHANGE_VOLTAGE | \
REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_MODE | \
REGULATOR_CHANGE_DRMS, 0, _pull_down, _always_on, \
- _supply_regulator, _system_uA, _enable_time)
+ _supply_regulator, _system_uA, _enable_time, _reg_id)
-#define PM8018_VREG_INIT_NLDO1200(_id, _always_on, _pull_down, _min_uV, \
- _max_uV, _enable_time, _supply_regulator, _system_uA) \
- PM8018_VREG_INIT(_id, _min_uV, _max_uV, REGULATOR_MODE_NORMAL \
+#define PM8XXX_NLDO1200(_id, _name, _always_on, _pull_down, _min_uV, \
+ _max_uV, _enable_time, _supply_regulator, _system_uA, _reg_id) \
+ PM8XXX_VREG_INIT(_id, _name, _min_uV, _max_uV, REGULATOR_MODE_NORMAL \
| REGULATOR_MODE_IDLE, REGULATOR_CHANGE_VOLTAGE | \
REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_MODE | \
REGULATOR_CHANGE_DRMS, 0, _pull_down, _always_on, \
- _supply_regulator, _system_uA, _enable_time)
+ _supply_regulator, _system_uA, _enable_time, _reg_id)
-#define PM8018_VREG_INIT_SMPS(_id, _always_on, _pull_down, _min_uV, _max_uV, \
- _enable_time, _supply_regulator, _system_uA) \
- PM8018_VREG_INIT(_id, _min_uV, _max_uV, REGULATOR_MODE_NORMAL \
+#define PM8XXX_SMPS(_id, _name, _always_on, _pull_down, _min_uV, _max_uV, \
+ _enable_time, _supply_regulator, _system_uA, _reg_id) \
+ PM8XXX_VREG_INIT(_id, _name, _min_uV, _max_uV, REGULATOR_MODE_NORMAL \
| REGULATOR_MODE_IDLE, REGULATOR_CHANGE_VOLTAGE | \
REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_MODE | \
REGULATOR_CHANGE_DRMS, 0, _pull_down, _always_on, \
- _supply_regulator, _system_uA, _enable_time)
+ _supply_regulator, _system_uA, _enable_time, _reg_id)
-#define PM8018_VREG_INIT_VS(_id, _always_on, _pull_down, _enable_time, \
- _supply_regulator) \
- PM8018_VREG_INIT(_id, 0, 0, 0, REGULATOR_CHANGE_STATUS, 0, _pull_down, \
- _always_on, _supply_regulator, 0, _enable_time)
+#define PM8XXX_VS(_id, _name, _always_on, _pull_down, _enable_time, \
+ _supply_regulator, _reg_id) \
+ PM8XXX_VREG_INIT(_id, _name, 0, 0, 0, REGULATOR_CHANGE_STATUS, 0, \
+ _pull_down, _always_on, _supply_regulator, 0, _enable_time, \
+ _reg_id)
/* Pin control initialization */
-#define PM8018_PC_INIT(_id, _always_on, _pin_fn, _pin_ctrl, _supply_regulator) \
+#define PM8XXX_PC(_id, _name, _always_on, _pin_fn, _pin_ctrl, \
+ _supply_regulator, _reg_id) \
{ \
.init_data = { \
.constraints = { \
.valid_ops_mask = REGULATOR_CHANGE_STATUS, \
.always_on = _always_on, \
+ .name = _name, \
}, \
.num_consumer_supplies = \
ARRAY_SIZE(vreg_consumers_##_id##_PC), \
.consumer_supplies = vreg_consumers_##_id##_PC, \
.supply_regulator = _supply_regulator, \
}, \
- .id = PM8018_VREG_ID_##_id##_PC, \
- .pin_fn = PM8018_VREG_PIN_FN_##_pin_fn, \
- .pin_ctrl = _pin_ctrl, \
+ .id = _reg_id, \
+ .pin_fn = PM8XXX_VREG_PIN_FN_##_pin_fn, \
+ .pin_ctrl = _pin_ctrl, \
}
#define RPM_INIT(_id, _min_uV, _max_uV, _modes, _ops, _apply_uV, _default_uV, \
@@ -266,7 +270,7 @@
};
/* PM8018 regulator constraints */
-struct pm8018_regulator_platform_data
+struct pm8xxx_regulator_platform_data
msm_pm8018_regulator_pdata[] __devinitdata = {
};
diff --git a/arch/arm/mach-msm/board-9615.h b/arch/arm/mach-msm/board-9615.h
index af47296..4759f8c 100644
--- a/arch/arm/mach-msm/board-9615.h
+++ b/arch/arm/mach-msm/board-9615.h
@@ -25,7 +25,7 @@
#define PM8018_IRQ_BASE (NR_MSM_IRQS + NR_GPIO_IRQS)
#define PM8018_MPP_IRQ_BASE (PM8018_IRQ_BASE + NR_GPIO_IRQS)
-extern struct pm8018_regulator_platform_data
+extern struct pm8xxx_regulator_platform_data
msm_pm8018_regulator_pdata[] __devinitdata;
extern int msm_pm8018_regulator_pdata_len __devinitdata;
diff --git a/drivers/mfd/pm8018-core.c b/drivers/mfd/pm8018-core.c
index 8d89568..fc85a42 100644
--- a/drivers/mfd/pm8018-core.c
+++ b/drivers/mfd/pm8018-core.c
@@ -16,11 +16,13 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/string.h>
#include <linux/err.h>
#include <linux/msm_ssbi.h>
#include <linux/mfd/core.h>
#include <linux/mfd/pm8xxx/pm8018.h>
#include <linux/mfd/pm8xxx/core.h>
+#include <linux/mfd/pm8xxx/regulator.h>
#include <linux/leds-pm8xxx.h>
@@ -53,10 +55,11 @@
}
struct pm8018 {
- struct device *dev;
- struct pm_irq_chip *irq_chip;
- struct mfd_cell *mfd_regulators;
- u32 rev_registers;
+ struct device *dev;
+ struct pm_irq_chip *irq_chip;
+ struct mfd_cell *mfd_regulators;
+ struct pm8xxx_regulator_core_platform_data *regulator_cdata;
+ u32 rev_registers;
};
static int pm8018_readb(const struct device *dev, u16 addr, u8 *val)
@@ -227,14 +230,136 @@
.id = -1,
};
+static struct pm8xxx_vreg regulator_data[] = {
+ /* name pc_name ctrl test hpm_min */
+ PLDO("8018_l2", "8018_l2_pc", 0x0B0, 0x0B1, LDO_50),
+ PLDO("8018_l3", "8018_l3_pc", 0x0B2, 0x0B3, LDO_50),
+ PLDO("8018_l4", "8018_l4_pc", 0x0B4, 0x0B5, LDO_300),
+ PLDO("8018_l5", "8018_l5_pc", 0x0B6, 0x0B7, LDO_150),
+ PLDO("8018_l6", "8018_l6_pc", 0x0B8, 0x0B9, LDO_150),
+ PLDO("8018_l7", "8018_l7_pc", 0x0BA, 0x0BB, LDO_300),
+ NLDO("8018_l8", "8018_l8_pc", 0x0BC, 0x0BD, LDO_150),
+ NLDO1200("8018_l9", 0x0BE, 0x0BF, LDO_1200),
+ NLDO1200("8018_l10", 0x0C0, 0x0C1, LDO_1200),
+ NLDO1200("8018_l11", 0x0C2, 0x0C3, LDO_1200),
+ NLDO1200("8018_l12", 0x0C4, 0x0C5, LDO_1200),
+ PLDO("8018_l13", "8018_l13_pc", 0x0C8, 0x0C9, LDO_50),
+ PLDO("8018_l14", "8018_l14_pc", 0x0CA, 0x0CB, LDO_50),
+
+ /* name pc_name ctrl test2 clk sleep hpm_min */
+ SMPS("8018_s1", "8018_s1_pc", 0x1D0, 0x1D5, 0x009, 0x1D2, SMPS_1500),
+ SMPS("8018_s2", "8018_s2_pc", 0x1D8, 0x1DD, 0x00A, 0x1DA, SMPS_1500),
+ SMPS("8018_s3", "8018_s3_pc", 0x1E0, 0x1E5, 0x00B, 0x1E2, SMPS_1500),
+ SMPS("8018_s4", "8018_s4_pc", 0x1E8, 0x1ED, 0x00C, 0x1EA, SMPS_1500),
+ SMPS("8018_s5", "8018_s5_pc", 0x1F0, 0x1F5, 0x00D, 0x1F2, SMPS_1500),
+
+ /* name pc_name ctrl */
+ VS("8018_lvs1", "8018_lvs1_pc", 0x060),
+};
+
+#define MAX_NAME_COMPARISON_LEN 32
+
+static int __devinit match_regulator(
+ struct pm8xxx_regulator_core_platform_data *core_data, char *name)
+{
+ int found = 0;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(regulator_data); i++) {
+ if (regulator_data[i].rdesc.name
+ && strncmp(regulator_data[i].rdesc.name, name,
+ MAX_NAME_COMPARISON_LEN) == 0) {
+ core_data->is_pin_controlled = false;
+ core_data->vreg = ®ulator_data[i];
+ found = 1;
+ break;
+ } else if (regulator_data[i].rdesc_pc.name
+ && strncmp(regulator_data[i].rdesc_pc.name, name,
+ MAX_NAME_COMPARISON_LEN) == 0) {
+ core_data->is_pin_controlled = true;
+ core_data->vreg = ®ulator_data[i];
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ pr_err("could not find a match for regulator: %s\n", name);
+
+ return found;
+}
+
+static int __devinit
+pm8018_add_regulators(const struct pm8018_platform_data *pdata,
+ struct pm8018 *pmic, int irq_base)
+{
+ int ret = 0;
+ struct mfd_cell *mfd_regulators;
+ struct pm8xxx_regulator_core_platform_data *cdata;
+ int i;
+
+ /* Add one device for each regulator used by the board. */
+ mfd_regulators = kzalloc(sizeof(struct mfd_cell)
+ * (pdata->num_regulators), GFP_KERNEL);
+ if (!mfd_regulators) {
+ pr_err("Cannot allocate %d bytes for pm8018 regulator "
+ "mfd cells\n", sizeof(struct mfd_cell)
+ * (pdata->num_regulators));
+ return -ENOMEM;
+ }
+ cdata = kzalloc(sizeof(struct pm8xxx_regulator_core_platform_data)
+ * pdata->num_regulators, GFP_KERNEL);
+ if (!cdata) {
+ pr_err("Cannot allocate %d bytes for pm8018 regulator "
+ "core data\n", pdata->num_regulators
+ * sizeof(struct pm8xxx_regulator_core_platform_data));
+ kfree(mfd_regulators);
+ return -ENOMEM;
+ }
+ for (i = 0; i < ARRAY_SIZE(regulator_data); i++)
+ mutex_init(®ulator_data[i].pc_lock);
+
+ for (i = 0; i < pdata->num_regulators; i++) {
+ if (!pdata->regulator_pdatas[i].init_data.constraints.name) {
+ pr_err("name missing for regulator %d\n", i);
+ ret = -EINVAL;
+ goto bail;
+ }
+ if (!match_regulator(&cdata[i],
+ pdata->regulator_pdatas[i].init_data.constraints.name)) {
+ ret = -ENODEV;
+ goto bail;
+ }
+ cdata[i].pdata = &(pdata->regulator_pdatas[i]);
+ mfd_regulators[i].name = PM8XXX_REGULATOR_DEV_NAME;
+ mfd_regulators[i].id = cdata[i].pdata->id;
+ mfd_regulators[i].platform_data = &cdata[i];
+ mfd_regulators[i].pdata_size =
+ sizeof(struct pm8xxx_regulator_core_platform_data);
+ }
+ ret = mfd_add_devices(pmic->dev, 0, mfd_regulators,
+ pdata->num_regulators, NULL, irq_base);
+ if (ret)
+ goto bail;
+
+ pmic->mfd_regulators = mfd_regulators;
+ pmic->regulator_cdata = cdata;
+ return ret;
+
+bail:
+ for (i = 0; i < ARRAY_SIZE(regulator_data); i++)
+ mutex_destroy(®ulator_data[i].pc_lock);
+ kfree(mfd_regulators);
+ kfree(cdata);
+ return ret;
+}
+
static int __devinit
pm8018_add_subdevices(const struct pm8018_platform_data *pdata,
struct pm8018 *pmic)
{
int ret = 0, irq_base = 0;
struct pm_irq_chip *irq_chip;
- static struct mfd_cell *mfd_regulators;
- int i;
if (pdata->irq_pdata) {
pdata->irq_pdata->irq_cdata.nirqs = PM8018_NR_IRQS;
@@ -341,36 +466,16 @@
goto bail;
}
- /* Add one device for each regulator used by the board. */
if (pdata->num_regulators > 0 && pdata->regulator_pdatas) {
- mfd_regulators = kzalloc(sizeof(struct mfd_cell)
- * (pdata->num_regulators), GFP_KERNEL);
- if (!mfd_regulators) {
- pr_err("Cannot allocate %d bytes for pm8018 regulator "
- "mfd cells\n", sizeof(struct mfd_cell)
- * (pdata->num_regulators));
- ret = -ENOMEM;
- goto bail;
- }
- for (i = 0; i < pdata->num_regulators; i++) {
- mfd_regulators[i].name = PM8018_REGULATOR_DEV_NAME;
- mfd_regulators[i].id = pdata->regulator_pdatas[i].id;
- mfd_regulators[i].platform_data =
- &(pdata->regulator_pdatas[i]);
- mfd_regulators[i].pdata_size =
- sizeof(struct pm8018_regulator_platform_data);
- }
- ret = mfd_add_devices(pmic->dev, 0, mfd_regulators,
- pdata->num_regulators, NULL, irq_base);
+ ret = pm8018_add_regulators(pdata, pmic, irq_base);
if (ret) {
pr_err("Failed to add regulator subdevices ret=%d\n",
ret);
- kfree(mfd_regulators);
goto bail;
}
- pmic->mfd_regulators = mfd_regulators;
}
+
return 0;
bail:
if (pmic->irq_chip) {
@@ -475,6 +580,8 @@
err:
mfd_remove_devices(pmic->dev);
platform_set_drvdata(pdev, NULL);
+ kfree(pmic->mfd_regulators);
+ kfree(pmic->regulator_cdata);
err_read_rev:
kfree(pmic);
return rc;
@@ -484,19 +591,27 @@
{
struct pm8xxx_drvdata *drvdata;
struct pm8018 *pmic = NULL;
+ int i;
drvdata = platform_get_drvdata(pdev);
if (drvdata)
pmic = drvdata->pm_chip_data;
- if (pmic)
- mfd_remove_devices(pmic->dev);
- if (pmic->irq_chip) {
- pm8xxx_irq_exit(pmic->irq_chip);
- pmic->irq_chip = NULL;
+ if (pmic) {
+ if (pmic->dev)
+ mfd_remove_devices(pmic->dev);
+ if (pmic->irq_chip) {
+ pm8xxx_irq_exit(pmic->irq_chip);
+ pmic->irq_chip = NULL;
+ }
+ if (pmic->mfd_regulators) {
+ for (i = 0; i < ARRAY_SIZE(regulator_data); i++)
+ mutex_destroy(®ulator_data[i].pc_lock);
+ }
+ kfree(pmic->mfd_regulators);
+ kfree(pmic->regulator_cdata);
+ kfree(pmic);
}
platform_set_drvdata(pdev, NULL);
- kfree(pmic->mfd_regulators);
- kfree(pmic);
return 0;
}
diff --git a/include/linux/mfd/pm8xxx/pm8018.h b/include/linux/mfd/pm8xxx/pm8018.h
index 1093409..e0ec0b4 100644
--- a/include/linux/mfd/pm8xxx/pm8018.h
+++ b/include/linux/mfd/pm8xxx/pm8018.h
@@ -25,7 +25,7 @@
#include <linux/mfd/pm8xxx/rtc.h>
#include <linux/input/pmic8xxx-pwrkey.h>
#include <linux/mfd/pm8xxx/misc.h>
-#include <linux/regulator/pm8018-regulator.h>
+#include <linux/regulator/pm8xxx-regulator.h>
#include <linux/mfd/pm8xxx/pm8xxx-adc.h>
#include <linux/mfd/pm8xxx/pwm.h>
#include <linux/leds-pm8xxx.h>
@@ -64,7 +64,7 @@
struct pm8xxx_rtc_platform_data *rtc_pdata;
struct pm8xxx_pwrkey_platform_data *pwrkey_pdata;
struct pm8xxx_misc_platform_data *misc_pdata;
- struct pm8018_regulator_platform_data *regulator_pdatas;
+ struct pm8xxx_regulator_platform_data *regulator_pdatas;
struct pm8xxx_adc_platform_data *adc_pdata;
int num_regulators;
struct pm8xxx_led_platform_data *leds_pdata;