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

Commit 6dbe2ffe authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  Himax83112-A touch driver porting (FairPhone)

Change-Id: I599f35cc21dec00c162236dc820db7edd4db13cc
parents 7a5d690b cebae4a9

arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi

+61 −61
Original line number Diff line number Diff line
@@ -1447,67 +1447,67 @@ 
				};

			};

		};



		spi3 {

			spi3_default: spi3_default {

				/* active state */

				mux {

					/* MOSI, MISO, CLK */

					pins = "gpio8", "gpio9", "gpio11";

					function = "blsp_spi3";

				};



				config {

					pins = "gpio8", "gpio9", "gpio11";

					drive-strength = <12>; /* 12 MA */

					bias-disable = <0>; /* No PULL */

				};

			};



			spi3_sleep: spi3_sleep {

				/* suspended state */

				mux {

					/* MOSI, MISO, CLK */

					pins = "gpio8", "gpio9", "gpio11";

					function = "gpio";

				};



				config {

					pins = "gpio8", "gpio9", "gpio11";

					drive-strength = <2>; /* 2 MA */

					bias-pull-down; /* PULL Down */

				};

			};



			spi3_cs0_active: cs0_active {

				/* CS */

				mux {

					pins = "gpio10";

					function = "blsp_spi3";

				};



				config {

					pins = "gpio10";

					drive-strength = <2>;

					bias-disable = <0>;

				};

			};



			spi3_cs0_sleep: cs0_sleep {

				/* CS */

				mux {

					pins = "gpio10";

					function = "gpio";

				};



				config {

					pins = "gpio10";

					drive-strength = <2>;

					bias-disable = <0>;

				};

			};

		};



/*[Arima_8901][allen_yu] Himax83112-A touch driver porting (Fairphone) 20181102 begin*/

//		spi3 {

//			spi3_default: spi3_default {

//				/* active state */

//				mux {

//					/* MOSI, MISO, CLK */

//					pins = "gpio8", "gpio9", "gpio11";

//					function = "blsp_spi3";

//				};



//				config {

//					pins = "gpio8", "gpio9", "gpio11";

//					drive-strength = <12>; /* 12 MA */

//					bias-disable = <0>; /* No PULL */

//				};

//			};



//			spi3_sleep: spi3_sleep {

//				/* suspended state */

//				mux {

//					/* MOSI, MISO, CLK */

//					pins = "gpio8", "gpio9", "gpio11";

//					function = "gpio";

//				};



//				config {

//					pins = "gpio8", "gpio9", "gpio11";

//					drive-strength = <2>; /* 2 MA */

//					bias-pull-down; /* PULL Down */

//				};

//			};



//			spi3_cs0_active: cs0_active {

//				/* CS */

//				mux {

//					pins = "gpio10";

//					function = "blsp_spi3";

//				};



//				config {

//					pins = "gpio10";

//					drive-strength = <2>;

//					bias-disable = <0>;

//				};

//			};



//			spi3_cs0_sleep: cs0_sleep {

//				/* CS */

//				mux {

//					pins = "gpio10";

//					function = "gpio";

//				};



//				config {

//					pins = "gpio10";

//					drive-strength = <2>;

//					bias-disable = <0>;

//				};

//			};

//		};

/*[Arima_8901][allen_yu] 20181102 end*/

		spi6 {

			spi6_default: spi6_default {

				/* active state */

arch/arm64/boot/dts/qcom/msm8953.dtsi

100644 → 100755
+34 −27
Original line number Diff line number Diff line
@@ -170,7 +170,9 @@ 
		i2c2 = &i2c_2;

		i2c3 = &i2c_3;

		i2c5 = &i2c_5;

		spi3 = &spi_3;

/*[Arima_8901][allen_yu] Himax83112-A touch driver porting (Fairphone) 20181102 begin*/

//		spi3 = &spi_3;

/*[Arima_8901][allen_yu] 20181102 end*/

		spi6 = &spi_6;

	};
@@ -669,31 +671,33 @@ 
		qcom,summing-threshold = <10>;

	};



	spi_3: spi@78b7000 { /* BLSP1 QUP3 */

		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "spi_physical", "spi_bam_physical";

		reg = <0x78b7000 0x600>,

			<0x7884000 0x1f000>;

		interrupt-names = "spi_irq", "spi_bam_irq";

		interrupts = <0 97 0>, <0 238 0>;

		spi-max-frequency = <19200000>;

		pinctrl-names = "spi_default", "spi_sleep";

		pinctrl-0 = <&spi3_default &spi3_cs0_active>;

		pinctrl-1 = <&spi3_sleep &spi3_cs0_sleep>;

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			<&clock_gcc clk_gcc_blsp1_qup3_spi_apps_clk>;

		clock-names = "iface_clk", "core_clk";

		qcom,infinite-mode = <0>;

		qcom,use-bam;

		qcom,use-pinctrl;

		qcom,ver-reg-exists;

		qcom,bam-consumer-pipe-index = <8>;

		qcom,bam-producer-pipe-index = <9>;

		qcom,master-id = <86>;

		status = "disabled";

	};

