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

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

Merge tag 'samsung-dt-4.9-2' of... 

Merge tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DeviceTree update for v4.9, second round" from Krzysztof Kozłowski:

1. Enable HDMI on Arndale Octa board.
2. Update list of clocks for FIMC-IS block on Exynos4x12.
3. Remove skeleton.dtsi thus fixing DT compiler warning:
	"Node /memory has a reg or ranges property, but no unit name"
   This is a tree-wide effort by various people. Javier Martinez Canillas did
   it for Exynos and S5PV210.

* tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5p: Add missing unit name to memory nodes for S5PV210 boards
  ARM: dts: s5p: Remove skeleton.dtsi inclusion for S5PV210
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos5 DTS
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos4 DTS
  ARM: dts: exynos: Add missing unit name to memory nodes in Exynos3 DTS
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos5
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos4
  ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos3
  ARM: dts: exynos: Add missing memory node for Exynos5440 boards
  ARM: dts: exynos: Add all required FIMC-IS clocks to exynos4x12
  ARM: dts: exynos: Enable HDMI for Arndale Octa board
parents 71e84db1 5271d002

arch/arm/boot/dts/exynos3250-artik5.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
		stdout-path = &serial_2;

	};



	memory {

	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x1ff00000>;

	};

arch/arm/boot/dts/exynos3250-monk.dts

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
		i2c7 = &i2c_max77836;

	};



	memory {

	memory@40000000 {

		device_type = "memory";

		reg =  <0x40000000 0x1ff00000>;

	};

arch/arm/boot/dts/exynos3250-rinato.dts

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
		i2c7 = &i2c_max77836;

	};



	memory {

	memory@40000000 {

		device_type = "memory";

		reg =  <0x40000000 0x1ff00000>;

	};

arch/arm/boot/dts/exynos3250.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 * published by the Free Software Foundation.

 */



#include "skeleton.dtsi"

#include "exynos4-cpu-thermal.dtsi"

#include "exynos-syscon-restart.dtsi"

#include <dt-bindings/clock/exynos3250.h>
@@ -25,6 +24,8 @@ 
/ {

	compatible = "samsung,exynos3250";

	interrupt-parent = <&gic>;

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		pinctrl0 = &pinctrl_0;

arch/arm/boot/dts/exynos4.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ 


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

#include <dt-bindings/clock/exynos-audss-clk.h>

#include "skeleton.dtsi"

#include "exynos-syscon-restart.dtsi"



/ {

	interrupt-parent = <&gic>;

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		spi0 = &spi_0;