ARM: rmobile: beacon-renesom: Enable QSPI NOR Flash
PATCH v2 1/1 ARM: rmobile: beacon-renesom: Enable QSPI NOR Flash
There is a QSPI NOR flash part on the board. Because this chip isn't yet supported in Linux, but it is supported in U-Boot, and the face that the RPC_SPI compatible names are different in U-Boot and Linux, the device tree updates are confined to -u-boot.dtsi files.
In order to use the QSPI, TF-A must leave RPC unlocked by compiling TF-A with RZG_RPC_HYPERFLASH_LOCKED=0.
---
V2: Add note to commit message about TF-A
No functional changes
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +27 -0
@@ -4,11 +4,19 @@ */ / { + aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; }; }; +&avb { + phy-mode = "rgmii-txid"; +}; + &cpg { u-boot,dm-pre-reloc; };
@@ -25,6 +33,25 @@ u-boot,dm-pre-reloc; }; +&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + &sdhi0 { /delete-property/ cd-gpios; };
arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi +23 -0
@@ -4,6 +4,10 @@ */ / { + aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; };
@@ -25,6 +29,25 @@ u-boot,dm-pre-reloc; }; +&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + &sdhi0 { /delete-property/ cd-gpios; };
arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi +23 -0
@@ -4,6 +4,10 @@ */ / { + aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; };
@@ -25,6 +29,25 @@ u-boot,dm-pre-reloc; }; +&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + &sdhi0 { /delete-property/ cd-gpios; sd-uhs-sdr12;
configs/r8a774a1_beacon_defconfig +9 -0
@@ -18,7 +18,9 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_PART=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y
@@ -47,6 +49,10 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y CONFIG_BITBANGMII=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y
@@ -56,6 +62,9 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_SCIF_CONSOLE=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_RENESAS_RPC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
configs/r8a774b1_beacon_defconfig +9 -0
@@ -18,7 +18,9 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_PART=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y
@@ -48,6 +50,10 @@ CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_BITBANGMII=y CONFIG_PHY_REALTEK=y
@@ -61,6 +67,9 @@ CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_RENESAS_RPC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
configs/r8a774e1_beacon_defconfig +9 -0
@@ -18,7 +18,9 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_PART=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y
@@ -47,6 +49,10 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y CONFIG_BITBANGMII=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y
@@ -56,6 +62,9 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_SCIF_CONSOLE=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_RENESAS_RPC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y
Signature · 1 line
2.17.1
Quoted 11 lines · Adam Ford
There is a QSPI NOR flash part on the board. Because this chip isn't yet supported in Linux, but it is supported in U-Boot, and the face that the
RPC_SPIcompatible names are different in U-Boot and Linux, the device tree updates are confined to-u-boot.dtsifiles.In order to use the QSPI, TF-A must leave RPC unlocked by compiling TF-A with RZG_RPC_HYPERFLASH_LOCKED=0.
Signed-off-by Adam Ford <[email protected]>Reviewed-by Biju Bas <[email protected]>
Marek,
It looks like this [1] was assigned to you. its been a couple months. any chance this could get applied or get feedback?
thanks,
adam
[1] - https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Quoted 244 lines
---
V2: Add note to commit message about TF-A
No functional changesarch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +27
-0@@ -4,11 +4,19 @@ */ / { + aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; }; }; +&avb { + phy-mode = "rgmii-txid"; +}; + &cpg { u-boot,dm-pre-reloc; };@@ -25,6 +33,25 @@ u-boot,dm-pre-reloc; }; +&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + &sdhi0 { /delete-property/ cd-gpios; };arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi +23
-0@@ -4,6 +4,10 @@ */ / { + aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; };@@ -25,6 +29,25 @@ u-boot,dm-pre-reloc; }; +&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + &sdhi0 { /delete-property/ cd-gpios; };arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi +23
-0@@ -4,6 +4,10 @@ */ / { + aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; };@@ -25,6 +29,25 @@ u-boot,dm-pre-reloc; }; +&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + &sdhi0 { /delete-property/ cd-gpios; sd-uhs-sdr12;configs/r8a774a1_beacon_defconfig +9
-0@@ -18,7 +18,9 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_PART=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y@@ -47,6 +49,10 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y CONFIG_BITBANGMII=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y@@ -56,6 +62,9 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_SCIF_CONSOLE=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_RENESAS_RPC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=yconfigs/r8a774b1_beacon_defconfig +9
-0@@ -18,7 +18,9 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_PART=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y@@ -48,6 +50,10 @@ CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_BITBANGMII=y CONFIG_PHY_REALTEK=y@@ -61,6 +67,9 @@ CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_RENESAS_RPC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=yconfigs/r8a774e1_beacon_defconfig +9
-1@@ -18,7 +18,9 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_PART=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y@@ -47,6 +49,10 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y CONFIG_BITBANGMII=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y@@ -56,6 +62,9 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_SCIF_CONSOLE=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_RENESAS_RPC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y --2.17.1
Quoted 10 lines · Adam Ford
Quoted 9 lines · Adam Ford
There is a QSPI NOR flash part on the board. Because this chip isn't yet supported in Linux, but it is supported in U-Boot, and the face that the
RPC_SPIcompatible names are different in U-Boot and Linux, the device tree updates are confined to-u-boot.dtsifiles.In order to use the QSPI, TF-A must leave RPC unlocked by compiling TF-A with RZG_RPC_HYPERFLASH_LOCKED=0.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Adam Ford <[email protected]>Reviewed-by Biju Bas <[email protected]>Marek,
It looks like this [1] was assigned to you. its been a couple months. any chance this could get applied or get feedback?
Rebase, fix the below, resend, I'll pick it.
Also, probably don't wait "a few months" and let the frustration grow next time, week or two usually means the patch was missed.
Quoted 10 lines
Quoted 10 lines
/ {arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +4
-0+ aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; }; };
Quoted 4 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi line 19
Quoted 4 lines
+&avb {
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +3
-0+ phy-mode = "rgmii-txid"; +}; +
Do you really need ethernet for QSPI NOR ?
Quoted 7 lines
Quoted 7 lines
&cpg { u-boot,dm-pre-reloc; };arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +0
-0@@ -25,6 +33,25 @@ u-boot,dm-pre-reloc; };
Quoted 7 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi line 42
Quoted 7 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +7
-0+&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay";
btw. can those duplicate entries be somehow deduplicated into some yourboard.dtsi file ?
Quoted 10 lines
Quoted 10 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +10
-0+ flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +};
[...]
Quoted 15 lines · Marek Vasut
Quoted 13 lines · Adam Ford
Quoted 11 lines · Adam Ford
There is a QSPI NOR flash part on the board. Because this chip isn't yet supported in Linux, but it is supported in U-Boot, and the face that the
RPC_SPIcompatible names are different in U-Boot and Linux, the device tree updates are confined to-u-boot.dtsifiles.In order to use the QSPI, TF-A must leave RPC unlocked by compiling TF-A with RZG_RPC_HYPERFLASH_LOCKED=0.
Signed-off-by Adam Ford <[email protected]>Reviewed-by Biju Bas <[email protected]>
Quoted 6 lines
Quoted 4 lines
Marek,
It looks like this [1] was assigned to you. its been a couple months. any chance this could get applied or get feedback?
Rebase, fix the below, resend, I'll pick it.
no problem.
Quoted 3 lines
Also, probably don't wait "a few months" and let the frustration grow next time, week or two usually means the patch was missed.
I would have sooner, but I was out on medical leave for 6 weeks with a broken wrist. I am just trying to catch up now.
adam
Quoted 48 lines
Quoted 11 lines
Quoted 11 lines
/ {arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +4
-0+ aliases { + spi0 = &rpc; + }; + soc { u-boot,dm-pre-reloc; }; };Quoted 4 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi line 19
Quoted 4 lines
+&avb {
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +3
-0+ phy-mode = "rgmii-txid"; +}; +Do you really need ethernet for QSPI NOR ?
Quoted 7 lines
Quoted 7 lines
&cpg { u-boot,dm-pre-reloc; };arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +0
-0@@ -25,6 +33,25 @@ u-boot,dm-pre-reloc; };Quoted 7 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi line 42
Quoted 7 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +7
-0+&rpc { + compatible = "renesas,rcar-gen3-rpc"; + num-cs = <1>; + spi-max-frequency = <40000000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay";btw. can those duplicate entries be somehow deduplicated into some
yourboard.dtsifile ?Quoted 10 lines
Quoted 10 lines
arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi +10
-0+ flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +};[...]
Quoted 23 lines · Adam Ford
Quoted 15 lines · Marek Vasut
Quoted 13 lines · Adam Ford
Quoted 11 lines · Adam Ford
There is a QSPI NOR flash part on the board. Because this chip isn't yet supported in Linux, but it is supported in U-Boot, and the face that the
RPC_SPIcompatible names are different in U-Boot and Linux, the device tree updates are confined to-u-boot.dtsifiles.In order to use the QSPI, TF-A must leave RPC unlocked by compiling TF-A with RZG_RPC_HYPERFLASH_LOCKED=0.
Signed-off-by Adam Ford <[email protected]>Reviewed-by Biju Bas <[email protected]>Quoted 6 lines
Quoted 4 lines
Marek,
It looks like this [1] was assigned to you. its been a couple months. any chance this could get applied or get feedback?
Rebase, fix the below, resend, I'll pick it.
Quoted 8 lines
no problem.
Quoted 3 lines
Also, probably don't wait "a few months" and let the frustration grow next time, week or two usually means the patch was missed.
I would have sooner, but I was out on medical leave for 6 weeks with a broken wrist. I am just trying to catch up now.
Oh well, then just fix the patch up and resend when you have time.