Merge "ARM: dts: msm: add VOLUME_P gpio key support for SDMMAGPIE" (6f07dd79) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi

+100 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@
		#include "sdmmagpie-thermal-overlay.dtsi"

		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
		#include <dt-bindings/iio/qcom,spmi-vadc.h>
		#include <dt-bindings/input/input.h>
		#include "sdmmagpie-sde-display.dtsi"

		&soc {
		@@ -166,3 +169,100 @@
		st,y-flip;
		};
		};

		&pm6150_qg {
		qcom,battery-data = <&mtp_batterydata>;
		};

		&pm6150_charger {
		io-channels = <&pm6150_vadc ADC_USB_IN_V_16>,
		<&pm6150_vadc ADC_USB_IN_I>,
		<&pm6150_vadc ADC_CHG_TEMP>,
		<&pm6150_vadc ADC_DIE_TEMP>,
		<&pm6150l_vadc ADC_AMUX_THM1_PU2>;
		io-channel-names = "usb_in_voltage",
		"usb_in_current",
		"chg_temp",
		"die_temp",
		"conn_temp";
		qcom,battery-data = <&mtp_batterydata>;
		qcom,step-charging-enable;
		qcom,sw-jeita-enable;
		qcom,fcc-stepping-enable;
		qcom,sec-charger-config = <3>;
		};

		&pm6150_gpios {
		smb_stat {
		smb_stat_default: smb_stat_default {
		pins = "gpio3";
		function = "normal";
		input-enable;
		bias-pull-up;
		qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_30>;
		power-source = <0>;
		};
		};
		};

		&qupv3_se9_i2c {
		status = "ok";
		#include "smb1390.dtsi"
		#include "smb1355.dtsi"
		};

		&smb1355 {
		/delete-property/ interrupts;
		interrupts = <0x0 0xc2 0x0 IRQ_TYPE_LEVEL_LOW>;
		status = "ok";
		};

		&smb1355_charger {
		status = "ok";
		};

		&smb1390 {
		/delete-property/ interrupts;
		interrupts = <0x0 0xc2 0x0 IRQ_TYPE_LEVEL_LOW>;
		pinctrl-names = "default";
		pinctrl-0 = <&smb_stat_default>;
		status = "ok";
		};

		&smb1390_charger {
		io-channels = <&pm6150l_vadc ADC_AMUX_THM2>;
		io-channel-names = "cp_die_temp";
		status = "ok";
		};

		&pm6150l_gpios {
		key_vol_up {
		key_vol_up_default: key_vol_up_default {
		pins = "gpio2";
		function = "normal";
		input-enable;
		bias-pull-up;
		power-source = <0>;
		};
		};
		};

		&soc {
		gpio_keys {
		compatible = "gpio-keys";
		label = "gpio-keys";

		pinctrl-names = "default";
		pinctrl-0 = <&key_vol_up_default>;

		vol_up {
		label = "volume_up";
		gpios = <&pm6150l_gpios 2 GPIO_ACTIVE_LOW>;
		linux,input-type = <1>;
		linux,code = <KEY_VOLUMEUP>;
		linux,can-disable;
		debounce-interval = <15>;
		gpio-key,wakeup;
		};
		};
		};

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

+88 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,9 @@
		*/

		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
		#include <dt-bindings/iio/qcom,spmi-vadc.h>
		#include <dt-bindings/input/input.h>
		#include "sdmmagpie-thermal-overlay.dtsi"

		#include "sdmmagpie-sde-display.dtsi"
		@@ -145,3 +148,88 @@
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&pm6150l_gpios 9 0>;
		};

		&pm6150_qg {
		qcom,battery-data = <&mtp_batterydata>;
		};

		&pm6150_charger {
		io-channels = <&pm6150_vadc ADC_USB_IN_V_16>,
		<&pm6150_vadc ADC_USB_IN_I>,
		<&pm6150_vadc ADC_CHG_TEMP>,
		<&pm6150_vadc ADC_DIE_TEMP>,
		<&pm6150l_vadc ADC_AMUX_THM1_PU2>;
		io-channel-names = "usb_in_voltage",
		"usb_in_current",
		"chg_temp",
		"die_temp",
		"conn_temp";
		qcom,battery-data = <&mtp_batterydata>;
		qcom,sw-jeita-enable;
		qcom,fcc-stepping-enable;
		qcom,sec-charger-config = <1>;
		};

		&pm6150_gpios {
		smb_stat {
		smb_stat_default: smb_stat_default {
		pins = "gpio3";
		function = "normal";
		input-enable;
		bias-pull-up;
		qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_30>;
		power-source = <0>;
		};
		};
		};

		&qupv3_se9_i2c {
		status = "ok";
		#include "smb1390.dtsi"
		};

		&smb1390 {
		/delete-property/ interrupts;
		interrupts = <0x0 0xc2 0x0 IRQ_TYPE_LEVEL_LOW>;
		pinctrl-names = "default";
		pinctrl-0 = <&smb_stat_default>;
		status = "ok";
		};

		&smb1390_charger {
		io-channels = <&pm6150l_vadc ADC_AMUX_THM2>;
		io-channel-names = "cp_die_temp";
		status = "ok";
		};

		&pm6150l_gpios {
		key_vol_up {
		key_vol_up_default: key_vol_up_default {
		pins = "gpio2";
		function = "normal";
		input-enable;
		bias-pull-up;
		power-source = <0>;
		};
		};
		};

		&soc {
		gpio_keys {
		compatible = "gpio-keys";
		label = "gpio-keys";

		pinctrl-names = "default";
		pinctrl-0 = <&key_vol_up_default>;

		vol_up {
		label = "volume_up";
		gpios = <&pm6150l_gpios 2 GPIO_ACTIVE_LOW>;
		linux,input-type = <1>;
		linux,code = <KEY_VOLUMEUP>;
		linux,can-disable;
		debounce-interval = <15>;
		gpio-key,wakeup;
		};
		};
		};

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -662,6 +662,12 @@
		linux,cma-default;
		};
		};

		mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
		#include "qg-batterydata-alium-3600mah.dtsi"
		#include "qg-batterydata-mlp356477-2800mah.dtsi"
		};
		};

		&soc {
		@@ -2266,8 +2272,8 @@
		interrupts = <GIC_SPI 481 IRQ_TYPE_NONE>;
		qcom,ee = <0>;
		qcom,channel = <0>;
		#address-cells = <2>;
		#size-cells = <0>;
		#address-cells = <1>;
		#size-cells = <1>;
		interrupt-controller;
		#interrupt-cells = <4>;
		cell-index = <0>;
		@@ -2967,6 +2973,11 @@
		extcon = <&pm6150_pdphy>, <&pm6150_charger>, <&eud>;
		};

		&pm6150_charger {
		dpdm-supply = <&qusb_phy0>;
		qcom,suspend-input-on-debug-batt;
		};

		&pm6150_vadc {
		rf_pa0_therm {
		reg = <ADC_AMUX_THM2_PU2>;