Skip to content

Commit

Permalink
drivers/rtc/rtc-hym8563.c: add optional clock-output-names property
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mmind authored and torvalds committed Jun 6, 2014
1 parent 778575f commit 68164a7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions drivers/rtc/rtc-hym8563.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 68164a7

Please sign in to comment.