diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2014-06-06 14:36:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 16:08:08 -0700 |
| commit | 68164a73b1055191975419f5da7180294902f461 (patch) | |
| tree | 5c080ffacc06ca6fffaa1f0f9b8b574c9ea1ece6 | |
| parent | 778575ff30294adea9fc1d935dc1364e25f8f138 (diff) | |
| download | linux-stable-68164a73b1055191975419f5da7180294902f461.tar.gz linux-stable-68164a73b1055191975419f5da7180294902f461.tar.bz2 linux-stable-68164a73b1055191975419f5da7180294902f461.zip | |
drivers/rtc/rtc-hym8563.c: add optional clock-output-names property
This enables the setting of a custom clock name for the clock provided by
the hym8563 rtc.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt | 3 | ||||
| -rw-r--r-- | drivers/rtc/rtc-hym8563.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt b/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt index 31406fd4a43e..5c199ee044cb 100644 --- a/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt +++ b/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt @@ -9,6 +9,9 @@ Required properties: - interrupts: rtc alarm/event interrupt - #clock-cells: the value should be 0 +Optional properties: +- clock-output-names: From common clock binding + Example: hym8563: hym8563@51 { diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c index e3290abbb03e..b936bb4096b5 100644 --- a/drivers/rtc/rtc-hym8563.c +++ b/drivers/rtc/rtc-hym8563.c @@ -418,6 +418,9 @@ static struct clk *hym8563_clkout_register_clk(struct hym8563 *hym8563) init.num_parents = 0; hym8563->clkout_hw.init = &init; + /* optional override of the clockname */ + of_property_read_string(node, "clock-output-names", &init.name); + /* register the clock */ clk = clk_register(&client->dev, &hym8563->clkout_hw); |