devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: Fix missing "device_type" in Aspeed memory nodes
@ 2018-01-12  4:56 Benjamin Herrenschmidt
       [not found] ` <1515732971.31850.87.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2018-01-12  4:56 UTC (permalink / raw)
  To: devicetree; +Cc: Joel Stanley, linux-arm-kernel

When Joel removed skeleton.dtsi, the Aspeed boards lost their
"device_type" property in the memory node. Since a number of
these still use old bootloaders that won't patch it properly,
booting breaks as a result.

This adds the property back to the individual nodes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

Should we just have a skeleton in the g4 and g5 dtsi with just
that property instead ?
---
 arch/arm/boot/dts/aspeed-ast2500-evb.dts         | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts    | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 1 +
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 1 +
 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts     | 1 +
 6 files changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index ede11c597673..0c3f14d05046 100644
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -17,6 +17,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 };
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index 4379d09a261f..9d18cce971be 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -13,6 +13,7 @@
 	};
 
 	memory@40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x20000000>;
 	};
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index 623b6ab42021..cd06d5738782 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -13,6 +13,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index 5f9049d2c4c3..b64553a083b0 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -14,6 +14,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index c881484a85cf..f3f5b3279e52 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -13,6 +13,7 @@
 	};
 
 	memory@80000000 {
+		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
index 76aa6ea1f988..ca7a4ae9ed08 100644
--- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
@@ -13,6 +13,7 @@
 	};
 
 	memory@40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x8000000>;
 	};

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ARM: dts: Fix missing "device_type" in Aspeed memory nodes
       [not found] ` <1515732971.31850.87.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
@ 2018-01-15 15:43   ` Joel Stanley
  0 siblings, 0 replies; 2+ messages in thread
From: Joel Stanley @ 2018-01-15 15:43 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: devicetree, Joel Stanley, Linux ARM

On Thu, Jan 11, 2018 at 8:56 PM, Benjamin Herrenschmidt
<benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> wrote:
> When Joel removed skeleton.dtsi, the Aspeed boards lost their
> "device_type" property in the memory node. Since a number of
> these still use old bootloaders that won't patch it properly,
> booting breaks as a result.
>
> This adds the property back to the individual nodes.
>
> Signed-off-by: Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
> ---
>
> Should we just have a skeleton in the g4 and g5 dtsi with just
> that property instead ?

I like this option better. That way future boards don't need to
remember to add this. Can you send a v2 please?

Thanks for the patch. I assume I missed this as I normally use a
device tree aware boot where u-boot populates the memory node for us.

Cheers,

Joel

> ---
>  arch/arm/boot/dts/aspeed-ast2500-evb.dts         | 1 +
>  arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts    | 1 +
>  arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 1 +
>  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 1 +
>  arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts       | 1 +
>  arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts     | 1 +
>  6 files changed, 6 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> index ede11c597673..0c3f14d05046 100644
> --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> @@ -17,6 +17,7 @@
>         };
>
>         memory@80000000 {
> +               device_type = "memory";
>                 reg = <0x80000000 0x20000000>;
>         };
>  };
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> index 4379d09a261f..9d18cce971be 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> @@ -13,6 +13,7 @@
>         };
>
>         memory@40000000 {
> +               device_type = "memory";
>                 reg = <0x40000000 0x20000000>;
>         };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> index 623b6ab42021..cd06d5738782 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> @@ -13,6 +13,7 @@
>         };
>
>         memory@80000000 {
> +               device_type = "memory";
>                 reg = <0x80000000 0x20000000>;
>         };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> index 5f9049d2c4c3..b64553a083b0 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> @@ -14,6 +14,7 @@
>         };
>
>         memory@80000000 {
> +               device_type = "memory";
>                 reg = <0x80000000 0x20000000>;
>         };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> index c881484a85cf..f3f5b3279e52 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> @@ -13,6 +13,7 @@
>         };
>
>         memory@80000000 {
> +               device_type = "memory";
>                 reg = <0x80000000 0x40000000>;
>         };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> index 76aa6ea1f988..ca7a4ae9ed08 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> @@ -13,6 +13,7 @@
>         };
>
>         memory@40000000 {
> +               device_type = "memory";
>                 reg = <0x40000000 0x8000000>;
>         };
>
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-15 15:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-12  4:56 [PATCH] ARM: dts: Fix missing "device_type" in Aspeed memory nodes Benjamin Herrenschmidt
     [not found] ` <1515732971.31850.87.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
2018-01-15 15:43   ` Joel Stanley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).