From 395e7ce8d3276ca0db45f0727fad655dfb5bc9b2 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Thu, 18 Jun 2020 11:10:50 +0200 Subject: ARM: dts: align all applicable memory nodes with spec and convention The spec[1] says that top level memory nodes `shall have device_type = "memory"'. Since 8226f7f9 ("of: base: parse all available memory nodes"), we parse only nodes with device_type = "memory", so we should add the device_type property where ever it's missing. When the nodes were first added, this wasn't an issue because the skeleton.dtsi defined a memory skeleton with correct device_type, but this was removed upstream and imported into barebox along with 1dc748b3 ("dts: update to v5.1-rc1"). Upstream device trees with a memory node were adapted to have device_type = "memory" in-line. This wasn't the case for nodes defined only within barebox. Rectify this now and rename the nodes to feature a unit name as well to be aligned with the upstream trend. [1]: https://github.com/devicetree-org/devicetree-specification/releases/download/v0.3/devicetree-specification-v0.3.pdf Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/dts/am335x-afi-gf.dts | 2 +- arch/arm/dts/am35xx-pfc-750_820x.dts | 2 +- arch/arm/dts/imx51-genesi-efika-sb.dts | 3 ++- arch/arm/dts/imx6dl-eltec-hipercam.dts | 3 ++- arch/arm/dts/imx6dl-mba6x.dts | 3 ++- arch/arm/dts/imx6q-guf-santaro.dts | 3 ++- arch/arm/dts/imx6q-mba6x.dts | 3 ++- arch/arm/dts/imx6q-var-som.dtsi | 3 ++- arch/arm/dts/imx6qdl-udoo.dtsi | 3 ++- arch/arm/dts/imx7d-phyboard-zeta.dts | 4 ++-- arch/arm/dts/imx7d-phycore-som.dtsi | 5 +++-- arch/arm/dts/imx7d-sdb.dts | 2 +- arch/arm/dts/module-mb7707.dts | 3 ++- arch/arm/dts/rk3288-phycore-som.dts | 3 ++- arch/arm/dts/virt2real.dts | 2 +- 15 files changed, 27 insertions(+), 17 deletions(-) diff --git a/arch/arm/dts/am335x-afi-gf.dts b/arch/arm/dts/am335x-afi-gf.dts index 961fe2e241..cba8cbc8d6 100644 --- a/arch/arm/dts/am335x-afi-gf.dts +++ b/arch/arm/dts/am335x-afi-gf.dts @@ -29,7 +29,7 @@ }; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x10000000>; /* 128 MB */ }; diff --git a/arch/arm/dts/am35xx-pfc-750_820x.dts b/arch/arm/dts/am35xx-pfc-750_820x.dts index 707778dfac..55c883944b 100644 --- a/arch/arm/dts/am35xx-pfc-750_820x.dts +++ b/arch/arm/dts/am35xx-pfc-750_820x.dts @@ -20,7 +20,7 @@ stdout-path = &uart3; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB */ }; diff --git a/arch/arm/dts/imx51-genesi-efika-sb.dts b/arch/arm/dts/imx51-genesi-efika-sb.dts index 23e6ea4165..fb62fe2c72 100644 --- a/arch/arm/dts/imx51-genesi-efika-sb.dts +++ b/arch/arm/dts/imx51-genesi-efika-sb.dts @@ -35,7 +35,8 @@ }; }; - memory { + memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x20000000>; }; diff --git a/arch/arm/dts/imx6dl-eltec-hipercam.dts b/arch/arm/dts/imx6dl-eltec-hipercam.dts index 41af229835..ce2af4051c 100644 --- a/arch/arm/dts/imx6dl-eltec-hipercam.dts +++ b/arch/arm/dts/imx6dl-eltec-hipercam.dts @@ -7,7 +7,8 @@ model = "ELTEC HiPerCam"; compatible = "eltec,hipercam-rev01", "fsl,imx6dl"; - memory { + memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x10000000>; }; diff --git a/arch/arm/dts/imx6dl-mba6x.dts b/arch/arm/dts/imx6dl-mba6x.dts index cdb0334260..dddc3d384c 100644 --- a/arch/arm/dts/imx6dl-mba6x.dts +++ b/arch/arm/dts/imx6dl-mba6x.dts @@ -21,7 +21,8 @@ stdout-path = &uart2; }; - memory { + memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; }; }; diff --git a/arch/arm/dts/imx6q-guf-santaro.dts b/arch/arm/dts/imx6q-guf-santaro.dts index 0fb05d05dc..a915348171 100644 --- a/arch/arm/dts/imx6q-guf-santaro.dts +++ b/arch/arm/dts/imx6q-guf-santaro.dts @@ -20,7 +20,8 @@ model = "Garz+Fricke i.MX6q Santaro"; compatible = "guf,imx6q-santaro", "fsl,imx6q"; - memory { + memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; diff --git a/arch/arm/dts/imx6q-mba6x.dts b/arch/arm/dts/imx6q-mba6x.dts index 9391c1d6fe..64635b9582 100644 --- a/arch/arm/dts/imx6q-mba6x.dts +++ b/arch/arm/dts/imx6q-mba6x.dts @@ -21,7 +21,8 @@ stdout-path = &uart2; }; - memory { + memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; }; diff --git a/arch/arm/dts/imx6q-var-som.dtsi b/arch/arm/dts/imx6q-var-som.dtsi index 63a17fc660..7dbaa1e3d4 100644 --- a/arch/arm/dts/imx6q-var-som.dtsi +++ b/arch/arm/dts/imx6q-var-som.dtsi @@ -17,7 +17,8 @@ model = "Variscite i.MX6 Quad SOM"; compatible = "variscite,imx6q-som", "fsl,imx6q"; - memory { + memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; }; diff --git a/arch/arm/dts/imx6qdl-udoo.dtsi b/arch/arm/dts/imx6qdl-udoo.dtsi index ebc103858c..bf47297bad 100644 --- a/arch/arm/dts/imx6qdl-udoo.dtsi +++ b/arch/arm/dts/imx6qdl-udoo.dtsi @@ -22,7 +22,8 @@ stdout-path = &uart2; }; - memory { + memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; diff --git a/arch/arm/dts/imx7d-phyboard-zeta.dts b/arch/arm/dts/imx7d-phyboard-zeta.dts index fbd0da2383..a34f12f616 100644 --- a/arch/arm/dts/imx7d-phyboard-zeta.dts +++ b/arch/arm/dts/imx7d-phyboard-zeta.dts @@ -21,7 +21,7 @@ }; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x40000000>; }; @@ -139,4 +139,4 @@ &uart2 { status = "okay"; -}; \ No newline at end of file +}; diff --git a/arch/arm/dts/imx7d-phycore-som.dtsi b/arch/arm/dts/imx7d-phycore-som.dtsi index 622261bd1e..e892a54bdd 100644 --- a/arch/arm/dts/imx7d-phycore-som.dtsi +++ b/arch/arm/dts/imx7d-phycore-som.dtsi @@ -13,7 +13,8 @@ model = "Phytec i.MX7D phyCORE"; compatible = "phytec,imx7d-phycore-som", "fsl,imx7d"; - memory { + memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; }; }; @@ -269,4 +270,4 @@ tuning-step = <2>; non-removable; status = "disabled"; -}; \ No newline at end of file +}; diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts index 16bfabe9b3..7beb065920 100644 --- a/arch/arm/dts/imx7d-sdb.dts +++ b/arch/arm/dts/imx7d-sdb.dts @@ -14,7 +14,7 @@ stdout-path = &uart1; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/dts/module-mb7707.dts b/arch/arm/dts/module-mb7707.dts index 94a3373fc1..9a0f74997d 100644 --- a/arch/arm/dts/module-mb7707.dts +++ b/arch/arm/dts/module-mb7707.dts @@ -6,7 +6,8 @@ model = "Module MB 77.07"; compatible = "module,mb7707"; - memory { + memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x8000000>; }; }; diff --git a/arch/arm/dts/rk3288-phycore-som.dts b/arch/arm/dts/rk3288-phycore-som.dts index 65c53895c4..67073b2d83 100644 --- a/arch/arm/dts/rk3288-phycore-som.dts +++ b/arch/arm/dts/rk3288-phycore-som.dts @@ -20,7 +20,8 @@ model = "phycore-rk3288"; compatible = "phytec,rk3288-phycore-som", "rockchip,rk3288"; - memory { + memory@0 { + device_type = "memory"; reg = <0x0 0x0 0x0 0x40000000>; }; diff --git a/arch/arm/dts/virt2real.dts b/arch/arm/dts/virt2real.dts index 8f8c65ba7a..3b543b6e93 100644 --- a/arch/arm/dts/virt2real.dts +++ b/arch/arm/dts/virt2real.dts @@ -5,7 +5,7 @@ / { model = "virt2real"; - memory { + memory@82000000 { device_type = "memory"; reg = <0x82000000 0x01000000>; }; -- cgit v1.2.3