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

ARM: dts: sti: ensure unique unit-address in stih410-clock

Move quadfs and a9-mux clocks nodes into clockgen nodes so
that they can get the reg property from the parent node and
ensure only one node has the address.

Signed-off-by: Alain Volmat <avolmat@me.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>

authored by

Alain Volmat and committed by
Patrice Chotard
97623670 97cdb331

+48 -52
+48 -52
arch/arm/boot/dts/stih410-clock.dtsi
··· 32 32 */ 33 33 clockgen-a9@92b0000 { 34 34 compatible = "st,clkgen-c32"; 35 - reg = <0x92b0000 0xffff>; 35 + reg = <0x92b0000 0x10000>; 36 36 37 37 clockgen_a9_pll: clockgen-a9-pll { 38 38 #clock-cells = <1>; ··· 40 40 41 41 clocks = <&clk_sysin>; 42 42 }; 43 - }; 44 43 45 - /* 46 - * ARM CPU related clocks. 47 - */ 48 - clk_m_a9: clk-m-a9@92b0000 { 49 - #clock-cells = <0>; 50 - compatible = "st,stih407-clkgen-a9-mux", "st,clkgen-mux"; 51 - reg = <0x92b0000 0x10000>; 52 - 53 - clocks = <&clockgen_a9_pll 0>, 54 - <&clockgen_a9_pll 0>, 55 - <&clk_s_c0_flexgen 13>, 56 - <&clk_m_a9_ext2f_div2>; 57 44 /* 58 - * ARM Peripheral clock for timers 45 + * ARM CPU related clocks. 59 46 */ 60 - arm_periph_clk: clk-m-a9-periphs { 47 + clk_m_a9: clk-m-a9 { 61 48 #clock-cells = <0>; 62 - compatible = "fixed-factor-clock"; 63 - clocks = <&clk_m_a9>; 64 - clock-div = <2>; 65 - clock-mult = <1>; 49 + compatible = "st,stih407-clkgen-a9-mux", "st,clkgen-mux"; 50 + 51 + clocks = <&clockgen_a9_pll 0>, 52 + <&clockgen_a9_pll 0>, 53 + <&clk_s_c0_flexgen 13>, 54 + <&clk_m_a9_ext2f_div2>; 55 + 56 + /* 57 + * ARM Peripheral clock for timers 58 + */ 59 + arm_periph_clk: clk-m-a9-periphs { 60 + #clock-cells = <0>; 61 + compatible = "fixed-factor-clock"; 62 + clocks = <&clk_m_a9>; 63 + clock-div = <2>; 64 + clock-mult = <1>; 65 + }; 66 66 }; 67 67 }; 68 68 ··· 87 87 }; 88 88 }; 89 89 90 - clk_s_c0_quadfs: clk-s-c0-quadfs@9103000 { 91 - #clock-cells = <1>; 92 - compatible = "st,quadfs-pll"; 93 - reg = <0x9103000 0x1000>; 94 - 95 - clocks = <&clk_sysin>; 96 - }; 97 - 98 90 clk_s_c0: clockgen-c@9103000 { 99 91 compatible = "st,clkgen-c32"; 100 92 reg = <0x9103000 0x1000>; ··· 101 109 clk_s_c0_pll1: clk-s-c0-pll1 { 102 110 #clock-cells = <1>; 103 111 compatible = "st,clkgen-pll1-c0"; 112 + 113 + clocks = <&clk_sysin>; 114 + }; 115 + 116 + clk_s_c0_quadfs: clk-s-c0-quadfs { 117 + #clock-cells = <1>; 118 + compatible = "st,quadfs-pll"; 104 119 105 120 clocks = <&clk_sysin>; 106 121 }; ··· 141 142 }; 142 143 }; 143 144 144 - clk_s_d0_quadfs: clk-s-d0-quadfs@9104000 { 145 - #clock-cells = <1>; 146 - compatible = "st,quadfs-d0"; 147 - reg = <0x9104000 0x1000>; 148 - 149 - clocks = <&clk_sysin>; 150 - }; 151 - 152 145 clockgen-d0@9104000 { 153 146 compatible = "st,clkgen-c32"; 154 147 reg = <0x9104000 0x1000>; 148 + 149 + clk_s_d0_quadfs: clk-s-d0-quadfs { 150 + #clock-cells = <1>; 151 + compatible = "st,quadfs-d0"; 152 + 153 + clocks = <&clk_sysin>; 154 + }; 155 155 156 156 clk_s_d0_flexgen: clk-s-d0-flexgen { 157 157 #clock-cells = <1>; ··· 164 166 }; 165 167 }; 166 168 167 - clk_s_d2_quadfs: clk-s-d2-quadfs@9106000 { 168 - #clock-cells = <1>; 169 - compatible = "st,quadfs-d2"; 170 - reg = <0x9106000 0x1000>; 171 - 172 - clocks = <&clk_sysin>; 173 - }; 174 - 175 169 clockgen-d2@9106000 { 176 170 compatible = "st,clkgen-c32"; 177 171 reg = <0x9106000 0x1000>; 172 + 173 + clk_s_d2_quadfs: clk-s-d2-quadfs { 174 + #clock-cells = <1>; 175 + compatible = "st,quadfs-d2"; 176 + 177 + clocks = <&clk_sysin>; 178 + }; 178 179 179 180 clk_s_d2_flexgen: clk-s-d2-flexgen { 180 181 #clock-cells = <1>; ··· 189 192 }; 190 193 }; 191 194 192 - clk_s_d3_quadfs: clk-s-d3-quadfs@9107000 { 193 - #clock-cells = <1>; 194 - compatible = "st,quadfs-d3"; 195 - reg = <0x9107000 0x1000>; 196 - 197 - clocks = <&clk_sysin>; 198 - }; 199 - 200 195 clockgen-d3@9107000 { 201 196 compatible = "st,clkgen-c32"; 202 197 reg = <0x9107000 0x1000>; 198 + 199 + clk_s_d3_quadfs: clk-s-d3-quadfs { 200 + #clock-cells = <1>; 201 + compatible = "st,quadfs-d3"; 202 + 203 + clocks = <&clk_sysin>; 204 + }; 203 205 204 206 clk_s_d3_flexgen: clk-s-d3-flexgen { 205 207 #clock-cells = <1>;