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

Commit 9744426e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "Samsung Device Tree updates and improvements for v4.7" from Krzysztof Kozlowski:

1. Enable accelerated AES (Security SubSystem) on Exynos4412-based boards.
2. Enable HDMI CEC on Exynos4412-based Odroid.
3. Add regulator supplies for eMMC/SD on Odroid XU3/XU4.
4. Fix DTC unit name warnings.
5. Merge topic branch of new Artik5 board.

* tag 'samsung-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5p: Fix DTC unit name warnings in SMDKv210 board
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos5440
  ARM: dts: exynos: Fix DTC unit name warnings in SMDK5420
  ARM: dts: exynos: Fix DTC unit name warnings in Peach Pit
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos542x
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos5250
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos4x12
  ARM: dts: exynos: Fix DTC unit name warnings in Trats2 board
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos4
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos3250
  ARM: dts: exynos: Fix DTC unit name warnings in cros-adc-thermistors
  ARM: dts: exynos: Add eMMC and SD regulator supplies to Odroid XU3/XU4
  ARM: dts: exynos: Enable the HDMI CEC device on Exynos4412 Odroid boards
  ARM: dts: exynos: Add node for the HDMI CEC device to exynos4
  ARM: dts: exynos: Add HDMI CEC pin definition to exynos4 pinctrl
  ARM: dts: exynos: Enable SSS on Odroid X/X2/U3 family
  ARM: dts: exynos: Enable SSS on Trats2
  ARM: dts: exynos: Add Security SubSystem node to Exynos4
parents 036f8d06 06e520c4

arch/arm/boot/dts/cros-adc-thermistors.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -13,28 +13,28 @@ 
*/



&adc {

	ncp15wb473@3 {

	thermistor3 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 3>;

	};

	ncp15wb473@4 {

	thermistor4 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 4>;

	};

	ncp15wb473@5 {

	thermistor5 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 5>;

	};

	ncp15wb473@6 {

	thermistor6 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

arch/arm/boot/dts/exynos3250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 
			interrupt-parent = <&gic>;

		};



		mipi_phy: video-phy@10020710 {

		mipi_phy: video-phy {

			compatible = "samsung,s5pv210-mipi-video-phy";

			#phy-cells = <1>;

			syscon = <&pmu_system_controller>;

arch/arm/boot/dts/exynos4.dtsi

+22 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
		reg = <0x12570000 0x14>;

	};



	mipi_phy: video-phy@10020710 {

	mipi_phy: video-phy {

		compatible = "samsung,s5pv210-mipi-video-phy";

		#phy-cells = <1>;

		syscon = <&pmu_system_controller>;
@@ -743,6 +743,18 @@ 
		status = "disabled";

	};



	hdmicec: cec@100B0000 {

		compatible = "samsung,s5p-cec";

		reg = <0x100B0000 0x200>;

		interrupts = <0 114 0>;

		clocks = <&clock CLK_HDMI_CEC>;

		clock-names = "hdmicec";

		samsung,syscon-phandle = <&pmu_system_controller>;

		pinctrl-names = "default";

		pinctrl-0 = <&hdmi_cec>;

		status = "disabled";

	};



	mixer: mixer@12C10000 {

		compatible = "samsung,exynos4210-mixer";

		interrupts = <0 91 0>;
@@ -969,6 +981,15 @@ 
		#iommu-cells = <0>;

	};



	sss: sss@10830000 {

		compatible = "samsung,exynos4210-secss";

		reg = <0x10830000 0x300>;

		interrupts = <0 112 0>;

		clocks = <&clock CLK_SSS>;

		clock-names = "secss";

		status = "disabled";

	};



	prng: rng@10830400 {

		compatible = "samsung,exynos4-rng";

		reg = <0x10830400 0x200>;

arch/arm/boot/dts/exynos4210-pinctrl.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -820,6 +820,13 @@ 
			samsung,pin-pud = <1>;

			samsung,pin-drv = <0>;

		};



		hdmi_cec: hdmi-cec {

			samsung,pins = "gpx3-6";

			samsung,pin-function = <3>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

		};

	};



	pinctrl@03860000 {

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ 
	status = "okay";

};



&hdmicec {

	status = "okay";

};



&hsotg {

	dr_mode = "peripheral";

	status = "okay";
@@ -492,6 +496,10 @@ 
	status = "okay";

};



&sss {

	status = "okay";

};



&tmu {

	vtmu-supply = <&ldo10_reg>;

	status = "okay";