diff mbox

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

Message ID CAPLgG=kFuyyZoX=g4_sZQgMG=r+dk-AjKADYBof0mwhH8Q5JZQ@mail.gmail.com
State Superseded, archived
Headers show

Commit Message

Rick Altherr Feb. 17, 2017, 3:33 a.m. UTC
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" <cyrilbur@gmail.com> wrote:

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

Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
---
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(-)

--
2.11.1

Comments

Joel Stanley Feb. 17, 2017, 3:40 a.m. UTC | #1
On Fri, Feb 17, 2017 at 2:03 PM, Rick Altherr <raltherr@google.com> wrote:
> 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.


>
> On Feb 16, 2017 7:15 PM, "Cyril Bur" <cyrilbur@gmail.com> wrote:
>
> Zaius platform doesn't use VGA so don't reserve that memory
>
> Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> index 4b2d8aa8abb6..b79cadb2f6d7 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> @@ -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 */
>                 };
>         };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> index e1c9b3f4fe44..5a06da43801b 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> @@ -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
>
>
Rick Altherr Feb. 17, 2017, 3:50 a.m. UTC | #2
Sounds good to me.

On Feb 16, 2017 7:41 PM, "Joel Stanley" <joel@jms.id.au> wrote:

> On Fri, Feb 17, 2017 at 2:03 PM, Rick Altherr <raltherr@google.com> wrote:
> > 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.
>
>
> >
> > On Feb 16, 2017 7:15 PM, "Cyril Bur" <cyrilbur@gmail.com> wrote:
> >
> > Zaius platform doesn't use VGA so don't reserve that memory
> >
> > Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
> > ---
> > 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(-)
> >
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> > b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> > index 4b2d8aa8abb6..b79cadb2f6d7 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> > @@ -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 */
> >                 };
> >         };
> >
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> > b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> > index e1c9b3f4fe44..5a06da43801b 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> > @@ -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
> >
> >
>
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 4b2d8aa8abb6..b79cadb2f6d7 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -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 */
                };
        };

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index e1c9b3f4fe44..5a06da43801b 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -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 {