ARM: dts: Group omap3 CM_ICLKEN3_CORE 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/omap34xx-omap36xx-clocks.dtsi b/arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
index eca6b25..b6316be 100644 (file)
--- a/arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
@@ -231,12 +231,21 @@
                        ti,bit-shift = <23>;
                };
        };
-       mad2d_ick: mad2d_ick@a18 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&l3_ick>;
-               reg = <0x0a18>;
-               ti,bit-shift = <3>;
+
+       /* CM_ICLKEN3_CORE */
+       clock@a18 {
+               compatible = "ti,clksel";
+               reg = <0xa18>;
+               #clock-cells = <2>;
+               #address-cells = <0>;
+
+               mad2d_ick: clock-mad2d-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "mad2d_ick";
+                       clocks = <&l3_ick>;
+                       ti,bit-shift = <3>;
+               };
        };
 
 };

diff --git a/arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi b/arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
index f8583bb..1c41530 100644 (file)
--- a/arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
+++ b/arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
@@ -133,12 +133,20 @@
                ti,bit-shift = <2>;
        };
 
-       usbtll_ick: usbtll_ick@a18 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&core_l4_ick>;
-               reg = <0x0a18>;
-               ti,bit-shift = <2>;
+       /* CM_ICLKEN3_CORE */
+       clock@a18 {
+               compatible = "ti,clksel";
+               reg = <0xa18>;
+               #clock-cells = <2>;
+               #address-cells = <0>;
+
+               usbtll_ick: clock-usbtll-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "usbtll_ick";
+                       clocks = <&core_l4_ick>;
+                       ti,bit-shift = <2>;
+               };
        };
 
        clock@a10 {