diff mbox

[v3,36/36] ARM: STi: Add support for the FSM Serial Flash Controller

Message ID 1385727565-25794-37-git-send-email-lee.jones@linaro.org
State Superseded
Headers show

Commit Message

Lee Jones Nov. 29, 2013, 12:19 p.m. UTC
Here we add the necessary device nodes required for successful device
probing and Pinctrl setup for the FSM.

Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/stih416-b2105.dts    | 14 ++++++++++++++
 arch/arm/boot/dts/stih416-pinctrl.dtsi | 12 ++++++++++++
 2 files changed, 26 insertions(+)

Comments

Srinivas KANDAGATLA Dec. 2, 2013, 1:05 p.m. UTC | #1
Hi Lee,
On 29/11/13 12:19, Lee Jones wrote:
> +		/* FSM */
> +		spifsm: spifsm@fe902000{
> +		        compatible         = "st,spi-fsm", "simple-bus";
"simple-bus" is redundant here.

> +		        reg                =  <0xfe902000 0x1000>;
> +		        reg-names          = "spi-fsm";
> +		        pinctrl-0          = <&pinctrl_fsm>;
> +
> +			st,syscfg	   = <&syscfg_rear>;
> +		        st,boot-device-reg = <0x958>;
> +		        st,boot-device-spi = <0x1a>;
> +
> +		        status = "okay";
> +		};


thanks,
srini
Lee Jones Dec. 2, 2013, 1:20 p.m. UTC | #2
> > +		/* FSM */
> > +		spifsm: spifsm@fe902000{
> > +		        compatible         = "st,spi-fsm", "simple-bus";
> "simple-bus" is redundant here.

Yes I agree, good spot.

I removed it from the Documentation, but missed this one.

If I remove it, can I add your Ack for the remainder of the patch?

> > +		        reg                =  <0xfe902000 0x1000>;
> > +		        reg-names          = "spi-fsm";
> > +		        pinctrl-0          = <&pinctrl_fsm>;
> > +
> > +			st,syscfg	   = <&syscfg_rear>;
> > +		        st,boot-device-reg = <0x958>;
> > +		        st,boot-device-spi = <0x1a>;
> > +
> > +		        status = "okay";
> > +		};
Srinivas KANDAGATLA Dec. 2, 2013, 1:26 p.m. UTC | #3
On 02/12/13 13:20, Lee Jones wrote:
>>> +		/* FSM */
>>> +		spifsm: spifsm@fe902000{
>>> +		        compatible         = "st,spi-fsm", "simple-bus";
>> "simple-bus" is redundant here.
> 
> Yes I agree, good spot.
> 
> I removed it from the Documentation, but missed this one.
> 
> If I remove it, can I add your Ack for the remainder of the patch?
Yes,

Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>

You should be aware that arch/arm/boot/dts/stih416-b2105.dts is not in
mainline yet.

Thanks,
srini


> 
>>> +		        reg                =  <0xfe902000 0x1000>;
>>> +		        reg-names          = "spi-fsm";
>>> +		        pinctrl-0          = <&pinctrl_fsm>;
>>> +
>>> +			st,syscfg	   = <&syscfg_rear>;
>>> +		        st,boot-device-reg = <0x958>;
>>> +		        st,boot-device-spi = <0x1a>;
>>> +
>>> +		        status = "okay";
>>> +		};
>
Lee Jones Dec. 2, 2013, 1:43 p.m. UTC | #4
On Mon, 02 Dec 2013, srinivas kandagatla wrote:

