diff options
author | Johan Hovold <jhovold@gmail.com> | 2012-06-28 06:20:22 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-08 18:16:14 -0400 |
commit | bcc1dd4cd77ec168894ea325b4e89b15a8b5b4f6 (patch) | |
tree | d34b4a8a4096bad51c22e2170a2090f5cc65cb8e | |
parent | 712db99df155eeef7bbab8677d8a02d0eff50d11 (diff) |
mfd: Add device-tree entry to enable tps65910 external 32-kHz oscillator
Add device-tree entry to enable external 32-kHz crystal oscillator
input.
Compile-only tested.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | Documentation/devicetree/bindings/mfd/tps65910.txt | 4 | ||||
-rw-r--r-- | drivers/mfd/tps65910.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/tps65910.txt b/Documentation/devicetree/bindings/mfd/tps65910.txt index 645f5eaadb3f..0f5d9b74f4b9 100644 --- a/Documentation/devicetree/bindings/mfd/tps65910.txt +++ b/Documentation/devicetree/bindings/mfd/tps65910.txt | |||
@@ -29,6 +29,8 @@ Optional properties: | |||
29 | comparator. (see VMBCH_VSEL in TPS65910 datasheet) | 29 | comparator. (see VMBCH_VSEL in TPS65910 datasheet) |
30 | - ti,vmbch2-threshold: (tps65911) main battery discharged threshold | 30 | - ti,vmbch2-threshold: (tps65911) main battery discharged threshold |
31 | comparator. (see VMBCH_VSEL in TPS65910 datasheet) | 31 | comparator. (see VMBCH_VSEL in TPS65910 datasheet) |
32 | - ti,en-ck32k-xtal: enable external 32-kHz crystal oscillator (see CK32K_CTRL | ||
33 | in TPS6591X datasheet) | ||
32 | - ti,en-gpio-sleep: enable sleep control for gpios | 34 | - ti,en-gpio-sleep: enable sleep control for gpios |
33 | There should be 9 entries here, one for each gpio. | 35 | There should be 9 entries here, one for each gpio. |
34 | 36 | ||
@@ -53,7 +55,7 @@ Example: | |||
53 | 55 | ||
54 | ti,vmbch-threshold = 0; | 56 | ti,vmbch-threshold = 0; |
55 | ti,vmbch2-threshold = 0; | 57 | ti,vmbch2-threshold = 0; |
56 | 58 | ti,en-ck32k-xtal; | |
57 | ti,en-gpio-sleep = <0 0 1 0 0 0 0 0 0>; | 59 | ti,en-gpio-sleep = <0 0 1 0 0 0 0 0 0>; |
58 | 60 | ||
59 | regulators { | 61 | regulators { |
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index b0526b7d6550..3f27ea1f1ba6 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c | |||
@@ -194,6 +194,9 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, | |||
194 | else if (*chip_id == TPS65911) | 194 | else if (*chip_id == TPS65911) |
195 | dev_warn(&client->dev, "VMBCH2-Threshold not specified"); | 195 | dev_warn(&client->dev, "VMBCH2-Threshold not specified"); |
196 | 196 | ||
197 | prop = of_property_read_bool(np, "ti,en-ck32k-xtal"); | ||
198 | board_info->en_ck32k_xtal = prop; | ||
199 | |||
197 | board_info->irq = client->irq; | 200 | board_info->irq = client->irq; |
198 | board_info->irq_base = -1; | 201 | board_info->irq_base = -1; |
199 | 202 | ||