We now have fancy new syntax for having label references be
both short and trigger an error if non-existent. Let's make use of it.
Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 6 ++--
arch/arm/dts/imx6qdl-prti6q-nor.dtsi | 14 ++++-----
arch/arm/dts/imx6qdl-skov-imx6.dtsi | 42 +++++++++++++--------------
arch/arm/dts/imx6sx-udoo-neo-full.dts | 5 ++--
arch/arm/dts/imx6ul-prti6g.dts | 14 ++++-----
arch/arm/dts/imx8mm-evkb.dts | 4 +--
6 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
index 1c7fbf6ed89c..b083fa0b37de 100644
--- a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
@@ -23,6 +23,9 @@
};
};
+/delete-node/ &{flash/partition@c0000};
+/delete-node/ &{flash/partition@c2000};
+
&flash {
#address-cells = <1>;
#size-cells = <1>;
@@ -32,9 +35,6 @@
reg = <0x0 0xe0000>;
};
- /delete-node/ partition@c0000;
- /delete-node/ partition@c2000;
-
env_nor: partition@e0000 {
label = "barebox-environment";
reg = <0xe0000 0x20000>;
diff --git a/arch/arm/dts/imx6qdl-prti6q-nor.dtsi
b/arch/arm/dts/imx6qdl-prti6q-nor.dtsi
index 7a88652b4242..238fc4ca0f9b 100644
--- a/arch/arm/dts/imx6qdl-prti6q-nor.dtsi
+++ b/arch/arm/dts/imx6qdl-prti6q-nor.dtsi
@@ -2,14 +2,12 @@
#include "imx6qdl-prti6q-emmc.dtsi"
-&ecspi1 {
- flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
+&{ecspi1/flash@0} {
+ #address-cells = <1>;
+ #size-cells = <1>;
- partition@0 {
- label = "barebox";
- reg = <0x0 0x100000>;
- };
+ partition@0 {
+ label = "barebox";
+ reg = <0x0 0x100000>;
};
};
diff --git a/arch/arm/dts/imx6qdl-skov-imx6.dtsi
b/arch/arm/dts/imx6qdl-skov-imx6.dtsi
index cb4224f1b441..5415bb743aa2 100644
--- a/arch/arm/dts/imx6qdl-skov-imx6.dtsi
+++ b/arch/arm/dts/imx6qdl-skov-imx6.dtsi
@@ -314,32 +314,30 @@
};
/* spi */
-&ecspi1 {
- flash@0 {
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
+&{ecspi1/flash@0} {
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
- partition@0 {
- label = "barebox";
- reg = <0x0 0x100000>;
- };
+ partition@0 {
+ label = "barebox";
+ reg = <0x0 0x100000>;
+ };
- /* space left to let barebox grow */
+ /* space left to let barebox grow */
- /* placed near the end of the NOR memory */
- barebox_env: partition@780000 {
- label = "barebox-environment";
- reg = <0x780000 0x40000>;
- };
+ /* placed near the end of the NOR memory */
+ barebox_env: partition@780000 {
+ label = "barebox-environment";
+ reg = <0x780000 0x40000>;
+ };
- /* placed at the end of the NOR memory */
- state_storage: partition@7C0000 {
- label = "barebox-state";
- /* four times mirrored */
- reg = <0x7C0000 0x40000>;
- };
+ /* placed at the end of the NOR memory */
+ state_storage: partition@7C0000 {
+ label = "barebox-state";
+ /* four times mirrored */
+ reg = <0x7C0000 0x40000>;
};
};
};
diff --git a/arch/arm/dts/imx6sx-udoo-neo-full.dts
b/arch/arm/dts/imx6sx-udoo-neo-full.dts
index 0848574e418e..9623cc4b3d72 100644
--- a/arch/arm/dts/imx6sx-udoo-neo-full.dts
+++ b/arch/arm/dts/imx6sx-udoo-neo-full.dts
@@ -2,9 +2,6 @@
#include "imx6sx.dtsi"
/ {
-
- /delete-node/ memory@80000000;
-
chosen {
environment {
compatible = "barebox,environment";
@@ -13,6 +10,8 @@
};
};
+/delete-node/ &{/memory@80000000};
+
&usdhc2 {
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx6ul-prti6g.dts b/arch/arm/dts/imx6ul-prti6g.dts
index 3efbf357f1ac..f0bd1c9684bc 100644
--- a/arch/arm/dts/imx6ul-prti6g.dts
+++ b/arch/arm/dts/imx6ul-prti6g.dts
@@ -25,15 +25,13 @@
};
};
-&ecspi1 {
- flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
+&{ecspi1/flash@0} {
+ #address-cells = <1>;
+ #size-cells = <1>;
- partition@0 {
- label = "barebox";
- reg = <0x0 0x100000>;
- };
+ partition@0 {
+ label = "barebox";
+ reg = <0x0 0x100000>;
};
};
diff --git a/arch/arm/dts/imx8mm-evkb.dts b/arch/arm/dts/imx8mm-evkb.dts
index b7d3be7a847a..365427f50df0 100644
--- a/arch/arm/dts/imx8mm-evkb.dts
+++ b/arch/arm/dts/imx8mm-evkb.dts
@@ -16,9 +16,9 @@
compatible = "fsl,imx8mm-evkb", "fsl,imx8mm";
};
-&i2c1 {
- /delete-node/ pmic@4b;
+/delete-node/ &{i2c1/pmic@4b};
+&i2c1 {
pmic@25 {
compatible = "nxp,pca9450a";
reg = <0x25>;
--
2.30.2