/*[Arima_8901][allen_yu] Himax83112-A touch driver porting (Fairphone) 20181102 begin*/

//	spi_3: spi@78b7000 { /* BLSP1 QUP3 */

//		compatible = "qcom,spi-qup-v2";

//		#address-cells = <1>;

//		#size-cells = <0>;

//		reg-names = "spi_physical", "spi_bam_physical";

//		reg = <0x78b7000 0x600>,

//			<0x7884000 0x1f000>;

//		interrupt-names = "spi_irq", "spi_bam_irq";

//		interrupts = <0 97 0>, <0 238 0>;

//		spi-max-frequency = <19200000>;

//		pinctrl-names = "spi_default", "spi_sleep";

//		pinctrl-0 = <&spi3_default &spi3_cs0_active>;

//		pinctrl-1 = <&spi3_sleep &spi3_cs0_sleep>;

//		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

//			<&clock_gcc clk_gcc_blsp1_qup3_spi_apps_clk>;

//		clock-names = "iface_clk", "core_clk";

//		qcom,infinite-mode = <0>;

//		qcom,use-bam;

//		qcom,use-pinctrl;

//		qcom,ver-reg-exists;

//		qcom,bam-consumer-pipe-index = <8>;

//		qcom,bam-producer-pipe-index = <9>;

//		qcom,master-id = <86>;

//		status = "disabled";

//	};

/*[Arima_8901][allen_yu] 20181102 end*/



	spi_6: spi@7af6000 { /* BLSP2 QUP2 */

		compatible = "qcom,spi-qup-v2";
@@ -795,7 +799,10 @@ 
		dmas = <&dma_blsp1 8 64 0x20000020 0x20>,

			<&dma_blsp1 9 32 0x20000020 0x20>;

		dma-names = "tx", "rx";

		status = "disabled";

/*[Arima_8901][allen_yu] Himax83112-A touch driver porting (Fairphone) 20181102 begin*/

		//status = "disabled";

		status = "ok";

/*[Arima_8901][allen_yu] 20181102 end*/

	};



	i2c_5: i2c@7af5000 { /* BLSP2 QUP1 */

arch/arm64/boot/dts/qcom/sdm450-pmi632.dtsi

+19 −1
Original line number Diff line number Diff line
@@ -395,3 +395,21 @@ 
	};

};

*/

/*[Arima_8901][allen_yu] Himax83112-A touch driver porting (Fairphone) 20181102 begin*/

&i2c_3 {

	status = "ok";

	himax_ts@48 {

		compatible = "himax,hxcommon";

		reg = <0x48>;

		interrupt-parent = <&tlmm>;

		interrupts = <65 0x2>;

		vcc_i2c-supply = <&pm8953_l6>;

		vdd-ana-supply = <&pm8953_l10>;

		himax,display-coords = <0 1080 0 2160>;

		himax,panel-coords = <0 1080 0 2160>;

		himax,irq-gpio = <&tlmm 65 0x00>;

		himax,rst-gpio = <&tlmm 64 0x00>;

		report_type = <1>;

	};

};

/*[Arima_8901][allen_yu] 20181102 end*/
 
 No newline at end of file

arch/arm64/configs/msm8953-perf_defconfig

100644 → 100755
+4 −1
Original line number Diff line number Diff line
@@ -313,8 +313,11 @@ CONFIG_KEYBOARD_GPIO=y 
# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y

CONFIG_TOUCHSCREEN_HIMAX_I2C=y

CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

# CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set

arch/arm64/configs/msm8953_defconfig

100644 → 100755
+4 −1
Original line number Diff line number Diff line
@@ -320,8 +320,11 @@ CONFIG_KEYBOARD_GPIO=y 
# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y

CONFIG_TOUCHSCREEN_HIMAX_I2C=y

CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

# CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set