Many state variables have a reg property, but no unit name. Also some
unnecessary #size-cells and #address-cells are removed.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/dts/imx6dl-prtvt7.dts | 4 +++-
arch/arm/dts/imx6qdl-prti6q-emmc.dtsi | 14 ++++++--------
arch/arm/dts/imx6qdl-skov-imx6.dtsi | 2 +-
arch/arm/dts/imx6ul-phytec-state.dtsi | 16 +++++++---------
arch/arm/dts/imx6ul-webasto-ccbv2.dts | 2 --
arch/arm/dts/imx6ul-webasto-marvel.dts | 2 --
6 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/arch/arm/dts/imx6dl-prtvt7.dts b/arch/arm/dts/imx6dl-prtvt7.dts
index 19794add17..dcfde2c8c6 100644
--- a/arch/arm/dts/imx6dl-prtvt7.dts
+++ b/arch/arm/dts/imx6dl-prtvt7.dts
@@ -6,8 +6,10 @@
&state_emmc {
magic = <0x72766467>;
+ #address-cells = <1>;
+ #size-cells = <1>;
- brand {
+ brand@1b0 {
reg = <0x1b0 0x4>;
type = "enum32";
names = "unbranded", "agco", "vermeer";
diff --git a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
index 8ad41174d4..581ff349a4 100644
--- a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
+++ b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
@@ -20,8 +20,6 @@
backend-type = "raw";
backend = <&state_backend_emmc>;
backend-stridesize = <0x400>;
- #address-cells = <1>;
- #size-cells = <1>;
bootstate {
#address-cells = <1>;
@@ -31,13 +29,13 @@
#address-cells = <1>;
#size-cells = <1>;
- remaining_attempts {
+ remaining_attempts@0 {
reg = <0x0 0x4>;
type = "uint32";
default = <3>;
};
- priority {
+ priority@4 {
reg = <0x4 0x4>;
type = "uint32";
default = <21>;
@@ -48,20 +46,20 @@
#address-cells = <1>;
#size-cells = <1>;
- remaining_attempts {
+ remaining_attempts@10 {
reg = <0x10 0x4>;
type = "uint32";
default = <3>;
};
- priority {
+ priority@14 {
reg = <0x14 0x4>;
type = "uint32";
default = <20>;
};
};
- last_chosen {
+ last_chosen@20 {
reg = <0x20 0x4>;
type = "uint32";
};
@@ -71,7 +69,7 @@
#address-cells = <1>;
#size-cells = <1>;
- data_partitions {
+ data_partitions@26 {
reg = <0x26 0x100>;
type = "string";
};
diff --git a/arch/arm/dts/imx6qdl-skov-imx6.dtsi b/arch/arm/dts/imx6qdl-skov-imx6.dtsi
index cb4224f1b4..12be8ee4f7 100644
--- a/arch/arm/dts/imx6qdl-skov-imx6.dtsi
+++ b/arch/arm/dts/imx6qdl-skov-imx6.dtsi
@@ -113,7 +113,7 @@
#address-cells = <1>;
#size-cells = <1>;
- eth2 {
+ eth2@1e {
reg = <0x1E 0x6>;
type = "mac";
default = [00 11 22 33 44 55];
diff --git a/arch/arm/dts/imx6ul-phytec-state.dtsi b/arch/arm/dts/imx6ul-phytec-state.dtsi
index 78a32ed96b..d0cad1b516 100644
--- a/arch/arm/dts/imx6ul-phytec-state.dtsi
+++ b/arch/arm/dts/imx6ul-phytec-state.dtsi
@@ -18,29 +18,27 @@
backend-stridesize = <54>;
status = "disabled";
- #address-cells = <1>;
- #size-cells = <1>;
bootstate {
#address-cells = <1>;
#size-cells = <1>;
- last_chosen {
+ last_chosen@0 {
reg = <0x0 0x4>;
type = "uint32";
};
system0 {
#address-cells = <1>;
#size-cells = <1>;
- remaining_attempts {
+ remaining_attempts@4 {
reg = <0x4 0x4>;
type = "uint32";
default = <3>;
};
- priority {
+ priority@8 {
reg = <0x8 0x4>;
type = "uint32";
default = <21>;
};
- ok {
+ ok@c {
reg = <0xc 0x4>;
type = "uint32";
default = <0>;
@@ -49,17 +47,17 @@
system1 {
#address-cells = <1>;
#size-cells = <1>;
- remaining_attempts {
+ remaining_attempts@10 {
reg = <0x10 0x4>;
type = "uint32";
default = <3>;
};
- priority {
+ priority@14 {
reg = <0x14 0x4>;
type = "uint32";
default = <20>;
};
- ok {
+ ok@18 {
reg = <0x18 0x4>;
type = "uint32";
default = <0>;
diff --git a/arch/arm/dts/imx6ul-webasto-ccbv2.dts b/arch/arm/dts/imx6ul-webasto-ccbv2.dts
index 93e9445b48..198088bd44 100644
--- a/arch/arm/dts/imx6ul-webasto-ccbv2.dts
+++ b/arch/arm/dts/imx6ul-webasto-ccbv2.dts
@@ -32,8 +32,6 @@
};
state_emmc: state {
- #address-cells = <1>;
- #size-cells = <1>;
compatible = "barebox,state";
magic = <0x290cf8c6>;
backend-type = "raw";
diff --git a/arch/arm/dts/imx6ul-webasto-marvel.dts b/arch/arm/dts/imx6ul-webasto-marvel.dts
index b8ecb00c8c..300cd5cf4b 100644
--- a/arch/arm/dts/imx6ul-webasto-marvel.dts
+++ b/arch/arm/dts/imx6ul-webasto-marvel.dts
@@ -38,8 +38,6 @@
};
state_emmc: state {
- #address-cells = <1>;
- #size-cells = <1>;
compatible = "barebox,state";
magic = <0x290cf8c6>;
backend-type = "raw";
--
2.30.2
