* [PATCH 01/15] ARM: i.MX50: fix renamed node reference
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 02/15] ARM: dts: fix now duplicate memory nodes Ahmad Fatoum
` (13 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
There is no /soc/aips@50000000 node upstream any longer as it was
renamed with the 8d158e1a4091 ("dts: update to v5.7-rc1") sync.
Adjust the barebox device tree accordingly. It's likely that this
resulted in barebox v2020.06.0 USB connectivity breakage for the
i.MX50's second USB PHY.
Fixes: 8d158e1a4091 ("dts: update to v5.7-rc1")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/imx50.dtsi | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/arch/arm/dts/imx50.dtsi b/arch/arm/dts/imx50.dtsi
index 68edd37b13be..b5def2e4f67f 100644
--- a/arch/arm/dts/imx50.dtsi
+++ b/arch/arm/dts/imx50.dtsi
@@ -1,22 +1,18 @@
#include <arm/imx50.dtsi>
-/ {
- soc {
- aips@50000000 { /* AIPS1 */
- usbphy1: usbphy@1 {
- compatible = "usb-nop-xceiv";
- clocks = <&clks IMX5_CLK_USB_PHY2_GATE>;
- clock-names = "main_clk";
- status = "okay";
- };
+&{/soc/bus@50000000} { /* AIPS1 */
+ usbphy1: usbphy@1 {
+ compatible = "usb-nop-xceiv";
+ clocks = <&clks IMX5_CLK_USB_PHY2_GATE>;
+ clock-names = "main_clk";
+ status = "okay";
+ };
- usbmisc: usbmisc@53f80800 {
- #index-cells = <1>;
- compatible = "fsl,imx53-usbmisc";
- reg = <0x53f80800 0x200>;
- clocks = <&clks IMX5_CLK_USBOH3_GATE>;
- };
- };
+ usbmisc: usbmisc@53f80800 {
+ #index-cells = <1>;
+ compatible = "fsl,imx53-usbmisc";
+ reg = <0x53f80800 0x200>;
+ clocks = <&clks IMX5_CLK_USBOH3_GATE>;
};
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 02/15] ARM: dts: fix now duplicate memory nodes
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 01/15] ARM: i.MX50: fix renamed node reference Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 03/15] ARM: dts: align all applicable memory nodes with spec and convention Ahmad Fatoum
` (12 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
With the upstream migration to memory@BASE_ADDRESS naming scheme in the
device tree of some SoC families, we now have multiple overlapping memory
nodes in some of the barebox device trees. Rename the defunct overrides, so
they once again override the upstream nodes.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/am335x-bone.dts | 7 +++----
arch/arm/dts/am335x-boneblack.dts | 7 +++----
arch/arm/dts/imx53-tqma53.dtsi | 6 +++---
arch/arm/dts/imx6dl-wandboard.dts | 6 +++---
arch/arm/dts/imx6q-wandboard.dts | 6 +++---
arch/arm/dts/tegra30-beaver.dts | 8 ++++----
6 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/arch/arm/dts/am335x-bone.dts b/arch/arm/dts/am335x-bone.dts
index a2e62a3b1c40..df044a57382b 100644
--- a/arch/arm/dts/am335x-bone.dts
+++ b/arch/arm/dts/am335x-bone.dts
@@ -13,11 +13,10 @@
/ {
model = "TI AM335x BeagleBone";
compatible = "ti,am335x-bone", "ti,am33xx";
+};
- memory {
- device_type = "memory";
- reg = <0x80000000 0x10000000>; /* 256 MB */
- };
+&{/memory@80000000} {
+ reg = <0x80000000 0x10000000>; /* 256 MB */
};
&ldo3_reg {
diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack.dts
index f79a6bc8a4ca..80d710b924cb 100644
--- a/arch/arm/dts/am335x-boneblack.dts
+++ b/arch/arm/dts/am335x-boneblack.dts
@@ -13,11 +13,10 @@
/ {
model = "TI AM335x BeagleBone black";
compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+};
- memory {
- device_type = "memory";
- reg = <0x80000000 0x20000000>; /* 512 MB */
- };
+&{/memory@80000000} {
+ reg = <0x80000000 0x20000000>; /* 512 MB */
};
&ldo3_reg {
diff --git a/arch/arm/dts/imx53-tqma53.dtsi b/arch/arm/dts/imx53-tqma53.dtsi
index 860fb64df2b9..6efc0f1003a0 100644
--- a/arch/arm/dts/imx53-tqma53.dtsi
+++ b/arch/arm/dts/imx53-tqma53.dtsi
@@ -18,10 +18,10 @@
status = "disabled";
};
};
+};
- memory {
- reg = <0x70000000 0x0>; /* Up to 1GiB */
- };
+&{/memory@70000000} {
+ reg = <0x70000000 0x0>; /* Up to 1GiB */
};
&esdhc3 { /* EMMC */
diff --git a/arch/arm/dts/imx6dl-wandboard.dts b/arch/arm/dts/imx6dl-wandboard.dts
index 0a7a7182a596..c4695fb8d845 100644
--- a/arch/arm/dts/imx6dl-wandboard.dts
+++ b/arch/arm/dts/imx6dl-wandboard.dts
@@ -11,10 +11,10 @@
device-path = &environment_usdhc3;
};
};
+};
- memory {
- reg = <0x0 0x0>;
- };
+&{/memory@10000000} {
+ reg = <0x10000000 0x0>;
};
&ocotp {
diff --git a/arch/arm/dts/imx6q-wandboard.dts b/arch/arm/dts/imx6q-wandboard.dts
index d96f0579615b..d182faf21718 100644
--- a/arch/arm/dts/imx6q-wandboard.dts
+++ b/arch/arm/dts/imx6q-wandboard.dts
@@ -11,10 +11,10 @@
device-path = &environment_usdhc3;
};
};
+};
- memory {
- reg = <0x0 0x0>;
- };
+&{/memory@10000000} {
+ reg = <0x10000000 0x0>;
};
&ocotp {
diff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts
index acbdd318b12a..7a9ced6cef0f 100644
--- a/arch/arm/dts/tegra30-beaver.dts
+++ b/arch/arm/dts/tegra30-beaver.dts
@@ -22,10 +22,6 @@
};
};
- memory {
- reg = <0x80000000 0x7ff00000>;
- };
-
pcie-controller@00003000 {
status = "okay";
pex-clk-supply = <&sys_3v3_pexs_reg>;
@@ -936,3 +932,7 @@
clock-names = "pll_a", "pll_a_out0", "mclk";
};
};
+
+&{/memory@80000000} {
+ reg = <0x80000000 0x7ff00000>;
+};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 03/15] ARM: dts: align all applicable memory nodes with spec and convention
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 01/15] ARM: i.MX50: fix renamed node reference Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 02/15] ARM: dts: fix now duplicate memory nodes Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 13:59 ` Sascha Hauer
2020-06-18 9:10 ` [PATCH 04/15] ARM: vexpress: dts: fix barebox partitioning breakage Ahmad Fatoum
` (11 subsequent siblings)
14 siblings, 1 reply; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
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 <a.fatoum@pengutronix.de>
---
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 961fe2e241bc..cba8cbc8d6b7 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 707778dfac5a..55c883944b85 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 23e6ea416534..fb62fe2c7295 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 41af22983536..ce2af4051c49 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 cdb0334260b9..dddc3d384ccc 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 0fb05d05dc45..a9153481717b 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 9391c1d6fefc..64635b958213 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 63a17fc66083..7dbaa1e3d4b5 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 ebc103858c64..bf47297badc5 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 fbd0da238346..a34f12f616f2 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 622261bd1e3b..e892a54bdde0 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 16bfabe9b358..7beb065920b3 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 94a3373fc15b..9a0f74997dba 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 65c53895c444..67073b2d83d4 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 8f8c65ba7a74..3b543b6e93a8 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>;
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 03/15] ARM: dts: align all applicable memory nodes with spec and convention
2020-06-18 9:10 ` [PATCH 03/15] ARM: dts: align all applicable memory nodes with spec and convention Ahmad Fatoum
@ 2020-06-18 13:59 ` Sascha Hauer
0 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2020-06-18 13:59 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: barebox
On Thu, Jun 18, 2020 at 11:10:50AM +0200, Ahmad Fatoum wrote:
> 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 <a.fatoum@pengutronix.de>
> ---
> 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 961fe2e241bc..cba8cbc8d6b7 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 */
> };
The am335x devices register their memory banks with values read back
from the memory controller in arch/arm/mach-omap/am33xx_scrm.c
> diff --git a/arch/arm/dts/imx51-genesi-efika-sb.dts b/arch/arm/dts/imx51-genesi-efika-sb.dts
> index 23e6ea416534..fb62fe2c7295 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>;
> };
The i.MX devices register their memory banks with values read back from
the memory controller in arch/arm/mach-imx/esdctl.c
For these boards it's probably better to remove the memory nodes
entirely.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 04/15] ARM: vexpress: dts: fix barebox partitioning breakage
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (2 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 03/15] ARM: dts: align all applicable memory nodes with spec and convention Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 05/15] ARM: at91: dts: extend, don't create anew, pinctrl node Ahmad Fatoum
` (10 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum, Roland Hieber
There is no /smb@4000000 node upstream any longer as it was
renamed with the 8d158e1a4091 ("dts: update to v5.7-rc1") sync.
Adjust the barebox device tree accordingly. It's likely that this
resulted in barebox v2020.06.0 state, environment and update breakage on
the vexpress boards.
Cc: Roland Hieber <rhi@pengutronix.de>
Fixes: 8d158e1a4091 ("dts: update to v5.7-rc1")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/vexpress-v2p-ca15.dts | 26 +++++++--------
arch/arm/dts/vexpress-v2p-ca9.dts | 51 ++++++++++++++----------------
2 files changed, 34 insertions(+), 43 deletions(-)
diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts
index 211eaccb6238..a4cdc8d1f5f0 100644
--- a/arch/arm/dts/vexpress-v2p-ca15.dts
+++ b/arch/arm/dts/vexpress-v2p-ca15.dts
@@ -5,23 +5,19 @@
compatible = "barebox,environment";
device-path = &barebox_env;
};
+};
- smb@8000000 {
- motherboard {
- flash@0,00000000 {
- #address-cells = <1>;
- #size-cells = <1>;
+&{/bus@8000000/motherboard/flash@0,00000000} {
+ #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>;
};
};
diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
index b13c114f0cb0..cb4afef185b6 100644
--- a/arch/arm/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
@@ -10,34 +10,6 @@
state = &state;
};
- smb@4000000 {
- motherboard {
- flash@0,00000000 {
- #address-cells = <1>;
- #size-cells = <1>;
-
- partitions {
- compatible = "fixed-partitions";
-
- partition@0 {
- label = "barebox";
- reg = <0x0 0x80000>;
- };
-
- barebox_env: partition@80000 {
- label = "barebox-environment";
- reg = <0x80000 0x80000>;
- };
-
- state_storage: partition@100000 {
- label = "barebox-state";
- reg = <0x100000 0x100000>;
- };
- };
- };
- };
- };
-
/* State: mutable part */
state: state {
magic = <0x4d433230>;
@@ -92,3 +64,26 @@
};
};
};
+
+&{/bus@4000000/motherboard/flash@0,00000000} {
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "barebox";
+ reg = <0x0 0x80000>;
+ };
+
+ barebox_env: partition@80000 {
+ label = "barebox-environment";
+ reg = <0x80000 0x80000>;
+ };
+
+ state_storage: partition@100000 {
+ label = "barebox-state";
+ reg = <0x100000 0x100000>;
+ };
+ };
+};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 05/15] ARM: at91: dts: extend, don't create anew, pinctrl node
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (3 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 04/15] ARM: vexpress: dts: fix barebox partitioning breakage Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 06/15] ARM: dts: reference nodes to extend by phandles instead Ahmad Fatoum
` (9 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
The pinctrl device is also on the APB in the base device tree. The
barebox device tree wrongly creates a new one top-level under /.
Move it to the correct location, so the upstream node is extended.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/at91sam9263ek.dts | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts
index 7fe283ced768..37f895d6ca73 100644
--- a/arch/arm/dts/at91sam9263ek.dts
+++ b/arch/arm/dts/at91sam9263ek.dts
@@ -24,15 +24,14 @@
wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
};
};
- };
- };
-
- pinctrl@fffff200 {
- pinctrl_board_mmc1: mmc1-board {
- atmel,pins =
- <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
- AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */
+ pinctrl@fffff200 {
+ pinctrl_board_mmc1: mmc1-board {
+ atmel,pins =
+ <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
+ AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */
+ };
+ };
};
};
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 06/15] ARM: dts: reference nodes to extend by phandles instead
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (4 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 05/15] ARM: at91: dts: extend, don't create anew, pinctrl node Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 07/15] ARM: i.MX7: warp: drop duplicate memory node Ahmad Fatoum
` (8 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
Many device trees upstream have moved to memory@BASE_ADDRESS for the
memory node instead of a unit-name-less memory node. This has resulted
in breakage[1] in barebox, because some device trees feature an upstream
memory size that's not available in all variants and the barebox device
tree must override it, not create a second correct node next to the broken
one and risk of_add_memory allocating banks with bogus sizes.
To avoid this happening in future, to memory or to other nodes, extension
of nodes should happen via phandles throughout, because a phandle is assumed
to be more stable and if one is removed a compile error results instead
of creating a new node somewhere. For nodes lacking a phandle, we can
use the &{/path} syntax to declare an anonymous phandle that will fail
to compile when the upstream path changes. This is better than having
devices fail to boot at runtime.
[1]: 0d26ce1c11a1 ("ARM: Phytec phyFLEX i.MX6: delete wrong memory node")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/armada-370-mirabox-bb.dts | 12 +-
arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts | 8 +-
arch/arm/dts/at91-microchip-ksz9477-evb.dts | 6 +-
arch/arm/dts/at91-sama5d27_giantboard.dts | 6 +-
arch/arm/dts/at91sam9263ek.dts | 45 +++--
arch/arm/dts/at91sam9x5ek.dts | 30 ++-
arch/arm/dts/dove-cubox-bb.dts | 8 +-
arch/arm/dts/fsl-ls1046a-rdb.dts | 108 +++++------
arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts | 171 +++++++++---------
arch/arm/dts/imx53-guf-vincell-lt.dts | 10 +-
arch/arm/dts/imx53-guf-vincell.dts | 10 +-
arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 4 +-
arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 4 +-
arch/arm/dts/imx6ul-litesom.dtsi | 4 +-
.../dts/kirkwood-guruplug-server-plus-bb.dts | 8 +-
arch/arm/dts/kirkwood-openblocks_a6-bb.dts | 8 +-
arch/arm/dts/kirkwood-topkick-bb.dts | 8 +-
arch/arm/dts/socfpga_arria10_achilles.dts | 32 ++--
arch/arm/dts/stm32mp151.dtsi | 25 +--
arch/arm/dts/stm32mp157a-dk1.dtsi | 22 +--
arch/arm/dts/tegra124-jetson-tk1.dts | 6 +-
arch/arm/dts/versatile-pb.dts | 6 +-
arch/arm/dts/vf610-zii-cfu1.dts | 4 +
arch/arm/dts/vf610-zii-dev-rev-b.dts | 16 +-
24 files changed, 248 insertions(+), 313 deletions(-)
diff --git a/arch/arm/dts/armada-370-mirabox-bb.dts b/arch/arm/dts/armada-370-mirabox-bb.dts
index 315678151abc..99263d485446 100644
--- a/arch/arm/dts/armada-370-mirabox-bb.dts
+++ b/arch/arm/dts/armada-370-mirabox-bb.dts
@@ -9,14 +9,8 @@
chosen {
stdout-path = "/soc/internal-regs/serial@12000";
};
+};
- soc {
- internal-regs {
- gpio_leds {
- green_pwr_led {
- barebox,default-trigger = "heartbeat";
- };
- };
- };
- };
+&{/soc/internal-regs/gpio_leds/green_pwr_led} {
+ barebox,default-trigger = "heartbeat";
};
diff --git a/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts b/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts
index 5f1a6073814d..b43bac37dd54 100644
--- a/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts
+++ b/arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dts
@@ -5,10 +5,6 @@
#include "arm/armada-xp-lenovo-ix4-300d.dts"
-/ {
- gpio-leds {
- power-led {
- linux,default-trigger = "heartbeat";
- };
- };
+&{/gpio-leds/power-led} {
+ linux,default-trigger = "heartbeat";
};
diff --git a/arch/arm/dts/at91-microchip-ksz9477-evb.dts b/arch/arm/dts/at91-microchip-ksz9477-evb.dts
index 075cdcd088a5..a0c3ce39bbf7 100644
--- a/arch/arm/dts/at91-microchip-ksz9477-evb.dts
+++ b/arch/arm/dts/at91-microchip-ksz9477-evb.dts
@@ -27,10 +27,10 @@
file-path = "barebox.env";
};
};
+};
- memory {
- reg = <0x20000000 0x10000000>;
- };
+&{/memory} {
+ reg = <0x20000000 0x10000000>;
};
&pinctrl {
diff --git a/arch/arm/dts/at91-sama5d27_giantboard.dts b/arch/arm/dts/at91-sama5d27_giantboard.dts
index 7e48fa18ae71..2ef516bd9e95 100644
--- a/arch/arm/dts/at91-sama5d27_giantboard.dts
+++ b/arch/arm/dts/at91-sama5d27_giantboard.dts
@@ -38,10 +38,10 @@
linux,default-trigger = "mmc0";
};
};
+};
- memory {
- reg = <0x20000000 0x8000000>;
- };
+&{/memory} {
+ reg = <0x20000000 0x8000000>;
};
&slow_xtal {
diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts
index 37f895d6ca73..90131081441e 100644
--- a/arch/arm/dts/at91sam9263ek.dts
+++ b/arch/arm/dts/at91sam9263ek.dts
@@ -7,32 +7,29 @@
};
};
- ahb {
- apb {
- mmc1: mmc@fff84000 {
- pinctrl-0 = <
- &pinctrl_board_mmc1
- &pinctrl_mmc1_clk
- &pinctrl_mmc1_slot0_cmd_dat0
- &pinctrl_mmc1_slot0_dat1_3>;
- cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
- status = "okay";
- slot@0 {
- reg = <0>;
- bus-width = <4>;
- cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
- wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
- };
- };
+};
- pinctrl@fffff200 {
- pinctrl_board_mmc1: mmc1-board {
- atmel,pins =
- <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
- AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */
- };
- };
+&{/ahb/apb/mmc@fff84000} {
+ pinctrl-0 = <
+ &pinctrl_board_mmc1
+ &pinctrl_mmc1_clk
+ &pinctrl_mmc1_slot0_cmd_dat0
+ &pinctrl_mmc1_slot0_dat1_3>;
+ cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+ slot@0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
+ wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
};
+};
+
+&{/ahb/apb/pinctrl@fffff200} {
+ pinctrl_board_mmc1: mmc1-board {
+ atmel,pins =
+ <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
+ AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */
};
};
diff --git a/arch/arm/dts/at91sam9x5ek.dts b/arch/arm/dts/at91sam9x5ek.dts
index bc2a279709d3..c753268fb994 100644
--- a/arch/arm/dts/at91sam9x5ek.dts
+++ b/arch/arm/dts/at91sam9x5ek.dts
@@ -14,25 +14,23 @@
mmc0 = &mmc0;
mmc1 = &mmc1;
};
+};
- i2c-gpio-0 {
- status = "okay";
- };
+&{/i2c-gpio-0} {
+ status = "okay";
+};
- leds {
- /*
- * PB18 has a resource conflict since it is both used
- * as a heartbeat LED and 1-wire bus in the kernel
- * device tree. Because 1-wire EEPROMs contains
- * importatnt revision information we move heartbeat
- * to PD21 and remove the original pb18 node
- */
- /delete-node/ pb18;
+/*
+ * PB18 has a resource conflict since it is both used
+ * as a heartbeat LED and 1-wire bus in the kernel
+ * device tree. Because 1-wire EEPROMs contains
+ * importatnt revision information we move heartbeat
+ * to PD21 and remove the original pb18 node
+ */
+/delete-node/ &{/leds/pb18};
- pd21 {
- linux,default-trigger = "heartbeat";
- };
- };
+&{/leds/pd21} {
+ linux,default-trigger = "heartbeat";
};
&spi0 {
diff --git a/arch/arm/dts/dove-cubox-bb.dts b/arch/arm/dts/dove-cubox-bb.dts
index 83e1d5df50da..06966d9c2ee2 100644
--- a/arch/arm/dts/dove-cubox-bb.dts
+++ b/arch/arm/dts/dove-cubox-bb.dts
@@ -9,10 +9,8 @@
chosen {
stdout-path = &uart0;
};
+};
- leds {
- power {
- barebox,default-trigger = "heartbeat";
- };
- };
+&{/leds/power} {
+ barebox,default-trigger = "heartbeat";
};
diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index 23e43701f304..c211b26ae90e 100644
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -61,72 +61,52 @@
/delete-node/ &non_existent_eeprom;
-&fman0 {
- ethernet@e0000 {
- status = "disabled";
- };
-
- ethernet@e2000 {
- status = "disabled";
- };
-
- ethernet@e4000 {
- phy-mode = "rgmii-id";
- };
-
- ethernet@e6000 {
- phy-mode = "rgmii-id";
- };
-
- ethernet@e8000 {
- };
-
- ethernet@ea000 {
- };
-
- ethernet@f0000 {
- };
+&enet0 {
+ status = "disabled";
+};
- ethernet@f2000 {
- };
+&enet1 {
+ status = "disabled";
+};
- mdio@fc000 {
- };
+&enet2 {
+ phy-mode = "rgmii-id";
+};
- mdio@fd000 {
- };
+&enet3 {
+ phy-mode = "rgmii-id";
+};
- mdio@e1000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e1000} {
+ status = "disabled";
+};
- mdio@e3000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e3000} {
+ status = "disabled";
+};
- mdio@e5000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e5000} {
+ status = "disabled";
+};
- mdio@e7000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e7000} {
+ status = "disabled";
+};
- mdio@e9000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e9000} {
+ status = "disabled";
+};
- mdio@eb000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@eb000} {
+ status = "disabled";
+};
- mdio@f1000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@f1000} {
+ status = "disabled";
+};
- mdio@f3000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@f3000} {
+ status = "disabled";
};
&usb0 {
@@ -143,16 +123,14 @@
dr_mode = "host";
};
-&soc {
- pcie1: pcie@3400000 {
- status = "okay";
- };
+&{/soc/pcie@3400000} {
+ status = "okay";
+};
- pcie2: pcie@3500000 {
- status = "okay";
- };
+&{/soc/pcie@3500000} {
+ status = "okay";
+};
- pcie3: pcie@3600000 {
- status = "okay";
- };
+&{/soc/pcie@3600000} {
+ status = "okay";
};
diff --git a/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts b/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts
index 7b17fe2210f4..7f9a764a8259 100644
--- a/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts
+++ b/arch/arm/dts/fsl-tqmls1046a-mbls10xxa.dts
@@ -225,121 +225,120 @@
&fman0 {
status = "okay";
+};
- ethernet@e0000 { /* EMAC.1 */
- phy-connection-type = "sgmii";
+&enet0 { /* EMAC.1 */
+ phy-connection-type = "sgmii";
+};
- };
+&enet1 { /* EMAC.2 */
+ phy-connection-type = "sgmii";
+};
- ethernet@e2000 { /* EMAC.2 */
- phy-connection-type = "sgmii";
- };
+&enet2 { /* EMAC.3 */
+ phy-handle = <&rgmii_phy1>;
+ phy-connection-type = "rgmii";
+ phy-mode = "rgmii-id";
+};
- ethernet@e4000 { /* EMAC.3 */
- phy-handle = <&rgmii_phy1>;
- phy-connection-type = "rgmii";
- phy-mode = "rgmii-id";
- };
+&enet3 { /* EMAC.4 */
+ phy-handle = <&rgmii_phy2>;
+ phy-connection-type = "rgmii";
+ phy-mode = "rgmii-id";
+};
- ethernet@e6000 { /* EMAC.4 */
- phy-handle = <&rgmii_phy2>;
- phy-connection-type = "rgmii";
- phy-mode = "rgmii-id";
- };
+&enet4 { /* EMAC.5 */
+ phy-connection-type = "sgmii";
+};
- ethernet@e8000 { /* EMAC.5 */
- phy-connection-type = "sgmii";
- };
+&enet5 { /* EMAC.6 */
+ phy-connection-type = "sgmii";
+};
- ethernet@ea000 { /* EMAC.6 */
- phy-connection-type = "sgmii";
- };
+&enet6 { /* EMAC.9 */
+ phy-connection-type = "sgmii";
+};
- ethernet@f0000 { /* EMAC.9 */
- phy-connection-type = "sgmii";
- };
+&enet7 { /* EMAC.10 */
+ phy-connection-type = "sgmii";
+};
- ethernet@f2000 { /* EMAC.10 */
- phy-connection-type = "sgmii";
- };
+&{/soc/fman@1a00000/mdio@e1000} {
+ status = "disabled";
+};
- mdio@e1000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e3000} {
+ status = "disabled";
+};
- mdio@e3000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e5000} {
+ status = "disabled";
+};
- mdio@e5000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e7000} {
+ status = "disabled";
+};
- mdio@e7000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@e9000} {
+ status = "disabled";
+};
- mdio@e9000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@eb000} {
+ status = "disabled";
+};
- mdio@eb000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@f1000} {
+ status = "disabled";
+};
- mdio@f1000 {
- status = "disabled";
- };
+&{/soc/fman@1a00000/mdio@f3000} {
+ status = "disabled";
+};
- mdio@f3000 {
- status = "disabled";
+&mdio0 {
+ rgmii_phy1: ethernet-phy@0e {
+ reg = <0x0e>;
+ ti,rx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
+ ti,tx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
+ ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
};
- mdio@fc000 {
- rgmii_phy1: ethernet-phy@0e {
- reg = <0x0e>;
- ti,rx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
- ti,tx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
- ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
- };
-
- rgmii_phy2: ethernet-phy@0c {
- reg = <0x0c>;
- ti,rx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
- ti,tx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
- ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
- };
-
- qsgmii1_phy1: ethernet-phy@1c {
- reg = <0x1c>;
- };
+ rgmii_phy2: ethernet-phy@0c {
+ reg = <0x0c>;
+ ti,rx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
+ ti,tx-internal-delay = <DP83867_RGMIIDCTL_1_50_NS>;
+ ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
+ };
- qsgmii1_phy2: ethernet-phy@1d {
- reg = <0x1d>;
- };
+ qsgmii1_phy1: ethernet-phy@1c {
+ reg = <0x1c>;
+ };
- qsgmii2_phy1: ethernet-phy@00 {
- reg = <0x00>;
- };
+ qsgmii1_phy2: ethernet-phy@1d {
+ reg = <0x1d>;
+ };
- qsgmii2_phy2: ethernet-phy@01 {
- reg = <0x01>;
- };
+ qsgmii2_phy1: ethernet-phy@00 {
+ reg = <0x00>;
+ };
- qsgmii2_phy3: ethernet-phy@02 {
- reg = <0x02>;
- };
+ qsgmii2_phy2: ethernet-phy@01 {
+ reg = <0x01>;
+ };
- qsgmii2_phy4: ethernet-phy@03 {
- reg = <0x03>;
- };
+ qsgmii2_phy3: ethernet-phy@02 {
+ reg = <0x02>;
};
- mdio@fd000 {
- status = "disabled";
+ qsgmii2_phy4: ethernet-phy@03 {
+ reg = <0x03>;
};
};
+&xmdio0 {
+ status = "disabled";
+};
+
&qflash0 {
partitions {
#address-cells = <1>;
diff --git a/arch/arm/dts/imx53-guf-vincell-lt.dts b/arch/arm/dts/imx53-guf-vincell-lt.dts
index 4c6205135aee..0cc6ffc288f7 100644
--- a/arch/arm/dts/imx53-guf-vincell-lt.dts
+++ b/arch/arm/dts/imx53-guf-vincell-lt.dts
@@ -30,12 +30,6 @@
};
};
- clocks {
- ckih1 {
- clock-frequency = <0>;
- };
- };
-
panel: panel {
compatible = "giantplus,gpg482739qs5", "simple-panel";
power-supply = <®_panel>;
@@ -119,6 +113,10 @@
};
};
+&{/clocks/ckih1} {
+ clock-frequency = <0>;
+};
+
&audmux {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_audmux>;
diff --git a/arch/arm/dts/imx53-guf-vincell.dts b/arch/arm/dts/imx53-guf-vincell.dts
index d34b59f4d31f..9686a2cb579f 100644
--- a/arch/arm/dts/imx53-guf-vincell.dts
+++ b/arch/arm/dts/imx53-guf-vincell.dts
@@ -25,12 +25,6 @@
stdout-path = &uart2;
};
- clocks {
- ckih1 {
- clock-frequency = <0>;
- };
- };
-
panel: panel {
compatible = "ampire,am800480r3tmqwa1h", "simple-panel";
enable-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
@@ -74,6 +68,10 @@
};
};
+&{/clocks/ckih1} {
+ clock-frequency = <0>;
+};
+
&audmux {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_audmux>;
diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
index 3cb8b3782a0f..b83511cb011f 100644
--- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
@@ -12,8 +12,6 @@
#include <arm/imx6qdl-phytec-pfla02.dtsi>
/ {
- /delete-node/ memory@10000000;
-
chosen {
environment-nand {
compatible = "barebox,environment";
@@ -53,6 +51,8 @@
};
};
+/delete-node/ &{/memory@10000000};
+
&ecspi3 {
flash: flash@0 {
partitions {
diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
index e99846c2b67f..2fb920945f8a 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -33,10 +33,10 @@
status = "disabled";
};
};
-
- /delete-node/ memory@10000000;
};
+/delete-node/ &{/memory@10000000};
+
&fec {
/delete-property/ phy-supply;
phy-reset-duration = <10>; /* in msecs */
diff --git a/arch/arm/dts/imx6ul-litesom.dtsi b/arch/arm/dts/imx6ul-litesom.dtsi
index 8b73bfdd6f54..3776d160ca46 100644
--- a/arch/arm/dts/imx6ul-litesom.dtsi
+++ b/arch/arm/dts/imx6ul-litesom.dtsi
@@ -3,6 +3,4 @@
* to dynamic memory size detection based on DDR controller settings
*/
-/ {
- /delete-node/ memory@80000000;
-};
+/delete-node/ &{/memory@80000000};
diff --git a/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts b/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts
index aba7c06160d0..1be03a7ac0d3 100644
--- a/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts
+++ b/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts
@@ -5,10 +5,6 @@
#include "arm/kirkwood-guruplug-server-plus.dts"
-/ {
- gpio-leds {
- health-r {
- barebox,default-trigger = "heartbeat";
- };
- };
+&{/gpio-leds/health-r} {
+ barebox,default-trigger = "heartbeat";
};
diff --git a/arch/arm/dts/kirkwood-openblocks_a6-bb.dts b/arch/arm/dts/kirkwood-openblocks_a6-bb.dts
index 42bfb07c949c..b13ab2ab93f0 100644
--- a/arch/arm/dts/kirkwood-openblocks_a6-bb.dts
+++ b/arch/arm/dts/kirkwood-openblocks_a6-bb.dts
@@ -4,10 +4,6 @@
#include "arm/kirkwood-openblocks_a6.dts"
-/ {
- gpio-leds {
- led-green {
- barebox,default-trigger = "heartbeat";
- };
- };
+&{/gpio-leds/led-green} {
+ barebox,default-trigger = "heartbeat";
};
diff --git a/arch/arm/dts/kirkwood-topkick-bb.dts b/arch/arm/dts/kirkwood-topkick-bb.dts
index 20b74b111d91..c70d654c52cd 100644
--- a/arch/arm/dts/kirkwood-topkick-bb.dts
+++ b/arch/arm/dts/kirkwood-topkick-bb.dts
@@ -5,10 +5,6 @@
#include "arm/kirkwood-topkick.dts"
-/ {
- gpio-leds {
- system {
- barebox,default-trigger = "heartbeat";
- };
- };
+&{/gpio-leds/system} {
+ barebox,default-trigger = "heartbeat";
};
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index 4c6460fb60aa..2fce0114c89a 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -124,26 +124,22 @@
default_attempts = <3>;
};
};
+};
- soc {
- clkmgr@ffd04000 {
- clocks {
- osc1 {
- clock-frequency = <25000000>;
- };
+&{/soc/clkmgr@ffd04000/clocks/osc1} {
+ clock-frequency = <25000000>;
+};
- cb_intosc_hs_div2_clk {
- clock-frequency = <0>;
- };
- cb_intosc_ls_clk {
- clock-frequency = <60000000>;
- };
- f2s_free_clk {
- clock-frequency = <200000000>;
- };
- };
- };
- };
+&{/soc/clkmgr@ffd04000/clocks/cb_intosc_hs_div2_clk} {
+ clock-frequency = <0>;
+};
+
+&{/soc/clkmgr@ffd04000/clocks/cb_intosc_ls_clk} {
+ clock-frequency = <60000000>;
+};
+
+&{/soc/clkmgr@ffd04000/clocks/f2s_free_clk} {
+ clock-frequency = <200000000>;
};
&gmac1 {
diff --git a/arch/arm/dts/stm32mp151.dtsi b/arch/arm/dts/stm32mp151.dtsi
index a647694405e3..5ff3b96fae4a 100644
--- a/arch/arm/dts/stm32mp151.dtsi
+++ b/arch/arm/dts/stm32mp151.dtsi
@@ -1,10 +1,5 @@
/ {
- clocks {
- /* Needed to let barebox find the clock nodes */
- compatible = "simple-bus";
- };
-
aliases {
gpio0 = &gpioa;
gpio1 = &gpiob;
@@ -35,15 +30,21 @@
pwm17 = &{/soc/timer@44008000/pwm};
};
- psci {
+};
+
+&{/clocks} {
+ /* Needed to let barebox find the clock nodes */
+ compatible = "simple-bus";
+};
+
+&{/psci} {
compatible = "arm,psci-0.2";
- };
+};
- soc {
- memory-controller@5a003000 {
- compatible = "st,stm32mp1-ddr";
- reg = <0x5a003000 0x1000>;
- };
+&{/soc} {
+ memory-controller@5a003000 {
+ compatible = "st,stm32mp1-ddr";
+ reg = <0x5a003000 0x1000>;
};
};
diff --git a/arch/arm/dts/stm32mp157a-dk1.dtsi b/arch/arm/dts/stm32mp157a-dk1.dtsi
index baaf60b18fa8..3a10ff9cf9b3 100644
--- a/arch/arm/dts/stm32mp157a-dk1.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1.dtsi
@@ -14,17 +14,17 @@
device-path = &sdmmc1, "partname:barebox-environment";
};
};
+};
- led {
- red {
- label = "error";
- gpios = <&gpioa 13 GPIO_ACTIVE_LOW>;
- default-state = "off";
- status = "okay";
- };
-
- blue {
- default-state = "on";
- };
+&{/led} {
+ red {
+ label = "error";
+ gpios = <&gpioa 13 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ status = "okay";
};
};
+
+&{/led/blue} {
+ default-state = "on";
+};
diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts
index 00eef6cacd19..7fd97b029e94 100644
--- a/arch/arm/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/dts/tegra124-jetson-tk1.dts
@@ -7,11 +7,7 @@
environment {
compatible = "barebox,environment";
- device-path = &emmc, "partname:boot1";
+ device-path = &{/sdhci@700b0600}, "partname:boot1"; /* eMMC */
};
};
-
- /* eMMC */
- emmc: sdhci@700b0600 {
- };
};
diff --git a/arch/arm/dts/versatile-pb.dts b/arch/arm/dts/versatile-pb.dts
index 8c80f8c2935e..d374f5429120 100644
--- a/arch/arm/dts/versatile-pb.dts
+++ b/arch/arm/dts/versatile-pb.dts
@@ -3,8 +3,8 @@
/ {
model = "ARM Versatile PB";
compatible = "arm,versatile-pb";
+};
- memory {
- reg = <0x0 0x04000000>;
- };
+&{/memory} {
+ reg = <0x0 0x04000000>;
};
diff --git a/arch/arm/dts/vf610-zii-cfu1.dts b/arch/arm/dts/vf610-zii-cfu1.dts
index 70cd9d1ba9b7..922693061251 100644
--- a/arch/arm/dts/vf610-zii-cfu1.dts
+++ b/arch/arm/dts/vf610-zii-cfu1.dts
@@ -26,6 +26,10 @@
};
};
+&{/gpio-leds/led-status} {
+ linux,default-trigger = "heartbeat";
+};
+
&i2c0 {
fiber_eeprom0: eeprom@50 {
compatible = "atmel,24c04";
diff --git a/arch/arm/dts/vf610-zii-dev-rev-b.dts b/arch/arm/dts/vf610-zii-dev-rev-b.dts
index abc5237080c6..2949042bc34b 100644
--- a/arch/arm/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/dts/vf610-zii-dev-rev-b.dts
@@ -8,16 +8,12 @@
#include "vf610-zii-dev.dtsi"
-/ {
- spi0 {
- flash@0 {
- #address-cells = <1>;
- #size-cells = <0>;
+&{/spi0/flash@0} {
+ #address-cells = <1>;
+ #size-cells = <0>;
- partition@0 {
- label = "bootloader";
- reg = <0x0 0x100000>;
- };
- };
+ partition@0 {
+ label = "bootloader";
+ reg = <0x0 0x100000>;
};
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 07/15] ARM: i.MX7: warp: drop duplicate memory node
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (5 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 06/15] ARM: dts: reference nodes to extend by phandles instead Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 08/15] ARM: mvebu: remove reference to non-existant node Ahmad Fatoum
` (7 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
The upstream device tree already features a memory node with the correct
size, but with the name memory@80000000. Drop the differently-named
barebox node.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/imx7s-warp.dts | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index c90147778346..8e645999cf60 100644
--- a/arch/arm/dts/imx7s-warp.dts
+++ b/arch/arm/dts/imx7s-warp.dts
@@ -18,11 +18,6 @@
device-path = &bareboxenv;
};
};
-
- memory {
- device_type = "memory";
- reg = <0x80000000 0x20000000>;
- };
};
&usdhc3 {
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 08/15] ARM: mvebu: remove reference to non-existant node
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (6 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 07/15] ARM: i.MX7: warp: drop duplicate memory node Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 09/15] ARM: i.MX6UL: dts: remove defunct override of pico-hobbit memory node Ahmad Fatoum
` (6 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
The container node of the leds has never had the name gpio_leds,
so there is no regression here, it just never worked.
Instead of fixing it, just drop it.
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
index e88f1dc78130..e57cd8f0ce4b 100644
--- a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
+++ b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
@@ -9,14 +9,4 @@
chosen {
stdout-path = "/soc/internal-regs/serial@12000";
};
-
- soc {
- internal-regs {
- gpio_leds {
- red_led {
- barebox,default-trigger = "heartbeat";
- };
- };
- };
- };
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 09/15] ARM: i.MX6UL: dts: remove defunct override of pico-hobbit memory node
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (7 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 08/15] ARM: mvebu: remove reference to non-existant node Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:15 ` Michael Grzeschik
2020-06-18 9:10 ` [PATCH 10/15] ARM: layerscape: dts: combine fsl-ls1046a-rdb.dts aliases nodes Ahmad Fatoum
` (5 subsequent siblings)
14 siblings, 1 reply; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
Prior to 8226f7f90973 ("of: base: parse all available memory nodes"),
barebox first looked at a /memory node, then at a node with a
device_type = "memory" property when probing available memory banks from
device tree. Linux instead only considered nodes with device_type =
"memory". The imx6ul-pico-hobbit predates the change in barebox behavior,
so it's unclear what is gained from dropping device_type = "memory" as
barebox used to parse the node by name anyway and Linux only saw the new
fixed up node.
Since then the Linux device tree has been split into a SoM and carrier
board device tree and the node name is now called memory@80000000 with
a size of 0 in the reg property. Because it's already used for boards
with differing memory size, we assume this will remain so and thus we
just drop the defunct barebox memory node override.
Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/imx6ul-pico-hobbit.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/dts/imx6ul-pico-hobbit.dts b/arch/arm/dts/imx6ul-pico-hobbit.dts
index 2f37b724b6e1..0c543de8c916 100644
--- a/arch/arm/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/dts/imx6ul-pico-hobbit.dts
@@ -9,10 +9,6 @@
device-path = &environment_usdhc1;
};
};
-
- memory {
- /delete-property/ device_type;
- };
};
&usdhc1 {
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 09/15] ARM: i.MX6UL: dts: remove defunct override of pico-hobbit memory node
2020-06-18 9:10 ` [PATCH 09/15] ARM: i.MX6UL: dts: remove defunct override of pico-hobbit memory node Ahmad Fatoum
@ 2020-06-18 9:15 ` Michael Grzeschik
0 siblings, 0 replies; 18+ messages in thread
From: Michael Grzeschik @ 2020-06-18 9:15 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: barebox
[-- Attachment #1.1: Type: text/plain, Size: 1844 bytes --]
On Thu, Jun 18, 2020 at 11:10:56AM +0200, Ahmad Fatoum wrote:
>Prior to 8226f7f90973 ("of: base: parse all available memory nodes"),
>barebox first looked at a /memory node, then at a node with a
>device_type = "memory" property when probing available memory banks from
>device tree. Linux instead only considered nodes with device_type =
>"memory". The imx6ul-pico-hobbit predates the change in barebox behavior,
>so it's unclear what is gained from dropping device_type = "memory" as
>barebox used to parse the node by name anyway and Linux only saw the new
>fixed up node.
>
>Since then the Linux device tree has been split into a SoM and carrier
>board device tree and the node name is now called memory@80000000 with
>a size of 0 in the reg property. Because it's already used for boards
>with differing memory size, we assume this will remain so and thus we
>just drop the defunct barebox memory node override.
>
>Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
>Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>---
> arch/arm/dts/imx6ul-pico-hobbit.dts | 4 ----
> 1 file changed, 4 deletions(-)
>
>diff --git a/arch/arm/dts/imx6ul-pico-hobbit.dts b/arch/arm/dts/imx6ul-pico-hobbit.dts
>index 2f37b724b6e1..0c543de8c916 100644
>--- a/arch/arm/dts/imx6ul-pico-hobbit.dts
>+++ b/arch/arm/dts/imx6ul-pico-hobbit.dts
>@@ -9,10 +9,6 @@
> device-path = &environment_usdhc1;
> };
> };
>-
>- memory {
>- /delete-property/ device_type;
>- };
> };
>
> &usdhc1 {
>--
>2.27.0
Ack
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 149 bytes --]
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 10/15] ARM: layerscape: dts: combine fsl-ls1046a-rdb.dts aliases nodes
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (8 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 09/15] ARM: i.MX6UL: dts: remove defunct override of pico-hobbit memory node Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 11/15] ARM: i.MX7: dts: replace commented-out code with status = "disabled" Ahmad Fatoum
` (4 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
This was likely overlooked because they were separate commits.
Combine them now. No functional change.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/fsl-ls1046a-rdb.dts | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index c211b26ae90e..d842387fa0da 100644
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -7,6 +7,7 @@
/ {
aliases {
eeprom = &eeprom;
+ mmc0 = &esdhc;
};
chosen {
@@ -17,10 +18,6 @@
device-path = &environment_sd;
};
};
-
- aliases {
- mmc0 = &esdhc;
- };
};
&esdhc {
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 11/15] ARM: i.MX7: dts: replace commented-out code with status = "disabled"
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (9 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 10/15] ARM: layerscape: dts: combine fsl-ls1046a-rdb.dts aliases nodes Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:10 ` [PATCH 12/15] ARM: i.MX: mx53-qsrb: dts: remove now-superfluous override Ahmad Fatoum
` (3 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
A status = "disabled" node should act the same as if it were
uncommented, with the difference that a board that does have the
resistor populated could easily fixup the status.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/imx7d-pba-c-09.dtsi | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/dts/imx7d-pba-c-09.dtsi b/arch/arm/dts/imx7d-pba-c-09.dtsi
index 7106d6bfd735..0b2a987fd440 100644
--- a/arch/arm/dts/imx7d-pba-c-09.dtsi
+++ b/arch/arm/dts/imx7d-pba-c-09.dtsi
@@ -36,7 +36,6 @@
};
/* Enable if R9 is populated. Conflicts with userbtn2 on PEB-EVAL-02 */
- /*
reg_can1_3v3: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
@@ -45,8 +44,8 @@
regulator-max-microvolt = <3300000>;
gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;
enable-active-high;
+ status = "disabled";
};
- */
};
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 12/15] ARM: i.MX: mx53-qsrb: dts: remove now-superfluous override
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (10 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 11/15] ARM: i.MX7: dts: replace commented-out code with status = "disabled" Ahmad Fatoum
@ 2020-06-18 9:10 ` Ahmad Fatoum
2020-06-18 9:11 ` [PATCH 13/15] ARM: zynqmp: dts: drop now superfluous zynqmp.dtsi Ahmad Fatoum
` (2 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:10 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
This gpio-keys node is now available upstream long with the
GPIO_ACTIVE_LOW flag, so we can drop the barebox override.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/imx53-qsb-common.dtsi | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/arch/arm/dts/imx53-qsb-common.dtsi b/arch/arm/dts/imx53-qsb-common.dtsi
index 24bbd6741aa2..5c692523c2e8 100644
--- a/arch/arm/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/dts/imx53-qsb-common.dtsi
@@ -19,24 +19,6 @@
device-path = &bareboxenv;
};
};
-
- /*
- * The buttons are marked as active high in the upstream dts.
- * Remove these once fixed upstream.
- */
- gpio-keys {
- power {
- gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
- };
-
- volume-up {
- gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
- };
-
- volume-down {
- gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
- };
- };
};
&esdhc1 {
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 13/15] ARM: zynqmp: dts: drop now superfluous zynqmp.dtsi
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (11 preceding siblings ...)
2020-06-18 9:10 ` [PATCH 12/15] ARM: i.MX: mx53-qsrb: dts: remove now-superfluous override Ahmad Fatoum
@ 2020-06-18 9:11 ` Ahmad Fatoum
2020-06-18 9:11 ` [PATCH 14/15] ARM: socfpga: dts: remove unused nodes and phandles Ahmad Fatoum
2020-06-18 9:11 ` [PATCH 15/15] Documentation: devicetree: codify extension of upstream DTS by phandles Ahmad Fatoum
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:11 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
zynqmp.dtsi's only node is now available in the upstream dtsi at same
path and same contents, so we can drop the file again.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/zynqmp-zcu104-revA.dts | 1 -
arch/arm/dts/zynqmp.dtsi | 17 -----------------
2 files changed, 18 deletions(-)
delete mode 100644 arch/arm/dts/zynqmp.dtsi
diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index c03112d7a02d..8b8dd84c1dc3 100644
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -8,5 +8,4 @@
*/
#include <arm64/xilinx/zynqmp-zcu104-revA.dts>
-#include "zynqmp.dtsi"
#include "zynqmp-clk.dtsi"
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
deleted file mode 100644
index 59984ee75891..000000000000
--- a/arch/arm/dts/zynqmp.dtsi
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * dts file for Xilinx ZynqMP
- *
- * (C) Copyright 2014 - 2015, Xilinx, Inc.
- *
- * Michal Simek <michal.simek@xilinx.com>
- */
-
-/ {
- firmware {
- zynqmp_firmware: zynqmp-firmware {
- compatible = "xlnx,zynqmp-firmware";
- method = "smc";
- };
- };
-};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 14/15] ARM: socfpga: dts: remove unused nodes and phandles
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (12 preceding siblings ...)
2020-06-18 9:11 ` [PATCH 13/15] ARM: zynqmp: dts: drop now superfluous zynqmp.dtsi Ahmad Fatoum
@ 2020-06-18 9:11 ` Ahmad Fatoum
2020-06-18 9:11 ` [PATCH 15/15] Documentation: devicetree: codify extension of upstream DTS by phandles Ahmad Fatoum
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:11 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
The phandles are unreferenced anywhere. They are likely a remnant of
copy and paste from another device tree that makes use of them, e.g. the
socfpga_cyclone5_socrates.dts. Drop them.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
index 40a7a9c488a7..427f150fb43d 100644
--- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
+++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
@@ -31,10 +31,4 @@
file-path = "barebox.env";
};
};
-
- leds: gpio-leds {
- };
-
- buttons: gpio-keys {
- };
};
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 15/15] Documentation: devicetree: codify extension of upstream DTS by phandles
2020-06-18 9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
` (13 preceding siblings ...)
2020-06-18 9:11 ` [PATCH 14/15] ARM: socfpga: dts: remove unused nodes and phandles Ahmad Fatoum
@ 2020-06-18 9:11 ` Ahmad Fatoum
14 siblings, 0 replies; 18+ messages in thread
From: Ahmad Fatoum @ 2020-06-18 9:11 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
Sync with the upstream device tree repository has been a common cause
for breakage in barebox. Often unnoticed:
* New bindings are merged upstream and device trees migrated, but
barebox didn't yet have support
* Nodes are renamed upstream, but barebox still extends the old name,
with duplicate nodes resulting
We can solve the second one by requiring dtc to give us errors when
paths we extend no longer exist. Document how to do so.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Documentation/devicetree/index.rst | 41 ++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/Documentation/devicetree/index.rst b/Documentation/devicetree/index.rst
index 908652642b9a..62fa990032b3 100644
--- a/Documentation/devicetree/index.rst
+++ b/Documentation/devicetree/index.rst
@@ -31,6 +31,47 @@ device tree under ``dts/src/$ARCH`` with ``#include "$ARCH/board.dts"`` and
then extends it with barebox-specifics like :ref:`barebox,state`,
environment or boot-time device configuration.
+Device Tree probing largely happens via compatible properties with no special
+meaning to the node names themselves. It's thus paramount that any device tree
+nodes extended in the barebox device tree are referenced by a phandle, not by
+path, to avoid run-time breakage like this::
+
+ # Upstream dts/src/$ARCH/board.dts
+ / {
+ leds {
+ led-red { /* formerly named red when the barebox DTS was written */
+ /* ... */
+ };
+ };
+ };
+
+ # barebox arch/$ARCH/dts/board.dts
+ #include <$ARCH/board.dts>
+ / {
+ leds {
+ red {
+ barebox,default-trigger = "heartbeat";
+ };
+ };
+ };
+
+In the prvious example, a device tree sync with upstream resulted in a regression
+as the former override became a new node with a single property without effect.
+
+Using phandles avoids this. When no phandle mapping the full path is defined
+upstream, the ``&{/path}`` syntax should be used instead, e.g.::
+
+ &{/leds/red} {
+ barebox,default-trigger = "heartbeat";
+ };
+
+This would lead to a compile error should the ``/leds/red`` path be renamed or
+removed. This also applies to uses of ``/delete-node/``.
+
+Only exception to this rule are well-known node names that are specified by
+the spec to be parsed by name. These are: ``chosen``, ``aliases`` and ``cpus``,
+but **not** ``memory``.
+
Device Tree Compiler
--------------------
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 18+ messages in thread