ARM: dts: Group omap3 CM_ICLKEN_WKUP 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/omap36xx-omap3430es2plus-clocks.dtsi b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
index 7c25739..b177eeb 100644 (file)
--- a/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
+++ b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
@@ -183,12 +183,19 @@
                clocks = <&usim_gate_fck>, <&usim_mux_fck>;
        };
 
-       usim_ick: usim_ick@c10 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&wkup_l4_ick>;
-               reg = <0x0c10>;
-               ti,bit-shift = <9>;
+       clock@c10 {
+               compatible = "ti,clksel";
+               reg = <0xc10>;
+               #clock-cells = <2>;
+               #address-cells = <0>;
+
+               usim_ick: clock-usim-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "usim_ick";
+                       clocks = <&wkup_l4_ick>;
+                       ti,bit-shift = <9>;
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/omap3xxx-clocks.dtsi b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
index 2cb77eb..5d8fff6 100644 (file)
--- a/arch/arm/boot/dts/omap3xxx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
@@ -1074,52 +1074,60 @@
                clock-div = <1>;
        };
 
-       wdt2_ick: wdt2_ick@c10 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&wkup_l4_ick>;
-               reg = <0x0c10>;
-               ti,bit-shift = <5>;
-       };
+       /* CM_ICLKEN_WKUP */
+       clock@c10 {
+               compatible = "ti,clksel";
+               reg = <0xc10>;
+               #clock-cells = <2>;
+               #address-cells = <0>;
 
-       wdt1_ick: wdt1_ick@c10 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&wkup_l4_ick>;
-               reg = <0x0c10>;
-               ti,bit-shift = <4>;
-       };
+               wdt2_ick: clock-wdt2-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "wdt2_ick";
+                       clocks = <&wkup_l4_ick>;
+                       ti,bit-shift = <5>;
+               };
 
-       gpio1_ick: gpio1_ick@c10 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&wkup_l4_ick>;
-               reg = <0x0c10>;
-               ti,bit-shift = <3>;
-       };
+               wdt1_ick: clock-wdt1-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "wdt1_ick";
+                       clocks = <&wkup_l4_ick>;
+                       ti,bit-shift = <4>;
+               };
 
-       omap_32ksync_ick: omap_32ksync_ick@c10 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&wkup_l4_ick>;
-               reg = <0x0c10>;
-               ti,bit-shift = <2>;
-       };
+               gpio1_ick: clock-gpio1-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "gpio1_ick";
+                       clocks = <&wkup_l4_ick>;
+                       ti,bit-shift = <3>;
+               };
 
-       gpt12_ick: gpt12_ick@c10 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&wkup_l4_ick>;
-               reg = <0x0c10>;
-               ti,bit-shift = <1>;
-       };
+               omap_32ksync_ick: clock-omap-32ksync-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "omap_32ksync_ick";
+                       clocks = <&wkup_l4_ick>;
+                       ti,bit-shift = <2>;
+               };
 
-       gpt1_ick: gpt1_ick@c10 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&wkup_l4_ick>;
-               reg = <0x0c10>;
-               ti,bit-shift = <0>;
+               gpt12_ick: clock-gpt12-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "gpt12_ick";
+                       clocks = <&wkup_l4_ick>;
+                       ti,bit-shift = <1>;
+               };
+
+               gpt1_ick: clock-gpt1-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "gpt1_ick";
+                       clocks = <&wkup_l4_ick>;
+                       ti,bit-shift = <0>;
+               };
        };
 
        per_96m_fck: per_96m_fck {