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

Commit cfacd692 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 vol-up gpio-key for SDM670 MTP/CDP"

parents a5bcdb42 8194030c

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

+13 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/gpio/gpio.h>

#include "sdm670-pmic-overlay.dtsi"



&ufsphy_mem {
@@ -106,7 +107,8 @@ 


		pinctrl-names = "default";

		pinctrl-0 = <&key_cam_snapshot_default

			     &key_cam_focus_default>;

			     &key_cam_focus_default

			     &key_vol_up_default>;



		cam_snapshot {

			label = "cam_snapshot";
@@ -127,5 +129,15 @@ 
			debounce-interval = <15>;

			linux,can-disable;

		};



		vol_up {

			label = "volume_up";

			gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <115>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};

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

+13 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/gpio/gpio.h>

#include "sdm670-pmic-overlay.dtsi"



&ufsphy_mem {
@@ -115,7 +116,8 @@ 


		pinctrl-names = "default";

		pinctrl-0 = <&key_cam_snapshot_default

			     &key_cam_focus_default>;

			     &key_cam_focus_default

			     &key_vol_up_default>;



		cam_snapshot {

			label = "cam_snapshot";
@@ -136,5 +138,15 @@ 
			debounce-interval = <15>;

			linux,can-disable;

		};



		vol_up {

			label = "volume_up";

			gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <115>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};

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

+12 −0
Original line number Diff line number Diff line
@@ -1475,3 +1475,15 @@ 


	};

};



&pm660l_gpios {

	key_vol_up {

		key_vol_up_default: key_vol_up_default {

			pins = "gpio7";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <0>;

		};

	};

};

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

+3 −3
Original line number Diff line number Diff line
@@ -2290,6 +2290,9 @@ 
	};

};



#include "pm660.dtsi"

#include "pm660l.dtsi"

#include "sdm670-regulator.dtsi"

#include "sdm670-pinctrl.dtsi"

#include "msm-arm-smmu-sdm670.dtsi"

#include "msm-gdsc-sdm845.dtsi"
@@ -2384,9 +2387,6 @@ 
	status = "ok";

};



#include "pm660.dtsi"

#include "pm660l.dtsi"

#include "sdm670-regulator.dtsi"

#include "sdm670-audio.dtsi"

#include "sdm670-usb.dtsi"

#include "sdm670-gpu.dtsi"