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

Commit c3e19d4d 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 gpio_key devices for buttons on SDM855 MTP, CDP and QRD"

parents 012c7173 01ebc6e1

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

+34 −0
Original line number Diff line number Diff line
@@ -10,8 +10,42 @@ 
 * GNU General Public License for more details.

 */



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

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



#include "sdm855-pmic-overlay.dtsi"



&qupv3_se12_2uart {

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default

			     &key_vol_up_default>;



		home {

			label = "home";

			gpios = <&pm855_gpios 1 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};



		vol_up {

			label = "volume_up";

			gpios = <&pm855_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};

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

+34 −0
Original line number Diff line number Diff line
@@ -10,8 +10,42 @@ 
 * GNU General Public License for more details.

 */



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

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



#include "sdm855-pmic-overlay.dtsi"



&qupv3_se12_2uart {

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default

			     &key_vol_up_default>;



		home {

			label = "home";

			gpios = <&pm855_gpios 1 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};



		vol_up {

			label = "volume_up";

			gpios = <&pm855_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};

arch/arm64/boot/dts/qcom/sdm855-pmic-overlay.dtsi

+24 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -14,3 +14,26 @@ 
#include "pm855.dtsi"

#include "pm855b.dtsi"

#include "pm855l.dtsi"



/* PMIC GPIO pin control configurations: */

&pm855_gpios {

	key_home {

		key_home_default: key_home_default {

			pins = "gpio1";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <0>;

		};

	};



	key_vol_up {

		key_vol_up_default: key_vol_up_default {

			pins = "gpio6";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <1>;

		};

	};

};

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

+34 −0
Original line number Diff line number Diff line
@@ -10,4 +10,38 @@ 
 * GNU General Public License for more details.

 */



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

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



#include "sdm855-pmic-overlay.dtsi"



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_home_default

			     &key_vol_up_default>;



		home {

			label = "home";

			gpios = <&pm855_gpios 1 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};



		vol_up {

			label = "volume_up";

			gpios = <&pm855_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};