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

Commit 29469775 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable atmel touch screen on 8084 CDP and MTP"

parents ebb106df c0e31aee

arch/arm/boot/dts/qcom/apq8084-cdp.dtsi

+252 −0
Original line number Diff line number Diff line
@@ -463,6 +463,258 @@ 
		synaptics,power-down;

		synaptics,fw-image-name = "PR1469074-s3408bt_001F010D.img";

	};



	atmel_mxt_ts@4a {

		compatible = "atmel,mxt-ts";

		reg = <0x4a>;

		interrupt-parent = <&msmgpio>;

		interrupts = <143 0x2>;

		vdd_ana-supply = <&pma8084_l18>;

		vcc_i2c-supply = <&pma8084_lvs1>;

		atmel,reset-gpio = <&msmgpio 145 0x00>;

		atmel,i2cmode-gpio = <&msmgpio 144 0x00>;

		atmel,irq-gpio = <&msmgpio 143 0x00>;

		atmel,panel-coords = <0 0 2560 1440>;

		atmel,display-coords = <0 0 2560 1440>;

		atmel,i2c-pull-up;

		atmel,no-force-update;

		atmel,no-lpm-support;

		atmel,bl-addr = <0x26>;

		atmel,cfg_1 {

			atmel,family-id = <0xa2>;

			atmel,variant-id = <0x00>;

			atmel,version = <0x20>;

			atmel,build = <0xab>;

			atmel,config = [

				/* Object 6, Instance = 0 */

				00 00 00 00 00 00

				/* Object 38, Instance = 0 */

				21 03 00 1B 0B 0D 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 71, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 7, Instance = 0 */

				21 08 0A 40

				/* Object 8, Instance = 0 */

				46 00 14 00 00 00 00 0A 32 19

				/* Object 9, Instance = 0 */

				83 00 00 20 34 00 AF 4B 01 07

				0A 0C 03 00 0A 05 0A 00 A0 05

				00 0A 03 07 04 00 08 14 1A 0D

				23 0A 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 15, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00

				/* Object 18, Instance = 0 */

				00 00

				/* Object 19, Instance = 0 */

				00 00 00 00 00 00

				/* Object 24, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00

				/* Object 25, Instance = 0 */

				01 00 00 00 00 00 00 00 00 00

				00 00 00 00 C8 00 00 00 00 00

				00

				/* Object 27, Instance = 0 */

				00 00 00 00 00 00 00

				/* Object 40, Instance = 0 */

				00 00 00 00 00

				/* Object 42, Instance = 0 */

				33 14 26 1C 64 00 00 00 05 01

				00 04 00

				/* Object 43, Instance = 0 */

				00 00 91 00 01 01 80 00 00 00

				00 00

				/* Object 46, Instance = 0 */

				00 00 10 18 00 00 01 00 00 1F

				05

				/* Object 47, Instance = 0 */

				01 0F 1E 06 03 28 00 C8 02 23

				CE CE 03 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 55, Instance = 0 */

				00 5A 14 0A 10 00 00

				/* Object 56, Instance = 0 */

				01 00 01 19 0D 0D 0D 0D 0D 0D

				0D 0D 0E 0E 0E 0E 0E 0E 0E 0E

				0F 0F 0F 0F 0F 0F 0F 0F 0F 0F

				0F 0F 0F 0F 0F 0F 00 00 01 02

				06 04 00 00 00 00 00 00 00 00

				00

				/* Object 57, Instance = 0 */

				00 00 00

				/* Object 61, Instance = 0 */

				00 00 00 00 00

				/* Object 62, Instance = 0 */

				7D 63 40 1A 00 07 20 00 00 00

				02 03 05 07 05 00 0A 05 05 AF

				1E 1E 34 0A 40 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 63, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00

				/* Object 65, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 66, Instance = 0 */

				00 00 00

				/* Object 70, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				/* Object 73, Instance = 0 */

				00 00 00 00 00 00

				/* Object 77, Instance = 0 */

				00 00 00 00

				/* Object 79, Instance = 0 */

				00 00 00

				];

		};

		atmel,cfg_2 {

			atmel,fw-name = "atmel_8084_liquid_v2_0_AB.hex";

			atmel,bootldr-id = <0x14>;

			atmel,family-id = <0xa2>;

			atmel,variant-id = <0x00>;

			atmel,version = <0x20>;

			atmel,build = <0xaa>;

			atmel,config = [

				/* Object 6, Instance = 0 */

				00 00 00 00 00 00

				/* Object 38, Instance = 0 */

				21 03 00 1B 0B 0D 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 71, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 7, Instance = 0 */

				21 08 0A 40

				/* Object 8, Instance = 0 */

				46 00 14 00 00 00 00 0A 32 19

				/* Object 9, Instance = 0 */

				83 00 00 20 34 00 AF 4B 01 07

				0A 0C 03 00 0A 05 0A 00 A0 05

				00 0A 03 07 04 00 08 14 1A 0D

				23 0A 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 15, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00

				/* Object 18, Instance = 0 */

				00 00

				/* Object 19, Instance = 0 */

				00 00 00 00 00 00

				/* Object 24, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00

				/* Object 25, Instance = 0 */

				01 00 00 00 00 00 00 00 00 00

				00 00 00 00 C8 00 00 00 00 00

				00

				/* Object 27, Instance = 0 */

				00 00 00 00 00 00 00

				/* Object 40, Instance = 0 */

				00 00 00 00 00

				/* Object 42, Instance = 0 */

				33 14 26 1C 64 00 00 00 05 01

				00 04 00

				/* Object 43, Instance = 0 */

				00 00 91 00 01 01 80 00 00 00

				00 00

				/* Object 46, Instance = 0 */

				00 00 10 18 00 00 01 00 00 1F

				05

				/* Object 47, Instance = 0 */

				01 0F 1E 06 03 28 00 C8 02 23

				32 32 03 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 55, Instance = 0 */

				00 5A 14 0A 10 00 00

				/* Object 56, Instance = 0 */

				01 00 01 19 0D 0D 0D 0D 0D 0D

				0D 0D 0E 0E 0E 0E 0E 0E 0E 0E

				0F 0F 0F 0F 0F 0F 0F 0F 0F 0F

				0F 0F 0F 0F 0F 0F 00 00 01 02

				06 04 00 00 00 00 00 00 00 00

				00

				/* Object 57, Instance = 0 */

				00 00 00

				/* Object 61, Instance = 0 */

				00 00 00 00 00

				/* Object 62, Instance = 0 */

				7D 63 40 1A 00 07 20 00 00 00

				02 03 05 07 05 00 0A 05 05 AF

				1E 1E 34 0A 40 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 63, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00

				/* Object 65, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 66, Instance = 0 */

				00 00 00

				/* Object 70, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				/* Object 73, Instance = 0 */

				00 00 00 00 00 00

				/* Object 77, Instance = 0 */

				00 00 00 00

				/* Object 79, Instance = 0 */

				00 00 00

				];

		};

	};

};



