ARM: dts: Group omap3 CONTROL_DEVCONF1 clocks

The clksel related registers on omap3 cause unique_unit_address and
node_name_chars_strict warnings with the W=1 or W=2 make flags enabled.

With the clock drivers updated, we can now avoid most of these warnings
by grouping the TI component clocks using the TI clksel binding, and
with the use of clock-output-names property to avoid non-standard node
names for the clocks.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap3xxx-clocks.dtsi b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
index b40832103dd6b83e4b7a82754c8bba4332fc3f2b..7518fd57f9dccaf77828845d6ae4fd0de6a43f33 100644 (file)
--- a/arch/arm/boot/dts/omap3xxx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
@@ -78,12 +78,35 @@
 };
 
 &scm_clocks {
-       mcbsp5_mux_fck: mcbsp5_mux_fck@68 {
-               #clock-cells = <0>;
-               compatible = "ti,composite-mux-clock";
-               clocks = <&core_96m_fck>, <&mcbsp_clks>;
-               ti,bit-shift = <4>;
+       /* CONTROL_DEVCONF1 */
+       clock@68 {
+               compatible = "ti,clksel";
                reg = <0x68>;
+               #clock-cells = <2>;
+               #address-cells = <0>;
+
+               mcbsp5_mux_fck: clock-mcbsp5-mux-fck {
+                       #clock-cells = <0>;
+                       compatible = "ti,composite-mux-clock";
+                       clock-output-names = "mcbsp5_mux_fck";
+                       clocks = <&core_96m_fck>, <&mcbsp_clks>;
+                       ti,bit-shift = <4>;
+               };
+
+               mcbsp3_mux_fck: clock-mcbsp3-mux-fck {
+                       #clock-cells = <0>;
+                       compatible = "ti,composite-mux-clock";
+                       clock-output-names = "mcbsp3_mux_fck";
+                       clocks = <&per_96m_fck>, <&mcbsp_clks>;
+               };
+
+               mcbsp4_mux_fck: clock-mcbsp4-mux-fck {
+                       #clock-cells = <0>;
+                       compatible = "ti,composite-mux-clock";
+                       clock-output-names = "mcbsp4_mux_fck";
+                       clocks = <&per_96m_fck>, <&mcbsp_clks>;
+                       ti,bit-shift = <2>;
+               };
        };
 
        mcbsp5_fck: mcbsp5_fck {
@@ -128,27 +151,12 @@
                clocks = <&mcbsp2_gate_fck>, <&mcbsp2_mux_fck>;
        };
 
-       mcbsp3_mux_fck: mcbsp3_mux_fck@68 {
-               #clock-cells = <0>;
-               compatible = "ti,composite-mux-clock";
-               clocks = <&per_96m_fck>, <&mcbsp_clks>;
-               reg = <0x68>;
-       };
-
        mcbsp3_fck: mcbsp3_fck {
                #clock-cells = <0>;
                compatible = "ti,composite-clock";
                clocks = <&mcbsp3_gate_fck>, <&mcbsp3_mux_fck>;
        };
 
-       mcbsp4_mux_fck: mcbsp4_mux_fck@68 {
-               #clock-cells = <0>;
-               compatible = "ti,composite-mux-clock";
-               clocks = <&per_96m_fck>, <&mcbsp_clks>;
-               ti,bit-shift = <2>;
-               reg = <0x68>;
-       };
-
        mcbsp4_fck: mcbsp4_fck {
                #clock-cells = <0>;
                compatible = "ti,composite-clock";