ARM: dts: Group omap3 crypto accelerator 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 37556b464f797e4df30755fb106a1abb8a1d9add..518eb7d60bcf0fbbade38de1322b575708b6fa2e 100644 (file)
--- a/arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi
@@ -13,36 +13,51 @@
                clock-div = <1>;
        };
 
-       aes1_ick: aes1_ick@a14 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&security_l4_ick2>;
-               ti,bit-shift = <3>;
-               reg = <0x0a14>;
-       };
+       clock@a14 {
+               compatible = "ti,clksel";
+               reg = <0xa14>;
+               #clock-cells = <2>;
+               #address-cells = <0>;
 
-       rng_ick: rng_ick@a14 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&security_l4_ick2>;
-               reg = <0x0a14>;
-               ti,bit-shift = <2>;
-       };
+               aes1_ick: clock-aes1-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "aes1_ick";
+                       clocks = <&security_l4_ick2>;
+                       ti,bit-shift = <3>;
+               };
 
-       sha11_ick: sha11_ick@a14 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&security_l4_ick2>;
-               reg = <0x0a14>;
-               ti,bit-shift = <1>;
-       };
+               rng_ick: clock-rng-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "rng_ick";
+                       clocks = <&security_l4_ick2>;
+                       ti,bit-shift = <2>;
+               };
 
-       des1_ick: des1_ick@a14 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&security_l4_ick2>;
-               reg = <0x0a14>;
-               ti,bit-shift = <0>;
+               sha11_ick: clock-sha11-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "sha11_ick";
+                       clocks = <&security_l4_ick2>;
+                       ti,bit-shift = <1>;
+               };
+
+               des1_ick: clock-des1-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "des1_ick";
+                       clocks = <&security_l4_ick2>;
+                       ti,bit-shift = <0>;
+               };
+
+               pka_ick: clock-pka-ick {
+                       #clock-cells = <0>;
+                       compatible = "ti,omap3-interface-clock";
+                       clock-output-names = "pka_ick";
+                       clocks = <&security_l3_ick>;
+                       ti,bit-shift = <4>;
+               };
        };
 
        cam_mclk: cam_mclk@f00 {
@@ -78,14 +93,6 @@
                clock-div = <1>;
        };
 
-       pka_ick: pka_ick@a14 {
-               #clock-cells = <0>;
-               compatible = "ti,omap3-interface-clock";
-               clocks = <&security_l3_ick>;
-               reg = <0x0a14>;
-               ti,bit-shift = <4>;
-       };
-
        icr_ick: icr_ick@a10 {
                #clock-cells = <0>;
                compatible = "ti,omap3-interface-clock";