Skip to contentSkip to conversation

ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi

PATCH In review James Feist 2 participants 6 messages Nov 28, 2017 – Dec 8, 2017

Subsystems (3)
Device tree bindings Arm/Aspeed machine support Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

James Feist

author
#0 lore raw

PATCH v2 1/2 ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi

Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi as this file is not open power specific.

Signed-off-by James Feist <[email protected]>

---
Changes since v1:
- Added patch 2 that depends on this patch.

 arch/arm/boot/dts/aspeed-ast2500-evb.dts           |  2 +-
 arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts      |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts     |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts     |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 26 ----------------------
 arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts      |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts       |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts      |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts       |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts         |  2 +-
 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts       |  2 +-
 arch/arm/boot/dts/openbmc-flash-layout.dtsi        | 26 ++++++++++++++++++++++
 13 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
 create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi
arch/arm/boot/dts/aspeed-ast2500-evb.dts +1 -1
index 3543989..d75b2e8 100644
@@ -21,7 +21,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts +1 -1
index d1dc2ef..2d0bc10 100644
@@ -24,7 +24,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +1 -1
index 6e70ca5..0b7a238 100644
@@ -61,7 +61,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +1 -1
index 93ad3ea..e8e61f7 100644
@@ -50,7 +50,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi deleted +0 -26
deleted file mode 100644
index 4bcfd1b..0000000
@@ -1,26 +0,0 @@
-		label = "bmc";
-		partitions {
-				#address-cells = < 1 >;
-				#size-cells = < 1 >;
-				compatible = "fixed-partitions";
-				u-boot@0 {
-					reg = < 0 0x60000 >;
-					label = "u-boot";
-				};
-				u-boot-env@60000 {
-					reg = < 0x60000 0x20000 >;
-					label = "u-boot-env";
-				};
-				kernel@80000 {
-					reg = < 0x80000 0x440000 >;
-					label = "kernel";
-				};
-				rofs@0c0000 {
-					reg = < 0x4c0000 0x1740000 >;
-					label = "rofs";
-				};
-				rwfs@1c00000 {
-					reg = < 0x1c00000 0x400000 >;
-					label = "rwfs";
-				};
-		};
arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +1 -1
index 95552c8..5e30912 100644
@@ -34,7 +34,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +1 -1
index 833ef17..58f7884 100644
@@ -96,7 +96,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +1 -1
index ab3fee6..b41c29a 100644
@@ -65,7 +65,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1 -1
index 060eb0c..329532a 100644
@@ -114,7 +114,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +1 -1
index 68058ec..7017984 100644
@@ -176,7 +176,7 @@
 		status = "okay";
 		m25p,fast-read;
 
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 	flash@1 {
 		status = "okay";
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +1 -1
index 5410f58..5f6a11a 100644
@@ -140,7 +140,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +1 -1
index 7ed3a77..eafd6f9 100644
@@ -107,7 +107,7 @@
 	flash@0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
 	};
 };
arch/arm/boot/dts/openbmc-flash-layout.dtsi new file +26 -0
new file mode 100644
index 0000000..4bcfd1b
@@ -0,0 +1,26 @@
+		label = "bmc";
+		partitions {
+				#address-cells = < 1 >;
+				#size-cells = < 1 >;
+				compatible = "fixed-partitions";
+				u-boot@0 {
+					reg = < 0 0x60000 >;
+					label = "u-boot";
+				};
+				u-boot-env@60000 {
+					reg = < 0x60000 0x20000 >;
+					label = "u-boot-env";
+				};
+				kernel@80000 {
+					reg = < 0x80000 0x440000 >;
+					label = "kernel";
+				};
+				rofs@0c0000 {
+					reg = < 0x4c0000 0x1740000 >;
+					label = "rofs";
+				};
+				rwfs@1c00000 {
+					reg = < 0x1c00000 0x400000 >;
+					label = "rwfs";
+				};
+		};
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 2/2 ARM: dts: Add Wfp BMC Machine

Wfp is a Intel system with an Aspeed ast2500 BMC.

Signed-off-by James Feist <[email protected]>

---
Changes since V1:
- Fix mac 0 pinctrl and use existing flash layout.
- Add dependency.

 arch/arm/boot/dts/Makefile                 |   1 +
 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts | 117 +++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
arch/arm/boot/dts/Makefile +1 -0
index 6d6c9eb..987e23e 100644
@@ -992,6 +992,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \
 	aspeed-bmc-opp-lanyang.dtb \
 	aspeed-bmc-mellanox-msn.dtb \
 	aspeed-bmc-quanta-q71l.dtb \
+	aspeed-bmc-intel-wfp.dtb \
 	aspeed-ast2500-evb.dtb
 endif
arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts new file +117 -0

117 lines not on this page · raw message

Signature · 1 line
2.7.4
maintainer
#2 lore raw

