regulator: palmas: fix build warnings
[linux-2.6.git] / drivers / regulator / pcf50633-regulator.c
index c8f41dc..6db46c6 100644 (file)
@@ -108,7 +108,8 @@ static unsigned int ldo_voltage_value(u8 bits)
 }
 
 static int pcf50633_regulator_set_voltage(struct regulator_dev *rdev,
-                                               int min_uV, int max_uV)
+                                         int min_uV, int max_uV,
+                                         unsigned *selector)
 {
        struct pcf50633 *pcf;
        int regulator_id, millivolts;
@@ -141,12 +142,15 @@ static int pcf50633_regulator_set_voltage(struct regulator_dev *rdev,
        case PCF50633_REGULATOR_LDO5:
        case PCF50633_REGULATOR_LDO6:
        case PCF50633_REGULATOR_HCLDO:
+       case PCF50633_REGULATOR_MEMLDO:
                volt_bits = ldo_voltage_bits(millivolts);
                break;
        default:
                return -EINVAL;
        }
 
+       *selector = volt_bits;
+
        return pcf50633_reg_write(pcf, regnr, volt_bits);
 }
 
@@ -172,6 +176,7 @@ static int pcf50633_regulator_voltage_value(enum pcf50633_regulator_id id,
        case PCF50633_REGULATOR_LDO5:
        case PCF50633_REGULATOR_LDO6:
        case PCF50633_REGULATOR_HCLDO:
+       case PCF50633_REGULATOR_MEMLDO:
                millivolts = ldo_voltage_value(bits);
                break;
        default:
@@ -214,9 +219,6 @@ static int pcf50633_regulator_list_voltage(struct regulator_dev *rdev,
        case PCF50633_REGULATOR_AUTO:
                index += 0x2f;
                break;
-       case PCF50633_REGULATOR_HCLDO:
-               index += 0x01;
-               break;
        default:
                break;
        }
@@ -285,27 +287,27 @@ static struct regulator_ops pcf50633_regulator_ops = {
 
 static struct regulator_desc regulators[] = {
        [PCF50633_REGULATOR_AUTO] =
-               PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 80),
+               PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 81),
        [PCF50633_REGULATOR_DOWN1] =
-               PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 95),
+               PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 96),
        [PCF50633_REGULATOR_DOWN2] =
-               PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2, 95),
+               PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2, 96),
        [PCF50633_REGULATOR_LDO1] =
-               PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1, 27),
+               PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1, 28),
        [PCF50633_REGULATOR_LDO2] =
-               PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2, 27),
+               PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2, 28),
        [PCF50633_REGULATOR_LDO3] =
-               PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3, 27),
+               PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3, 28),
        [PCF50633_REGULATOR_LDO4] =
-               PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4, 27),
+               PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4, 28),
        [PCF50633_REGULATOR_LDO5] =
-               PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5, 27),
+               PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5, 28),
        [PCF50633_REGULATOR_LDO6] =
-               PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6, 27),
+               PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6, 28),
        [PCF50633_REGULATOR_HCLDO] =
-               PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO, 26),
+               PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO, 28),
        [PCF50633_REGULATOR_MEMLDO] =
-               PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO, 0),
+               PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO, 28),
 };
 
 static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
@@ -317,7 +319,7 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
        pcf = dev_to_pcf50633(pdev->dev.parent);
 
        rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
-                                 pdev->dev.platform_data, pcf);
+                                 pdev->dev.platform_data, pcf, NULL);
        if (IS_ERR(rdev))
                return PTR_ERR(rdev);