lkml.org 
[lkml]   [2011]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/6] mfd: 88pm860x: avoid to use constraint name in regulator driver
    Date
    Avoid to use constraint name in regulator driver. So use regulator id is used
    instead in platform driver.

    Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
    Cc: Samuel Ortiz <samuel.ortiz@intel.com>
    Cc: Liam Girdwood <lrg@slimlogic.co.uk>
    Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
    ---
    drivers/mfd/88pm860x-core.c | 35 ++++++++---------------------------
    drivers/regulator/88pm8607.c | 25 +++++++++++++------------
    2 files changed, 21 insertions(+), 39 deletions(-)

    diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
    index 04ab50c..8e88fba 100644
    --- a/drivers/mfd/88pm860x-core.c
    +++ b/drivers/mfd/88pm860x-core.c
    @@ -581,7 +581,7 @@ static void __devinit device_regulator_init(struct pm860x_chip *chip,
    {
    struct regulator_init_data *initdata;
    int ret;
    - int i, j;
    + int i, seq;

    if ((pdata == NULL) || (pdata->regulator == NULL))
    return;
    @@ -589,40 +589,21 @@ static void __devinit device_regulator_init(struct pm860x_chip *chip,
    if (pdata->num_regulators > ARRAY_SIZE(regulator_devs))
    pdata->num_regulators = ARRAY_SIZE(regulator_devs);

    - for (i = 0, j = -1; i < pdata->num_regulators; i++) {
    + for (i = 0, seq = -1; i < pdata->num_regulators; i++) {
    initdata = &pdata->regulator[i];
    - if (strstr(initdata->constraints.name, "BUCK")) {
    - sscanf(initdata->constraints.name, "BUCK%d", &j);
    - /* BUCK1 ~ BUCK3 */
    - if ((j < 1) || (j > 3)) {
    - dev_err(chip->dev, "Failed to add constraint "
    - "(%s)\n", initdata->constraints.name);
    - goto out;
    - }
    - j = (j - 1) + PM8607_ID_BUCK1;
    - }
    - if (strstr(initdata->constraints.name, "LDO")) {
    - sscanf(initdata->constraints.name, "LDO%d", &j);
    - /* LDO1 ~ LDO15 */
    - if ((j < 1) || (j > 15)) {
    - dev_err(chip->dev, "Failed to add constraint "
    - "(%s)\n", initdata->constraints.name);
    - goto out;
    - }
    - j = (j - 1) + PM8607_ID_LDO1;
    - }
    - if (j == -1) {
    - dev_err(chip->dev, "Failed to add constraint (%s)\n",
    - initdata->constraints.name);
    + seq = *(unsigned int *)initdata->driver_data;
    + if ((seq < 0) || (seq > PM8607_ID_RG_MAX)) {
    + dev_err(chip->dev, "Wrong ID(%d) on regulator(%s)\n",
    + seq, initdata->constraints.name);
    goto out;
    }
    regulator_devs[i].platform_data = &pdata->regulator[i];
    regulator_devs[i].pdata_size = sizeof(struct regulator_init_data);
    regulator_devs[i].num_resources = 1;
    - regulator_devs[i].resources = &regulator_resources[j];
    + regulator_devs[i].resources = &regulator_resources[seq];

    ret = mfd_add_devices(chip->dev, 0, &regulator_devs[i], 1,
    - &regulator_resources[j], 0);
    + &regulator_resources[seq], 0);
    if (ret < 0) {
    dev_err(chip->dev, "Failed to add regulator subdev\n");
    goto out;
    diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
    index 784ea77..1904be9 100644
    --- a/drivers/regulator/88pm8607.c
    +++ b/drivers/regulator/88pm8607.c
    @@ -398,32 +398,33 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
    {
    struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
    struct pm8607_regulator_info *info = NULL;
    - struct regulator_init_data *pdata;
    + struct regulator_init_data *pdata = pdev->dev.platform_data;
    + struct resource *res;
    int i;

    - pdata = pdev->dev.platform_data;
    - if (pdata == NULL)
    + res = platform_get_resource(pdev, IORESOURCE_IO, 0);
    + if (res == NULL) {
    + dev_err(&pdev->dev, "No I/O resource!\n");
    return -EINVAL;
    -
    + }
    for (i = 0; i < ARRAY_SIZE(pm8607_regulator_info); i++) {
    info = &pm8607_regulator_info[i];
    - if (!strcmp(info->desc.name, pdata->constraints.name))
    + if (info->desc.id == res->start)
    break;
    }
    - if (i > ARRAY_SIZE(pm8607_regulator_info)) {
    - dev_err(&pdev->dev, "Failed to find regulator %s\n",
    - pdata->constraints.name);
    + if ((i < 0) || (i > PM8607_ID_RG_MAX)) {
    + dev_err(&pdev->dev, "Failed to find regulator %d\n",
    + res->start);
    return -EINVAL;
    }
    -
    info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
    info->chip = chip;

    /* check DVC ramp slope double */
    - if (!strcmp(info->desc.name, "BUCK3"))
    - if (info->chip->buck3_double)
    - info->slope_double = 1;
    + if ((i == PM8607_ID_BUCK3) && info->chip->buck3_double)
    + info->slope_double = 1;

    + /* replace driver_data with info */
    info->regulator = regulator_register(&info->desc, &pdev->dev,
    pdata, info);
    if (IS_ERR(info->regulator)) {
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2011-05-06 11:31    [W:0.027 / U:147.812 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site