ARM: dts: aspeed-g5: Update zaius with new spi-nor binding
Subsystems (2)
PATCH 1/1 ARM: dts: aspeed-g5: Update zaius with new spi-nor binding
Zaius has one flash module for the BMC firmware, one flash module for the host firmware, and one more flash module on SPI2.
--- arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 66 ++++++++++++------------------ 1 file changed, 26 insertions(+), 40 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +26 -40
@@ -20,46 +20,6 @@ reg = <0x80000000 0x40000000>; }; - ahb { - bmc_pnor: fmc@1e620000 { - reg = < 0x1e620000 0xc4 - 0x20000000 0x04000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2500-fmc"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; -#include "aspeed-bmc-opp-flash-layout.dtsi" - }; - }; - - host_pnor: spi@1e630000 { - reg = < 0x1e630000 0xc4 - 0x30000000 0x04000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2500-smc"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - label = "pnor"; - }; - }; - - data_pnor: spi@1e631000 { - reg = < 0x1e631000 0xc4 - 0x38000000 0x00800000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2500-smc"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - }; - }; - }; - leds { compatible = "gpio-leds";
@@ -85,6 +45,32 @@ }; }; +&fmc { + status = "okay"; + flash@0 { + status = "okay"; +#include "aspeed-bmc-opp-flash-layout.dtsi" + }; +}; + +&spi1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; + + flash@0 { + status = "okay"; + label = "pnor"; + }; +}; + +&spi2 { + status = "okay"; + flash@0 { + status = "okay"; + }; +}; + &uart5 { status = "okay"; };
Signature · 1 line
2.8.0.rc3.226.g39d4020
Joel Stanley
maintainerHey Xo,
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts line 68
Quoted 13 lines · Xo Wang
+&spi1 {
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +12
-0+ status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; + + flash@0 { + status = "okay"; + label = "pnor"; + }; +}; + +&spi2 { + status = "okay";
I think we want to request the pins here. Something like this:
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi2ck_default
+ &pinctrl_spi2cs0_default + &pinctrl_spi2cs1_default + &pinctrl_spi2miso_default + &pinctrl_spi2mosi_default>;
+
Can you try that and do a test boot on your hardware?
Cheers,
Joel
Quoted 5 lines
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +5
-0+ flash@0 { + status = "okay"; + }; +}; +
Quoted 20 lines · Joel Stanley
Hey Xo,
Quoted 5 lines · Xo Wang
+&spi1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi1_default>;arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts line 68
Quoted 9 lines
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +9
-0+ + flash@0 { + status = "okay"; + label = "pnor"; + }; +}; + +&spi2 { + status = "okay";I think we want to request the pins here. Something like this:
Quoted 7 lines
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi2ck_default+ &pinctrl_spi2cs0_default + &pinctrl_spi2cs1_default + &pinctrl_spi2miso_default + &pinctrl_spi2mosi_default>;
Yes, we need this, though maybe the chip selects should be pushed out to the board dts?
Andrew
Quoted 14 lines
+
Can you try that and do a test boot on your hardware?
Cheers,
Joel
Quoted 6 lines
+ flash@0 {
+ status = "okay";
+ };(quoted diff) +2
-0+}; +
Hi Joel, Andrew,
Quoted 29 lines · Andrew Jeffery
Quoted 20 lines · Joel Stanley
Hey Xo,
Quoted 4 lines · Xo Wang
+&spi1 {
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +2
-0+ status = "okay"; + pinctrl-names = "default";arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts line 68
Quoted 10 lines
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +10
-0+ pinctrl-0 = <&pinctrl_spi1_default>; + + flash@0 { + status = "okay"; + label = "pnor"; + }; +}; + +&spi2 { + status = "okay";I think we want to request the pins here. Something like this:
Review
Quoted 7 lines
(quoted diff) +7
-0+ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2ck_default + &pinctrl_spi2cs0_default + &pinctrl_spi2cs1_default + &pinctrl_spi2miso_default + &pinctrl_spi2mosi_default>;
Quoted 8 lines
Yes, we need this, though maybe the chip selects should be pushed out to the board dts?
Andrew
Quoted 3 lines
+
Can you try that and do a test boot on your hardware?
Good catch! I hadn't picked up that the SPI2 flash wasn't being probed. Now it's showing up:
platform 1e620000.flash-controller:flash@0: mx66l51235l (65536 Kbytes) 6 ofpart partitions found on MTD device bmc
Creating 6 MTD partitions on "bmc":
0x000000000000-0x000000060000 : "u-boot" 0x000000060000-0x000000080000 : "u-boot-env" 0x000000080000-0x000000300000 : "kernel" 0x000000300000-0x0000004c0000 : "initramfs" 0x0000004c0000-0x000001c00000 : "rofs" 0x000001c00000-0x000002000000 : "rwfs"
aspeed-smc 1e630000.flash-controller: no DMA support. platform 1e630000.flash-controller:flash@0: mx66l51235l (65536 Kbytes) aspeed-smc 1e631000.flash-controller: no DMA support. platform 1e631000.flash-controller:flash@0: mx25l6405d (8192 Kbytes)
cheers
xo
Quoted 11 lines
Quoted 11 lines
Cheers,
Joel
Quoted 6 lines
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +5
-0+ flash@0 { + status = "okay"; + }; +}; +