[U-Boot] [PATCH 1/4] arm: dts: ls1028a: Add FSPI node properties
Align flexspi node properties with linux device-tree properties Tested on LS1028A-RDB
Signed-off-by: Kuldeep Singh kuldeep.singh@nxp.com --- Depends on https://patchwork.ozlabs.org/patch/1190054/ https://patchwork.ozlabs.org/patch/1190052/ https://patchwork.ozlabs.org/patch/1190051/
arch/arm/dts/fsl-ls1028a-qds.dts | 16 ++++++++++++++++ arch/arm/dts/fsl-ls1028a-rdb.dts | 15 +++++++++++++++ 2 files changed, 31 insertions(+)
diff --git a/arch/arm/dts/fsl-ls1028a-qds.dts b/arch/arm/dts/fsl-ls1028a-qds.dts index 5d143ba077..3fd37beedf 100644 --- a/arch/arm/dts/fsl-ls1028a-qds.dts +++ b/arch/arm/dts/fsl-ls1028a-qds.dts @@ -13,6 +13,10 @@ / { model = "NXP Layerscape 1028a QDS Board"; compatible = "fsl,ls1028a-qds", "fsl,ls1028a"; + aliases { + spi0 = &fspi; + }; + };
&dspi0 { @@ -36,6 +40,18 @@
};
+&fspi { + status = "okay"; + + mt35xu02g0: flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <0>; + }; +}; + &i2c0 { status = "okay"; u-boot,dm-pre-reloc; diff --git a/arch/arm/dts/fsl-ls1028a-rdb.dts b/arch/arm/dts/fsl-ls1028a-rdb.dts index 3d5e8ade21..a8f40855b6 100644 --- a/arch/arm/dts/fsl-ls1028a-rdb.dts +++ b/arch/arm/dts/fsl-ls1028a-rdb.dts @@ -13,6 +13,9 @@ / { model = "NXP Layerscape 1028a RDB Board"; compatible = "fsl,ls1028a-rdb", "fsl,ls1028a"; + aliases { + spi0 = &fspi; + }; };
&dspi0 { @@ -36,6 +39,18 @@ mmc-hs200-1_8v; };
+&fspi { + status = "okay"; + + mt35xu02g0: flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <0>; + }; +}; + &i2c0 { status = "okay"; u-boot,dm-pre-reloc;
Align flexspi node properties with linux device-tree properties Tested on LX2160A-RDB
Signed-off-by: Kuldeep Singh kuldeep.singh@nxp.com --- Depends on https://patchwork.ozlabs.org/patch/1190054/ https://patchwork.ozlabs.org/patch/1190052/ https://patchwork.ozlabs.org/patch/1190051/
arch/arm/dts/fsl-lx2160a-rdb.dts | 24 +++++++++++++++++++++++- arch/arm/dts/fsl-lx2160a.dtsi | 15 +++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/fsl-lx2160a-rdb.dts b/arch/arm/dts/fsl-lx2160a-rdb.dts index 46a9239c25..e542c6992a 100644 --- a/arch/arm/dts/fsl-lx2160a-rdb.dts +++ b/arch/arm/dts/fsl-lx2160a-rdb.dts @@ -16,7 +16,9 @@ / { model = "NXP Layerscape LX2160ARDB Board"; compatible = "fsl,lx2160ardb", "fsl,lx2160a"; - + aliases { + spi0 = &fspi; + }; };
&esdhc0 { @@ -28,6 +30,26 @@ mmc-hs200-1_8v; };
+&fspi { + status = "okay"; + + mt35xu512aba0: flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <0>; + }; + + mt35xu512aba1: flash@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <1>; + }; +}; + &i2c0 { status = "okay"; u-boot,dm-pre-reloc; diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi index a189333e40..8c2ab1da31 100644 --- a/arch/arm/dts/fsl-lx2160a.dtsi +++ b/arch/arm/dts/fsl-lx2160a.dtsi @@ -6,6 +6,8 @@ * */
+#include <dt-bindings/interrupt-controller/arm-gic.h> + / { compatible = "fsl,lx2160a"; interrupt-parent = <&gic>; @@ -49,6 +51,19 @@ <1 10 0x8>; /* Hypervisor PPI, active-low */ };
+ fspi: flexspi@20c0000 { + compatible = "nxp,lx2160a-fspi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x20c0000 0x0 0x10000>, + <0x0 0x20000000 0x0 0x10000000>; + reg-names = "fspi_base", "fspi_mmap"; + clocks = <&clockgen 4 3>, <&clockgen 4 3>; + clock-names = "fspi_en", "fspi"; + interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + i2c0: i2c@2000000 { compatible = "fsl,vf610-i2c"; #address-cells = <1>;
Enable FSPI controller support. So, flash environment can now be used
Signed-off-by: Kuldeep Singh kuldeep.singh@nxp.com --- Depends on https://patchwork.ozlabs.org/patch/1190054/ https://patchwork.ozlabs.org/patch/1190052/ https://patchwork.ozlabs.org/patch/1190051/
configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028aqds_tfa_defconfig | 1 + configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 + 4 files changed, 4 insertions(+)
diff --git a/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig index 3170d81aaf..c115885923 100644 --- a/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig @@ -65,6 +65,7 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/ls1028aqds_tfa_defconfig b/configs/ls1028aqds_tfa_defconfig index 2da7b1d94e..1fbba3c73d 100644 --- a/configs/ls1028aqds_tfa_defconfig +++ b/configs/ls1028aqds_tfa_defconfig @@ -68,6 +68,7 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig index c1e88b5465..caba7f7be4 100644 --- a/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig @@ -65,6 +65,7 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index 5ff34047a7..f1c8f0348d 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -69,6 +69,7 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
Enable FSPI controller support. So, flash environment can now be used
Signed-off-by: Kuldeep Singh kuldeep.singh@nxp.com --- Depends on https://patchwork.ozlabs.org/patch/1190054/ https://patchwork.ozlabs.org/patch/1190052/ https://patchwork.ozlabs.org/patch/1190051/
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 2 ++ configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 2 ++ 4 files changed, 6 insertions(+)
diff --git a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig index 3d4506bbff..dc3a613b48 100644 --- a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig @@ -61,6 +61,7 @@ CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index ef774af62e..568da54c71 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -28,6 +28,7 @@ CONFIG_OF_CONTROL=y CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-qds" CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y @@ -61,6 +62,7 @@ CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index ede4e0f75f..786f2c6a78 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -56,6 +56,7 @@ CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index 1ad4ad79b5..e59bbb275b 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -29,6 +29,7 @@ CONFIG_OF_CONTROL=y CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb" CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y @@ -60,6 +61,7 @@ CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
-----Original Message----- From: Kuldeep Singh kuldeep.singh@nxp.com Sent: Wednesday, November 6, 2019 4:38 PM To: u-boot@lists.denx.de Cc: Priyanka Jain priyanka.jain@nxp.com; Kuldeep Singh kuldeep.singh@nxp.com Subject: [PATCH 4/4] configs: lx2160a: Enable FSPI support
Enable FSPI controller support. So, flash environment can now be used
Signed-off-by: Kuldeep Singh kuldeep.singh@nxp.com
Kindly fix below config related error
* Restart config... * * * Environment * ..... Environment is in SPI flash (ENV_IS_IN_SPI_FLASH) [Y/n/?] y SPI flash bus for environment (USE_ENV_SPI_BUS) [N/y/?] n SPI flash chip select for environment (USE_ENV_SPI_CS) [N/y/?] n SPI flash max frequency for environment (USE_ENV_SPI_MAX_HZ) [N/y/?] n SPI flash mode for environment (USE_ENV_SPI_MODE) [N/y/?] n Enable redundant environment support (SYS_REDUNDAND_ENVIRONMENT) [N/y/?] n Environment address (ENV_ADDR) [0x0] 0x0 Environment offset (ENV_OFFSET) [0x500000] 0x500000 Environment Size (ENV_SIZE) [0x2000] 0x2000 Environment Sector-Size (ENV_SECT_SIZE) [] (NEW)
-Priyanka
-----Original Message----- From: Kuldeep Singh kuldeep.singh@nxp.com Sent: Wednesday, November 6, 2019 4:38 PM To: u-boot@lists.denx.de Cc: Priyanka Jain priyanka.jain@nxp.com; Kuldeep Singh kuldeep.singh@nxp.com Subject: [PATCH 1/4] arm: dts: ls1028a: Add FSPI node properties
Align flexspi node properties with linux device-tree properties Tested on LS1028A-RDB
Signed-off-by: Kuldeep Singh kuldeep.singh@nxp.com
Series (except 4/4 for which changes are requested) applied on u-boot-fsl-qoriq/master. Awaiting upstream -priyankajain
participants (2)
-
Kuldeep Singh -
Priyanka Jain