From: Gongwei Chen <gongwei.chen@amlogic.com>
Date: Mon, 28 Oct 2019 03:17:40 +0000 (+0800)
Subject: dts: sync w400_a form W400 [1/1]
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7bced3e2ecd66a676b254ea956454ed777b47726;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

dts: sync w400_a form W400 [1/1]

PD#SWPL-15005

Problem:
sync w400_a form W400

Solution:
sync w400_a form W400

Verify:
Verify by Android P w400_a

Change-Id: I0ace7496f26bacac6343fd772ec2ab8c87721e76
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
---

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
index cf61f5f5e24c..fd0c0e5ad13b 100644
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -498,6 +498,9 @@
 		gamma_en = <0>;/*1:enabel ;0:disable*/
 		wb_en = <0>;/*1:enabel ;0:disable*/
 		cm_en = <0>;/*1:enabel ;0:disable*/
+
+		interrupts = <0 56 1>;
+		interrupt-names = "vsync2";
 	};
 	amdolby_vision {
 		compatible = "amlogic, dolby_vision_g12a";
@@ -780,7 +783,7 @@
 	sensor: sensor {
 		compatible = "soc, sensor";
 		status = "okay";
-		sensor-name = "imx290"; /*imx290;os08a10;imx227*/
+		sensor-name = "os08a10"; /*imx290;os08a10;imx227*/
 		pinctrl-names="default";
 		pinctrl-0=<&clk12_24_z_pins>;
 		clocks = <&clkc CLKID_24M>;
@@ -793,7 +796,7 @@
 	iq: iq {
 		compatible = "soc, iq";
 		status = "okay";
-		sensor-name = "imx290"; /*imx290;os08a10;imx227*/
+		sensor-name = "os08a10"; /*imx290;os08a10;imx227*/
 	};
 }; /* end of / */
 
@@ -878,12 +881,13 @@
 
 	touchscreen@38 {
 		compatible = "focaltech,fts";
-		status = "disabled";
+		status = "okay";
 		reg = <0x38>;
 		reset-gpio = <&gpio GPIOZ_9 GPIO_ACTIVE_HIGH>;
 		irq-gpio = <&gpio GPIOZ_3 GPIO_ACTIVE_HIGH>;
-		x_max = <720>;
-		y_max = <1280>;
+		x_max = <1280>;
+		y_max = <720>;
+		rotation = <1>;
 		max-touch-number = <10>;
 	};
 };
@@ -901,6 +905,7 @@
 		reg = <0x31>;
 		status = "okay";
 		reset_pin = <&gpio GPIOA_5 0>;
+		no_mclk;
 	};
 
 	tlv320adc3101_32: tlv320adc3101_32@32 {
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
index a5e16bf004dd..fa3d13ad44ca 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -499,6 +499,9 @@
 		gamma_en = <0>;/*1:enabel ;0:disable*/
 		wb_en = <0>;/*1:enabel ;0:disable*/
 		cm_en = <0>;/*1:enabel ;0:disable*/
+
+		interrupts = <0 56 1>;
+		interrupt-names = "vsync2";
 	};
 	amdolby_vision {
 		compatible = "amlogic, dolby_vision_g12a";
@@ -781,7 +784,7 @@
 	sensor: sensor {
 		compatible = "soc, sensor";
 		status = "okay";
-		sensor-name = "imx290"; /*imx290;os08a10;imx227*/
+		sensor-name = "os08a10"; /*imx290;os08a10;imx227*/
 		pinctrl-names="default";
 		pinctrl-0=<&clk12_24_z_pins>;
 		clocks = <&clkc CLKID_24M>;
@@ -794,7 +797,7 @@
 	iq: iq {
 		compatible = "soc, iq";
 		status = "okay";
-		sensor-name = "imx290"; /*imx290;os08a10;imx227*/
+		sensor-name = "os08a10"; /*imx290;os08a10;imx227*/
 	};
 }; /* end of / */
 
@@ -879,12 +882,13 @@
 
 	touchscreen@38 {
 		compatible = "focaltech,fts";
-		status = "disabled";
+		status = "okay";
 		reg = <0x38>;
 		reset-gpio = <&gpio GPIOZ_9 GPIO_ACTIVE_HIGH>;
 		irq-gpio = <&gpio GPIOZ_3 GPIO_ACTIVE_HIGH>;
-		x_max = <720>;
-		y_max = <1280>;
+		x_max = <1280>;
+		y_max = <720>;
+		rotation = <1>;
 		max-touch-number = <10>;
 	};
 };
@@ -902,6 +906,7 @@
 		reg = <0x31>;
 		status = "okay";
 		reset_pin = <&gpio GPIOA_5 0>;
+		no_mclk;
 	};
 
 	tlv320adc3101_32: tlv320adc3101_32@32 {