Merge "ARM: dts: msm: Update the PM660 GPIO definitions" (e652f934) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/sdm660-camera-sensor-cdp.dtsi

+24 −22

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2016-2017, 2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -125,6 +125,7 @@
	pinctrl-names = "cam_default", "cam_suspend";		pinctrl-names = "cam_default", "cam_suspend";
	pinctrl-0 = <&cam_sensor_mclk0_active		pinctrl-0 = <&cam_sensor_mclk0_active
	&cam_sensor_rear_active		&cam_sensor_rear_active
			&cam_sensor_eldo4_default
	&cam_actuator_vaf_active>;		&cam_actuator_vaf_active>;
	pinctrl-1 = <&cam_sensor_mclk0_suspend		pinctrl-1 = <&cam_sensor_mclk0_suspend
	&cam_sensor_rear_suspend		&cam_sensor_rear_suspend
	@@ -169,7 +170,8 @@
	qcom,gpio-no-mux = <0>;		qcom,gpio-no-mux = <0>;
	pinctrl-names = "cam_default", "cam_suspend";		pinctrl-names = "cam_default", "cam_suspend";
	pinctrl-0 = <&cam_sensor_mclk2_active		pinctrl-0 = <&cam_sensor_mclk2_active
	&cam_sensor_rear2_active>;		&cam_sensor_rear2_active
			&cam_sensor_eldo3_default>;
	pinctrl-1 = <&cam_sensor_mclk2_suspend		pinctrl-1 = <&cam_sensor_mclk2_suspend
	&cam_sensor_rear2_suspend>;		&cam_sensor_rear2_suspend>;
	gpios = <&tlmm 34 0>,		gpios = <&tlmm 34 0>,
	@@ -261,7 +263,8 @@
	qcom,gpio-no-mux = <0>;		qcom,gpio-no-mux = <0>;
	pinctrl-names = "cam_default", "cam_suspend";		pinctrl-names = "cam_default", "cam_suspend";
	pinctrl-0 = <&cam_sensor_mclk0_active		pinctrl-0 = <&cam_sensor_mclk0_active
	&cam_sensor_rear_active>;		&cam_sensor_rear_active
			&cam_sensor_eldo4_default>;
	pinctrl-1 = <&cam_sensor_mclk0_suspend		pinctrl-1 = <&cam_sensor_mclk0_suspend
	&cam_sensor_rear_suspend>;		&cam_sensor_rear_suspend>;
	gpios = <&tlmm 32 0>,		gpios = <&tlmm 32 0>,
	@@ -307,7 +310,8 @@
	qcom,gpio-no-mux = <0>;		qcom,gpio-no-mux = <0>;
	pinctrl-names = "cam_default", "cam_suspend";		pinctrl-names = "cam_default", "cam_suspend";
	pinctrl-0 = <&cam_sensor_mclk2_active		pinctrl-0 = <&cam_sensor_mclk2_active
	&cam_sensor_rear2_active>;		&cam_sensor_rear2_active
			&cam_sensor_eldo3_default>;
	pinctrl-1 = <&cam_sensor_mclk2_suspend		pinctrl-1 = <&cam_sensor_mclk2_suspend
	&cam_sensor_rear2_suspend>;		&cam_sensor_rear2_suspend>;
	gpios = <&tlmm 34 0>,		gpios = <&tlmm 34 0>,
	@@ -352,7 +356,8 @@
	qcom,gpio-no-mux = <0>;		qcom,gpio-no-mux = <0>;
	pinctrl-names = "cam_default", "cam_suspend";		pinctrl-names = "cam_default", "cam_suspend";
	pinctrl-0 = <&cam_sensor_mclk1_active		pinctrl-0 = <&cam_sensor_mclk1_active
	&cam_sensor_front_active>;		&cam_sensor_front_active
			&cam_sensor_eldo3_default>;
	pinctrl-1 = <&cam_sensor_mclk1_suspend		pinctrl-1 = <&cam_sensor_mclk1_suspend
	&cam_sensor_front_suspend>;		&cam_sensor_front_suspend>;
	gpios = <&tlmm 33 0>,		gpios = <&tlmm 33 0>,
	@@ -380,23 +385,20 @@
	};		};

	&pm660l_gpios {		&pm660l_gpios {
	gpio@c300 { /* GPIO4 -CAMERA SENSOR 0 VDIG*/		cam_sensor_eldo3 {
	qcom,mode = <1>; /* Output */		cam_sensor_eldo3_default: cam_sensor_eldo3_default {
	qcom,pull = <5>; /* No Pull */		pins = "gpio3";
	qcom,vin-sel = <0>; /* VIN1 GPIO_LV */		function = "normal";
	qcom,src-sel = <0>; /* GPIO */		output-enable;
	qcom,invert = <0>; /* Invert */		bias-disable;
	qcom,master-en = <1>; /* Enable GPIO */		};
	status = "ok";		};
			cam_sensor_eldo4 {
			cam_sensor_eldo4_default: cam_sensor_eldo4_default {
			pins = "gpio4";
			function = "normal";
			output-enable;
			bias-disable;
	};		};

	gpio@c200 { /* GPIO3 -CAMERA SENSOR 2 VDIG*/
	qcom,mode = <1>; /* Output */
	qcom,pull = <5>; /* No Pull */
	qcom,vin-sel = <0>; /* VIN1 GPIO_LV */
	qcom,src-sel = <0>; /* GPIO */
	qcom,invert = <0>; /* Invert */
	qcom,master-en = <1>; /* Enable GPIO */
	status = "ok";
	};		};
	};		};

