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

Commit ccd93c82 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 pinctrl devices for PM660, PM660L PMIC GPIOs"

parents 2b57af0a a1f7344b

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

+15 −83
Original line number Diff line number Diff line
@@ -67,91 +67,23 @@ 
			qcom,temp_alarm-vadc = <&pm660_vadc>;

		};



		pm660_gpios: gpios {

			compatible = "qcom,qpnp-pin";

		pm660_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0xd00>;

			interrupts = <0x0 0xc1 0 IRQ_TYPE_NONE>,

					<0x0 0xc2 0 IRQ_TYPE_NONE>,

					<0x0 0xc3 0 IRQ_TYPE_NONE>,

					<0x0 0xc8 0 IRQ_TYPE_NONE>,

					<0x0 0xca 0 IRQ_TYPE_NONE>,

					<0x0 0xcb 0 IRQ_TYPE_NONE>,

					<0x0 0xcc 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm660_gpio2", "pm660_gpio3",

					"pm660_gpio4", "pm660_gpio9",

					"pm660_gpio11", "pm660_gpio12",

					"pm660_gpio13";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pm660-gpio";



			gpio@c000 {

				reg = <0xc000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};



			gpio@c100 {

				reg = <0xc100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};



			gpio@c200 {

				reg = <0xc200 0x100>;

				qcom,pin-num = <3>;

				status = "disabled";

			};



			gpio@c300 {

				reg = <0xc300 0x100>;

				qcom,pin-num = <4>;

				status = "disabled";

			};



			gpio@c400 {

				reg = <0xc400 0x100>;

				qcom,pin-num = <5>;

				status = "disabled";

			};



			gpio@c500 {

				reg = <0xc500 0x100>;

				qcom,pin-num = <6>;

				status = "disabled";

			};



			gpio@c600 {

				reg = <0xc600 0x100>;

				qcom,pin-num = <7>;

				status = "disabled";

			};



			gpio@c700 {

				reg = <0xc700 0x100>;

				qcom,pin-num = <8>;

				status = "disabled";

			};



			gpio@c800 {

				reg = <0xc800 0x100>;

				qcom,pin-num = <9>;

				status = "disabled";

			};



			gpio@c900 {

				reg = <0xc900 0x100>;

				qcom,pin-num = <10>;

				status = "disabled";

			};



			gpio@ca00 {

				reg = <0xca00 0x100>;

				qcom,pin-num = <11>;

				status = "disabled";

			};



			gpio@cb00 {

				reg = <0xcb00 0x100>;

				qcom,pin-num = <12>;

				status = "disabled";

			};



			gpio@cc00 {

				reg = <0xcc00 0x100>;

				qcom,pin-num = <13>;

				status = "disabled";

			};

			qcom,gpios-disallowed = <1 5 6 7 8 10>;

		};



		pm660_coincell: qcom,coincell@2800 {

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

+19 −78
Original line number Diff line number Diff line
@@ -46,86 +46,27 @@ 
			label = "pm660l_tz";

		};



		pm660l_gpios: gpios {

			compatible = "qcom,qpnp-pin";

		pm660l_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0xc00>;

			interrupts = <0x2 0xc0 0 IRQ_TYPE_NONE>,

					<0x2 0xc2 0 IRQ_TYPE_NONE>,

					<0x2 0xc3 0 IRQ_TYPE_NONE>,

					<0x2 0xc4 0 IRQ_TYPE_NONE>,

					<0x2 0xc5 0 IRQ_TYPE_NONE>,

					<0x2 0xc6 0 IRQ_TYPE_NONE>,

					<0x2 0xc7 0 IRQ_TYPE_NONE>,

					<0x2 0xc8 0 IRQ_TYPE_NONE>,

					<0x2 0xca 0 IRQ_TYPE_NONE>,

					<0x2 0xcb 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm660l_gpio1", "pm660l_gpio3",

					"pm660l_gpio4", "pm660l_gpio5",

					"pm660l_gpio6", "pm660l_gpio7",

					"pm660l_gpio8", "pm660l_gpio9",

					"pm660l_gpio11", "pm660l_gpio12";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pm660l-gpio";



			gpio@c000 {

				reg = <0xc000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};



			gpio@c100 {

				reg = <0xc100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};



			gpio@c200 {

				reg = <0xc200 0x100>;

				qcom,pin-num = <3>;

				status = "disabled";

			};



			gpio@c300 {

				reg = <0xc300 0x100>;

				qcom,pin-num = <4>;

				status = "disabled";

			};



			gpio@c400 {

				reg = <0xc400 0x100>;

				qcom,pin-num = <5>;

				status = "disabled";

			};



			gpio@c500 {

				reg = <0xc500 0x100>;

				qcom,pin-num = <6>;

				status = "disabled";

			};



			gpio@c600 {

				reg = <0xc600 0x100>;

				qcom,pin-num = <7>;

				status = "disabled";

			};



			gpio@c700 {

				reg = <0xc700 0x100>;

				qcom,pin-num = <8>;

				status = "disabled";

			};



			gpio@c800 {

				reg = <0xc800 0x100>;

				qcom,pin-num = <9>;

				status = "disabled";

			};



			gpio@c900 {

				reg = <0xc900 0x100>;

				qcom,pin-num = <10>;

				status = "disabled";

			};



			gpio@ca00 {

				reg = <0xca00 0x100>;

				qcom,pin-num = <11>;

				status = "disabled";

			};



			gpio@cb00 {

				reg = <0xcb00 0x100>;

				qcom,pin-num = <12>;

				status = "disabled";

			};



			qcom,gpios-disallowed = <2 10>;

		};

	};