aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel FERNANDEZ <gabriel.fernandez@st.com>2014-05-20 09:22:00 -0400
committerMaxime Coquelin <maxime.coquelin@st.com>2014-05-21 08:27:08 -0400
commited3593f98603110e504c2552eed50c62233e648a (patch)
tree55b98421215217a92e5fc8f0a0dc9765043c2a0b
parente92cc8810194504085423185e785a9577a41b65a (diff)
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>
Diffstat
-rw-r--r--arch/arm/boot/dts/stih415-clock.dtsi2
-rw-r--r--arch/arm/boot/dts/stih415.dtsi10
-rw-r--r--arch/arm/boot/dts/stih416-clock.dtsi5
-rw-r--r--arch/arm/boot/dts/stih416.dtsi10
4 files changed, 14 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/stih415-clock.dtsi b/arch/arm/boot/dts/stih415-clock.dtsi
index d047dbc28d61..8ef996483105 100644
--- a/arch/arm/boot/dts/stih415-clock.dtsi
+++ b/arch/arm/boot/dts/stih415-clock.dtsi
@@ -10,7 +10,7 @@
10 /* 10 /*
11 * Fixed 30MHz oscillator input to SoC 11 * Fixed 30MHz oscillator input to SoC
12 */ 12 */
13 CLK_SYSIN: CLK_SYSIN { 13 clk_sysin: clk-sysin {
14 #clock-cells = <0>; 14 #clock-cells = <0>;
15 compatible = "fixed-clock"; 15 compatible = "fixed-clock";
16 clock-frequency = <30000000>; 16 clock-frequency = <30000000>;
diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index ba0905c65527..20425a7f3ed0 100644
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -91,7 +91,7 @@
91 status = "disabled"; 91 status = "disabled";
92 reg = <0xfe531000 0x2c>; 92 reg = <0xfe531000 0x2c>;
93 interrupts = <0 210 0>; 93 interrupts = <0 210 0>;
94 clocks = <&CLK_SYSIN>; 94 clocks = <&clk_sysin>;
95 pinctrl-names = "default"; 95 pinctrl-names = "default";
96 pinctrl-0 = <&pinctrl_sbc_serial1>; 96 pinctrl-0 = <&pinctrl_sbc_serial1>;
97 }; 97 };
@@ -126,7 +126,7 @@
126 compatible = "st,comms-ssc4-i2c"; 126 compatible = "st,comms-ssc4-i2c";
127 reg = <0xfe540000 0x110>; 127 reg = <0xfe540000 0x110>;
128 interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; 128 interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
129 clocks = <&CLK_SYSIN>; 129 clocks = <&clk_sysin>;
130 clock-names = "ssc"; 130 clock-names = "ssc";
131 clock-frequency = <400000>; 131 clock-frequency = <400000>;
132 pinctrl-names = "default"; 132 pinctrl-names = "default";
@@ -139,7 +139,7 @@
139 compatible = "st,comms-ssc4-i2c"; 139 compatible = "st,comms-ssc4-i2c";
140 reg = <0xfe541000 0x110>; 140 reg = <0xfe541000 0x110>;
141 interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>; 141 interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
142 clocks = <&CLK_SYSIN>; 142 clocks = <&clk_sysin>;
143 clock-names = "ssc"; 143 clock-names = "ssc";
144 clock-frequency = <400000>; 144 clock-frequency = <400000>;
145 pinctrl-names = "default"; 145 pinctrl-names = "default";
@@ -200,7 +200,7 @@
200 compatible = "st,comms-irb"; 200 compatible = "st,comms-irb";
201 reg = <0xfe518000 0x234>; 201 reg = <0xfe518000 0x234>;
202 interrupts = <0 203 0>; 202 interrupts = <0 203 0>;
203 clocks = <&CLK_SYSIN>; 203 clocks = <&clk_sysin>;
204 rx-mode = "infrared"; 204 rx-mode = "infrared";
205 pinctrl-names = "default"; 205 pinctrl-names = "default";
206 pinctrl-0 = <&pinctrl_ir>; 206 pinctrl-0 = <&pinctrl_ir>;
@@ -212,7 +212,7 @@
212 status = "disabled"; 212 status = "disabled";
213 reg = <0xfe4b0000 0x2000>; 213 reg = <0xfe4b0000 0x2000>;
214 interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>; 214 interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>;
215 clocks = <&CLK_SYSIN>; 215 clocks = <&clk_sysin>;
216 pinctrl-names = "default"; 216 pinctrl-names = "default";
217 pinctrl-0 = <&pinctrl_keyscan>; 217 pinctrl-0 = <&pinctrl_keyscan>;
218 resets = <&powerdown STIH415_KEYSCAN_POWERDOWN>, 218 resets = <&powerdown STIH415_KEYSCAN_POWERDOWN>,
diff --git a/arch/arm/boot/dts/stih416-clock.dtsi b/arch/arm/boot/dts/stih416-clock.dtsi
index a6942c75cbbb..10f8389ce9eb 100644
--- a/arch/arm/boot/dts/stih416-clock.dtsi
+++ b/arch/arm/boot/dts/stih416-clock.dtsi
@@ -6,16 +6,17 @@
6 * it under the terms of the GNU General Public License version 2 as 6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 */ 8 */
9
9/ { 10/ {
10 clocks { 11 clocks {
12
11 /* 13 /*
12 * Fixed 30MHz oscillator inputs to SoC 14 * Fixed 30MHz oscillator inputs to SoC
13 */ 15 */
14 CLK_SYSIN: CLK_SYSIN { 16 clk_sysin: clk-sysin {
15 #clock-cells = <0>; 17 #clock-cells = <0>;
16 compatible = "fixed-clock"; 18 compatible = "fixed-clock";
17 clock-frequency = <30000000>; 19 clock-frequency = <30000000>;
18 clock-output-names = "CLK_SYSIN";
19 }; 20 };
20 21
21 /* 22 /*
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index d3bc26360072..09592a83fe15 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -102,7 +102,7 @@
102 interrupts = <0 210 0>; 102 interrupts = <0 210 0>;
103 pinctrl-names = "default"; 103 pinctrl-names = "default";
104 pinctrl-0 = <&pinctrl_sbc_serial1>; 104 pinctrl-0 = <&pinctrl_sbc_serial1>;
105 clocks = <&CLK_SYSIN>; 105 clocks = <&clk_sysin>;
106 }; 106 };
107 107
108 i2c@fed40000 { 108 i2c@fed40000 {
@@ -135,7 +135,7 @@
135 compatible = "st,comms-ssc4-i2c"; 135 compatible = "st,comms-ssc4-i2c";
136 reg = <0xfe540000 0x110>; 136 reg = <0xfe540000 0x110>;
137 interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; 137 interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
138 clocks = <&CLK_SYSIN>; 138 clocks = <&clk_sysin>;
139 clock-names = "ssc"; 139 clock-names = "ssc";
140 clock-frequency = <400000>; 140 clock-frequency = <400000>;
141 pinctrl-names = "default"; 141 pinctrl-names = "default";
@@ -148,7 +148,7 @@
148 compatible = "st,comms-ssc4-i2c"; 148 compatible = "st,comms-ssc4-i2c";
149 reg = <0xfe541000 0x110>; 149 reg = <0xfe541000 0x110>;
150 interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>; 150 interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
151 clocks = <&CLK_SYSIN>; 151 clocks = <&clk_sysin>;
152 clock-names = "ssc"; 152 clock-names = "ssc";
153 clock-frequency = <400000>; 153 clock-frequency = <400000>;
154 pinctrl-names = "default"; 154 pinctrl-names = "default";
@@ -206,7 +206,7 @@
206 reg = <0xfe518000 0x234>; 206 reg = <0xfe518000 0x234>;
207 interrupts = <0 203 0>; 207 interrupts = <0 203 0>;
208 rx-mode = "infrared"; 208 rx-mode = "infrared";
209 clocks = <&CLK_SYSIN>; 209 clocks = <&clk_sysin>;
210 pinctrl-names = "default"; 210 pinctrl-names = "default";
211 pinctrl-0 = <&pinctrl_ir>; 211 pinctrl-0 = <&pinctrl_ir>;
212 resets = <&softreset STIH416_IRB_SOFTRESET>; 212 resets = <&softreset STIH416_IRB_SOFTRESET>;
@@ -230,7 +230,7 @@
230 status = "disabled"; 230 status = "disabled";
231 reg = <0xfe4b0000 0x2000>; 231 reg = <0xfe4b0000 0x2000>;
232 interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>; 232 interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>;
233 clocks = <&CLK_SYSIN>; 233 clocks = <&clk_sysin>;
234 pinctrl-names = "default"; 234 pinctrl-names = "default";
235 pinctrl-0 = <&pinctrl_keyscan>; 235 pinctrl-0 = <&pinctrl_keyscan>;
236 resets = <&powerdown STIH416_KEYSCAN_POWERDOWN>, 236 resets = <&powerdown STIH416_KEYSCAN_POWERDOWN>,
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-07 12:49:29 -0400