diff options
Diffstat (limited to 'patches/0304-ARM-dts-r8a7793-Stop-grouping-clocks-under-a-clocks-.patch')
| -rw-r--r-- | patches/0304-ARM-dts-r8a7793-Stop-grouping-clocks-under-a-clocks-.patch | 157 |
1 files changed, 157 insertions, 0 deletions
diff --git a/patches/0304-ARM-dts-r8a7793-Stop-grouping-clocks-under-a-clocks-.patch b/patches/0304-ARM-dts-r8a7793-Stop-grouping-clocks-under-a-clocks-.patch new file mode 100644 index 00000000000000..a0b01a30d58291 --- /dev/null +++ b/patches/0304-ARM-dts-r8a7793-Stop-grouping-clocks-under-a-clocks-.patch @@ -0,0 +1,157 @@ +From 33ad27d7d8b0b7937d1a9d36e0c6c5862771aadf Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven <geert+renesas@glider.be> +Date: Fri, 18 Aug 2017 11:16:56 +0200 +Subject: [PATCH 0304/1795] ARM: dts: r8a7793: Stop grouping clocks under a + "clocks" subnode + +The current practice is to not group clocks under a "clocks" subnode, +but just put them together with the other on-SoC devices. + +Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> +Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +(cherry picked from commit c67e243ccf06aec0fece59b8a1f3eb719e07b0e3) +Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> +--- + arch/arm/boot/dts/r8a7793.dtsi | 125 ++++++++++++++++----------------- + 1 file changed, 60 insertions(+), 65 deletions(-) + +diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi +index ef8009c01e66..d48b97c853cd 100644 +--- a/arch/arm/boot/dts/r8a7793.dtsi ++++ b/arch/arm/boot/dts/r8a7793.dtsi +@@ -972,71 +972,66 @@ + status = "disabled"; + }; + +- clocks { +- #address-cells = <2>; +- #size-cells = <2>; +- ranges; +- +- /* External root clock */ +- extal_clk: extal { +- compatible = "fixed-clock"; +- #clock-cells = <0>; +- /* This value must be overridden by the board. */ +- 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 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>; +- }; +- +- /* External SCIF clock */ +- scif_clk: scif { +- compatible = "fixed-clock"; +- #clock-cells = <0>; +- /* This value must be overridden by the board. */ +- clock-frequency = <0>; +- }; +- +- /* Special CPG clocks */ +- cpg: clock-controller@e6150000 { +- compatible = "renesas,r8a7793-cpg-mssr"; +- reg = <0 0xe6150000 0 0x1000>; +- clocks = <&extal_clk>, <&usb_extal_clk>; +- clock-names = "extal", "usb_extal"; +- #clock-cells = <2>; +- #power-domain-cells = <0>; +- }; ++ /* External root clock */ ++ extal_clk: extal { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ /* This value must be overridden by the board. */ ++ 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 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>; ++ }; ++ ++ /* External SCIF clock */ ++ scif_clk: scif { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ /* This value must be overridden by the board. */ ++ clock-frequency = <0>; ++ }; ++ ++ /* Special CPG clocks */ ++ cpg: clock-controller@e6150000 { ++ compatible = "renesas,r8a7793-cpg-mssr"; ++ reg = <0 0xe6150000 0 0x1000>; ++ clocks = <&extal_clk>, <&usb_extal_clk>; ++ clock-names = "extal", "usb_extal"; ++ #clock-cells = <2>; ++ #power-domain-cells = <0>; + }; + + rst: reset-controller@e6160000 { +-- +2.19.0 + |