projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| d006af40 AF |
1 | From ffdb3fad79cf70dcc943764f075215d6525435be Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Nelson <robertcnelson@gmail.com> | |
| 3 | Date: Sat, 1 Jun 2013 16:32:54 -0500 | |
| 4 | Subject: [PATCH 10/10] Revert "regulator: twl: Remove references to 32kHz | |
| 5 | clock from DT bindings" | |
| 6 | ||
| 7 | This reverts commit 0e8e5c34cf1a8beaaf0a6a05c053592693bf8cb4. | |
| 8 | ||
| 9 | Signed-off-by: Robert Nelson <robertcnelson@gmail.com> | |
| 10 | --- | |
| 11 | Documentation/devicetree/bindings/regulator/twl-regulator.txt | 1 + | |
| 12 | drivers/regulator/twl-regulator.c | 2 ++ | |
| 13 | 2 files changed, 3 insertions(+) | |
| 14 | ||
| 15 | diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/Documentation/devicetree/bindings/regulator/twl-regulator.txt | |
| 16 | index 658749b..0c3395d 100644 | |
| 17 | --- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt | |
| 18 | +++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt | |
| 19 | @@ -15,6 +15,7 @@ For twl6030 regulators/LDOs | |
| 20 | - "ti,twl6030-vusb" for VUSB LDO | |
| 21 | - "ti,twl6030-v1v8" for V1V8 LDO | |
| 22 | - "ti,twl6030-v2v1" for V2V1 LDO | |
| 23 | + - "ti,twl6030-clk32kg" for CLK32KG RESOURCE | |
| 24 | - "ti,twl6030-vdd1" for VDD1 SMPS | |
| 25 | - "ti,twl6030-vdd2" for VDD2 SMPS | |
| 26 | - "ti,twl6030-vdd3" for VDD3 SMPS | |
| 27 | diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c | |
| 28 | index 5a18317..40f27bb 100644 | |
| 29 | --- a/drivers/regulator/twl-regulator.c | |
| 30 | +++ b/drivers/regulator/twl-regulator.c | |
| 31 | @@ -1054,6 +1054,7 @@ static u8 twl_get_smps_mult(void) | |
| 32 | #define TWL6030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6030, label) | |
| 33 | #define TWL6025_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6025, label) | |
| 34 | #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label) | |
| 35 | +#define TWLRES_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLRES, label) | |
| 36 | #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label) | |
| 37 | ||
| 38 | static const struct of_device_id twl_of_match[] = { | |
| 39 | @@ -1101,6 +1102,7 @@ static const struct of_device_id twl_of_match[] = { | |
| 40 | TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB), | |
| 41 | TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8), | |
| 42 | TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1), | |
| 43 | + TWLRES_OF_MATCH("ti,twl6030-clk32kg", CLK32KG), | |
| 44 | TWLSMPS_OF_MATCH("ti,twl6025-smps3", SMPS3), | |
| 45 | TWLSMPS_OF_MATCH("ti,twl6025-smps4", SMPS4), | |
| 46 | TWLSMPS_OF_MATCH("ti,twl6025-vio", VIO), | |
| 47 | -- | |
| 48 | 1.7.10.4 | |
| 49 |