From e307bc559a2830b7f695150212ea1b26cdca69fb Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 23 Jun 2020 15:45:34 +0200 Subject: ARM: dts: vexpress-v2p-ca15: adapt fixed NOR flash partition setup Roland already fixed the vexpress-v2p-ca9: > Upstream DTS commit 62a5017bf825c9e4d317 ("ARM: dts: vexpress: specify > AFS partition") [1] introduced an empty node at /smb@4000000 > /motherboard/flash@0,00000000/partitions, which is preferred by the OF > partitions parser over the single partition nodes. In the same commit, > upstream set the compatible to "arm,arm-firmware-suite", which barebox > does not know about. Adapt our fixed partition setup accordingly by > wrapping all partitions in an extra "partitions" node with the correct > compatible. > [1]: https://git.kernel.org/linus/62a5017bf825c9e4d3176eb975a01c329a9f36 Do the same for the vexpress-v2p-ca15. While at it use the new label: added along with 6940ba22c66a ("dts: update to v5.3-rc1"). This way we aren't (build-)broken, when the upstream path changes in v5.8-rc1. Fixes: 6940ba22c66ac1c71350 ("dts: update to v5.3-rc1") Cc: Roland Hieber Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/dts/vexpress-v2p-ca15.dts | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts index a4cdc8d1f5..69e93ee7b2 100644 --- a/arch/arm/dts/vexpress-v2p-ca15.dts +++ b/arch/arm/dts/vexpress-v2p-ca15.dts @@ -7,17 +7,20 @@ }; }; -&{/bus@8000000/motherboard/flash@0,00000000} { - #address-cells = <1>; - #size-cells = <1>; +&nor_flash { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - partition@0 { - label = "barebox"; - reg = <0x0 0x80000>; - }; + partition@0 { + label = "barebox"; + reg = <0x0 0x80000>; + }; - barebox_env: partition@80000 { - label = "barebox-environment"; - reg = <0x80000 0x80000>; + barebox_env: partition@80000 { + label = "barebox-environment"; + reg = <0x80000 0x80000>; + }; }; }; -- cgit v1.2.3