Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adff8079 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'berlin-dt-for-v4.9-1' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 7dd84f06 9a0af838

arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x40000000>; /* 1 GB */

	};

arch/arm/boot/dts/berlin2.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -39,13 +39,14 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include "skeleton.dtsi"

#include <dt-bindings/clock/berlin2.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	model = "Marvell Armada 1500 (BG2) SoC";

	compatible = "marvell,berlin2", "marvell,berlin";

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		serial0 = &uart0;
@@ -89,7 +90,7 @@ 
		clock-frequency = <25000000>;

	};



	soc {

	soc@f7000000 {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;
@@ -447,7 +448,6 @@ 
				reg = <0x2000 0x100>;

				clocks = <&refclk>;

				interrupts = <1>;

				status = "disabled";

			};



			wdt2: watchdog@3000 {
@@ -455,7 +455,6 @@ 
				reg = <0x3000 0x100>;

				clocks = <&refclk>;

				interrupts = <2>;

				status = "disabled";

			};



			sm_gpio1: gpio@5000 {

arch/arm/boot/dts/berlin2cd-google-chromecast.dts

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

	};

arch/arm/boot/dts/berlin2cd.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -39,13 +39,14 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include "skeleton.dtsi"

#include <dt-bindings/clock/berlin2.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	model = "Marvell Armada 1500-mini (BG2CD) SoC";

	compatible = "marvell,berlin2cd", "marvell,berlin";

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		serial0 = &uart0;
@@ -78,7 +79,7 @@ 
		clock-frequency = <25000000>;

	};



	soc {

	soc@f7000000 {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/berlin2q-marvell-dmp.dts

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
	model = "Marvell BG2-Q DMP";

	compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x80000000>;

	};