[PATCH v2] ARM: berlin: add SPI nodes for BG2Q

[PATCH v2] ARM: berlin: add SPI nodes for BG2Q

[Antoine Tenart]

The BG2Q SoC has two SPI controllers. Add the corresponding nodes.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---

Changes since v1:
	- reworked the pinmux
	- removed useless interrupt-parent properties
	- typo

 arch/arm/boot/dts/berlin2q.dtsi | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 187d056f7ad2..9f42ebfa50f2 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -286,6 +286,19 @@
 				status = "disabled";
 			};
 
+			spi0: spi@1c00 {
+				compatible = "snps,dw-apb-ssi";
+				reg = <0x1c00 0x100>;
+				interrupts = <7>;
+				clocks = <&chip_clk CLKID_CFG>;
+				pinctrl-0 = <&spi1_pmux>;
+				pinctrl-names = "default";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				num-cs = <4>;
+				status = "disabled";
+			};
+
 			timer0: timer@2c00 {
 				compatible = "snps,dw-apb-timer";
 				reg = <0x2c00 0x14>;
@@ -383,6 +396,11 @@
 					groups = "G7";
 					function = "twsi1";
 				};
+
+				spi1_pmux: spi1-pmux {
+					groups = "G8";
+					function = "spi1";
+				};
 			};
 
 			chip_rst: reset {
@@ -473,6 +491,19 @@
 				};
 			};
 
+			spi1: spi@6000 {
+				compatible = "snps,dw-apb-ssi";
+				reg = <0x6000 0x100>;
+				interrupts = <5>;
+				clocks = <&refclk>;
+				pinctrl-0 = <&spi2_pmux>;
+				pinctrl-names = "default";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				num-cs = <4>;
+				status = "disabled";
+			};
+
 			i2c2: i2c@7000 {
 				compatible = "snps,designware-i2c";
 				#address-cells = <1>;
@@ -564,6 +595,11 @@
 						groups = "GSM14";
 						function = "twsi3";
 					};
+
+					spi2_pmux: spi2-pmux {
+						groups = "GSM3";
+						function = "spi2";
+					};
 				};
 			};
 
-- 
2.4.1

Re: [PATCH v2] ARM: berlin: add SPI nodes for BG2Q

[Sebastian Hesselbarth]

On 27.05.2015 09:59, Antoine Tenart wrote:
> The BG2Q SoC has two SPI controllers. Add the corresponding nodes.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> ---
>
> Changes since v1:
> 	- reworked the pinmux
> 	- removed useless interrupt-parent properties
> 	- typo
>
>   arch/arm/boot/dts/berlin2q.dtsi | 36 ++++++++++++++++++++++++++++++++++++
>   1 file changed, 36 insertions(+)
>
> diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
> index 187d056f7ad2..9f42ebfa50f2 100644
> --- a/arch/arm/boot/dts/berlin2q.dtsi
> +++ b/arch/arm/boot/dts/berlin2q.dtsi
> @@ -286,6 +286,19 @@
>   				status = "disabled";
>   			};
>
> +			spi0: spi@1c00 {
> +				compatible = "snps,dw-apb-ssi";
> +				reg = <0x1c00 0x100>;
> +				interrupts = <7>;
> +				clocks = <&chip_clk CLKID_CFG>;
> +				pinctrl-0 = <&spi1_pmux>;

Antoine,

you missed s/spi0/spi1/ and the same for the node below?

BTW, you have any SPI device to test this? If you are brave
enough you could read the flash from the Berlin secure boot
SPI key ;)

Sebastian

> +				pinctrl-names = "default";
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				num-cs = <4>;
> +				status = "disabled";
> +			};
> +
>   			timer0: timer@2c00 {
>   				compatible = "snps,dw-apb-timer";
>   				reg = <0x2c00 0x14>;
> @@ -383,6 +396,11 @@
>   					groups = "G7";
>   					function = "twsi1";
>   				};
> +
> +				spi1_pmux: spi1-pmux {
> +					groups = "G8";
> +					function = "spi1";
> +				};
>   			};
>
>   			chip_rst: reset {
> @@ -473,6 +491,19 @@
>   				};
>   			};
>
> +			spi1: spi@6000 {
> +				compatible = "snps,dw-apb-ssi";
> +				reg = <0x6000 0x100>;
> +				interrupts = <5>;
> +				clocks = <&refclk>;
> +				pinctrl-0 = <&spi2_pmux>;
> +				pinctrl-names = "default";
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				num-cs = <4>;
> +				status = "disabled";
> +			};
> +
>   			i2c2: i2c@7000 {
>   				compatible = "snps,designware-i2c";
>   				#address-cells = <1>;
> @@ -564,6 +595,11 @@
>   						groups = "GSM14";
>   						function = "twsi3";
>   					};
> +
> +					spi2_pmux: spi2-pmux {
> +						groups = "GSM3";
> +						function = "spi2";
> +					};
>   				};
>   			};
>
>

