ARM: STi: DT: STiH41x: Rename CLK_SYSIN into clk_sysin

all-caps node name is not very usual.

Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>

diff --git a/arch/arm/boot/dts/stih415-clock.dtsi b/arch/arm/boot/dts/stih415-clock.dtsi
index d047dbc28d61ece8e763833ba6e1c76af9bfc2a0..8ef996483105a7d8f10b97adc8a69c5f5374c576 100644 (file)
--- a/arch/arm/boot/dts/stih415-clock.dtsi
+++ b/arch/arm/boot/dts/stih415-clock.dtsi
@@ -10,7 +10,7 @@
                /*
                 * Fixed 30MHz oscillator input to SoC
                 */
-               CLK_SYSIN: CLK_SYSIN {
+               clk_sysin: clk-sysin {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
                        clock-frequency = <30000000>;

diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index ba0905c65527f1e74df9f9fea1ecf4be78792144..20425a7f3ed0b24d812b1b901313c01accb1dbe1 100644 (file)
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -91,7 +91,7 @@
                        status          = "disabled";
                        reg             = <0xfe531000 0x2c>;
                        interrupts      = <0 210 0>;
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_sbc_serial1>;
                };
@@ -126,7 +126,7 @@
                        compatible      = "st,comms-ssc4-i2c";
                        reg             = <0xfe540000 0x110>;
                        interrupts      = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                        clock-names     = "ssc";
                        clock-frequency = <400000>;
                        pinctrl-names   = "default";
@@ -139,7 +139,7 @@
                        compatible      = "st,comms-ssc4-i2c";
                        reg             = <0xfe541000 0x110>;
                        interrupts      = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                        clock-names     = "ssc";
                        clock-frequency = <400000>;
                        pinctrl-names   = "default";
@@ -200,7 +200,7 @@
                        compatible      = "st,comms-irb";
                        reg             = <0xfe518000 0x234>;
                        interrupts      =  <0 203 0>;
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                        rx-mode         = "infrared";
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_ir>;
@@ -212,7 +212,7 @@
                        status = "disabled";
                        reg = <0xfe4b0000 0x2000>;
                        interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>;
-                       clocks = <&CLK_SYSIN>;
+                       clocks = <&clk_sysin>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_keyscan>;
                        resets  = <&powerdown STIH415_KEYSCAN_POWERDOWN>,

diff --git a/arch/arm/boot/dts/stih416-clock.dtsi b/arch/arm/boot/dts/stih416-clock.dtsi
index a6942c75cbbbbf4de002588576306cd97c205193..10f8389ce9eb35274e62a40404b2dc5d8d091628 100644 (file)
--- a/arch/arm/boot/dts/stih416-clock.dtsi
+++ b/arch/arm/boot/dts/stih416-clock.dtsi
@@ -6,16 +6,17 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
 / {
        clocks {
+
                /*
                 * Fixed 30MHz oscillator inputs to SoC
                 */
-               CLK_SYSIN: CLK_SYSIN {
+               clk_sysin: clk-sysin {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
                        clock-frequency = <30000000>;
-                       clock-output-names = "CLK_SYSIN";
                };
 
                /*

diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index d3bc26360072fb795f29a8f4eceb2f81e331cf26..09592a83fe155a49c0eceebeca9b41d752f4ed73 100644 (file)
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -102,7 +102,7 @@
                        interrupts      = <0 210 0>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_sbc_serial1>;
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                };
 
                i2c@fed40000 {
@@ -135,7 +135,7 @@
                        compatible      = "st,comms-ssc4-i2c";
                        reg             = <0xfe540000 0x110>;
                        interrupts      = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                        clock-names     = "ssc";
                        clock-frequency = <400000>;
                        pinctrl-names   = "default";
@@ -148,7 +148,7 @@
                        compatible      = "st,comms-ssc4-i2c";
                        reg             = <0xfe541000 0x110>;
                        interrupts      = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                        clock-names     = "ssc";
                        clock-frequency = <400000>;
                        pinctrl-names   = "default";
@@ -206,7 +206,7 @@
                        reg             = <0xfe518000 0x234>;
                        interrupts      =  <0 203 0>;
                        rx-mode         = "infrared";
-                       clocks          = <&CLK_SYSIN>;
+                       clocks          = <&clk_sysin>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_ir>;
                        resets          = <&softreset STIH416_IRB_SOFTRESET>;
@@ -230,7 +230,7 @@
                        status = "disabled";
                        reg = <0xfe4b0000 0x2000>;
                        interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>;
-                       clocks = <&CLK_SYSIN>;
+                       clocks = <&clk_sysin>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_keyscan>;
                        resets  = <&powerdown STIH416_KEYSCAN_POWERDOWN>,