aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-03-21 07:33:07 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-26 21:01:05 -0400
commit77f8d9b7e67e0b98c7eb857cc5e85607389df2b6 (patch)
tree69f9df97da72a0d672009f369a95e77b3d3edfd6 /arch/arm/boot
parent4de6732f88552e4f8fc504070ca4b840e7fe75f4 (diff)
ARM: STi: stih416: Add support for the FSM Serial Flash Controller
Here we add the necessary device nodes required for successful device probing and Pinctrl setup for the FSM when booting on an STiH416 (Orly2). Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> Acked-by Angus Clark <angus.clark@st.com> Acked-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Maxime Coquelin <maxime.coquelin@st.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/stih416-pinctrl.dtsi13
-rw-r--r--arch/arm/boot/dts/stih416.dtsi12
2 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi
index e7f8b5f4460a..aeea304086eb 100644
--- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
@@ -310,6 +310,19 @@
310 }; 310 };
311 }; 311 };
312 }; 312 };
313
314 fsm {
315 pinctrl_fsm: fsm {
316 st,pins {
317 spi-fsm-clk = <&PIO12 2 ALT1 OUT>;
318 spi-fsm-cs = <&PIO12 3 ALT1 OUT>;
319 spi-fsm-mosi = <&PIO12 4 ALT1 OUT>;
320 spi-fsm-miso = <&PIO12 5 ALT1 IN>;
321 spi-fsm-hol = <&PIO12 6 ALT1 OUT>;
322 spi-fsm-wp = <&PIO12 7 ALT1 OUT>;
323 };
324 };
325 };
313 }; 326 };
314 327
315 pin-controller-rear { 328 pin-controller-rear {
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index 8299a7b8fee8..78746d20382e 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -212,5 +212,17 @@
212 resets = <&softreset STIH416_IRB_SOFTRESET>; 212 resets = <&softreset STIH416_IRB_SOFTRESET>;
213 }; 213 };
214 214
215 /* FSM */
216 spifsm: spifsm@fe902000 {
217 compatible = "st,spi-fsm";
218 reg = <0xfe902000 0x1000>;
219 pinctrl-0 = <&pinctrl_fsm>;
220
221 st,syscfg = <&syscfg_rear>;
222 st,boot-device-reg = <0x958>;
223 st,boot-device-spi = <0x1a>;
224
225 status = "disabled";
226 };
215 }; 227 };
216}; 228};