arch/arm64/boot/dts/qcom/sdm660-camera-sensor-qrd.dtsi

+21 −20

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2017, 2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2017, 2019-2020 The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -48,6 +48,8 @@
	regulator-max-microvolt = <1350000>;		regulator-max-microvolt = <1350000>;
	enable-active-high;		enable-active-high;
	gpio = <&pm660l_gpios 4 0>;		gpio = <&pm660l_gpios 4 0>;
			pinctrl-names = "default";
			pinctrl-0 = <&cam_sensor_eldo4_default>;
	vin-supply = <&pm660_s5>;		vin-supply = <&pm660_s5>;
	};		};
	};		};
	@@ -258,7 +260,8 @@
	qcom,gpio-no-mux = <0>;		qcom,gpio-no-mux = <0>;
	pinctrl-names = "cam_default", "cam_suspend";		pinctrl-names = "cam_default", "cam_suspend";
	pinctrl-0 = <&cam_sensor_mclk1_active		pinctrl-0 = <&cam_sensor_mclk1_active
	&cam_sensor_front_active>;		&cam_sensor_front_active
			&cam_sensor_eldo3_default>;
	pinctrl-1 = <&cam_sensor_mclk1_suspend		pinctrl-1 = <&cam_sensor_mclk1_suspend
	&cam_sensor_front_suspend>;		&cam_sensor_front_suspend>;
	gpios = <&tlmm 33 0>,		gpios = <&tlmm 33 0>,
	@@ -380,7 +383,8 @@
	qcom,gpio-no-mux = <0>;		qcom,gpio-no-mux = <0>;
	pinctrl-names = "cam_default", "cam_suspend";		pinctrl-names = "cam_default", "cam_suspend";
	pinctrl-0 = <&cam_sensor_mclk1_active		pinctrl-0 = <&cam_sensor_mclk1_active
	&cam_sensor_front_active>;		&cam_sensor_front_active
			&cam_sensor_eldo3_default>;
	pinctrl-1 = <&cam_sensor_mclk1_suspend		pinctrl-1 = <&cam_sensor_mclk1_suspend
	&cam_sensor_front_suspend>;		&cam_sensor_front_suspend>;
	gpios = <&tlmm 33 0>,		gpios = <&tlmm 33 0>,
	@@ -405,23 +409,20 @@
	};		};

	&pm660l_gpios {		&pm660l_gpios {
	gpio@c300 { /* GPIO4 -CAMERA SENSOR 0 VDIG*/		cam_sensor_eldo3 {
	qcom,mode = <1>; /* Output */		cam_sensor_eldo3_default: cam_sensor_eldo3_default {
	qcom,pull = <5>; /* No Pull */		pins = "gpio3";
	qcom,vin-sel = <0>; /* VIN1 GPIO_LV */		function = "normal";
	qcom,src-sel = <0>; /* GPIO */		output-high;
	qcom,invert = <0>; /* Invert */		bias-disable;
	qcom,master-en = <1>; /* Enable GPIO */		};
	status = "ok";		};
			cam_sensor_eldo4 {
			cam_sensor_eldo4_default: cam_sensor_eldo4_default {
			pins = "gpio4";
			function = "normal";
			output-low;
			bias-disable;
	};		};

	gpio@c200 { /* GPIO3 -CAMERA SENSOR 2 VDIG*/
	qcom,mode = <1>; /* Output */
	qcom,pull = <5>; /* No Pull */
	qcom,vin-sel = <0>; /* VIN1 GPIO_LV */
	qcom,src-sel = <0>; /* GPIO */
	qcom,invert = <0>; /* Invert */
	qcom,master-en = <1>; /* Enable GPIO */
	status = "ok";
	};		};
	};		};

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

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -43,12 +43,13 @@

	&pm660_gpios {		&pm660_gpios {
	/* GPIO 4 (NFC_CLK_REQ) */		/* GPIO 4 (NFC_CLK_REQ) */
	gpio@c300 {		nfc_clk {
	qcom,mode = <0>;		nfc_clk_default: nfc_clk_default {
	qcom,vin-sel = <1>;		pins = "gpio4";
	qcom,src-sel = <0>;		function = "normal";
	qcom,master-en = <1>;		input-enable;
	status = "okay";		power-source = <1>;
			};
	};		};
	};		};

	@@ -66,7 +67,8 @@
	interrupts = <28 0>;		interrupts = <28 0>;
	interrupt-names = "nfc_irq";		interrupt-names = "nfc_irq";
	pinctrl-names = "nfc_active", "nfc_suspend";		pinctrl-names = "nfc_active", "nfc_suspend";
	pinctrl-0 = <&nfc_int_active &nfc_enable_active>;		pinctrl-0 = <&nfc_int_active &nfc_enable_active
			&nfc_clk_default>;
	pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
	};		};
	};		};

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

