arm: dts: Stratix10: Add QSPI node
PATCH v4 1/1 arm: dts: Stratix10: Add QSPI node
Add QSPI device tree to Stratix 10. Sync from Linux Stratix 10 dts.
Tested on Stratix 10 SoC devkit.SOCFPGA_STRATIX10 # sf probe 0:0
SF: Detected mt25qu02g with page size 256 Bytes, erase size 64 KiB, total 256 MiB
---v3->v4:
- Add qspi node to dtsi based on alphabetical order
- Add spi-tx-bus-width and spi-rx-bus-width
v2->v3:
- Change flash compatible to "jedec,spi-nor"
- Change spi-max-frequency to 100MHz
--- arch/arm/dts/socfpga_stratix10.dtsi | 15 +++++++++++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+)
arch/arm/dts/socfpga_stratix10.dtsi +15 -0
@@ -237,6 +237,21 @@ reg = <0xffe00000 0x100000>; }; + qspi: spi at 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>; + bus-num = <0>; + status = "disabled"; + u-boot,dm-pre-reloc; + }; + rst: rstmgr at ffd11000 { #reset-cells = <1>; compatible = "altr,rst-mgr";
arch/arm/dts/socfpga_stratix10_socdk.dts +23 -0
@@ -10,6 +10,7 @@ aliases { serial0 = &uart0; + spi0 = &qspi; }; chosen {
@@ -87,6 +88,28 @@ smplsel = <0>; }; +&qspi { + status = "okay"; + + flash at 0 { + u-boot,dm-pre-reloc; + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; /* chip select */ + spi-max-frequency = <100000000>; + + page-size = <256>; + block-size = <16>; /* 2^16, 64KB */ + cdns,tshsl-ns = <50>; + cdns,tsd2d-ns = <50>; + cdns,tchsh-ns = <4>; + cdns,tslch-ns = <4>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + &uart0 { status = "okay"; };
Signature · 1 line
2.19.0
PATCH v4 1/1 arm: dts: Stratix10: Add QSPI node
Quoted 3 lines · Ley Foon Tan
Add QSPI device tree to Stratix 10. Sync from Linux Stratix 10 dts.
Which tree? Which commit?
Quoted 31 lines
Tested on Stratix 10 SoC devkit.
SOCFPGA_STRATIX10# sf probe 0:0
SF: Detected mt25qu02g with page size 256 Bytes, erase size 64 KiB, total 256 MiBSigned-off-by Ley Foon Tan <[email protected]>---
v3->v4:
- Add qspi node to dtsi based on alphabetical order
- Add spi-tx-bus-width and spi-rx-bus-width
v2->v3:
- Change flash compatible to "jedec,spi-nor"
- Change spi-max-frequency to 100MHz--- arch/arm/dts/socfpga_stratix10.dtsi | 15 +++++++++++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+)arch/arm/dts/socfpga_stratix10.dtsi +3
-0@@ -237,6 +237,21 @@ reg = <0xffe00000 0x100000>; }; + qspi: spi at ff8d2000 { + compatible = "cdns,qspi-nor"; + #address-cells = <1>;
arch/arm/dts/socfpga_stratix10.dtsi line 252
Quoted 10 lines
arch/arm/dts/socfpga_stratix10.dtsi +10
-0+ #size-cells = <0>; + reg = <0xff8d2000 0x100>, + <0xff900000 0x100000>; + interrupts = <0 3 4>; + cdns,fifo-depth = <128>; + cdns,fifo-width = <4>; + cdns,trigger-address = <0x00000000>; + bus-num = <0>; + status = "disabled"; + u-boot,dm-pre-reloc;
This file should be in sync with the Linux one, no? Does the Linux on havethis U-Boot specific property here? I could check myself if you would have given a tree or commit id of the sync source in the commit message...
If the Linux dts does not have this property, it would have to be moved to a U-Boot specific "-u-boot.dtsi" addon file.
Quoted 18 lines
arch/arm/dts/socfpga_stratix10.dtsi +2
-0+ }; + rst: rstmgr at ffd11000 { #reset-cells = <1>; compatible = "altr,rst-mgr";arch/arm/dts/socfpga_stratix10_socdk.dts +1
-0@@ -10,6 +10,7 @@ aliases { serial0 = &uart0; + spi0 = &qspi; }; chosen {
arch/arm/dts/socfpga_stratix10_socdk.dts line 95
Quoted 8 lines
arch/arm/dts/socfpga_stratix10_socdk.dts +5
-0@@ -87,6 +88,28 @@ smplsel = <0>; }; +&qspi { + status = "okay"; + + flash at 0 { + u-boot,dm-pre-reloc;
Same as above.
Regards,
Simon
Quoted 22 lines
arch/arm/dts/socfpga_stratix10_socdk.dts +17
-1+ #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; /* chip select */ + spi-max-frequency = <100000000>; + + page-size = <256>; + block-size = <16>; /* 2^16, 64KB */ + cdns,tshsl-ns = <50>; + cdns,tsd2d-ns = <50>; + cdns,tchsh-ns = <4>; + cdns,tslch-ns = <4>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + &uart0 { status = "okay"; }; --2.19.0
PATCH v4 1/1 arm: dts: Stratix10: Add QSPI node
Quoted 7 lines · Simon Goldschmidt
Quoted 3 lines · Ley Foon Tan
Add QSPI device tree to Stratix 10. Sync from Linux Stratix 10 dts.
Which tree? Which commit?
It is based on kernel v5.0 in mainline.
Quoted 47 lines
Quoted 32 lines
Tested on Stratix 10 SoC devkit.
SOCFPGA_STRATIX10# sf probe 0:0
SF: Detected mt25qu02g with page size 256 Bytes, erase size 64 KiB, total 256 MiBSigned-off-by Ley Foon Tan <[email protected]>---
v3->v4:
- Add qspi node to dtsi based on alphabetical order
- Add spi-tx-bus-width and spi-rx-bus-width
v2->v3:
- Change flash compatible to "jedec,spi-nor"
- Change spi-max-frequency to 100MHz--- arch/arm/dts/socfpga_stratix10.dtsi | 15 +++++++++++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+)arch/arm/dts/socfpga_stratix10.dtsi +3
-0@@ -237,6 +237,21 @@ reg = <0xffe00000 0x100000>; }; + qspi: spi at ff8d2000 { + compatible = "cdns,qspi-nor"; + #address-cells = <1>;arch/arm/dts/socfpga_stratix10.dtsi line 252
Quoted 10 lines
arch/arm/dts/socfpga_stratix10.dtsi +10
-0+ #size-cells = <0>; + reg = <0xff8d2000 0x100>, + <0xff900000 0x100000>; + interrupts = <0 3 4>; + cdns,fifo-depth = <128>; + cdns,fifo-width = <4>; + cdns,trigger-address = <0x00000000>; + bus-num = <0>; + status = "disabled"; + u-boot,dm-pre-reloc;This file should be in sync with the Linux one, no? Does the Linux on havethis U-Boot specific property here? I could check myself if you would have given a tree or commit id of the sync source in the commit message...
Quoted 2 lines
If the Linux dts does not have this property, it would have to be moved to a U-Boot specific "
-u-boot.dtsi" addon file.
Okay, will add this in new revision.
Thanks.
Regards
Ley Foon
PATCH v4 1/1 arm: dts: Stratix10: Add QSPI node
Quoted 11 lines · Ley Foon Tan
Quoted 7 lines · Simon Goldschmidt
Quoted 3 lines · Ley Foon Tan
Add QSPI device tree to Stratix 10. Sync from Linux Stratix 10 dts.
Which tree? Which commit?
It is based on kernel v5.0 in mainline.
In my understanding, 'sync from Linux' means this is a 1:1 copy of the file as it is in Linux. You should add the commit id or something like that to help reviewers identify the source and compare it.
However, I don't see all these U-Boot specific properties in the Linux version, so the term 'sync from Linux' does not seem correct. It seems like this difference
has been there before this patch, so could you clean it up first? You'd do that by copying the files (e.g. from Linux 5.0) and after that restore the U-Boot contents by adding "-u-boot.dtsi" files. See my commit for gen5:
commit c402e8170245 ("dts: arm: socfpga: merge gen5 devicetrees from linux") with the downside of a bad example: I forgot to add a Linux commit id :-(
Regards,
Simon
Quoted 56 lines
Quoted 48 lines
Quoted 33 lines
Tested on Stratix 10 SoC devkit.
SOCFPGA_STRATIX10# sf probe 0:0
SF: Detected mt25qu02g with page size 256 Bytes, erase size 64 KiB, total 256 MiBSigned-off-by Ley Foon Tan <[email protected]>---
v3->v4:
- Add qspi node to dtsi based on alphabetical order
- Add spi-tx-bus-width and spi-rx-bus-width
v2->v3:
- Change flash compatible to "jedec,spi-nor"
- Change spi-max-frequency to 100MHz--- arch/arm/dts/socfpga_stratix10.dtsi | 15 +++++++++++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+)arch/arm/dts/socfpga_stratix10.dtsi +3
-0@@ -237,6 +237,21 @@ reg = <0xffe00000 0x100000>; }; + qspi: spi at ff8d2000 { + compatible = "cdns,qspi-nor"; + #address-cells = <1>;arch/arm/dts/socfpga_stratix10.dtsi line 252
Quoted 10 lines
arch/arm/dts/socfpga_stratix10.dtsi +10
-0+ #size-cells = <0>; + reg = <0xff8d2000 0x100>, + <0xff900000 0x100000>; + interrupts = <0 3 4>; + cdns,fifo-depth = <128>; + cdns,fifo-width = <4>; + cdns,trigger-address = <0x00000000>; + bus-num = <0>; + status = "disabled"; + u-boot,dm-pre-reloc;This file should be in sync with the Linux one, no? Does the Linux on havethis U-Boot specific property here? I could check myself if you would have given a tree or commit id of the sync source in the commit message...
Quoted 2 lines
If the Linux dts does not have this property, it would have to be moved to a U-Boot specific "
-u-boot.dtsi" addon file.Okay, will add this in new revision.
Thanks.
Regards
Ley Foon
PATCH v4 1/1 arm: dts: Stratix10: Add QSPI node
Quoted 18 lines · Simon Goldschmidt
Quoted 11 lines · Ley Foon Tan
Quoted 7 lines · Simon Goldschmidt
Quoted 3 lines · Ley Foon Tan
Add QSPI device tree to Stratix 10. Sync from Linux Stratix 10 dts.
Which tree? Which commit?
It is based on kernel v5.0 in mainline.
In my understanding, 'sync from Linux' means this is a 1:1 copy of the file as it is in Linux. You should add the commit id or something like that to help reviewers identify the source and compare it.
Quoted 9 lines
However, I don't see all these U-Boot specific properties in the Linux version, so the term 'sync from Linux' does not seem correct. It seems like this difference
has been there before this patch, so could you clean it up first? You'd do that by copying the files (e.g. from Linux 5.0) and after that restore the U-Boot contents by adding "-u-boot.dtsi" files. See my commit for gen5:
commitc402e8170245("dts: arm: socfpga: merge gen5 devicetrees from linux") with the downside of a bad example: I forgot to add a Linux commit id :-(
Okay, I will take a look this.
Thanks.
Regards
Ley Foon
Quoted 56 lines
Quoted 56 lines
Quoted 48 lines
Quoted 33 lines
Tested on Stratix 10 SoC devkit.
SOCFPGA_STRATIX10# sf probe 0:0
SF: Detected mt25qu02g with page size 256 Bytes, erase size 64 KiB, total 256 MiBSigned-off-by Ley Foon Tan <[email protected]>---
v3->v4:
- Add qspi node to dtsi based on alphabetical order
- Add spi-tx-bus-width and spi-rx-bus-width
v2->v3:
- Change flash compatible to "jedec,spi-nor"
- Change spi-max-frequency to 100MHz--- arch/arm/dts/socfpga_stratix10.dtsi | 15 +++++++++++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+)arch/arm/dts/socfpga_stratix10.dtsi +3
-0@@ -237,6 +237,21 @@ reg = <0xffe00000 0x100000>; }; + qspi: spi at ff8d2000 { + compatible = "cdns,qspi-nor"; + #address-cells = <1>;arch/arm/dts/socfpga_stratix10.dtsi line 252
Quoted 10 lines
arch/arm/dts/socfpga_stratix10.dtsi +10
-0+ #size-cells = <0>; + reg = <0xff8d2000 0x100>, + <0xff900000 0x100000>; + interrupts = <0 3 4>; + cdns,fifo-depth = <128>; + cdns,fifo-width = <4>; + cdns,trigger-address = <0x00000000>; + bus-num = <0>; + status = "disabled"; + u-boot,dm-pre-reloc;This file should be in sync with the Linux one, no? Does the Linux on havethis U-Boot specific property here? I could check myself if you would have given a tree or commit id of the sync source in the commit message...
Quoted 2 lines
If the Linux dts does not have this property, it would have to be moved to a U-Boot specific "
-u-boot.dtsi" addon file.Okay, will add this in new revision.
Thanks.
Regards
Ley Foon