diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-07-24 04:18:00 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-07 13:10:26 -0400 |
| commit | 7f852e0584f67654060f7814149744a1b7250480 (patch) | |
| tree | e16a22960f10fc5dcc9864fedd98459d85b4da0e | |
| parent | 1c9d2d71a3cb0fcbfe91307b3c18d22f7d93f0cd (diff) | |
regulator: tps6586x: correct vin pin for sm0/sm1/sm2
As per datasheet, the vin pin for the regulator is named
as vin_sm0, vin_sm1, vin_sm2 for sm0, sm1 and sm2 respectively.
Correcting the names in driver and documentation to match with
datasheet.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reported-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/tps6586x.txt | 12 | ||||
| -rw-r--r-- | drivers/regulator/tps6586x-regulator.c | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt index d156e1b5db12..da80c2ae0915 100644 --- a/Documentation/devicetree/bindings/regulator/tps6586x.txt +++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt | |||
| @@ -9,9 +9,9 @@ Required properties: | |||
| 9 | - regulators: list of regulators provided by this controller, must have | 9 | - regulators: list of regulators provided by this controller, must have |
| 10 | property "regulator-compatible" to match their hardware counterparts: | 10 | property "regulator-compatible" to match their hardware counterparts: |
| 11 | sm[0-2], ldo[0-9] and ldo_rtc | 11 | sm[0-2], ldo[0-9] and ldo_rtc |
| 12 | - sm0-supply: The input supply for the SM0. | 12 | - vin-sm0-supply: The input supply for the SM0. |
| 13 | - sm1-supply: The input supply for the SM1. | 13 | - vin-sm1-supply: The input supply for the SM1. |
| 14 | - sm2-supply: The input supply for the SM2. | 14 | - vin-sm2-supply: The input supply for the SM2. |
| 15 | - vinldo01-supply: The input supply for the LDO1 and LDO2 | 15 | - vinldo01-supply: The input supply for the LDO1 and LDO2 |
| 16 | - vinldo23-supply: The input supply for the LDO2 and LDO3 | 16 | - vinldo23-supply: The input supply for the LDO2 and LDO3 |
| 17 | - vinldo4-supply: The input supply for the LDO4 | 17 | - vinldo4-supply: The input supply for the LDO4 |
| @@ -30,9 +30,9 @@ Example: | |||
| 30 | #gpio-cells = <2>; | 30 | #gpio-cells = <2>; |
| 31 | gpio-controller; | 31 | gpio-controller; |
| 32 | 32 | ||
| 33 | sm0-supply = <&some_reg>; | 33 | vin-sm0-supply = <&some_reg>; |
| 34 | sm1-supply = <&some_reg>; | 34 | vin-sm1-supply = <&some_reg>; |
| 35 | sm2-supply = <&some_reg>; | 35 | vin-sm2-supply = <&some_reg>; |
| 36 | vinldo01-supply = <...>; | 36 | vinldo01-supply = <...>; |
| 37 | vinldo23-supply = <...>; | 37 | vinldo23-supply = <...>; |
| 38 | vinldo4-supply = <...>; | 38 | vinldo4-supply = <...>; |
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c index e6da90ab5153..19241fc30050 100644 --- a/drivers/regulator/tps6586x-regulator.c +++ b/drivers/regulator/tps6586x-regulator.c | |||
| @@ -240,14 +240,16 @@ static struct tps6586x_regulator tps6586x_regulator[] = { | |||
| 240 | TPS6586X_LDO(LDO_9, "vinldo9", ldo, SUPPLYV6, 3, 3, ENE, 7, ENE, 7), | 240 | TPS6586X_LDO(LDO_9, "vinldo9", ldo, SUPPLYV6, 3, 3, ENE, 7, ENE, 7), |
| 241 | TPS6586X_LDO(LDO_RTC, NULL, ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7), | 241 | TPS6586X_LDO(LDO_RTC, NULL, ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7), |
| 242 | TPS6586X_LDO(LDO_1, "vinldo01", dvm, SUPPLYV1, 0, 5, ENC, 1, END, 1), | 242 | TPS6586X_LDO(LDO_1, "vinldo01", dvm, SUPPLYV1, 0, 5, ENC, 1, END, 1), |
| 243 | TPS6586X_LDO(SM_2, "sm2", sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7), | 243 | TPS6586X_LDO(SM_2, "vin-sm2", sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7), |
| 244 | 244 | ||
| 245 | TPS6586X_DVM(LDO_2, "vinldo23", dvm, LDO2BV1, 0, 5, ENA, 3, | 245 | TPS6586X_DVM(LDO_2, "vinldo23", dvm, LDO2BV1, 0, 5, ENA, 3, |
| 246 | ENB, 3, VCC2, 6), | 246 | ENB, 3, VCC2, 6), |
| 247 | TPS6586X_DVM(LDO_4, "vinldo4", ldo4, LDO4V1, 0, 5, ENC, 3, | 247 | TPS6586X_DVM(LDO_4, "vinldo4", ldo4, LDO4V1, 0, 5, ENC, 3, |
| 248 | END, 3, VCC1, 6), | 248 | END, 3, VCC1, 6), |
| 249 | TPS6586X_DVM(SM_0, "sm0", dvm, SM0V1, 0, 5, ENA, 1, ENB, 1, VCC1, 2), | 249 | TPS6586X_DVM(SM_0, "vin-sm0", dvm, SM0V1, 0, 5, ENA, 1, |
| 250 | TPS6586X_DVM(SM_1, "sm1", dvm, SM1V1, 0, 5, ENA, 0, ENB, 0, VCC1, 0), | 250 | ENB, 1, VCC1, 2), |
| 251 | TPS6586X_DVM(SM_1, "vin-sm1", dvm, SM1V1, 0, 5, ENA, 0, | ||
| 252 | ENB, 0, VCC1, 0), | ||
| 251 | }; | 253 | }; |
| 252 | 254 | ||
| 253 | /* | 255 | /* |
