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

Commit 3dda927f authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'ib-qcom-ssbi' into devel

parents 9aac1e33 79890c2e

arch/arm/boot/dts/qcom-apq8060-dragonboard.dts

+8 −13
Original line number Diff line number Diff line
@@ -93,9 +93,8 @@ 
		vdd-supply = <&pm8058_l14>; // 2.85V

		aset-gpios = <&pm8058_gpio 35 GPIO_ACTIVE_LOW>;

		capella,aset-resistance-ohms = <100000>;

		/* GPIO34 has interrupt 225 on the PM8058 */

		/* Trig on both edges - getting close or far away */

		interrupts-extended = <&pm8058 225 IRQ_TYPE_EDGE_BOTH>;

		interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>;

		/* MPP05 analog input to the XOADC */

		io-channels = <&xoadc 0x00 0x05>;

		io-channel-names = "aout";
@@ -515,9 +514,8 @@ 
				ak8975@c {

					compatible = "asahi-kasei,ak8975";

					reg = <0x0c>;

					/* FIXME: GPIO33 has interrupt 224 on the PM8058 */

					interrupt-parent = <&pm8058>;

					interrupts = <224 IRQ_TYPE_EDGE_RISING>;

					interrupt-parent = <&pm8058_gpio>;

					interrupts = <33 IRQ_TYPE_EDGE_RISING>;

					pinctrl-names = "default";

					pinctrl-0 = <&dragon_ak8975_gpios>;

					vid-supply = <&pm8058_lvs0>; // 1.8V
@@ -526,9 +524,8 @@ 
				bmp085@77 {

					compatible = "bosch,bmp085";

					reg = <0x77>;

					/* FIXME: GPIO16 has interrupt 207 on the PM8058 */

					interrupt-parent = <&pm8058>;

					interrupts = <207 IRQ_TYPE_EDGE_RISING>;

					interrupt-parent = <&pm8058_gpio>;

					interrupts = <16 IRQ_TYPE_EDGE_RISING>;

					reset-gpios = <&tlmm 86 GPIO_ACTIVE_LOW>;

					pinctrl-names = "default";

					pinctrl-0 = <&dragon_bmp085_gpios>;
@@ -539,12 +536,11 @@ 
					compatible = "invensense,mpu3050";

					reg = <0x68>;

					/*

					 * GPIO17 has interrupt 208 on the

					 * PM8058, it is pulled high by a 10k

					 * GPIO17 is pulled high by a 10k

					 * resistor to VLOGIC so needs to be

					 * active low/falling edge.

					 */

					interrupts-extended = <&pm8058 208 IRQ_TYPE_EDGE_FALLING>;

					interrupts-extended = <&pm8058_gpio 17 IRQ_TYPE_EDGE_FALLING>;

					pinctrl-names = "default";

					pinctrl-0 = <&dragon_mpu3050_gpios>;

					vlogic-supply = <&pm8058_lvs0>; // 1.8V
@@ -589,11 +585,10 @@ 
				compatible = "smsc,lan9221", "smsc,lan9115";

				reg = <2 0x0 0x100>;

				/*

				 * GPIO7 has interrupt 198 on the PM8058

				 * The second interrupt is the PME interrupt

				 * for network wakeup, connected to the TLMM.

				 */

				interrupts-extended = <&pm8058 198 IRQ_TYPE_EDGE_FALLING>,

				interrupts-extended = <&pm8058_gpio 7 IRQ_TYPE_EDGE_FALLING>,

						    <&tlmm 29 IRQ_TYPE_EDGE_RISING>;

				reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;

				vdd33a-supply = <&dragon_veth>;

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

+2 −44
Original line number Diff line number Diff line
@@ -705,50 +705,8 @@ 
					compatible = "qcom,pm8921-gpio",

						     "qcom,ssbi-gpio";

					reg = <0x150>;

					interrupts = <192 IRQ_TYPE_NONE>,

						     <193 IRQ_TYPE_NONE>,

						     <194 IRQ_TYPE_NONE>,

						     <195 IRQ_TYPE_NONE>,

						     <196 IRQ_TYPE_NONE>,

						     <197 IRQ_TYPE_NONE>,

						     <198 IRQ_TYPE_NONE>,

						     <199 IRQ_TYPE_NONE>,

						     <200 IRQ_TYPE_NONE>,

						     <201 IRQ_TYPE_NONE>,

						     <202 IRQ_TYPE_NONE>,

						     <203 IRQ_TYPE_NONE>,

						     <204 IRQ_TYPE_NONE>,

						     <205 IRQ_TYPE_NONE>,

						     <206 IRQ_TYPE_NONE>,

						     <207 IRQ_TYPE_NONE>,

						     <208 IRQ_TYPE_NONE>,

						     <209 IRQ_TYPE_NONE>,

						     <210 IRQ_TYPE_NONE>,

						     <211 IRQ_TYPE_NONE>,

						     <212 IRQ_TYPE_NONE>,

						     <213 IRQ_TYPE_NONE>,

						     <214 IRQ_TYPE_NONE>,

						     <215 IRQ_TYPE_NONE>,

						     <216 IRQ_TYPE_NONE>,

						     <217 IRQ_TYPE_NONE>,

						     <218 IRQ_TYPE_NONE>,

						     <219 IRQ_TYPE_NONE>,

						     <220 IRQ_TYPE_NONE>,

						     <221 IRQ_TYPE_NONE>,

						     <222 IRQ_TYPE_NONE>,

						     <223 IRQ_TYPE_NONE>,

						     <224 IRQ_TYPE_NONE>,

						     <225 IRQ_TYPE_NONE>,

						     <226 IRQ_TYPE_NONE>,

						     <227 IRQ_TYPE_NONE>,

						     <228 IRQ_TYPE_NONE>,

						     <229 IRQ_TYPE_NONE>,

						     <230 IRQ_TYPE_NONE>,

						     <231 IRQ_TYPE_NONE>,

						     <232 IRQ_TYPE_NONE>,

						     <233 IRQ_TYPE_NONE>,

						     <234 IRQ_TYPE_NONE>,

						     <235 IRQ_TYPE_NONE>;

					interrupt-controller;

					#interrupt-cells = <2>;

					gpio-controller;

					#gpio-cells = <2>;

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

+2 −7
Original line number Diff line number Diff line
@@ -323,13 +323,8 @@ 


				pmicgpio: gpio@150 {

					compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";

					interrupt-parent = <&pmicintc>;

					interrupts = <24 IRQ_TYPE_NONE>,

						     <25 IRQ_TYPE_NONE>,

						     <26 IRQ_TYPE_NONE>,

						     <27 IRQ_TYPE_NONE>,

						     <28 IRQ_TYPE_NONE>,

						     <29 IRQ_TYPE_NONE>;

					interrupt-controller;

					#interrupt-cells = <2>;

					gpio-controller;

					#gpio-cells = <2>;

				};

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

+2 −45
Original line number Diff line number Diff line
@@ -285,51 +285,8 @@ 
					compatible = "qcom,pm8058-gpio",

						     "qcom,ssbi-gpio";

					reg = <0x150>;

					interrupt-parent = <&pm8058>;

					interrupts = <192 IRQ_TYPE_NONE>,

						     <193 IRQ_TYPE_NONE>,

						     <194 IRQ_TYPE_NONE>,

						     <195 IRQ_TYPE_NONE>,

						     <196 IRQ_TYPE_NONE>,

						     <197 IRQ_TYPE_NONE>,

						     <198 IRQ_TYPE_NONE>,

						     <199 IRQ_TYPE_NONE>,

						     <200 IRQ_TYPE_NONE>,

						     <201 IRQ_TYPE_NONE>,

						     <202 IRQ_TYPE_NONE>,

						     <203 IRQ_TYPE_NONE>,

						     <204 IRQ_TYPE_NONE>,

						     <205 IRQ_TYPE_NONE>,

						     <206 IRQ_TYPE_NONE>,

						     <207 IRQ_TYPE_NONE>,

						     <208 IRQ_TYPE_NONE>,

						     <209 IRQ_TYPE_NONE>,

						     <210 IRQ_TYPE_NONE>,

						     <211 IRQ_TYPE_NONE>,

						     <212 IRQ_TYPE_NONE>,

						     <213 IRQ_TYPE_NONE>,

						     <214 IRQ_TYPE_NONE>,

						     <215 IRQ_TYPE_NONE>,

						     <216 IRQ_TYPE_NONE>,

						     <217 IRQ_TYPE_NONE>,

						     <218 IRQ_TYPE_NONE>,

						     <219 IRQ_TYPE_NONE>,

						     <220 IRQ_TYPE_NONE>,

						     <221 IRQ_TYPE_NONE>,

						     <222 IRQ_TYPE_NONE>,

						     <223 IRQ_TYPE_NONE>,

						     <224 IRQ_TYPE_NONE>,

						     <225 IRQ_TYPE_NONE>,

						     <226 IRQ_TYPE_NONE>,

						     <227 IRQ_TYPE_NONE>,

						     <228 IRQ_TYPE_NONE>,

						     <229 IRQ_TYPE_NONE>,

						     <230 IRQ_TYPE_NONE>,

						     <231 IRQ_TYPE_NONE>,

						     <232 IRQ_TYPE_NONE>,

						     <233 IRQ_TYPE_NONE>,

						     <234 IRQ_TYPE_NONE>,

						     <235 IRQ_TYPE_NONE>;

					interrupt-controller;

					#interrupt-cells = <2>;

					gpio-controller;

					#gpio-cells = <2>;

drivers/mfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ config UCB1400_CORE 
config MFD_PM8XXX

	tristate "Qualcomm PM8xxx PMIC chips driver"

	depends on (ARM || HEXAGON || COMPILE_TEST)

	select IRQ_DOMAIN

	select IRQ_DOMAIN_HIERARCHY

	select MFD_CORE

	select REGMAP

	help