| From 5a18f84cb57b88718dfb51ad779546593cd2b27b Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Wed, 17 Jan 2018 17:17:05 +0100 |
| Subject: [PATCH 1071/1795] ARM: dts: r8a7790: sort subnodes of root node |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Sort subnodes of root node to aid maintenance. |
| |
| This patch should not introduce any functional change. |
| |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Reviewed-by: Niklas Sรถderlund <niklas.soderlund+renesas@ragnatech.se> |
| Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| (cherry picked from commit 003d2d68b2a6fbf242506d4d579f3b5506224c88) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/arm/boot/dts/r8a7790.dtsi | 104 ++++++++++++++++----------------- |
| 1 file changed, 52 insertions(+), 52 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi |
| index 54c5a2d7ea89..3bbcc0b93f1c 100644 |
| --- a/arch/arm/boot/dts/r8a7790.dtsi |
| +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| @@ -40,6 +40,35 @@ |
| vin3 = &vin3; |
| }; |
| |
| + /* |
| + * The external audio clocks are configured as 0 Hz fixed frequency |
| + * clocks by default. |
| + * Boards that provide audio clocks should override them. |
| + */ |
| + audio_clk_a: audio_clk_a { |
| + compatible = "fixed-clock"; |
| + #clock-cells = <0>; |
| + clock-frequency = <0>; |
| + }; |
| + audio_clk_b: audio_clk_b { |
| + compatible = "fixed-clock"; |
| + #clock-cells = <0>; |
| + clock-frequency = <0>; |
| + }; |
| + audio_clk_c: audio_clk_c { |
| + compatible = "fixed-clock"; |
| + #clock-cells = <0>; |
| + clock-frequency = <0>; |
| + }; |
| + |
| + /* External CAN clock */ |
| + can_clk: can { |
| + compatible = "fixed-clock"; |
| + #clock-cells = <0>; |
| + /* This value must be overridden by the board. */ |
| + clock-frequency = <0>; |
| + }; |
| + |
| cpus { |
| #address-cells = <1>; |
| #size-cells = <0>; |
| @@ -158,6 +187,29 @@ |
| }; |
| }; |
| |
| + /* External root clock */ |
| + extal_clk: extal { |
| + compatible = "fixed-clock"; |
| + #clock-cells = <0>; |
| + /* This value must be overridden by the board. */ |
| + clock-frequency = <0>; |
| + }; |
| + |
| + /* External PCIe clock - can be overridden by the board */ |
| + pcie_bus_clk: pcie_bus { |
| + compatible = "fixed-clock"; |
| + #clock-cells = <0>; |
| + clock-frequency = <0>; |
| + }; |
| + |
| + /* External SCIF clock */ |
| + scif_clk: scif { |
| + compatible = "fixed-clock"; |
| + #clock-cells = <0>; |
| + /* This value must be overridden by the board. */ |
| + clock-frequency = <0>; |
| + }; |
| + |
| soc { |
| compatible = "simple-bus"; |
| interrupt-parent = <&gic>; |
| @@ -1678,62 +1730,10 @@ |
| <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; |
| }; |
| |
| - /* External root clock */ |
| - extal_clk: extal { |
| - compatible = "fixed-clock"; |
| - #clock-cells = <0>; |
| - /* This value must be overridden by the board. */ |
| - clock-frequency = <0>; |
| - }; |
| - |
| - /* External PCIe clock - can be overridden by the board */ |
| - pcie_bus_clk: pcie_bus { |
| - compatible = "fixed-clock"; |
| - #clock-cells = <0>; |
| - clock-frequency = <0>; |
| - }; |
| - |
| - /* |
| - * The external audio clocks are configured as 0 Hz fixed frequency |
| - * clocks by default. |
| - * Boards that provide audio clocks should override them. |
| - */ |
| - audio_clk_a: audio_clk_a { |
| - compatible = "fixed-clock"; |
| - #clock-cells = <0>; |
| - clock-frequency = <0>; |
| - }; |
| - audio_clk_b: audio_clk_b { |
| - compatible = "fixed-clock"; |
| - #clock-cells = <0>; |
| - clock-frequency = <0>; |
| - }; |
| - audio_clk_c: audio_clk_c { |
| - compatible = "fixed-clock"; |
| - #clock-cells = <0>; |
| - clock-frequency = <0>; |
| - }; |
| - |
| - /* External SCIF clock */ |
| - scif_clk: scif { |
| - compatible = "fixed-clock"; |
| - #clock-cells = <0>; |
| - /* This value must be overridden by the board. */ |
| - clock-frequency = <0>; |
| - }; |
| - |
| /* External USB clock - can be overridden by the board */ |
| usb_extal_clk: usb_extal { |
| compatible = "fixed-clock"; |
| #clock-cells = <0>; |
| clock-frequency = <48000000>; |
| }; |
| - |
| - /* External CAN clock */ |
| - can_clk: can { |
| - compatible = "fixed-clock"; |
| - #clock-cells = <0>; |
| - /* This value must be overridden by the board. */ |
| - clock-frequency = <0>; |
| - }; |
| }; |
| -- |
| 2.19.0 |
| |