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

Commit 6daf2aab authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-4.12' of... 

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

Samsung DeviceTree ARM update for v4.12:
1. Enhancements to PCIe nodes on Exynos5440.
2. Fix thermal values on some of Exynos5420 boards like Odroid XU3.
3. Add proper clock frequency properties to DSI nodes.
4. Fix watchdog reset on Exynos4412.
5. Fix watchdog infinite interrupt in soft mode on Exynos4210,
   Exynos5440, S3C64xx and S5Pv210.
6. Enable watchdog on Exynos4 and S3C SoCs.

* tag 'samsung-dt-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi
  ARM: dts: s5pv210: Fix infinite interrupt in soft mode
  ARM: dts: s3c64xx: Fix infinite interrupt in soft mode
  ARM: dts: exynos: Fix infinite interrupt in soft mode on Exynos4210 and Exynos5440
  ARM: dts: exynos: Enable watchdog on all Exynos4 boards
  ARM: dts: s3c64xx: Enable watchdog on all S3C64xx boards
  ARM: dts: exynos: Fix watchdog reset on Exynos4412
  ARM: dts: exynos: Add the burst and esc clock frequency properties to DSI node
  ARM: dts: exynos: Do not ignore real-world fuse values for thermal zone 0 on Exynos5420
  ARM: dts: exynos: Add phy-pcie node for pcie to Exynos5440

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 10719376 a1146328

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

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ 
&dsi_0 {

	vddcore-supply = <&ldo6_reg>;

	vddio-supply = <&ldo6_reg>;

	samsung,burst-clock-frequency = <250000000>;

	samsung,esc-clock-frequency = <20000000>;

	samsung,pll-clock-frequency = <24000000>;

	status = "okay";

arch/arm/boot/dts/exynos4.dtsi

+1 −9
Original line number Diff line number Diff line
@@ -283,15 +283,6 @@ 
		};

	};



	watchdog: watchdog@10060000 {

		compatible = "samsung,s3c2410-wdt";

		reg = <0x10060000 0x100>;

		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_WDT>;

		clock-names = "watchdog";

		status = "disabled";

	};



	rtc: rtc@10070000 {

		compatible = "samsung,s3c6410-rtc";

		reg = <0x10070000 0x100>;
@@ -771,6 +762,7 @@ 
		clocks = <&clock CLK_HDMI_CEC>;

		clock-names = "hdmicec";

		samsung,syscon-phandle = <&pmu_system_controller>;

		hdmi-phandle = <&hdmi>;

		pinctrl-names = "default";

		pinctrl-0 = <&hdmi_cec>;

		status = "disabled";

arch/arm/boot/dts/exynos4210-origen.dts

+0 −4
Original line number Diff line number Diff line
@@ -328,7 +328,3 @@ 
&tmu {

	status = "okay";

};
 


&watchdog {

	status = "okay";

};

arch/arm/boot/dts/exynos4210-trats.dts

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ 
&dsi_0 {

	vddcore-supply = <&vusb_reg>;

	vddio-supply = <&vmipi_reg>;

	samsung,burst-clock-frequency = <500000000>;

	samsung,esc-clock-frequency = <20000000>;

	samsung,pll-clock-frequency = <24000000>;

	status = "okay";

arch/arm/boot/dts/exynos4210.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -119,6 +119,14 @@ 
		};

	};



	watchdog: watchdog@10060000 {

		compatible = "samsung,s3c6410-wdt";

		reg = <0x10060000 0x100>;

		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_WDT>;

		clock-names = "watchdog";

	};



	clock: clock-controller@10030000 {

		compatible = "samsung,exynos4210-clock";

		reg = <0x10030000 0x20000>;