[PATCH linux dev-4.7 v2 1/3] ARM: dts: aspeed-g5: Add SoC Display Controller node

[Joel Stanley]

On Tue, Feb 14, 2017 at 11:21 AM, Andrew Jeffery <andrew at aj.id.au> wrote:
> Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
> Signed-off-by: Joel Stanley <joel at jms.id.au>
> (cherry picked from commit daf042580a0dacd894a3825dd6f048364fd66770)
> [AJ: Reworked to disable GFX in the dtsi, as it is missing from the 2520]
> Signed-off-by: Andrew Jeffery <andrew at aj.id.au>

Acked-by: Joel Stanley <joel at jms.id.au>

Xo, can we get your ack for the Zaius change.

Lei, please review for Romulus.

Matthew, please review for the Facebook board.

Cheers,

Joel

> ---
>  arch/arm/boot/dts/aspeed-ast2500-evb.dts         | 4 ++++
>  arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts    | 4 ++++
>  arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 4 ++++
>  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 ++++
>  arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 4 ++++
>  arch/arm/boot/dts/aspeed-g5.dtsi                 | 9 +++++++++
>  6 files changed, 29 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> index 9d88f3aadbc6..1999a06eec80 100644
> --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> @@ -79,3 +79,7 @@
>                 reg = <0x4d>;
>         };
>  };
> +
> +&gfx {
> +       status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> index e6d61c3abd80..9e48c4a1313c 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> @@ -198,3 +198,7 @@
>         status = "okay";
>         /* CPLD at reg = <3E> */
>  };
> +
> +&gfx {
> +       status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> index c23627ec5e84..947cfeb02457 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> @@ -155,3 +155,7 @@
>  &vuart {
>         status = "okay";
>  };
> +
> +&gfx {
> +       status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> index 4b2d8aa8abb6..76b738dd0c6b 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> @@ -273,3 +273,7 @@
>  &vuart {
>         status = "okay";
>  };
> +
> +&gfx {
> +       status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> index e1c9b3f4fe44..e22701bfe5fc 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> @@ -343,3 +343,7 @@
>  &vuart {
>         status = "okay";
>  };
> +
> +&gfx {
> +       status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
> index e1994c9e38c3..b73503c866aa 100644
> --- a/arch/arm/boot/dts/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
> @@ -1005,6 +1005,15 @@
>                                 reg = <0x1e6e202c 0x4>;
>                         };
>
> +                       gfx: display at 1e6e6000 {
> +                               compatible = "aspeed,ast2500-gfx", "syscon";
> +                               reg = <0x1e6e6000 0x1000>;
> +                               reg-io-width = <4>;
> +
> +                               /* AST2520 doesn't have GFX, so disable */
> +                               status = "disabled";
> +                       };
> +
>                         sram at 1e720000 {
>                                 compatible = "mmio-sram";
>                                 reg = <0x1e720000 0x9000>;      // 36K
> --
> 2.9.3
>