&i2c_2 {

arch/arm/boot/dts/qcom/apq8084-mtp.dtsi

+252 −0
Original line number Diff line number Diff line
@@ -287,6 +287,258 @@ 
		synaptics,power-down;

		synaptics,fw-image-name = "PR1469074-s3408bt_001F010D.img";

	};



	atmel_mxt_ts@4a {

		compatible = "atmel,mxt-ts";

		reg = <0x4a>;

		interrupt-parent = <&msmgpio>;

		interrupts = <143 0x2>;

		vdd_ana-supply = <&pma8084_l18>;

		vcc_i2c-supply = <&pma8084_lvs1>;

		atmel,reset-gpio = <&msmgpio 145 0x00>;

		atmel,i2cmode-gpio = <&msmgpio 144 0x00>;

		atmel,irq-gpio = <&msmgpio 143 0x00>;

		atmel,panel-coords = <0 0 2560 1440>;

		atmel,display-coords = <0 0 2560 1440>;

		atmel,i2c-pull-up;

		atmel,no-force-update;

		atmel,no-lpm-support;

		atmel,bl-addr = <0x26>;

		atmel,cfg_1 {

			atmel,family-id = <0xa2>;

			atmel,variant-id = <0x00>;

			atmel,version = <0x20>;

			atmel,build = <0xab>;

			atmel,config = [

				/* Object 6, Instance = 0 */

				00 00 00 00 00 00

				/* Object 38, Instance = 0 */

				21 03 00 1B 0B 0D 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 71, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 7, Instance = 0 */

				21 08 0A 40

				/* Object 8, Instance = 0 */

				46 00 14 00 00 00 00 0A 32 19

				/* Object 9, Instance = 0 */

				83 00 00 20 34 00 AF 4B 01 07

				0A 0C 03 00 0A 05 0A 00 A0 05

				00 0A 03 07 04 00 08 14 1A 0D

				23 0A 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 15, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00

				/* Object 18, Instance = 0 */

				00 00

				/* Object 19, Instance = 0 */

				00 00 00 00 00 00

				/* Object 24, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00

				/* Object 25, Instance = 0 */

				01 00 00 00 00 00 00 00 00 00

				00 00 00 00 C8 00 00 00 00 00

				00

				/* Object 27, Instance = 0 */

				00 00 00 00 00 00 00

				/* Object 40, Instance = 0 */

				00 00 00 00 00

				/* Object 42, Instance = 0 */

				33 14 26 1C 64 00 00 00 05 01

				00 04 00

				/* Object 43, Instance = 0 */

				00 00 91 00 01 01 80 00 00 00

				00 00

				/* Object 46, Instance = 0 */

				00 00 10 18 00 00 01 00 00 1F

				05

				/* Object 47, Instance = 0 */

				01 0F 1E 06 03 28 00 C8 02 23

				CE CE 03 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 55, Instance = 0 */

				00 5A 14 0A 10 00 00

				/* Object 56, Instance = 0 */

				01 00 01 19 0D 0D 0D 0D 0D 0D

				0D 0D 0E 0E 0E 0E 0E 0E 0E 0E

				0F 0F 0F 0F 0F 0F 0F 0F 0F 0F

				0F 0F 0F 0F 0F 0F 00 00 01 02

				06 04 00 00 00 00 00 00 00 00

				00

				/* Object 57, Instance = 0 */

				00 00 00

				/* Object 61, Instance = 0 */

				00 00 00 00 00

				/* Object 62, Instance = 0 */

				7D 63 40 1A 00 07 20 00 00 00

				02 03 05 07 05 00 0A 05 05 AF

				1E 1E 34 0A 40 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 63, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00

				/* Object 65, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 66, Instance = 0 */

				00 00 00

				/* Object 70, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				/* Object 73, Instance = 0 */

				00 00 00 00 00 00

				/* Object 77, Instance = 0 */

				00 00 00 00

				/* Object 79, Instance = 0 */

				00 00 00

				];

		};

		atmel,cfg_2 {

			atmel,fw-name = "atmel_8084_liquid_v2_0_AB.hex";

			atmel,bootldr-id = <0x14>;

			atmel,family-id = <0xa2>;

			atmel,variant-id = <0x00>;

			atmel,version = <0x20>;

			atmel,build = <0xaa>;

			atmel,config = [

				/* Object 6, Instance = 0 */

				00 00 00 00 00 00

				/* Object 38, Instance = 0 */

				21 03 00 1B 0B 0D 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 71, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 7, Instance = 0 */

				21 08 0A 40

				/* Object 8, Instance = 0 */

				46 00 14 00 00 00 00 0A 32 19

				/* Object 9, Instance = 0 */

				83 00 00 20 34 00 AF 4B 01 07

				0A 0C 03 00 0A 05 0A 00 A0 05

				00 0A 03 07 04 00 08 14 1A 0D

				23 0A 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 15, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00

				/* Object 18, Instance = 0 */

				00 00

				/* Object 19, Instance = 0 */

				00 00 00 00 00 00

				/* Object 24, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00

				/* Object 25, Instance = 0 */

				01 00 00 00 00 00 00 00 00 00

				00 00 00 00 C8 00 00 00 00 00

				00

				/* Object 27, Instance = 0 */

				00 00 00 00 00 00 00

				/* Object 40, Instance = 0 */

				00 00 00 00 00

				/* Object 42, Instance = 0 */

				33 14 26 1C 64 00 00 00 05 01

				00 04 00

				/* Object 43, Instance = 0 */

				00 00 91 00 01 01 80 00 00 00

				00 00

				/* Object 46, Instance = 0 */

				00 00 10 18 00 00 01 00 00 1F

				05

				/* Object 47, Instance = 0 */

				01 0F 1E 06 03 28 00 C8 02 23

				32 32 03 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00

				/* Object 55, Instance = 0 */

				00 5A 14 0A 10 00 00

				/* Object 56, Instance = 0 */

				01 00 01 19 0D 0D 0D 0D 0D 0D

				0D 0D 0E 0E 0E 0E 0E 0E 0E 0E

				0F 0F 0F 0F 0F 0F 0F 0F 0F 0F

				0F 0F 0F 0F 0F 0F 00 00 01 02

				06 04 00 00 00 00 00 00 00 00

				00

				/* Object 57, Instance = 0 */

				00 00 00

				/* Object 61, Instance = 0 */

				00 00 00 00 00

				/* Object 62, Instance = 0 */

				7D 63 40 1A 00 07 20 00 00 00

				02 03 05 07 05 00 0A 05 05 AF

				1E 1E 34 0A 40 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00

				/* Object 63, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00

				/* Object 65, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				00 00 00 00 00 00 00

				/* Object 66, Instance = 0 */

				00 00 00

				/* Object 70, Instance = 0 */

				00 00 00 00 00 00 00 00 00 00

				/* Object 73, Instance = 0 */

				00 00 00 00 00 00

				/* Object 77, Instance = 0 */

				00 00 00 00

				/* Object 79, Instance = 0 */

				00 00 00

				];

		};

	};

};



&pma8084_gpios {