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

Commit cf88d64a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add volume up gpio-keys device for Lahaina boards"

parents 9bb8e1e5 6c07bf59

qcom/lahaina-cdp.dtsi

+23 −0
Original line number Diff line number Diff line 
#include <dt-bindings/gpio/gpio.h>

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



#include "lahaina-pmic-overlay.dtsi"



&spmi_debug_bus {

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";

			gpios = <&pm8350_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};

qcom/lahaina-mtp.dtsi

+23 −0
Original line number Diff line number Diff line 
#include <dt-bindings/gpio/gpio.h>

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



#include "lahaina-pmic-overlay.dtsi"



&spmi_debug_bus {

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";

			gpios = <&pm8350_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};

qcom/lahaina-pmic-overlay.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -6,3 +6,15 @@ 
#include "pm8350b.dtsi"

#include "pmr735a.dtsi"

#include "pmr735b.dtsi"



&pm8350_gpios {

	key_vol_up {

		key_vol_up_default: key_vol_up_default {

			pins = "gpio6";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <1>;

		};

	};

};

qcom/lahaina-qrd.dtsi

+23 −0
Original line number Diff line number Diff line 
#include <dt-bindings/gpio/gpio.h>

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



#include "lahaina-pmic-overlay.dtsi"



&spmi_debug_bus {

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";

			gpios = <&pm8350_gpios 6 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};

qcom/pmk8350.dtsi

+26 −0
Original line number Diff line number Diff line 
#include <dt-bindings/input/input.h>

#include <dt-bindings/input/qcom,qpnp-power-on.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/spmi/spmi.h>
@@ -14,6 +15,31 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		pon_pbs@800 {

			compatible = "qcom,qpnp-power-on";

			reg = <0x800>;

			qcom,system-reset;

			qcom,store-hard-reset-reason;

		};



		pon_hlos@1300 {

			compatible = "qcom,qpnp-power-on";

			reg = <0x1300>;

			interrupts = <0x0 0x13 0x7 IRQ_TYPE_EDGE_BOTH>,

				     <0x0 0x13 0x6 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "kpdpwr", "resin";



			qcom,pon_1 {

				qcom,pon-type = <PON_POWER_ON_TYPE_KPDPWR>;

				linux,code = <KEY_POWER>;

			};



			qcom,pon_2 {

				qcom,pon-type = <PON_POWER_ON_TYPE_RESIN>;

				linux,code = <KEY_VOLUMEDOWN>;

			};

		};



		pmk8350_sdam_2: sdam@7100 {

			compatible = "qcom,spmi-sdam";

			reg = <0x7100>;