diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2008-11-20 19:46:51 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-20 19:46:51 +0000 |
| commit | ad1e78fb2babc9cf9acd62923d62389ea28b1df2 (patch) | |
| tree | dd37e7a75e654d38e601342cacd57a6b30cded8c /drivers/regulator | |
| parent | 5557b3223d35dd25366d6ef047299b1dc94b17e6 (diff) | |
pcf50633_mdc_related_changes.patch
Changes related to pcf50633_mfd.patch
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/pcf50633-regulator.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index c7082d857d0..ef4165ae560 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c @@ -4,9 +4,11 @@ #include <linux/regulator/driver.h> #include <linux/platform_device.h> -#include <linux/pcf50633.h> #include <linux/err.h> +#include <linux/mfd/pcf50633/core.h> +#include <linux/mfd/pcf50633/pmic.h> + #define PCF50633_REGULATOR(_name, _id) \ { \ .name = _name, \ @@ -16,7 +18,7 @@ .owner = THIS_MODULE, \ } -static const u_int8_t regulator_registers[__NUM_PCF50633_REGULATORS] = { +static const u_int8_t regulator_registers[PCF50633_NUM_REGULATORS] = { [PCF50633_REGULATOR_AUTO] = PCF50633_REG_AUTOOUT, [PCF50633_REGULATOR_DOWN1] = PCF50633_REG_DOWN1OUT, [PCF50633_REGULATOR_DOWN2] = PCF50633_REG_DOWN2OUT, @@ -93,11 +95,11 @@ static int pcf50633_regulator_set_voltage(struct regulator_dev *rdev, uint8_t regnr; int regulator_id; int millivolts; - struct pcf50633_data *pcf = rdev_get_drvdata(rdev);; + struct pcf50633 *pcf = rdev_get_drvdata(rdev);; regulator_id = rdev_get_id(rdev); - if (regulator_id >= __NUM_PCF50633_REGULATORS) + if (regulator_id >= PCF50633_NUM_REGULATORS) return -EINVAL; millivolts = min_uV / 1000; @@ -136,9 +138,9 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev) uint8_t regnr; unsigned int rc = 0; int regulator_id = rdev_get_id(rdev); - struct pcf50633_data *pcf = rdev_get_drvdata(rdev); + struct pcf50633 *pcf = rdev_get_drvdata(rdev); - if (regulator_id >= __NUM_PCF50633_REGULATORS) + if (regulator_id >= PCF50633_NUM_REGULATORS) return -EINVAL; regnr = regulator_registers[regulator_id]; @@ -174,9 +176,9 @@ static int pcf50633_regulator_enable(struct regulator_dev *rdev) { uint8_t regnr; int regulator_id = rdev_get_id(rdev); - struct pcf50633_data *pcf = rdev_get_drvdata(rdev); + struct pcf50633 *pcf = rdev_get_drvdata(rdev); - if (regulator_id >= __NUM_PCF50633_REGULATORS) + if (regulator_id >= PCF50633_NUM_REGULATORS) return -EINVAL; /* the *ENA register is always one after the *OUT register */ @@ -192,9 +194,9 @@ static int pcf50633_regulator_disable(struct regulator_dev *rdev) { uint8_t regnr; int regulator_id = rdev_get_id(rdev); - struct pcf50633_data *pcf = rdev_get_drvdata(rdev); + struct pcf50633 *pcf = rdev_get_drvdata(rdev); - if (regulator_id >= __NUM_PCF50633_REGULATORS) + if (regulator_id >= PCF50633_NUM_REGULATORS) return -EINVAL; /* the *ENA register is always one after the *OUT register */ @@ -209,9 +211,9 @@ static int pcf50633_regulator_is_enabled(struct regulator_dev *rdev) { uint8_t val, regnr; int regulator_id = rdev_get_id(rdev); - struct pcf50633_data *pcf = rdev_get_drvdata(rdev); + struct pcf50633 *pcf = rdev_get_drvdata(rdev); - if (regulator_id >= __NUM_PCF50633_REGULATORS) + if (regulator_id >= PCF50633_NUM_REGULATORS) return -EINVAL; /* the *ENA register is always one after the *OUT register */ @@ -259,7 +261,7 @@ struct regulator_desc regulators[] = { int __init pcf50633_regulator_probe(struct platform_device *pdev) { struct regulator_dev *rdev; - struct pcf50633_data *pcf; + struct pcf50633 *pcf; pcf = pdev->dev.driver_data; |