Re: [PATCH v2] ARM: berlin: add SPI nodes for BG2Q

[Antoine Tenart]

Sebastian,

On Wed, May 27, 2015 at 10:03:01AM +0200, Sebastian Hesselbarth wrote:
> On 27.05.2015 09:59, Antoine Tenart wrote:
> >The BG2Q SoC has two SPI controllers. Add the corresponding nodes.
> >
> >Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> >---
> >
> >Changes since v1:
> >	- reworked the pinmux
> >	- removed useless interrupt-parent properties
> >	- typo
> >
> >  arch/arm/boot/dts/berlin2q.dtsi | 36 ++++++++++++++++++++++++++++++++++++
> >  1 file changed, 36 insertions(+)
> >
> >diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
> >index 187d056f7ad2..9f42ebfa50f2 100644
> >--- a/arch/arm/boot/dts/berlin2q.dtsi
> >+++ b/arch/arm/boot/dts/berlin2q.dtsi
> >@@ -286,6 +286,19 @@
> >  				status = "disabled";
> >  			};
> >
> >+			spi0: spi@1c00 {
> >+				compatible = "snps,dw-apb-ssi";
> >+				reg = <0x1c00 0x100>;
> >+				interrupts = <7>;
> >+				clocks = <&chip_clk CLKID_CFG>;
> >+				pinctrl-0 = <&spi1_pmux>;
> 
> Antoine,
> 
> you missed s/spi0/spi1/ and the same for the node below?

I think we had a misunderstanding then :) You would like to have spi1
and spi2 nodes, without having an spi0 one?

> BTW, you have any SPI device to test this? If you are brave
> enough you could read the flash from the Berlin secure boot
> SPI key ;)

Until now, I tested it using spidev and connecting SDI to SDO.

Antoine

-- 
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH v2] ARM: berlin: add SPI nodes for BG2Q

[Sebastian Hesselbarth]

On 27.05.2015 10:33, Antoine Tenart wrote:
> On Wed, May 27, 2015 at 10:03:01AM +0200, Sebastian Hesselbarth wrote:
>> On 27.05.2015 09:59, Antoine Tenart wrote:
>>> The BG2Q SoC has two SPI controllers. Add the corresponding nodes.
>>>
>>> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
>>> ---
>>>
>>> Changes since v1:
>>> 	- reworked the pinmux
>>> 	- removed useless interrupt-parent properties
>>> 	- typo
>>>
>>>   arch/arm/boot/dts/berlin2q.dtsi | 36 ++++++++++++++++++++++++++++++++++++
>>>   1 file changed, 36 insertions(+)
>>>
>>> diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
>>> index 187d056f7ad2..9f42ebfa50f2 100644
>>> --- a/arch/arm/boot/dts/berlin2q.dtsi
>>> +++ b/arch/arm/boot/dts/berlin2q.dtsi
>>> @@ -286,6 +286,19 @@
>>>   				status = "disabled";
>>>   			};
>>>
>>> +			spi0: spi@1c00 {
>>> +				compatible = "snps,dw-apb-ssi";
>>> +				reg = <0x1c00 0x100>;
>>> +				interrupts = <7>;
>>> +				clocks = <&chip_clk CLKID_CFG>;
>>> +				pinctrl-0 = <&spi1_pmux>;
>>
>> Antoine,
>>
>> you missed s/spi0/spi1/ and the same for the node below?
>
> I think we had a misunderstanding then :) You would like to have spi1
> and spi2 nodes, without having an spi0 one?

Yes, sorry if I was unclear. I would have _preferred_ to start counting
with 0 _but_ pinctrl driver already uses spi{1,2} and if the DS also
suggests this numbering we should start with spi1.

In any way, match up the DT numbering with datasheet numbering.

>> BTW, you have any SPI device to test this? If you are brave
>> enough you could read the flash from the Berlin secure boot
>> SPI key ;)
>
> Until now, I tested it using spidev and connecting SDI to SDO.

Ok. I haven't checked in detail but except the optional SPI key,
there is no other SPI device on BG2Q DMP, right?

Sebastian