Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / omap36xx-omap3430es2plus-clocks.dtsi

diff --git a/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
index 8ed475dd63c982305f83c350ac41b8a87b246048..877318c283643ace96f5f162883dc644afc8f919 100644 (file)
--- a/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
+++ b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi
@@ -25,16 +25,16 @@
                ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>;
        };
 
-       ssi_ssr_fck_3430es2: ssi_ssr_fck_3430es2 {
+       ssi_ssr_fck: ssi_ssr_fck_3430es2 {
                #clock-cells = <0>;
                compatible = "ti,composite-clock";
                clocks = <&ssi_ssr_gate_fck_3430es2>, <&ssi_ssr_div_fck_3430es2>;
        };
 
-       ssi_sst_fck_3430es2: ssi_sst_fck_3430es2 {
+       ssi_sst_fck: ssi_sst_fck_3430es2 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
-               clocks = <&ssi_ssr_fck_3430es2>;
+               clocks = <&ssi_ssr_fck>;
                clock-mult = <1>;
                clock-div = <2>;
        };
@@ -55,7 +55,7 @@
                clock-div = <1>;
        };
 
-       ssi_ick_3430es2: ssi_ick_3430es2 {
+       ssi_ick: ssi_ick_3430es2 {
                #clock-cells = <0>;
                compatible = "ti,omap3-ssi-interface-clock";
                clocks = <&ssi_l4_ick>;
@@ -193,6 +193,6 @@
                         <&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>,
                         <&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>,
                         <&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>,
-                        <&ssi_ick_3430es2>;
+                        <&ssi_ick>;
        };
 };