From: Simon Horman <horms+renesas@verge.net.au> To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm <magnus.damm@gmail.com>, Simon Horman <horms+renesas@verge.net.au> Subject: [PATCH 4/4] ARM: dts: r7s72100: sort subnodes of root node Date: Mon, 12 Feb 2018 15:39:30 +0100 [thread overview] Message-ID: <20180212143930.4763-5-horms+renesas@verge.net.au> (raw) In-Reply-To: <20180212143930.4763-1-horms+renesas@verge.net.au> Sort the subnodes of the soc node to improve maintainability. The sort has been done alphabetically with the node name as the key. This patch should not introduce any functional change. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r7s72100.dtsi | 78 +++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi index d69d4810e597..ecf9516bcda8 100644 --- a/arch/arm/boot/dts/r7s72100.dtsi +++ b/arch/arm/boot/dts/r7s72100.dtsi @@ -30,43 +30,45 @@ spi4 = &spi4; }; - /* External clocks */ - extal_clk: extal { + /* Fixed factor clocks */ + b_clk: b { #clock-cells = <0>; - compatible = "fixed-clock"; - /* If clk present, value must be set by board */ - clock-frequency = <0>; + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R7S72100_CLK_PLL>; + clock-mult = <1>; + clock-div = <3>; }; - usb_x1_clk: usb_x1 { - #clock-cells = <0>; - compatible = "fixed-clock"; - /* If clk present, value must be set by board */ - clock-frequency = <0>; - }; + cpus { + #address-cells = <1>; + #size-cells = <0>; - rtc_x1_clk: rtc_x1 { - #clock-cells = <0>; - compatible = "fixed-clock"; - /* If clk present, value must be set by board to 32678 */ - clock-frequency = <0>; + cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0>; + clock-frequency = <400000000>; + clocks = <&cpg_clocks R7S72100_CLK_I>; + next-level-cache = <&L2>; + }; }; - rtc_x3_clk: rtc_x3 { + /* External clocks */ + extal_clk: extal { #clock-cells = <0>; compatible = "fixed-clock"; - /* If clk present, value must be set by board to 4000000 */ + /* If clk present, value must be set by board */ clock-frequency = <0>; }; - /* Fixed factor clocks */ - b_clk: b { + p0_clk: p0 { #clock-cells = <0>; compatible = "fixed-factor-clock"; clocks = <&cpg_clocks R7S72100_CLK_PLL>; clock-mult = <1>; - clock-div = <3>; + clock-div = <12>; }; + p1_clk: p1 { #clock-cells = <0>; compatible = "fixed-factor-clock"; @@ -74,26 +76,19 @@ clock-mult = <1>; clock-div = <6>; }; - p0_clk: p0 { + + rtc_x1_clk: rtc_x1 { #clock-cells = <0>; - compatible = "fixed-factor-clock"; - clocks = <&cpg_clocks R7S72100_CLK_PLL>; - clock-mult = <1>; - clock-div = <12>; + compatible = "fixed-clock"; + /* If clk present, value must be set by board to 32678 */ + clock-frequency = <0>; }; - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu@0 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <0>; - clock-frequency = <400000000>; - clocks = <&cpg_clocks R7S72100_CLK_I>; - next-level-cache = <&L2>; - }; + rtc_x3_clk: rtc_x3 { + #clock-cells = <0>; + compatible = "fixed-clock"; + /* If clk present, value must be set by board to 4000000 */ + clock-frequency = <0>; }; soc { @@ -689,4 +684,11 @@ status = "disabled"; }; }; + + usb_x1_clk: usb_x1 { + #clock-cells = <0>; + compatible = "fixed-clock"; + /* If clk present, value must be set by board */ + clock-frequency = <0>; + }; }; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: horms+renesas@verge.net.au (Simon Horman) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] ARM: dts: r7s72100: sort subnodes of root node Date: Mon, 12 Feb 2018 15:39:30 +0100 [thread overview] Message-ID: <20180212143930.4763-5-horms+renesas@verge.net.au> (raw) In-Reply-To: <20180212143930.4763-1-horms+renesas@verge.net.au> Sort the subnodes of the soc node to improve maintainability. The sort has been done alphabetically with the node name as the key. This patch should not introduce any functional change. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r7s72100.dtsi | 78 +++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi index d69d4810e597..ecf9516bcda8 100644 --- a/arch/arm/boot/dts/r7s72100.dtsi +++ b/arch/arm/boot/dts/r7s72100.dtsi @@ -30,43 +30,45 @@ spi4 = &spi4; }; - /* External clocks */ - extal_clk: extal { + /* Fixed factor clocks */ + b_clk: b { #clock-cells = <0>; - compatible = "fixed-clock"; - /* If clk present, value must be set by board */ - clock-frequency = <0>; + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R7S72100_CLK_PLL>; + clock-mult = <1>; + clock-div = <3>; }; - usb_x1_clk: usb_x1 { - #clock-cells = <0>; - compatible = "fixed-clock"; - /* If clk present, value must be set by board */ - clock-frequency = <0>; - }; + cpus { + #address-cells = <1>; + #size-cells = <0>; - rtc_x1_clk: rtc_x1 { - #clock-cells = <0>; - compatible = "fixed-clock"; - /* If clk present, value must be set by board to 32678 */ - clock-frequency = <0>; + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0>; + clock-frequency = <400000000>; + clocks = <&cpg_clocks R7S72100_CLK_I>; + next-level-cache = <&L2>; + }; }; - rtc_x3_clk: rtc_x3 { + /* External clocks */ + extal_clk: extal { #clock-cells = <0>; compatible = "fixed-clock"; - /* If clk present, value must be set by board to 4000000 */ + /* If clk present, value must be set by board */ clock-frequency = <0>; }; - /* Fixed factor clocks */ - b_clk: b { + p0_clk: p0 { #clock-cells = <0>; compatible = "fixed-factor-clock"; clocks = <&cpg_clocks R7S72100_CLK_PLL>; clock-mult = <1>; - clock-div = <3>; + clock-div = <12>; }; + p1_clk: p1 { #clock-cells = <0>; compatible = "fixed-factor-clock"; @@ -74,26 +76,19 @@ clock-mult = <1>; clock-div = <6>; }; - p0_clk: p0 { + + rtc_x1_clk: rtc_x1 { #clock-cells = <0>; - compatible = "fixed-factor-clock"; - clocks = <&cpg_clocks R7S72100_CLK_PLL>; - clock-mult = <1>; - clock-div = <12>; + compatible = "fixed-clock"; + /* If clk present, value must be set by board to 32678 */ + clock-frequency = <0>; }; - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu at 0 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <0>; - clock-frequency = <400000000>; - clocks = <&cpg_clocks R7S72100_CLK_I>; - next-level-cache = <&L2>; - }; + rtc_x3_clk: rtc_x3 { + #clock-cells = <0>; + compatible = "fixed-clock"; + /* If clk present, value must be set by board to 4000000 */ + clock-frequency = <0>; }; soc { @@ -689,4 +684,11 @@ status = "disabled"; }; }; + + usb_x1_clk: usb_x1 { + #clock-cells = <0>; + compatible = "fixed-clock"; + /* If clk present, value must be set by board */ + clock-frequency = <0>; + }; }; -- 2.11.0
next prev parent reply other threads:[~2018-02-12 14:39 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-12 14:39 [PATCH 0/4] ARM: dts: r7s72100: add soc node Simon Horman 2018-02-12 14:39 ` Simon Horman 2018-02-12 14:39 ` [PATCH 1/4] " Simon Horman 2018-02-12 14:39 ` Simon Horman 2018-02-12 14:39 ` [PATCH 2/4] ARM: dts: r7s72100: sort subnodes of " Simon Horman 2018-02-12 14:39 ` Simon Horman 2018-02-12 14:39 ` [PATCH 3/4] ARM: dts: r7s72100: stop grouping clocks under a "clocks" subnode Simon Horman 2018-02-12 14:39 ` Simon Horman 2018-02-12 14:39 ` Simon Horman [this message] 2018-02-12 14:39 ` [PATCH 4/4] ARM: dts: r7s72100: sort subnodes of root node Simon Horman 2018-02-12 15:12 ` [PATCH 0/4] ARM: dts: r7s72100: add soc node Geert Uytterhoeven 2018-02-12 15:12 ` Geert Uytterhoeven 2018-02-13 7:44 ` Simon Horman 2018-02-13 7:44 ` Simon Horman
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=20180212143930.4763-5-horms+renesas@verge.net.au \ --to=horms+renesas@verge.net.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=magnus.damm@gmail.com \ /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.