diff mbox

[linux,dev-4.7,05/12] ARM: dts: aspeed-g5: update witherspoon for new spi-nor binding

Message ID 1476448684-6149-6-git-send-email-clg@kaod.org
State Changes Requested, archived
Headers show

Commit Message

Cédric Le Goater Oct. 14, 2016, 12:37 p.m. UTC
From: Milton Miller <miltonm@us.ibm.com>

Witherspoon has two flash modules for the BMC firmware and one for the
host.

Signed-off-by: Milton Miller <miltonm@us.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 28 ++++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

Comments

Joel Stanley Oct. 17, 2016, 5:03 a.m. UTC | #1
On Fri, Oct 14, 2016 at 11:07 PM, Cédric Le Goater <clg@kaod.org> wrote:
> From: Milton Miller <miltonm@us.ibm.com>
>
> Witherspoon has two flash modules for the BMC firmware and one for the
> host.
>
> Signed-off-by: Milton Miller <miltonm@us.ibm.com>
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

Reviewed-by: Joel Stanley <joel@jms.id.au>

> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 28 ++++++++++++++----------
>  1 file changed, 16 insertions(+), 12 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index fcc880a80ee0..53af584e8f63 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -19,20 +19,24 @@ 
 	memory {
 		reg = <0x80000000 0x40000000>;
 	};
+};
 
-	ahb {
-		bmc_pnor: fmc@1e620000 {
-			reg = < 0x1e620000 0x94
-				0x20000000 0x02000000 >;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "aspeed,ast2500-fmc";
-			flash@0 {
-				reg = < 0 >;
-				compatible = "jedec,spi-nor" ;
+&fmc {
+	status = "okay";
+	flash@0 {
+		status = "okay";
 #include "aspeed-bmc-opp-flash-layout.dtsi"
-			};
-		};
+	};
+	flash@1 {
+		status = "okay";
+		label = "alt";
+	};
+};
+
+&spi1 {
+	status = "okay";
+	flash@0 {
+		status = "okay";
 	};
 };