Skip to contentSkip to conversation

ARM: dts: aspeed: Update reserved memory nodes for zaius and witherspoon

PATCH In review Cyril Bur 3 participants 5 messages Feb 17, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Cyril Bur

author
#0 lore raw

PATCH v2 1/1 ARM: dts: aspeed: Update reserved memory nodes for zaius and witherspoon

Zaius platform doesn't use VGA so don't reserve that memory

---
v2: Drop reserving the framebuffer on Zaius
Both platforms have 1GB not 512MB - adjust numbers Add comment requested by Joel.

 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 15 +++++++++++++--
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 12 ++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +13 -2
index 4b2d8aa8abb6..b79cadb2f6d7 100644
@@ -25,9 +25,20 @@
 		#size-cells = <1>;
 		ranges;
 
-		flash_memory: region@94000000 {
+		/*
+		 * The addreses for the flash_memory reserved range are the
+		 * highest allowable for the size of the mapping (ie, the
+		 * address has no set bits greater than the size)
+		 */
+
+		flash_memory: region@b8000000 {
+			no-map;
+			reg = <0xb8000000 0x04000000>; /* 64M */
+		};
+
+		vga_memory: framebuffer@bc000000 {
 			no-map;
-			reg = <0x94000000 0x04000000>; /* 64M */
+			reg = <0xbc000000 0x04000000>; /* 64M */
 		};
 	};
 
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +10 -2
index e1c9b3f4fe44..5a06da43801b 100644
@@ -25,10 +25,18 @@
 		#size-cells = <1>;
 		ranges;
 
-		flash_memory: region@94000000 {
+		/*
+		 * The addreses for the flash_memory reserved range are the
+		 * highest allowable for the size of the mapping (ie, the
+		 * address has no set bits greater than the size)
+		 */
+
+		flash_memory: region@bc000000 {
 			no-map;
-			reg = <0x94000000 0x04000000>; /* 64M */
+			reg = <0xbc000000 0x04000000>; /* 64M */
 		};
+
+		/* Zaius doesn't use VGA so don't reserve VGA buffer */
 	};
 
 	onewire0 {
Signature · 1 line
2.11.1

A message that is not in the archive (sent off-list or not yet received): CAPLgG==cyh05UMqj3VD1cTjQX9ycuG36ECGumT84MKo5sO+MAg@mail.gmail.com

A message that is not in the archive (sent off-list or not yet received): CAPLgG=kMbxDs32dw6uGwabVsGevv5w7g42E+KtHERToowM5HKg@mail.gmail.com

#3 lore raw

Current Zaius and Barreleye G2 boards have AST2500 which has VGA support. Google hasn't tried the VGA but it is there. We plan to switch to 2520 later for our own designs but it's only a BOM option to switch between the two.

On Feb 16, 2017 7:15 PM, "Cyril Bur" <[email protected]> wrote:

Zaius platform doesn't use VGA so don't reserve that memory

---
v2: Drop reserving the framebuffer on Zaius
Both platforms have 1GB not 512MB - adjust numbers Add comment requested by Joel.

 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 15 +++++++++++++--
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 12 ++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 4b2d8aa8abb6..b79cadb2f6d7 100644

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +13 -2
@@ -25,9 +25,20 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are the
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@b8000000 {
+                       no-map;
+                       reg = <0xb8000000 0x04000000>; /* 64M */
+               };
+
+               vga_memory: framebuffer@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
        };
 
(quoted diff) +0 -0

b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index e1c9b3f4fe44..5a06da43801b 100644

arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +10 -2
@@ -25,10 +25,18 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are the
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
+
+               /* Zaius doesn't use VGA so don't reserve VGA buffer */
        };
 
        onewire0 {

--
2.11.1

maintainer
#4 lore raw
Quoted 3 lines · Rick Altherr

Current Zaius and Barreleye G2 boards have AST2500 which has VGA support. Google hasn't tried the VGA but it is there. We plan to switch to 2520 later for our own designs but it's only a BOM option to switch between the two.

I think detecting the board revision GPIOs in u-boot and performing a fixup of the device tree is a good way to handle these kind of things.

Perhaps we will end up having different device trees if the systems end up with vastly different configurations, or configs that aren't detectable from software.

Quoted 73 lines · Cyril Bur

Zaius platform doesn't use VGA so don't reserve that memory

---
v2: Drop reserving the framebuffer on Zaius
Both platforms have 1GB not 512MB - adjust numbers Add comment requested by Joel.

 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 15 +++++++++++++--
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 12 ++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +13 -2
index 4b2d8aa8abb6..b79cadb2f6d7 100644
@@ -25,9 +25,20 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are the
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@b8000000 {
+                       no-map;
+                       reg = <0xb8000000 0x04000000>; /* 64M */
+               };
+
+               vga_memory: framebuffer@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
        };
 
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +10 -3
index e1c9b3f4fe44..5a06da43801b 100644
@@ -25,10 +25,18 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are the
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
+
+               /* Zaius doesn't use VGA so don't reserve VGA buffer */
        };
 
        onewire0 {
--

2.11.1

#5 lore raw

Sounds good to me.

Quoted 90 lines · Joel Stanley
Quoted 2 lines · Rick Altherr

Current Zaius and Barreleye G2 boards have AST2500 which has VGA support. Google hasn't tried the VGA but it is there. We plan to switch to 2520

later

Quoted 1 line

for our own designs but it's only a BOM option to switch between the two.

I think detecting the board revision GPIOs in u-boot and performing a fixup of the device tree is a good way to handle these kind of things.

Perhaps we will end up having different device trees if the systems end up with vastly different configurations, or configs that aren't detectable from software.

Quoted 21 lines · Cyril Bur

Zaius platform doesn't use VGA so don't reserve that memory

---
v2: Drop reserving the framebuffer on Zaius
Both platforms have 1GB not 512MB - adjust numbers Add comment requested by Joel.

 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 15 +++++++++++++--
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 12 ++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +0 -0
index 4b2d8aa8abb6..b79cadb2f6d7 100644

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts line 29

Quoted 6 lines
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +2 -1
@@ -25,9 +25,20 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are

the

Quoted 22 lines
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +11 -1
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@b8000000 {
+                       no-map;
+                       reg = <0xb8000000 0x04000000>; /* 64M */
+               };
+
+               vga_memory: framebuffer@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
        };
 
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +0 -0
index e1c9b3f4fe44..5a06da43801b 100644

arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts line 29

Quoted 6 lines
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +2 -1
@@ -25,10 +25,18 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are

the

Quoted 18 lines
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +8 -2
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
+
+               /* Zaius doesn't use VGA so don't reserve VGA buffer */
        };
 
        onewire0 {
--

2.11.1

maintainer
#6 lore raw
In reply to Cyril Bur
Quoted 6 lines · Cyril Bur

Zaius platform doesn't use VGA so don't reserve that memory

---
v2: Drop reserving the framebuffer on Zaius
Both platforms have 1GB not 512MB - adjust numbers

Witherspoon has 512MB of DDR. I think Lei was trying to point out that the memory node needed fixing.

(The pass1 BMC boards for Witherspoon did have 1GB, but it was changed to 512MB. As far as I know we got rid of the pass1 boards so we only need to support 512MB systems).

Cheers,

Joel

Quoted 61 lines

Add comment requested by Joel.

 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 15 +++++++++++++--
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 12 ++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +13 -2
index 4b2d8aa8abb6..b79cadb2f6d7 100644
@@ -25,9 +25,20 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are the
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@b8000000 {
+                       no-map;
+                       reg = <0xb8000000 0x04000000>; /* 64M */
+               };
+
+               vga_memory: framebuffer@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
        };
 
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +10 -3
index e1c9b3f4fe44..5a06da43801b 100644
@@ -25,10 +25,18 @@
                #size-cells = <1>;
                ranges;
 
-               flash_memory: region@94000000 {
+               /*
+                * The addreses for the flash_memory reserved range are the
+                * highest allowable for the size of the mapping (ie, the
+                * address has no set bits greater than the size)
+                */
+
+               flash_memory: region@bc000000 {
                        no-map;
-                       reg = <0x94000000 0x04000000>; /* 64M */
+                       reg = <0xbc000000 0x04000000>; /* 64M */
                };
+
+               /* Zaius doesn't use VGA so don't reserve VGA buffer */
        };
 
        onewire0 {
--

2.11.1