* [PATCH] ARM: STi: Add support for the FSM Serial Flash Controller
@ 2014-03-20 15:55 Lee Jones
2014-03-20 18:47 ` Maxime Coquelin
0 siblings, 1 reply; 2+ messages in thread
From: Lee Jones @ 2014-03-20 15:55 UTC (permalink / raw)
To: linux-arm-kernel
Here we add the necessary device nodes required for successful device
probing and Pinctrl setup for the FSM.
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Acked-by Angus Clark <angus.clark@st.com>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/stih416-pinctrl.dtsi | 13 +++++++++++++
arch/arm/boot/dts/stih416.dtsi | 13 +++++++++++++
arch/arm/boot/dts/stih41x-b2020.dtsi | 1 +
arch/arm/boot/dts/stih41x-b2020x.dtsi | 28 ++++++++++++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 arch/arm/boot/dts/stih41x-b2020x.dtsi
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi
index b29ff4b..81df8e7 100644
--- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
@@ -210,6 +210,19 @@
};
};
};
+
+ fsm {
+ pinctrl_fsm: fsm {
+ st,pins {
+ spi-fsm-clk = <&PIO12 2 ALT1 OUT>;
+ spi-fsm-cs = <&PIO12 3 ALT1 OUT>;
+ spi-fsm-mosi = <&PIO12 4 ALT1 OUT>;
+ spi-fsm-miso = <&PIO12 5 ALT1 IN>;
+ spi-fsm-hol = <&PIO12 6 ALT1 OUT>;
+ spi-fsm-wp = <&PIO12 7 ALT1 OUT>;
+ };
+ };
+ };
};
pin-controller-rear {
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index b7ab47b..1e24b9e 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -145,5 +145,18 @@
status = "disabled";
};
+
+ /* FSM */
+ spifsm: spifsm at fe902000 {
+ compatible = "st,spi-fsm";
+ reg = <0xfe902000 0x1000>;
+ pinctrl-0 = <&pinctrl_fsm>;
+
+ st,syscfg = <&syscfg_rear>;
+ st,boot-device-reg = <0x958>;
+ st,boot-device-spi = <0x1a>;
+
+ status = "disabled";
+ };
};
};
diff --git a/arch/arm/boot/dts/stih41x-b2020.dtsi b/arch/arm/boot/dts/stih41x-b2020.dtsi
index 0ef0a69..01487e0 100644
--- a/arch/arm/boot/dts/stih41x-b2020.dtsi
+++ b/arch/arm/boot/dts/stih41x-b2020.dtsi
@@ -6,6 +6,7 @@
* it under the terms of the GNU General Public License version 2 as
* publishhed by the Free Software Foundation.
*/
+#include "stih41x-b2020x.dtsi"
/ {
memory{
device_type = "memory";
diff --git a/arch/arm/boot/dts/stih41x-b2020x.dtsi b/arch/arm/boot/dts/stih41x-b2020x.dtsi
new file mode 100644
index 0000000..df01c12
--- /dev/null
+++ b/arch/arm/boot/dts/stih41x-b2020x.dtsi
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 STMicroelectronics (R&D) Limited.
+ * Author: Lee Jones <lee.jones@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * publishhed by the Free Software Foundation.
+ */
+/ {
+ soc {
+ spifsm: spifsm at fe902000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ status = "okay";
+
+ partition at 0 {
+ label = "SerialFlash1";
+ reg = <0x00000000 0x00500000>;
+ };
+
+ partition at 500000 {
+ label = "SerialFlash2";
+ reg = <0x00500000 0x00b00000>;
+ };
+ };
+ };
+};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] ARM: STi: Add support for the FSM Serial Flash Controller
2014-03-20 15:55 [PATCH] ARM: STi: Add support for the FSM Serial Flash Controller Lee Jones
@ 2014-03-20 18:47 ` Maxime Coquelin
0 siblings, 0 replies; 2+ messages in thread
From: Maxime Coquelin @ 2014-03-20 18:47 UTC (permalink / raw)
To: linux-arm-kernel
On 03/20/2014 04:55 PM, Lee Jones wrote:
> Here we add the necessary device nodes required for successful device
> probing and Pinctrl setup for the FSM.
>
> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
> Acked-by Angus Clark <angus.clark@st.com>
> Acked-by: Brian Norris <computersforpeace@gmail.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> arch/arm/boot/dts/stih416-pinctrl.dtsi | 13 +++++++++++++
> arch/arm/boot/dts/stih416.dtsi | 13 +++++++++++++
> arch/arm/boot/dts/stih41x-b2020.dtsi | 1 +
> arch/arm/boot/dts/stih41x-b2020x.dtsi | 28 ++++++++++++++++++++++++++++
Could you please split this patch in two ?
1 - stih416-pinctrl.dtsi and stih416.dtsi
2 - stih41x-b2020.dtsi and stih41x-b2020x.dtsi
Once these changes done, you can add
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
Thanks,
Maxime
> 4 files changed, 55 insertions(+)
> create mode 100644 arch/arm/boot/dts/stih41x-b2020x.dtsi
>
> diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi
> index b29ff4b..81df8e7 100644
> --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
> +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
> @@ -210,6 +210,19 @@
> };
> };
> };
> +
> + fsm {
> + pinctrl_fsm: fsm {
> + st,pins {
> + spi-fsm-clk = <&PIO12 2 ALT1 OUT>;
> + spi-fsm-cs = <&PIO12 3 ALT1 OUT>;
> + spi-fsm-mosi = <&PIO12 4 ALT1 OUT>;
> + spi-fsm-miso = <&PIO12 5 ALT1 IN>;
> + spi-fsm-hol = <&PIO12 6 ALT1 OUT>;
> + spi-fsm-wp = <&PIO12 7 ALT1 OUT>;
> + };
> + };
> + };
> };
>
> pin-controller-rear {
> diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
> index b7ab47b..1e24b9e 100644
> --- a/arch/arm/boot/dts/stih416.dtsi
> +++ b/arch/arm/boot/dts/stih416.dtsi
> @@ -145,5 +145,18 @@
>
> status = "disabled";
> };
> +
> + /* FSM */
> + spifsm: spifsm at fe902000 {
> + compatible = "st,spi-fsm";
> + reg = <0xfe902000 0x1000>;
> + pinctrl-0 = <&pinctrl_fsm>;
> +
> + st,syscfg = <&syscfg_rear>;
> + st,boot-device-reg = <0x958>;
> + st,boot-device-spi = <0x1a>;
> +
> + status = "disabled";
> + };
> };
> };
> diff --git a/arch/arm/boot/dts/stih41x-b2020.dtsi b/arch/arm/boot/dts/stih41x-b2020.dtsi
> index 0ef0a69..01487e0 100644
> --- a/arch/arm/boot/dts/stih41x-b2020.dtsi
> +++ b/arch/arm/boot/dts/stih41x-b2020.dtsi
> @@ -6,6 +6,7 @@
> * it under the terms of the GNU General Public License version 2 as
> * publishhed by the Free Software Foundation.
> */
> +#include "stih41x-b2020x.dtsi"
> / {
> memory{
> device_type = "memory";
> diff --git a/arch/arm/boot/dts/stih41x-b2020x.dtsi b/arch/arm/boot/dts/stih41x-b2020x.dtsi
> new file mode 100644
> index 0000000..df01c12
> --- /dev/null
> +++ b/arch/arm/boot/dts/stih41x-b2020x.dtsi
> @@ -0,0 +1,28 @@
> +/*
> + * Copyright (C) 2013 STMicroelectronics (R&D) Limited.
> + * Author: Lee Jones <lee.jones@linaro.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * publishhed by the Free Software Foundation.
> + */
> +/ {
> + soc {
> + spifsm: spifsm at fe902000 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + status = "okay";
> +
> + partition at 0 {
> + label = "SerialFlash1";
> + reg = <0x00000000 0x00500000>;
> + };
> +
> + partition at 500000 {
> + label = "SerialFlash2";
> + reg = <0x00500000 0x00b00000>;
> + };
> + };
> + };
> +};
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-20 18:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-20 15:55 [PATCH] ARM: STi: Add support for the FSM Serial Flash Controller Lee Jones
2014-03-20 18:47 ` Maxime Coquelin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).