summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/dts/am335x-afi-gf.dts2
-rw-r--r--arch/arm/dts/am35xx-pfc-750_820x.dts2
-rw-r--r--arch/arm/dts/imx51-genesi-efika-sb.dts3
-rw-r--r--arch/arm/dts/imx6dl-eltec-hipercam.dts3
-rw-r--r--arch/arm/dts/imx6dl-mba6x.dts3
-rw-r--r--arch/arm/dts/imx6q-guf-santaro.dts3
-rw-r--r--arch/arm/dts/imx6q-mba6x.dts3
-rw-r--r--arch/arm/dts/imx6q-var-som.dtsi3
-rw-r--r--arch/arm/dts/imx6qdl-udoo.dtsi3
-rw-r--r--arch/arm/dts/imx7d-phyboard-zeta.dts4
-rw-r--r--arch/arm/dts/imx7d-phycore-som.dtsi5
-rw-r--r--arch/arm/dts/imx7d-sdb.dts2
-rw-r--r--arch/arm/dts/module-mb7707.dts3
-rw-r--r--arch/arm/dts/rk3288-phycore-som.dts3
-rw-r--r--arch/arm/dts/virt2real.dts2
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 961fe2e24..cba8cbc8d 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 707778dfa..55c883944 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 23e6ea416..fb62fe2c7 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 41af22983..ce2af4051 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 cdb033426..dddc3d384 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 0fb05d05d..a91534817 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 9391c1d6f..64635b958 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 63a17fc66..7dbaa1e3d 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 ebc103858..bf47297ba 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 fbd0da238..a34f12f61 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 622261bd1..e892a54bd 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 16bfabe9b..7beb06592 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 94a3373fc..9a0f74997 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 65c53895c..67073b2d8 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 8f8c65ba7..3b543b6e9 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>;
};