aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-10-03 01:20:39 -0400
committerOlof Johansson <olof@lixom.net>2016-10-03 01:20:39 -0400
commitadff807988f92d4646c50b601936e340a92d5455 (patch)
treea3fa1aed5bebeae8b4e6006bb165d914c26d4a8b
parent7dd84f065c5fea2c3af945b1e94cd734b3416fa8 (diff)
parent9a0af838c202572801dc344294eb0a2875f60ab7 (diff)
Merge tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt
Berlin DT changes for v4.9 - enable dw wdt nodes unconditionally, driver supports multiple instances now - fix some dtc compiler warnings * tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin: ARM: dts: sony-nsz-gs7: add missing unit name to /memory node ARM: dts: chromecast: add missing unit name to /memory node ARM: dts: berlin2q-marvell-dmp: add missing unit name to /memory node ARM: dts: berlin2: Add missing unit name to /soc node ARM: dts: berlin2cd: Add missing unit name to /soc node ARM: dts: berlin2q: Add missing unit name to /soc node ARM: dts: berlin2: Remove skeleton.dtsi inclusion ARM: dts: berlin2cd: Remove skeleton.dtsi inclusion ARM: dts: berlin2q: Remove skeleton.dtsi inclusion arm: dts: berlin2q: enable all wdt nodes unconditionally arm: dts: berlin2: enable all wdt nodes unconditionally Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts2
-rw-r--r--arch/arm/boot/dts/berlin2.dtsi7
-rw-r--r--arch/arm/boot/dts/berlin2cd-google-chromecast.dts2
-rw-r--r--arch/arm/boot/dts/berlin2cd.dtsi5
-rw-r--r--arch/arm/boot/dts/berlin2q-marvell-dmp.dts2
-rw-r--r--arch/arm/boot/dts/berlin2q.dtsi8
6 files changed, 12 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts b/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
index 3c0907b87fd6..1c475796d17f 100644
--- a/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
+++ b/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
@@ -49,7 +49,7 @@
49 stdout-path = "serial0:115200n8"; 49 stdout-path = "serial0:115200n8";
50 }; 50 };
51 51
52 memory { 52 memory@0 {
53 device_type = "memory"; 53 device_type = "memory";
54 reg = <0x00000000 0x40000000>; /* 1 GB */ 54 reg = <0x00000000 0x40000000>; /* 1 GB */
55 }; 55 };
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index ae81009741ff..425c48971abe 100644
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -39,13 +39,14 @@
39 * OTHER DEALINGS IN THE SOFTWARE. 39 * OTHER DEALINGS IN THE SOFTWARE.
40 */ 40 */
41 41
42#include "skeleton.dtsi"
43#include <dt-bindings/clock/berlin2.h> 42#include <dt-bindings/clock/berlin2.h>
44#include <dt-bindings/interrupt-controller/arm-gic.h> 43#include <dt-bindings/interrupt-controller/arm-gic.h>
45 44
46/ { 45/ {
47 model = "Marvell Armada 1500 (BG2) SoC"; 46 model = "Marvell Armada 1500 (BG2) SoC";
48 compatible = "marvell,berlin2", "marvell,berlin"; 47 compatible = "marvell,berlin2", "marvell,berlin";
48 #address-cells = <1>;
49 #size-cells = <1>;
49 50
50 aliases { 51 aliases {
51 serial0 = &uart0; 52 serial0 = &uart0;
@@ -89,7 +90,7 @@
89 clock-frequency = <25000000>; 90 clock-frequency = <25000000>;
90 }; 91 };
91 92
92 soc { 93 soc@f7000000 {
93 compatible = "simple-bus"; 94 compatible = "simple-bus";
94 #address-cells = <1>; 95 #address-cells = <1>;
95 #size-cells = <1>; 96 #size-cells = <1>;
@@ -447,7 +448,6 @@
447 reg = <0x2000 0x100>; 448 reg = <0x2000 0x100>;
448 clocks = <&refclk>; 449 clocks = <&refclk>;
449 interrupts = <1>; 450 interrupts = <1>;
450 status = "disabled";
451 }; 451 };
452 452
453 wdt2: watchdog@3000 { 453 wdt2: watchdog@3000 {
@@ -455,7 +455,6 @@
455 reg = <0x3000 0x100>; 455 reg = <0x3000 0x100>;
456 clocks = <&refclk>; 456 clocks = <&refclk>;
457 interrupts = <2>; 457 interrupts = <2>;
458 status = "disabled";
459 }; 458 };
460 459
461 sm_gpio1: gpio@5000 { 460 sm_gpio1: gpio@5000 {
diff --git a/arch/arm/boot/dts/berlin2cd-google-chromecast.dts b/arch/arm/boot/dts/berlin2cd-google-chromecast.dts
index 8ba8b50ce997..ca24def0ce13 100644
--- a/arch/arm/boot/dts/berlin2cd-google-chromecast.dts
+++ b/arch/arm/boot/dts/berlin2cd-google-chromecast.dts
@@ -50,7 +50,7 @@
50 stdout-path = "serial0:115200n8"; 50 stdout-path = "serial0:115200n8";
51 }; 51 };
52 52
53 memory { 53 memory@0 {
54 device_type = "memory"; 54 device_type = "memory";
55 reg = <0x00000000 0x20000000>; /* 512 MB */ 55 reg = <0x00000000 0x20000000>; /* 512 MB */
56 }; 56 };
diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 6d06b6118d83..4fe1574d08c3 100644
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -39,13 +39,14 @@
39 * OTHER DEALINGS IN THE SOFTWARE. 39 * OTHER DEALINGS IN THE SOFTWARE.
40 */ 40 */
41 41
42#include "skeleton.dtsi"
43#include <dt-bindings/clock/berlin2.h> 42#include <dt-bindings/clock/berlin2.h>
44#include <dt-bindings/interrupt-controller/arm-gic.h> 43#include <dt-bindings/interrupt-controller/arm-gic.h>
45 44
46/ { 45/ {
47 model = "Marvell Armada 1500-mini (BG2CD) SoC"; 46 model = "Marvell Armada 1500-mini (BG2CD) SoC";
48 compatible = "marvell,berlin2cd", "marvell,berlin"; 47 compatible = "marvell,berlin2cd", "marvell,berlin";
48 #address-cells = <1>;
49 #size-cells = <1>;
49 50
50 aliases { 51 aliases {
51 serial0 = &uart0; 52 serial0 = &uart0;
@@ -78,7 +79,7 @@
78 clock-frequency = <25000000>; 79 clock-frequency = <25000000>;
79 }; 80 };
80 81
81 soc { 82 soc@f7000000 {
82 compatible = "simple-bus"; 83 compatible = "simple-bus";
83 #address-cells = <1>; 84 #address-cells = <1>;
84 #size-cells = <1>; 85 #size-cells = <1>;
diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
index 33b28757b8f6..f485308840ab 100644
--- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
@@ -43,7 +43,7 @@
43 model = "Marvell BG2-Q DMP"; 43 model = "Marvell BG2-Q DMP";
44 compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin"; 44 compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";
45 45
46 memory { 46 memory@0 {
47 device_type = "memory"; 47 device_type = "memory";
48 reg = <0x00000000 0x80000000>; 48 reg = <0x00000000 0x80000000>;
49 }; 49 };
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 2c34bfb13632..e548229697fc 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -37,11 +37,11 @@
37#include <dt-bindings/clock/berlin2q.h> 37#include <dt-bindings/clock/berlin2q.h>
38#include <dt-bindings/interrupt-controller/arm-gic.h> 38#include <dt-bindings/interrupt-controller/arm-gic.h>
39 39
40#include "skeleton.dtsi"
41
42/ { 40/ {
43 model = "Marvell Armada 1500 pro (BG2-Q) SoC"; 41 model = "Marvell Armada 1500 pro (BG2-Q) SoC";
44 compatible = "marvell,berlin2q", "marvell,berlin"; 42 compatible = "marvell,berlin2q", "marvell,berlin";
43 #address-cells = <1>;
44 #size-cells = <1>;
45 45
46 aliases { 46 aliases {
47 serial0 = &uart0; 47 serial0 = &uart0;
@@ -99,7 +99,7 @@
99 clock-frequency = <25000000>; 99 clock-frequency = <25000000>;
100 }; 100 };
101 101
102 soc { 102 soc@f7000000 {
103 compatible = "simple-bus"; 103 compatible = "simple-bus";
104 #address-cells = <1>; 104 #address-cells = <1>;
105 #size-cells = <1>; 105 #size-cells = <1>;
@@ -525,7 +525,6 @@
525 reg = <0x2000 0x100>; 525 reg = <0x2000 0x100>;
526 clocks = <&refclk>; 526 clocks = <&refclk>;
527 interrupts = <1>; 527 interrupts = <1>;
528 status = "disabled";
529 }; 528 };
530 529
531 wdt2: watchdog@3000 { 530 wdt2: watchdog@3000 {
@@ -533,7 +532,6 @@
533 reg = <0x3000 0x100>; 532 reg = <0x3000 0x100>;
534 clocks = <&refclk>; 533 clocks = <&refclk>;
535 interrupts = <2>; 534 interrupts = <2>;
536 status = "disabled";
537 }; 535 };
538 536
539 sm_gpio1: gpio@5000 { 537 sm_gpio1: gpio@5000 {
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-25 07:51:48 -0400