From: Geert Uytterhoeven <geert+renesas@glider.be> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Magnus Damm <damm+renesas@opensource.se>, Simon Horman <horms+renesas@verge.net.au>, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: linux-clk@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v6 2/5] clk: shmobile: div6: Make clock-output-names optional Date: Thu, 12 Nov 2015 15:54:43 +0000 [thread overview] Message-ID: <1447343686-2038-3-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1447343686-2038-1-git-send-email-geert+renesas@glider.be> Renesas DIV6 clocks provide a single clock output. Hence make the "clock-output-names" DT property optional instead of mandatory. In case the DT property is omitted the DT node name will be used. Rename the variable "name" to "clk_name" to make the code more similar with fixed-factor-clock.c, and to avoid a conflict with a nested local variable while we're at it. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v6: - No changes, v5: - Integrated in this series as a contextual dependency. --- .../devicetree/bindings/clock/renesas,cpg-div6-clocks.txt | 4 ++++ drivers/clk/shmobile/clk-div6.c | 13 +++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt index 38dcf03701430e60..ae36ab84291988b7 100644 --- a/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt @@ -20,6 +20,10 @@ Required Properties: clocks must be specified. For clocks with multiple parents, invalid settings must be specified as "<0>". - #clock-cells: Must be 0 + + +Optional Properties: + - clock-output-names: The name of the clock as a free-form string diff --git a/drivers/clk/shmobile/clk-div6.c b/drivers/clk/shmobile/clk-div6.c index b4c8d6746f68a7b8..57016ff9c585fc6e 100644 --- a/drivers/clk/shmobile/clk-div6.c +++ b/drivers/clk/shmobile/clk-div6.c @@ -178,10 +178,9 @@ static void __init cpg_div6_clock_init(struct device_node *np) const char **parent_names; struct clk_init_data init; struct div6_clock *clock; - const char *name; + const char *clk_name = np->name; struct clk *clk; unsigned int i; - int ret; clock = kzalloc(sizeof(*clock), GFP_KERNEL); if (!clock) @@ -215,13 +214,7 @@ static void __init cpg_div6_clock_init(struct device_node *np) clock->div = (clk_readl(clock->reg) & CPG_DIV6_DIV_MASK) + 1; /* Parse the DT properties. */ - ret = of_property_read_string(np, "clock-output-names", &name); - if (ret < 0) { - pr_err("%s: failed to get %s DIV6 clock output name\n", - __func__, np->name); - goto error; - } - + of_property_read_string(np, "clock-output-names", &clk_name); for (i = 0, valid_parents = 0; i < num_parents; i++) { const char *name = of_clk_get_parent_name(np, i); @@ -255,7 +248,7 @@ static void __init cpg_div6_clock_init(struct device_node *np) } /* Register the clock. */ - init.name = name; + init.name = clk_name; init.ops = &cpg_div6_clock_ops; init.flags = CLK_IS_BASIC; init.parent_names = parent_names; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Magnus Damm <damm+renesas@opensource.se>, Simon Horman <horms+renesas@verge.net.au>, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: linux-clk@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v6 2/5] clk: shmobile: div6: Make clock-output-names optional Date: Thu, 12 Nov 2015 16:54:43 +0100 [thread overview] Message-ID: <1447343686-2038-3-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1447343686-2038-1-git-send-email-geert+renesas@glider.be> Renesas DIV6 clocks provide a single clock output. Hence make the "clock-output-names" DT property optional instead of mandatory. In case the DT property is omitted the DT node name will be used. Rename the variable "name" to "clk_name" to make the code more similar with fixed-factor-clock.c, and to avoid a conflict with a nested local variable while we're at it. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v6: - No changes, v5: - Integrated in this series as a contextual dependency. --- .../devicetree/bindings/clock/renesas,cpg-div6-clocks.txt | 4 ++++ drivers/clk/shmobile/clk-div6.c | 13 +++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt index 38dcf03701430e60..ae36ab84291988b7 100644 --- a/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt @@ -20,6 +20,10 @@ Required Properties: clocks must be specified. For clocks with multiple parents, invalid settings must be specified as "<0>". - #clock-cells: Must be 0 + + +Optional Properties: + - clock-output-names: The name of the clock as a free-form string diff --git a/drivers/clk/shmobile/clk-div6.c b/drivers/clk/shmobile/clk-div6.c index b4c8d6746f68a7b8..57016ff9c585fc6e 100644 --- a/drivers/clk/shmobile/clk-div6.c +++ b/drivers/clk/shmobile/clk-div6.c @@ -178,10 +178,9 @@ static void __init cpg_div6_clock_init(struct device_node *np) const char **parent_names; struct clk_init_data init; struct div6_clock *clock; - const char *name; + const char *clk_name = np->name; struct clk *clk; unsigned int i; - int ret; clock = kzalloc(sizeof(*clock), GFP_KERNEL); if (!clock) @@ -215,13 +214,7 @@ static void __init cpg_div6_clock_init(struct device_node *np) clock->div = (clk_readl(clock->reg) & CPG_DIV6_DIV_MASK) + 1; /* Parse the DT properties. */ - ret = of_property_read_string(np, "clock-output-names", &name); - if (ret < 0) { - pr_err("%s: failed to get %s DIV6 clock output name\n", - __func__, np->name); - goto error; - } - + of_property_read_string(np, "clock-output-names", &clk_name); for (i = 0, valid_parents = 0; i < num_parents; i++) { const char *name = of_clk_get_parent_name(np, i); @@ -255,7 +248,7 @@ static void __init cpg_div6_clock_init(struct device_node *np) } /* Register the clock. */ - init.name = name; + init.name = clk_name; init.ops = &cpg_div6_clock_ops; init.flags = CLK_IS_BASIC; init.parent_names = parent_names; -- 1.9.1
next prev parent reply other threads:[~2015-11-12 15:54 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-12 15:54 [PATCH v6 0/5] clk: shmobile: Add new CPG/MSSR driver Geert Uytterhoeven 2015-11-12 15:54 ` Geert Uytterhoeven 2015-11-12 15:54 ` [PATCH v6 1/5] clk: shmobile: Rework CONFIG_ARCH_SHMOBILE_MULTI Geert Uytterhoeven 2015-11-12 15:54 ` Geert Uytterhoeven 2015-11-12 15:54 ` Geert Uytterhoeven [this message] 2015-11-12 15:54 ` [PATCH v6 2/5] clk: shmobile: div6: Make clock-output-names optional Geert Uytterhoeven 2015-11-12 15:54 ` [PATCH v6 3/5] clk: shmobile: div6: Extract cpg_div6_register() Geert Uytterhoeven 2015-11-12 15:54 ` Geert Uytterhoeven 2015-11-12 15:54 ` [PATCH v6 4/5] clk: shmobile: Add new CPG/MSSR driver core Geert Uytterhoeven 2015-11-12 15:54 ` Geert Uytterhoeven 2015-12-05 3:08 ` Laurent Pinchart 2015-12-05 3:08 ` Laurent Pinchart 2015-12-08 9:38 ` Geert Uytterhoeven 2015-12-08 9:38 ` Geert Uytterhoeven 2015-11-12 15:54 ` [PATCH v6 5/5] clk: shmobile: r8a7795: Add new CPG/MSSR driver Geert Uytterhoeven 2015-11-12 15:54 ` Geert Uytterhoeven 2017-10-25 6:12 ` clk: r8a7795: Why to read EXTAL* from DT? (was: Re: [PATCH v6 5/5] clk: shmobile: r8a7795: Add new CPG/MSSR driver) Dirk Behme 2017-10-25 10:27 ` Geert Uytterhoeven 2015-12-04 9:04 ` [PATCH v6 0/5] clk: shmobile: Add new CPG/MSSR driver Geert Uytterhoeven 2015-12-04 9:04 ` Geert Uytterhoeven
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1447343686-2038-3-git-send-email-geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=damm+renesas@opensource.se \ --cc=horms+renesas@verge.net.au \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=mturquette@baylibre.com \ --cc=sboyd@codeaurora.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.