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

Commit 4136e455 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'ib-qcom-spmi' into devel

parents b0c3e54e e7dc6af8

Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ PMIC's from Qualcomm. 
		    "qcom,pm8998-gpio"

		    "qcom,pma8084-gpio"

		    "qcom,pmi8994-gpio"

		    "qcom,pmi8998-gpio"

		    "qcom,pms405-gpio"



		    And must contain either "qcom,spmi-gpio" or "qcom,ssbi-gpio"

arch/arm/boot/dts/qcom-pm8941.dtsi

+2 −36
Original line number Diff line number Diff line
@@ -64,42 +64,8 @@ 
			reg = <0xc000>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,

				     <0 0xc1 0 IRQ_TYPE_NONE>,

				     <0 0xc2 0 IRQ_TYPE_NONE>,

				     <0 0xc3 0 IRQ_TYPE_NONE>,

				     <0 0xc4 0 IRQ_TYPE_NONE>,

				     <0 0xc5 0 IRQ_TYPE_NONE>,

				     <0 0xc6 0 IRQ_TYPE_NONE>,

				     <0 0xc7 0 IRQ_TYPE_NONE>,

				     <0 0xc8 0 IRQ_TYPE_NONE>,

				     <0 0xc9 0 IRQ_TYPE_NONE>,

				     <0 0xca 0 IRQ_TYPE_NONE>,

				     <0 0xcb 0 IRQ_TYPE_NONE>,

				     <0 0xcc 0 IRQ_TYPE_NONE>,

				     <0 0xcd 0 IRQ_TYPE_NONE>,

				     <0 0xce 0 IRQ_TYPE_NONE>,

				     <0 0xcf 0 IRQ_TYPE_NONE>,

				     <0 0xd0 0 IRQ_TYPE_NONE>,

				     <0 0xd1 0 IRQ_TYPE_NONE>,

				     <0 0xd2 0 IRQ_TYPE_NONE>,

				     <0 0xd3 0 IRQ_TYPE_NONE>,

				     <0 0xd4 0 IRQ_TYPE_NONE>,

				     <0 0xd5 0 IRQ_TYPE_NONE>,

				     <0 0xd6 0 IRQ_TYPE_NONE>,

				     <0 0xd7 0 IRQ_TYPE_NONE>,

				     <0 0xd8 0 IRQ_TYPE_NONE>,

				     <0 0xd9 0 IRQ_TYPE_NONE>,

				     <0 0xda 0 IRQ_TYPE_NONE>,

				     <0 0xdb 0 IRQ_TYPE_NONE>,

				     <0 0xdc 0 IRQ_TYPE_NONE>,

				     <0 0xdd 0 IRQ_TYPE_NONE>,

				     <0 0xde 0 IRQ_TYPE_NONE>,

				     <0 0xdf 0 IRQ_TYPE_NONE>,

				     <0 0xe0 0 IRQ_TYPE_NONE>,

				     <0 0xe1 0 IRQ_TYPE_NONE>,

				     <0 0xe2 0 IRQ_TYPE_NONE>,

				     <0 0xe3 0 IRQ_TYPE_NONE>;

			interrupt-controller;

			#interrupt-cells = <2>;



			boost_bypass_n_pin: boost-bypass {

				pins = "gpio21";

arch/arm/boot/dts/qcom-pma8084.dtsi

+2 −22
Original line number Diff line number Diff line
@@ -32,28 +32,8 @@ 
			reg = <0xc000>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,

				     <0 0xc1 0 IRQ_TYPE_NONE>,

				     <0 0xc2 0 IRQ_TYPE_NONE>,

				     <0 0xc3 0 IRQ_TYPE_NONE>,

				     <0 0xc4 0 IRQ_TYPE_NONE>,

				     <0 0xc5 0 IRQ_TYPE_NONE>,

				     <0 0xc6 0 IRQ_TYPE_NONE>,

				     <0 0xc7 0 IRQ_TYPE_NONE>,

				     <0 0xc8 0 IRQ_TYPE_NONE>,

				     <0 0xc9 0 IRQ_TYPE_NONE>,

				     <0 0xca 0 IRQ_TYPE_NONE>,

				     <0 0xcb 0 IRQ_TYPE_NONE>,

				     <0 0xcc 0 IRQ_TYPE_NONE>,

				     <0 0xcd 0 IRQ_TYPE_NONE>,

				     <0 0xce 0 IRQ_TYPE_NONE>,

				     <0 0xcf 0 IRQ_TYPE_NONE>,

				     <0 0xd0 0 IRQ_TYPE_NONE>,

				     <0 0xd1 0 IRQ_TYPE_NONE>,

				     <0 0xd2 0 IRQ_TYPE_NONE>,

				     <0 0xd3 0 IRQ_TYPE_NONE>,

				     <0 0xd4 0 IRQ_TYPE_NONE>,

				     <0 0xd5 0 IRQ_TYPE_NONE>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		pma8084_mpps: mpps@a000 {

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

+2 −4
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 
			reg = <0xc000>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,

				     <0 0xc1 0 IRQ_TYPE_NONE>,

				     <0 0xc2 0 IRQ_TYPE_NONE>,

				     <0 0xc3 0 IRQ_TYPE_NONE>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



	};

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

+2 −26
Original line number Diff line number Diff line
@@ -94,32 +94,8 @@ 
			reg = <0xc000>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,

				     <0 0xc1 0 IRQ_TYPE_NONE>,

				     <0 0xc2 0 IRQ_TYPE_NONE>,

				     <0 0xc3 0 IRQ_TYPE_NONE>,

				     <0 0xc4 0 IRQ_TYPE_NONE>,

				     <0 0xc5 0 IRQ_TYPE_NONE>,

				     <0 0xc6 0 IRQ_TYPE_NONE>,

				     <0 0xc7 0 IRQ_TYPE_NONE>,

				     <0 0xc8 0 IRQ_TYPE_NONE>,

				     <0 0xc9 0 IRQ_TYPE_NONE>,

				     <0 0xca 0 IRQ_TYPE_NONE>,

				     <0 0xcb 0 IRQ_TYPE_NONE>,

				     <0 0xcc 0 IRQ_TYPE_NONE>,

				     <0 0xcd 0 IRQ_TYPE_NONE>,

				     <0 0xce 0 IRQ_TYPE_NONE>,

				     <0 0xcf 0 IRQ_TYPE_NONE>,

				     <0 0xd0 0 IRQ_TYPE_NONE>,

				     <0 0xd1 0 IRQ_TYPE_NONE>,

				     <0 0xd2 0 IRQ_TYPE_NONE>,

				     <0 0xd3 0 IRQ_TYPE_NONE>,

				     <0 0xd4 0 IRQ_TYPE_NONE>,

				     <0 0xd5 0 IRQ_TYPE_NONE>,

				     <0 0xd6 0 IRQ_TYPE_NONE>,

				     <0 0xd7 0 IRQ_TYPE_NONE>,

				     <0 0xd8 0 IRQ_TYPE_NONE>,

				     <0 0xd9 0 IRQ_TYPE_NONE>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



	};