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

Commit 9edd6fb7 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: add DT node for GPIO keys on MSMTITANIUM"

parents 6f2cd8b9 f8c68611

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

+89 −0
Original line number Diff line number Diff line
@@ -13,7 +13,96 @@ 


#include "msmtitanium-pinctrl.dtsi"



&spi_3 { /* BLSP1 QUP3 */

	spi-max-frequency = <8000000>;

	status = "ok";

	maxim_sti@0 {

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;

		interrupts = <65 0>;

		spi-max-frequency = <8000000>;

		avdd-supply = <&pmtitanium_l10>;

		dvdd-supply = <&pmtitanium_l5>;

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

		maxim_sti,reset-gpio = <&tlmm 64 0x00>;

		maxim_sti,touch_fusion = "/vendor/bin/touch_fusion";

		maxim_sti,config_file = "/etc/firmware/qtc800s.cfg";

		maxim_sti,fw_name = "qtc800s.bin";

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

						"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

	};

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

		pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-1 = <&gpio_key_suspend>;



		camera_focus {

			label = "camera_focus";

			gpios = <&tlmm 87 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&tlmm 86 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			debounce-interval = <15>;

		};



		vol_up {

			label = "volume_up";

			gpios = <&tlmm 85 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

		};



		home {

			label = "home";

			gpios = <&tlmm 88 0x1>;

			linux,input-type = <1>;

			linux,code = <102>;

			debounce-interval = <15>;

		};

	};

};



&tlmm {

	tlmm_gpio_key {

		gpio_key_active: gpio_key_active {

			mux {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

				function = "gpio";

			};



			config {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

			};

		};



		gpio_key_suspend: gpio_key_suspend {

			mux {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

				function = "gpio";

			};



			config {

				pins = "gpio85", "gpio86", "gpio87", "gpio88";

			};

		};

	};

};



&blsp1_uart0 {

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

+55 −0
Original line number Diff line number Diff line
@@ -13,7 +13,62 @@ 


#include "msmtitanium-pinctrl.dtsi"



&spi_3 { /* BLSP1 QUP3 */

	spi-max-frequency = <16000000>;

	status = "ok";

	maxim_sti@0 {

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;

		interrupts = <65 0>;

		spi-max-frequency = <16000000>;

		avdd-supply = <&pmtitanium_l10>;

		dvdd-supply = <&pmtitanium_l5>;

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

		maxim_sti,reset-gpio = <&tlmm 64 0x00>;

		maxim_sti,touch_fusion = "/vendor/bin/touch_fusion";

		maxim_sti,config_file = "/etc/firmware/qtc800s.cfg";

		maxim_sti,fw_name = "qtc800s.bin";

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

						"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

	};

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

		pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-1 = <&gpio_key_suspend>;



		camera_focus {

			label = "camera_focus";

			gpios = <&tlmm 87 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&tlmm 86 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			debounce-interval = <15>;

		};



		vol_up {

			label = "volume_up";

			gpios = <&tlmm 85 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

		};

	};

};



&blsp1_uart0 {

arch/arm/boot/dts/qcom/msmtitanium-pinctrl.dtsi

+100 −0
Original line number Diff line number Diff line
@@ -333,5 +333,105 @@ 
				};

			};

		};



		/* add pingrp for touchscreen */

		pmx_ts_int_active {

			ts_int_active: ts_int_active {

				mux {

					pins = "gpio65";

					function = "gpio";

				};



				config {

					pins = "gpio65";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_int_suspend {

			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio65";

					function = "gpio";

				};



				config {

					pins = "gpio65";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_reset_active {

			ts_reset_active: ts_reset_active {

				mux {

					pins = "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio64";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_reset_suspend {

			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio64";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_release {

			ts_release: ts_release {

				mux {

					pins = "gpio65", "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio65", "gpio64";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		tlmm_gpio_key {

			gpio_key_active: gpio_key_active {

				mux {

					pins = "gpio85", "gpio86", "gpio87";

					function = "gpio";

				};



				config {

					pins = "gpio85", "gpio86", "gpio87";

				};

			};



			gpio_key_suspend: gpio_key_suspend {

				mux {

					pins = "gpio85", "gpio86", "gpio87";

					function = "gpio";

				};



				config {

					pins = "gpio85", "gpio86", "gpio87";

				};

			};

		};

	};

};