+16 −14

Original line number	Original line	Diff line number	Diff line
	@@ -49,22 +49,23 @@

	&pm660_gpios {		&pm660_gpios {
	/* GPIO 4 (NFC_CLK_REQ) */		/* GPIO 4 (NFC_CLK_REQ) */
	gpio@c300 {		nfc_clk {
	qcom,mode = <0>;		nfc_clk_default: nfc_clk_default {
	qcom,vin-sel = <1>;		pins = "gpio4";
	qcom,src-sel = <0>;		function = "normal";
	qcom,master-en = <1>;		input-enable;
	status = "okay";		power-source = <1>;
			};
	};		};

	/* GPIO 11 for Home Key */		/* GPIO 11 for Home Key */
	gpio@ca00 {		home_key {
	status = "okay";		home_key_default: home_key_default {
	qcom,mode = <0>;		pins = "gpio11";
	qcom,pull = <0>;		function = "normal";
	qcom,vin-sel = <0>;		input-enable;
	qcom,src-sel = <0>;		bias-pull-up;
	qcom,out-strength = <1>;		};
	};		};
	};		};

	@@ -82,7 +83,8 @@
	interrupts = <28 0>;		interrupts = <28 0>;
	interrupt-names = "nfc_irq";		interrupt-names = "nfc_irq";
	pinctrl-names = "nfc_active", "nfc_suspend";		pinctrl-names = "nfc_active", "nfc_suspend";
	pinctrl-0 = <&nfc_int_active &nfc_enable_active>;		pinctrl-0 = <&nfc_int_active &nfc_enable_active
			&nfc_clk_default>;
	pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
	};		};
	};		};

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

+22 −16

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,8 @@
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*/		*/

			#include <dt-bindings/gpio/gpio.h>
			#include <dt-bindings/input/input.h>
	#include "sdm660-camera-sensor-qrd.dtsi"		#include "sdm660-camera-sensor-qrd.dtsi"
	#include "sdm660-external-codec.dtsi"		#include "sdm660-external-codec.dtsi"
	/ {		/ {
	@@ -133,12 +135,13 @@

	&pm660_gpios {		&pm660_gpios {
	/* GPIO 4 (NFC_CLK_REQ) */		/* GPIO 4 (NFC_CLK_REQ) */
	gpio@c300 {		nfc_clk {
	qcom,mode = <0>;		nfc_clk_default: nfc_clk_default {
	qcom,vin-sel = <1>;		pins = "gpio4";
	qcom,src-sel = <0>;		function = "normal";
	qcom,master-en = <1>;		input-enable;
	status = "okay";		power-source = <1>;
			};
	};		};
	};		};

	@@ -156,20 +159,21 @@
	interrupts = <28 0>;		interrupts = <28 0>;
	interrupt-names = "nfc_irq";		interrupt-names = "nfc_irq";
	pinctrl-names = "nfc_active", "nfc_suspend";		pinctrl-names = "nfc_active", "nfc_suspend";
	pinctrl-0 = <&nfc_int_active &nfc_enable_active>;		pinctrl-0 = <&nfc_int_active &nfc_enable_active
			&nfc_clk_default>;
	pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
	};		};
	};		};

	&pm660l_gpios {		&pm660l_gpios {
	/* GPIO 7 for VOL_UP */		/* GPIO 7 for VOL_UP */
	gpio@c600 {		key_vol_up {
	status = "ok";		key_vol_up_default: key_vol_up_default {
	qcom,mode = <0>;		pins = "gpio7";
	qcom,pull = <0>;		function = "normal";
	qcom,vin-sel = <0>;		input-enable;
	qcom,src-sel = <0>;		bias-pull-up;
	qcom,out-strength = <1>;		};
	};		};
	};		};

	@@ -215,13 +219,15 @@
	gpio_keys {		gpio_keys {
	compatible = "gpio-keys";		compatible = "gpio-keys";
	input-name = "gpio-keys";		input-name = "gpio-keys";
			pinctrl-names = "default";
			pinctrl-0 = <&key_vol_up_default>;
	status = "ok";		status = "ok";

	vol_up {		vol_up {
	label = "volume_up";		label = "volume_up";
	gpios = <&pm660l_gpios 7 0x1>;		gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>;
	linux,input-type = <1>;		linux,input-type = <1>;
	linux,code = <115>;		linux,code = <KEY_VOLUMEUP>;
	gpio-key,wakeup;		gpio-key,wakeup;
	debounce-interval = <15>;		debounce-interval = <15>;
	};		};