2018-05-11 16:08:50

by Thor Thayer

Subject: [PATCHv2] arm64: dts: stratix10: Add QSPI support for Stratix10

From: Thor Thayer <[email protected]>

Add qspi_clock
The qspi_clk frequency is updated by U-Boot before starting Linux.
Add QSPI interface node.
Add QSPI flash memory child node.
Setup the QSPI memory in 2 partitions.

Signed-off-by: Thor Thayer <[email protected]>
---
v2 s/_/-/ in qspi-clk
rename flash node.
use partition child node notation
---
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 22 ++++++++++++++
.../boot/dts/altera/socfpga_stratix10_socdk.dts | 35 ++++++++++++++++++++++
2 files changed, 57 insertions(+)

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index e6b059378dc0..bac01b0b7907 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -119,6 +119,12 @@
#clock-cells = <0>;
compatible = "fixed-clock";
};
+
+ qspi_clk: qspi-clk {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <200000000>;
+ };
};

gmac0: ethernet@ff800000 {
@@ -466,5 +472,21 @@
interrupts = <16 4>, <48 4>;
};
};
+
+ qspi: spi@ff8d2000 {
+ compatible = "cdns,qspi-nor";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0xff8d2000 0x100>,
+ <0xff900000 0x100000>;
+ interrupts = <0 3 4>;
+ cdns,fifo-depth = <128>;
+ cdns,fifo-width = <4>;
+ cdns,trigger-address = <0x00000000>;
+ clocks = <&qspi_clk>;
+ bus-num = <1>;
+
+ status = "disabled";
+ };
};
};
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
index f9b1ef12db48..96542150654b 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
@@ -147,3 +147,38 @@
reg = <0x68>;
};
};
+
+&qspi {
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "n25q00aa";
+ reg = <0>;
+ spi-max-frequency = <50000000>;
+
+ m25p,fast-read;
+ cdns,page-size = <256>;
+ cdns,block-size = <16>;
+ cdns,read-delay = <1>;
+ cdns,tshsl-ns = <50>;
+ cdns,tsd2d-ns = <50>;
+ cdns,tchsh-ns = <4>;
+ cdns,tslch-ns = <4>;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ qspi_boot: partition@0 {
+ label = "Boot and fpga data";
+ reg = <0x0 0x4000000>;
+ };
+
+ qspi_rootfs: partition@4000000 {
+ label = "Root Filesystem - JFFS2";
+ reg = <0x4000000 0x4000000>;
+ };
+ };
+ };
+};
--
2.7.4

2018-05-15 15:52:17

by Dinh Nguyen

Subject: Re: [PATCHv2] arm64: dts: stratix10: Add QSPI support for Stratix10

On 05/11/2018 11:10 AM, [email protected] wrote:
> From: Thor Thayer <[email protected]>
>
> Add qspi_clock
> The qspi_clk frequency is updated by U-Boot before starting Linux.
> Add QSPI interface node.
> Add QSPI flash memory child node.
> Setup the QSPI memory in 2 partitions.
>
> Signed-off-by: Thor Thayer <[email protected]>
> ---
> v2 s/_/-/ in qspi-clk
> rename flash node.
> use partition child node notation
> ---
> arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 22 ++++++++++++++
> .../boot/dts/altera/socfpga_stratix10_socdk.dts | 35 ++++++++++++++++++++++
> 2 files changed, 57 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> index e6b059378dc0..bac01b0b7907 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> @@ -119,6 +119,12 @@
> #clock-cells = <0>;
> compatible = "fixed-clock";
> };
> +
> + qspi_clk: qspi-clk {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + clock-frequency = <200000000>;
> + };
> };
>
> gmac0: ethernet@ff800000 {
> @@ -466,5 +472,21 @@
> interrupts = <16 4>, <48 4>;
> };
> };
> +
> + qspi: spi@ff8d2000 {
> + compatible = "cdns,qspi-nor";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0xff8d2000 0x100>,
> + <0xff900000 0x100000>;
> + interrupts = <0 3 4>;
> + cdns,fifo-depth = <128>;
> + cdns,fifo-width = <4>;
> + cdns,trigger-address = <0x00000000>;
> + clocks = <&qspi_clk>;
> + bus-num = <1>;

I don't you need "bus-num" anymore right? I don't see it getting used
anywhere in the driver.

Dinh

2018-05-15 20:08:26

by Thor Thayer

Subject: Re: [PATCHv2] arm64: dts: stratix10: Add QSPI support for Stratix10

On 05/15/2018 10:11 AM, Dinh Nguyen wrote:
>
> On 05/11/2018 11:10 AM, [email protected] wrote:
>> From: Thor Thayer <[email protected]>
>>
>> Add qspi_clock
>> The qspi_clk frequency is updated by U-Boot before starting Linux.
>> Add QSPI interface node.
>> Add QSPI flash memory child node.
>> Setup the QSPI memory in 2 partitions.
>>
>> Signed-off-by: Thor Thayer <[email protected]>
>> ---
>> v2 s/_/-/ in qspi-clk
>> rename flash node.
>> use partition child node notation<snip>>> + qspi: spi@ff8d2000 {
>> + compatible = "cdns,qspi-nor";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + reg = <0xff8d2000 0x100>,
>> + <0xff900000 0x100000>;
>> + interrupts = <0 3 4>;
>> + cdns,fifo-depth = <128>;
>> + cdns,fifo-width = <4>;
>> + cdns,trigger-address = <0x00000000>;
>> + clocks = <&qspi_clk>;
>> + bus-num = <1>;
>
> I don't you need "bus-num" anymore right? I don't see it getting used
> anywhere in the driver.
>
> Dinh
>

Yes, I missed that holdover. Thanks, I'll correct that.