Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx: drop 'clocks' container for board level clocks

For soc level of clocks which are input to Clock Control Module, clock
driver expects them to be under 'clocks' container node. But for board
level clocks, this container is not really necessary. Let's drop it and
use an unique name for fixed rate clock, so that 'reg' property can be
saved as well.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Acked-By: Lothar Waßmann <LW@KARO-electronics.de>

+19 -31
+4 -9
arch/arm/boot/dts/imx28-tx28.dts
··· 140 140 regulator-boot-on; 141 141 }; 142 142 143 - clocks { 144 - #address-cells = <1>; 145 - #size-cells = <0>; 146 - mclk: clock@0 { 147 - compatible = "fixed-clock"; 148 - reg = <0>; 149 - #clock-cells = <0>; 150 - clock-frequency = <26000000>; 151 - }; 143 + mclk: clock-mclk { 144 + compatible = "fixed-clock"; 145 + #clock-cells = <0>; 146 + clock-frequency = <26000000>; 152 147 }; 153 148 154 149 sound {
+5 -6
arch/arm/boot/dts/imx53-tx53.dtsi
··· 67 67 ckih1 { 68 68 clock-frequency = <0>; 69 69 }; 70 + }; 70 71 71 - mclk: clock@0 { 72 - compatible = "fixed-clock"; 73 - reg = <0>; 74 - #clock-cells = <0>; 75 - clock-frequency = <26000000>; 76 - }; 72 + mclk: clock-mclk { 73 + compatible = "fixed-clock"; 74 + #clock-cells = <0>; 75 + clock-frequency = <26000000>; 77 76 }; 78 77 79 78 gpio-keys {
+6 -9
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
··· 72 72 stdout-path = "serial0:115200n8"; 73 73 }; 74 74 75 - clocks { 76 - /* Fixed crystal dedicated to mcp251x */ 77 - clk16m: clk@1 { 78 - compatible = "fixed-clock"; 79 - reg = <1>; 80 - #clock-cells = <0>; 81 - clock-frequency = <16000000>; 82 - clock-output-names = "clk16m"; 83 - }; 75 + /* Fixed crystal dedicated to mcp251x */ 76 + clk16m: clock-16m { 77 + compatible = "fixed-clock"; 78 + #clock-cells = <0>; 79 + clock-frequency = <16000000>; 80 + clock-output-names = "clk16m"; 84 81 }; 85 82 86 83 gpio-keys {
+4 -7
arch/arm/boot/dts/imx6q-bx50v3.dtsi
··· 43 43 #include "imx6q-ba16.dtsi" 44 44 45 45 / { 46 - clocks { 47 - mclk: clock@0 { 48 - compatible = "fixed-clock"; 49 - reg = <0>; 50 - #clock-cells = <0>; 51 - clock-frequency = <22000000>; 52 - }; 46 + mclk: clock-mclk { 47 + compatible = "fixed-clock"; 48 + #clock-cells = <0>; 49 + clock-frequency = <22000000>; 53 50 }; 54 51 55 52 gpio-poweroff {