summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-06-28 12:20:22 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 00:16:14 +0200
commitbcc1dd4cd77ec168894ea325b4e89b15a8b5b4f6 (patch)
treed34b4a8a4096bad51c22e2170a2090f5cc65cb8e
parent712db99df155eeef7bbab8677d8a02d0eff50d11 (diff)
downloadlinux-stable-bcc1dd4cd77ec168894ea325b4e89b15a8b5b4f6.tar.gz
linux-stable-bcc1dd4cd77ec168894ea325b4e89b15a8b5b4f6.tar.bz2
linux-stable-bcc1dd4cd77ec168894ea325b4e89b15a8b5b4f6.zip
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.txt4
-rw-r--r--drivers/mfd/tps65910.c3
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:
comparator. (see VMBCH_VSEL in TPS65910 datasheet)
- ti,vmbch2-threshold: (tps65911) main battery discharged threshold
comparator. (see VMBCH_VSEL in TPS65910 datasheet)
+- ti,en-ck32k-xtal: enable external 32-kHz crystal oscillator (see CK32K_CTRL
+ in TPS6591X datasheet)
- ti,en-gpio-sleep: enable sleep control for gpios
There should be 9 entries here, one for each gpio.
@@ -53,7 +55,7 @@ Example:
ti,vmbch-threshold = 0;
ti,vmbch2-threshold = 0;
-
+ ti,en-ck32k-xtal;
ti,en-gpio-sleep = <0 0 1 0 0 0 0 0 0>;
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,
else if (*chip_id == TPS65911)
dev_warn(&client->dev, "VMBCH2-Threshold not specified");
+ prop = of_property_read_bool(np, "ti,en-ck32k-xtal");
+ board_info->en_ck32k_xtal = prop;
+
board_info->irq = client->irq;
board_info->irq_base = -1;