> On 02/12/13 13:20, Lee Jones wrote:
> >>> +		/* FSM */
> >>> +		spifsm: spifsm@fe902000{
> >>> +		        compatible         = "st,spi-fsm", "simple-bus";
> >> "simple-bus" is redundant here.
> > 
> > Yes I agree, good spot.
> > 
> > I removed it from the Documentation, but missed this one.
> > 
> > If I remove it, can I add your Ack for the remainder of the patch?
> Yes,
> 
> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
> 
> You should be aware that arch/arm/boot/dts/stih416-b2105.dts is not in
> mainline yet.

Yes, I am aware of this. Are you queuing patches for it?

> >>> +		        reg                =  <0xfe902000 0x1000>;
> >>> +		        reg-names          = "spi-fsm";
> >>> +		        pinctrl-0          = <&pinctrl_fsm>;
> >>> +
> >>> +			st,syscfg	   = <&syscfg_rear>;
> >>> +		        st,boot-device-reg = <0x958>;
> >>> +		        st,boot-device-spi = <0x1a>;
> >>> +
> >>> +		        status = "okay";
> >>> +		};
> > 
>
Srinivas KANDAGATLA Dec. 2, 2013, 1:56 p.m. UTC | #5
On 02/12/13 13:43, Lee Jones wrote:
> On Mon, 02 Dec 2013, srinivas kandagatla wrote:
> 
>> On 02/12/13 13:20, Lee Jones wrote:
>>>>> +		/* FSM */
>>>>> +		spifsm: spifsm@fe902000{
>>>>> +		        compatible         = "st,spi-fsm", "simple-bus";
>>>> "simple-bus" is redundant here.
>>>
>>> Yes I agree, good spot.
>>>
>>> I removed it from the Documentation, but missed this one.
>>>
>>> If I remove it, can I add your Ack for the remainder of the patch?
>> Yes,
>>
>> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
>>
>> You should be aware that arch/arm/boot/dts/stih416-b2105.dts is not in
>> mainline yet.
> 
> Yes, I am aware of this. Are you queuing patches for it?
Yes, I will post this soon.

thanks,
srini
> 
>>>>> +		        reg                =  <0xfe902000 0x1000>;
>>>>> +		        reg-names          = "spi-fsm";
>>>>> +		        pinctrl-0          = <&pinctrl_fsm>;
>>>>> +
>>>>> +			st,syscfg	   = <&syscfg_rear>;
>>>>> +		        st,boot-device-reg = <0x958>;
>>>>> +		        st,boot-device-spi = <0x1a>;
>>>>> +
>>>>> +		        status = "okay";
>>>>> +		};
>>>
>>
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/stih416-b2105.dts b/arch/arm/boot/dts/stih416-b2105.dts
index e518eb0..7acdfdf 100644
--- a/arch/arm/boot/dts/stih416-b2105.dts
+++ b/arch/arm/boot/dts/stih416-b2105.dts
@@ -33,6 +33,20 @@ 
 			status = "okay";
 		};
 
+		/* FSM */
+		spifsm: spifsm@fe902000{
+		        compatible         = "st,spi-fsm", "simple-bus";
+		        reg                =  <0xfe902000 0x1000>;
+		        reg-names          = "spi-fsm";
+		        pinctrl-0          = <&pinctrl_fsm>;
+
+			st,syscfg	   = <&syscfg_rear>;
+		        st,boot-device-reg = <0x958>;
+		        st,boot-device-spi = <0x1a>;
+
+		        status = "okay";
+		};
+
 		leds {
 			compatible	= "gpio-leds";
 			fp_led {
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi
index 10bb4df..9a48710 100644
--- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
@@ -235,6 +235,18 @@ 
 				};
 			};
 
+			fsm {
+				pinctrl_fsm: fsm {
+					st,pins {
+						spi-fsm-clk     = <&PIO12 2     OUT     ALT1>;
+						spi-fsm-cs      = <&PIO12 3     OUT     ALT1>;
+						spi-fsm-mosi    = <&PIO12 4     OUT     ALT1>;
+						spi-fsm-miso    = <&PIO12 5     IN      ALT1>;
+						spi-fsm-hol     = <&PIO12 6     OUT     ALT1>;
+						spi-fsm-wp      = <&PIO12 7     OUT     ALT1>;
+					};
+				};
+			};
 		};
 
 		pin-controller-rear {