Re: [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine

Quoted 1 line · James Feist

Wfp is a Intel system with an Aspeed ast2500 BMC.

Is WFP an acronym? It would be good to spell it out in the commit message.

Andrew, can you please review the bits of the device tree that you're familiar with (mostly pinmux)?

arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts line 15

Quoted 4 lines
arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts new file +4 -0
+
+       chosen {
+               stdout-path = &uart5;
+               bootargs = "115200 earlyprintk";

I don't think 115200 will do anything. Can you explain your intent here?

arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts line 20

Quoted 5 lines
arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts new file +5 -0
+       };
+
+       memory {
+               reg = <0x80000000 0x20000000>;
+       };

There's no reserved region for the VGA framebuffer, but you enable the GFX node below.

With the openbmc u-boot tree the size of the memory is adjusted to account for the framebuffer at the top of memory, but I was lead to believe Intel machines use their own u-boot fork.

Cheers,

Joel

author
#3 lore raw

Re: [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine

Quoted 6 lines · Joel Stanley
Quoted 1 line · James Feist

Wfp is a Intel system with an Aspeed ast2500 BMC.

Is WFP an acronym? It would be good to spell it out in the commit message.

It is not an acronym, it is a short name to describe current generation Intel boards.

Quoted 10 lines

Andrew, can you please review the bits of the device tree that you're familiar with (mostly pinmux)?

arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts line 15

Quoted 4 lines
arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts new file +4 -0
+
+       chosen {
+               stdout-path = &uart5;
+               bootargs = "115200 earlyprintk";

I don't think 115200 will do anything. Can you explain your intent here?

Will delete.

Quoted 7 lines

arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts line 20

Quoted 6 lines
arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts new file +5 -0
+       };
+
+       memory {
+               reg = <0x80000000 0x20000000>;
+       };
Quoted 7 lines

There's no reserved region for the VGA framebuffer, but you enable the GFX node below.

With the openbmc u-boot tree the size of the memory is adjusted to account for the framebuffer at the top of memory, but I was lead to believe Intel machines use their own u-boot fork.

We don't use u-boot, but I will fix this.

Quoted 4 lines

Cheers,

Joel

Thanks,

James

maintainer
#4 lore raw

Re: [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine

Quoted 5 lines · James Feist
Quoted 4 lines · Joel Stanley
Quoted 1 line · James Feist
Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Wfp is a Intel system with an Aspeed ast2500 BMC.

Is WFP an acronym? It would be good to spell it out in the commit message.

It is not an acronym, it is a short name to describe current generation Intel boards.

Okay. Can you please update the commit message with this information, and the long name?

Cheers,

Joel

maintainer
#5 lore raw
In reply to James Feist
Quoted 4 lines · James Feist

Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi as this file is not open power specific.

Signed-off-by James Feist <[email protected]>

This one looks okay. I've been flat out working on upstream and our v4.13 tree, but I will find some time to merge these for you in the coming days.

Quoted 231 lines

---
Changes since v1:
- Added patch 2 that depends on this patch.

 arch/arm/boot/dts/aspeed-ast2500-evb.dts           |  2 +-
 arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts      |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts     |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts     |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 26 ----------------------
 arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts      |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts       |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts      |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts       |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |  2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts         |  2 +-
 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts       |  2 +-
 arch/arm/boot/dts/openbmc-flash-layout.dtsi        | 26 ++++++++++++++++++++++
 13 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
 create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi
arch/arm/boot/dts/aspeed-ast2500-evb.dts +1 -1
index 3543989..d75b2e8 100644
@@ -21,7 +21,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts +1 -1
index d1dc2ef..2d0bc10 100644
@@ -24,7 +24,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +1 -1
index 6e70ca5..0b7a238 100644
@@ -61,7 +61,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +1 -1
index 93ad3ea..e8e61f7 100644
@@ -50,7 +50,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi deleted +0 -26
deleted file mode 100644
index 4bcfd1b..0000000
@@ -1,26 +0,0 @@
-               label = "bmc";
-               partitions {
-                               #address-cells = < 1 >;
-                               #size-cells = < 1 >;
-                               compatible = "fixed-partitions";
-                               u-boot@0 {
-                                       reg = < 0 0x60000 >;
-                                       label = "u-boot";
-                               };
-                               u-boot-env@60000 {
-                                       reg = < 0x60000 0x20000 >;
-                                       label = "u-boot-env";
-                               };
-                               kernel@80000 {
-                                       reg = < 0x80000 0x440000 >;
-                                       label = "kernel";
-                               };
-                               rofs@0c0000 {
-                                       reg = < 0x4c0000 0x1740000 >;
-                                       label = "rofs";
-                               };
-                               rwfs@1c00000 {
-                                       reg = < 0x1c00000 0x400000 >;
-                                       label = "rwfs";
-                               };
-               };
arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +1 -1
index 95552c8..5e30912 100644
@@ -34,7 +34,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +1 -1
index 833ef17..58f7884 100644
@@ -96,7 +96,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +1 -1
index ab3fee6..b41c29a 100644
@@ -65,7 +65,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1 -1
index 060eb0c..329532a 100644
@@ -114,7 +114,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +1 -1
index 68058ec..7017984 100644
@@ -176,7 +176,7 @@
                status = "okay";
                m25p,fast-read;
 
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
        flash@1 {
                status = "okay";
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +1 -1
index 5410f58..5f6a11a 100644
@@ -140,7 +140,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +1 -1
index 7ed3a77..eafd6f9 100644
@@ -107,7 +107,7 @@
        flash@0 {
                status = "okay";
                m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
        };
 };
arch/arm/boot/dts/openbmc-flash-layout.dtsi new file +26 -1
new file mode 100644
index 0000000..4bcfd1b
@@ -0,0 +1,26 @@
+               label = "bmc";
+               partitions {
+                               #address-cells = < 1 >;
+                               #size-cells = < 1 >;
+                               compatible = "fixed-partitions";
+                               u-boot@0 {
+                                       reg = < 0 0x60000 >;
+                                       label = "u-boot";
+                               };
+                               u-boot-env@60000 {
+                                       reg = < 0x60000 0x20000 >;
+                                       label = "u-boot-env";
+                               };
+                               kernel@80000 {
+                                       reg = < 0x80000 0x440000 >;
+                                       label = "kernel";
+                               };
+                               rofs@0c0000 {
+                                       reg = < 0x4c0000 0x1740000 >;
+                                       label = "rofs";
+                               };
+                               rwfs@1c00000 {
+                                       reg = < 0x1c00000 0x400000 >;
+                                       label = "rwfs";
+                               };
+               };
--

2.7.4