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

ARM: dts: fix omap3 dss clock handle names

The DSS fclk and iclk handles are named differently on OMAP3430 ES1 than
on later OMAP revisions. The ES1 has handles 'dss1_alwon_fck_3430es1'
and 'dss_ick_3430es1', whereas later revisions have similar names but
ending with 'es2'.

This means we don't have one clock handle to which we could refer to
when defining the DSS clocks.

However, as the namespaces are separate for ES1 and ES2+ OMAPs, we can
just rename the handles to 'dss1_alwon_fck' and 'dss_ick' for both ES1
and ES2+, removing the issue.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>

+6 -6
+3 -3
arch/arm/boot/dts/omap3430es1-clocks.dtsi
··· 152 152 clocks = <&usb_l4_gate_ick>, <&usb_l4_div_ick>; 153 153 }; 154 154 155 - dss1_alwon_fck_3430es1: dss1_alwon_fck_3430es1 { 155 + dss1_alwon_fck: dss1_alwon_fck_3430es1 { 156 156 #clock-cells = <0>; 157 157 compatible = "ti,gate-clock"; 158 158 clocks = <&dpll4_m4x2_ck>; ··· 161 161 ti,set-rate-parent; 162 162 }; 163 163 164 - dss_ick_3430es1: dss_ick_3430es1 { 164 + dss_ick: dss_ick_3430es1 { 165 165 #clock-cells = <0>; 166 166 compatible = "ti,omap3-no-wait-interface-clock"; 167 167 clocks = <&l4_ick>; ··· 184 184 dss_clkdm: dss_clkdm { 185 185 compatible = "ti,clockdomain"; 186 186 clocks = <&dss_tv_fck>, <&dss_96m_fck>, <&dss2_alwon_fck>, 187 - <&dss1_alwon_fck_3430es1>, <&dss_ick_3430es1>; 187 + <&dss1_alwon_fck>, <&dss_ick>; 188 188 }; 189 189 190 190 d2d_clkdm: d2d_clkdm {
+3 -3
arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
··· 160 160 ti,bit-shift = <30>; 161 161 }; 162 162 163 - dss1_alwon_fck_3430es2: dss1_alwon_fck_3430es2 { 163 + dss1_alwon_fck: dss1_alwon_fck_3430es2 { 164 164 #clock-cells = <0>; 165 165 compatible = "ti,dss-gate-clock"; 166 166 clocks = <&dpll4_m4x2_ck>; ··· 169 169 ti,set-rate-parent; 170 170 }; 171 171 172 - dss_ick_3430es2: dss_ick_3430es2 { 172 + dss_ick: dss_ick_3430es2 { 173 173 #clock-cells = <0>; 174 174 compatible = "ti,omap3-dss-interface-clock"; 175 175 clocks = <&l4_ick>; ··· 216 216 dss_clkdm: dss_clkdm { 217 217 compatible = "ti,clockdomain"; 218 218 clocks = <&dss_tv_fck>, <&dss_96m_fck>, <&dss2_alwon_fck>, 219 - <&dss1_alwon_fck_3430es2>, <&dss_ick_3430es2>; 219 + <&dss1_alwon_fck>, <&dss_ick>; 220 220 }; 221 221 222 222 core_l4_clkdm: core_l4_clkdm {