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

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

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

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

Samsung DeviceTree ARM64 update for v4.12:
1. Add IR, touchscreen and panel to TM2/TM2E boards.
2. Add proper clock frequency properties to DSI nodes.

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

:
  arm64: dts: exynos: Add the burst and esc clock frequency properties to DSI node
  arm64: dts: exynos: Add support for S6E3HA2 panel device on TM2 board
  arm64: dts: exynos: Add stmfts touchscreen node for TM2 and TM2E
  arm64: dts: exynos: Enable ir-spi in the TM2 and TM2E boards

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

arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

+41 −2
Original line number Diff line number Diff line
@@ -106,6 +106,13 @@ 
		};

	};



	irda_regulator: irda-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpr3 3 GPIO_ACTIVE_HIGH>;

		regulator-name = "irda_regulator";

	};



	sound {

		compatible = "samsung,tm2-audio";

		audio-codec = <&wm5110>;
@@ -298,6 +305,8 @@ 
	status = "okay";

	vddcore-supply = <&ldo6_reg>;

	vddio-supply = <&ldo7_reg>;

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

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

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

	pinctrl-names = "default";

	pinctrl-0 = <&te_irq>;
@@ -749,6 +758,19 @@ 
	};

};



&hsi2c_5 {

	status = "okay";



	stmfts: touchscreen@49 {

		compatible = "st,stmfts";

		reg = <0x49>;

		interrupt-parent = <&gpa1>;

		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;

		avdd-supply = <&ldo30_reg>;

		vdd-supply = <&ldo31_reg>;

	};

};



&hsi2c_7 {

	status = "okay";
@@ -894,7 +916,7 @@ 
		PIN(INPUT, gpa0-7, NONE, FAST_SR1);



		PIN(INPUT, gpa1-0, UP, FAST_SR1);

		PIN(INPUT, gpa1-1, NONE, FAST_SR1);

		PIN(INPUT, gpa1-1, UP, FAST_SR1);

		PIN(INPUT, gpa1-2, NONE, FAST_SR1);

		PIN(INPUT, gpa1-3, DOWN, FAST_SR1);

		PIN(INPUT, gpa1-4, DOWN, FAST_SR1);
@@ -1074,7 +1096,6 @@ 
		PIN(INPUT, gpg3-0, DOWN, FAST_SR1);

		PIN(INPUT, gpg3-1, DOWN, FAST_SR1);

		PIN(INPUT, gpg3-5, DOWN, FAST_SR1);

		PIN(INPUT, gpg3-7, DOWN, FAST_SR1);

	};

};
@@ -1152,6 +1173,24 @@ 
	};

};



&spi_3 {

	status = "okay";

	no-cs-readback;



	irled@0 {

		compatible = "ir-spi-led";

		reg = <0x0>;

		spi-max-frequency = <5000000>;

		power-supply = <&irda_regulator>;

		duty-cycle = <60>;

		led-active-low;



		controller-data {

			samsung,spi-feedback-delay = <0>;

		};

	};

};



&timer {

	clock-frequency = <24000000>;

};

arch/arm64/boot/dts/exynos/exynos5433-tm2.dts

+17 −0
Original line number Diff line number Diff line
@@ -52,6 +52,18 @@ 
	assigned-clock-rates = <250000000>, <400000000>;

};



&dsi {

	panel@0 {

		compatible = "samsung,s6e3ha2";

		reg = <0>;

		vdd3-supply = <&ldo27_reg>;

		vci-supply = <&ldo28_reg>;

		reset-gpios = <&gpg0 0 GPIO_ACTIVE_LOW>;

		enable-gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>;

		te-gpios = <&gpf1 3 GPIO_ACTIVE_HIGH>;

	};

};



&hsi2c_9 {

	status = "okay";
@@ -76,3 +88,8 @@ 
	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

};



&stmfts {

	touchscreen-size-x = <1439>;

	touchscreen-size-y = <2559>;

};

arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts

+7 −0
Original line number Diff line number Diff line
@@ -63,3 +63,10 @@ 
	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

};



&stmfts {

	touchscreen-size-x = <1599>;

	touchscreen-size-y = <2559>;

	touch-key-connected;

	ledvdd-supply = <&ldo33_reg>;

};