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

Commit f8e6333a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt 

Merge "Marvell Berlin DT for 4.4 take 1" from Sebastian Hesselbarth:
- use serial aliases and stdout path
- add cpufreq properties to all SoCs
- add pwm nodes for all SoCs

This depends on topic branch berlin-cpuclk-for-4.4-1

* tag 'berlin-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: berlin: add a PWM node on the BG2CD
  ARM: berlin: add a PWM node on the BG2
  ARM: berlin: add a PWM node on the BG2Q
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2CD
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2Q
  arm: dts: berlin: use stdout-path
  arm: dts: berlin: add aliases for serial
parents c85f9235 5f5cdc08

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

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
	compatible = "sony,nsz-gs7", "marvell,berlin2", "marvell,berlin";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	memory {

arch/arm/boot/dts/berlin2.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ 
	model = "Marvell Armada 1500 (BG2) SoC";

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



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -57,6 +63,16 @@ 
			device_type = "cpu";

			next-level-cache = <&l2>;

			reg = <0>;



			clocks = <&chip_clk CLKID_CPU>;

			clock-latency = <100000>;

			operating-points = <

				/* kHz    uV */

				1200000 1200000

				1000000 1200000

				800000  1200000

				600000  1200000

			>;

		};



		cpu@1 {
@@ -404,6 +420,13 @@ 
			};

		};



		pwm: pwm@f20000 {

			compatible = "marvell,berlin-pwm";

			reg = <0xf20000 0x40>;

			clocks = <&chip_clk CLKID_CFG>;

			#pwm-cells = <3>;

		};



		apb@fc0000 {

			compatible = "simple-bus";

			#address-cells = <1>;

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

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ 
	compatible = "google,chromecast", "marvell,berlin2cd", "marvell,berlin";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	memory {

arch/arm/boot/dts/berlin2cd.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
	model = "Marvell Armada 1500-mini (BG2CD) SoC";

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



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -56,6 +61,14 @@ 
			device_type = "cpu";

			next-level-cache = <&l2>;

			reg = <0>;



			clocks = <&chip_clk CLKID_CPU>;

			clock-latency = <100000>;

			operating-points = <

				/* kHz    uV */

				800000  1200000

				600000  1200000

			>;

		};

	};
@@ -368,6 +381,13 @@ 
			status = "disabled";

		};



		pwm: pwm@f20000 {

			compatible = "marvell,berlin-pwm";

			reg = <0xf20000 0x40>;

			clocks = <&chip_clk CLKID_CFG>;

			#pwm-cells = <3>;

		};



		apb@fc0000 {

			compatible = "simple-bus";

			#address-cells = <1>;

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

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ 
	};



	choosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

		bootargs = "earlyprintk";

		stdout-path = "serial0:115200n8";

	};



	regulators {