aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-06-16 16:29:08 -0400
committerOlof Johansson <olof@lixom.net>2019-06-16 16:29:08 -0400
commit9f22081ea221554d2ed8bb7f2abdbd312fce6436 (patch)
tree2f43f60907816e3c88207c0d130e7e479adba921
parent6515a2ceac76aa557ac91c7cb315a6f153870dfe (diff)
parente8bd76dccd792b371a934336c3e7d8c389755d9f (diff)
Merge tag 'arm-soc/for-5.2/devicetree-fixes' of https://github.com/Broadcom/stblinux into fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 5.2-rc1, please pull the following: - Florian fixes the remaining Broadcom DTS files to have a valid device_type = "memory" property which was missed during the removal of skeleton.dtsi * tag 'arm-soc/for-5.2/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: bcm: Add missing device_type = "memory" property Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-netgear-r6250.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts1
-rw-r--r--arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts1
-rw-r--r--arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts1
-rw-r--r--arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts1
-rw-r--r--arch/arm/boot/dts/bcm4709-linksys-ea9200.dts1
-rw-r--r--arch/arm/boot/dts/bcm4709-netgear-r7000.dts1
-rw-r--r--arch/arm/boot/dts/bcm4709-netgear-r8000.dts1
-rw-r--r--arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts1
-rw-r--r--arch/arm/boot/dts/bcm47094-phicomm-k3.dts1
-rw-r--r--arch/arm/boot/dts/bcm94708.dts1
-rw-r--r--arch/arm/boot/dts/bcm94709.dts1
-rw-r--r--arch/arm/boot/dts/bcm963138dvt.dts1
20 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
index 79d454ff3be4..1c6f561ac52b 100644
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x08000000>; 25 0x88000000 0x08000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
index 99365bb8c41e..e550799a6ae0 100644
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x08000000>; 25 0x88000000 0x08000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
index bc330b1f6de0..7bfa2238f70b 100644
--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x18000000>; 25 0x88000000 0x18000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
index 258d2b251900..fd361c9b1374 100644
--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
@@ -17,6 +17,7 @@
17 }; 17 };
18 18
19 memory { 19 memory {
20 device_type = "memory";
20 reg = <0x00000000 0x08000000>; 21 reg = <0x00000000 0x08000000>;
21 }; 22 };
22 23
diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
index babcfec50dde..7c34360d3285 100644
--- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
@@ -18,6 +18,7 @@
18 }; 18 };
19 19
20 memory { 20 memory {
21 device_type = "memory";
21 reg = <0x00000000 0x08000000>; 22 reg = <0x00000000 0x08000000>;
22 }; 23 };
23 24
diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
index e7fdaed99bd0..969b8d78e492 100644
--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
@@ -16,6 +16,7 @@
16 }; 16 };
17 17
18 memory { 18 memory {
19 device_type = "memory";
19 reg = <0x00000000 0x08000000>; 20 reg = <0x00000000 0x08000000>;
20 }; 21 };
21 22
diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
index 42bafc644013..b62854ee27ab 100644
--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000>; 24 reg = <0x00000000 0x08000000>;
24 }; 25 };
25 26
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index dce35eb79dbe..75f7b4ef35da 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -21,6 +21,7 @@
21 }; 21 };
22 22
23 memory { 23 memory {
24 device_type = "memory";
24 reg = <0x00000000 0x08000000 25 reg = <0x00000000 0x08000000
25 0x88000000 0x08000000>; 26 0x88000000 0x08000000>;
26 }; 27 };
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
index b7a024b7951b..148d16a9085e 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x08000000>; 25 0x88000000 0x08000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
index f7f834cd3448..eed3aab6679b 100644
--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x08000000>; 25 0x88000000 0x08000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
index 4cb10f88a95e..8f1e565c3db4 100644
--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x08000000>; 25 0x88000000 0x08000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
index 77d1687b4228..ce888b1835d1 100644
--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x18000000>; 25 0x88000000 0x18000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
index 983149b55269..ed8619b54d69 100644
--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
@@ -17,6 +17,7 @@
17 }; 17 };
18 18
19 memory { 19 memory {
20 device_type = "memory";
20 reg = <0x00000000 0x08000000 21 reg = <0x00000000 0x08000000
21 0x88000000 0x08000000>; 22 0x88000000 0x08000000>;
22 }; 23 };
diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
index ca41481b44bd..1f87993eae1d 100644
--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
@@ -20,6 +20,7 @@
20 }; 20 };
21 21
22 memory { 22 memory {
23 device_type = "memory";
23 reg = <0x00000000 0x08000000 24 reg = <0x00000000 0x08000000
24 0x88000000 0x08000000>; 25 0x88000000 0x08000000>;
25 }; 26 };
diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
index aa69e656d395..6c6199a53d09 100644
--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
@@ -31,6 +31,7 @@
31 }; 31 };
32 32
33 memory { 33 memory {
34 device_type = "memory";
34 reg = <0x00000000 0x08000000 35 reg = <0x00000000 0x08000000
35 0x88000000 0x08000000>; 36 0x88000000 0x08000000>;
36 }; 37 };
diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
index b527d2ff987e..f806be5da723 100644
--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
@@ -16,6 +16,7 @@
16 }; 16 };
17 17
18 memory { 18 memory {
19 device_type = "memory";
19 reg = <0x00000000 0x08000000>; 20 reg = <0x00000000 0x08000000>;
20 }; 21 };
21 22
diff --git a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
index ec09c0426d16..456045f17a00 100644
--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
@@ -14,6 +14,7 @@
14 model = "Phicomm K3"; 14 model = "Phicomm K3";
15 15
16 memory { 16 memory {
17 device_type = "memory";
17 reg = <0x00000000 0x08000000 18 reg = <0x00000000 0x08000000
18 0x88000000 0x18000000>; 19 0x88000000 0x18000000>;
19 }; 20 };
diff --git a/arch/arm/boot/dts/bcm94708.dts b/arch/arm/boot/dts/bcm94708.dts
index 934f07adfe3c..3d13e46c6949 100644
--- a/arch/arm/boot/dts/bcm94708.dts
+++ b/arch/arm/boot/dts/bcm94708.dts
@@ -39,6 +39,7 @@
39 compatible = "brcm,bcm94708", "brcm,bcm4708"; 39 compatible = "brcm,bcm94708", "brcm,bcm4708";
40 40
41 memory { 41 memory {
42 device_type = "memory";
42 reg = <0x00000000 0x08000000>; 43 reg = <0x00000000 0x08000000>;
43 }; 44 };
44}; 45};
diff --git a/arch/arm/boot/dts/bcm94709.dts b/arch/arm/boot/dts/bcm94709.dts
index 31e4dd098776..5017b7b259cb 100644
--- a/arch/arm/boot/dts/bcm94709.dts
+++ b/arch/arm/boot/dts/bcm94709.dts
@@ -39,6 +39,7 @@
39 compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708"; 39 compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708";
40 40
41 memory { 41 memory {
42 device_type = "memory";
42 reg = <0x00000000 0x08000000>; 43 reg = <0x00000000 0x08000000>;
43 }; 44 };
44}; 45};
diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts
index 8dca97eeaf57..29525686e51a 100644
--- a/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/arch/arm/boot/dts/bcm963138dvt.dts
@@ -17,6 +17,7 @@
17 }; 17 };
18 18
19 memory { 19 memory {
20 device_type = "memory";
20 reg = <0x0 0x08000000>; 21 reg = <0x0 0x08000000>;
21 }; 22 };
22 23
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-28 06:40:22 -0500