[PATCH linux] ARM: dts: aspeed-g5: Update zaius with new spi-nor binding
Xo Wang
xow at google.com
Wed Nov 2 10:30:25 AEDT 2016
Zaius has one flash module for the BMC firmware, one flash module for
the host firmware, and one more flash module on SPI2.
Signed-off-by: Xo Wang <xow at google.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 66 ++++++++++++------------------
1 file changed, 26 insertions(+), 40 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index eef045b..2004615 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -20,46 +20,6 @@
reg = <0x80000000 0x40000000>;
};
- ahb {
- bmc_pnor: fmc at 1e620000 {
- reg = < 0x1e620000 0xc4
- 0x20000000 0x04000000 >;
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "aspeed,ast2500-fmc";
- flash at 0 {
- reg = < 0 >;
- compatible = "jedec,spi-nor" ;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
- };
- };
-
- host_pnor: spi at 1e630000 {
- reg = < 0x1e630000 0xc4
- 0x30000000 0x04000000 >;
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "aspeed,ast2500-smc";
- flash at 0 {
- reg = < 0 >;
- compatible = "jedec,spi-nor" ;
- label = "pnor";
- };
- };
-
- data_pnor: spi at 1e631000 {
- reg = < 0x1e631000 0xc4
- 0x38000000 0x00800000 >;
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "aspeed,ast2500-smc";
- flash at 0 {
- reg = < 0 >;
- compatible = "jedec,spi-nor" ;
- };
- };
- };
-
leds {
compatible = "gpio-leds";
@@ -85,6 +45,32 @@
};
};
+&fmc {
+ status = "okay";
+ flash at 0 {
+ status = "okay";
+#include "aspeed-bmc-opp-flash-layout.dtsi"
+ };
+};
+
+&spi1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi1_default>;
+
+ flash at 0 {
+ status = "okay";
+ label = "pnor";
+ };
+};
+
+&spi2 {
+ status = "okay";
+ flash at 0 {
+ status = "okay";
+ };
+};
+
&uart5 {
status = "okay";
};
--
2.8.0.rc3.226.g39d4020
More information about the openbmc
mailing list