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

Commit b6966e76 authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy
Browse files

ARM: dts: msm: Fix home key and qbt1000 configuration for SM8150 platforms 



PM8150 GPIO 1 can be connected to either home button or fingerprint
sensor(FPS) on SM8150 platforms. Since there is no home button
present physically on SM8150 MTP/QRD and FPS can be connected
through a connector on need basis, remove home key configuration
from gpio_keys device on them. Since there is a physical home
button on SM8150 CDP to which PM8150 GPIO 1 is connected, keep
FPS (qbt1000) device disabled on it so that it can be enabled
with a proper configuration only when it needs to be used.

Also, move the default pinctrl configuration for PM8150 GPIO 1 to
FPS (qbt1000) device on SM8150 MTP/QRD as that owns the GPIO.

Change-Id: Ic01aa582242e358443ff3fcfe7f1c6edb4fb2e2a
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent c5e9ba26

arch/arm64/boot/dts/qcom/sm8150-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
		clock-frequency = <25000000>;

		qcom,ipc-gpio = <&tlmm 118 0>;

		qcom,finger-detect-gpio = <&pm8150_gpios 1 0>;

		status = "disabled";

	};

};

arch/arm64/boot/dts/qcom/sm8150-mtp.dtsi

+3 −12
Original line number Diff line number Diff line
@@ -76,18 +76,7 @@ 
		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default

			     &key_vol_up_default>;



		home {

			label = "home";

			gpios = <&pm8150_gpios 1 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";
@@ -105,6 +94,8 @@ 
		clock-names = "core", "iface";

		clock-frequency = <25000000>;

		qcom,ipc-gpio = <&tlmm 118 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default>;

		qcom,finger-detect-gpio = <&pm8150_gpios 1 0>;

	};

};

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+3 −12
Original line number Diff line number Diff line
@@ -54,18 +54,7 @@ 
		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default

			     &key_vol_up_default>;



		home {

			label = "home";

			gpios = <&pm8150_gpios 1 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";
@@ -83,6 +72,8 @@ 
		clock-names = "core", "iface";

		clock-frequency = <25000000>;

		qcom,ipc-gpio = <&tlmm 118 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default>;

		qcom,finger-detect-gpio = <&pm8150_gpios 1 0>;

	};

};