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

Commit 86e06f02 authored by Linus Walleij's avatar Linus Walleij Committed by Andy Gross
Browse files

ARM: dts: rename MSM8660/APQ8060 pmicintc to pm8058 



The name "pmicintc" is ambiguous: there is a second power
management IC named PM8901 on these systems, and it is also
an interrupt controller. To make things clear, just name the
node alias "pm8058", this in unambigous and has all information
we need.

Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent fc0dd866

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,7 @@ 
				 * The second interrupt is the PME interrupt

				 * The second interrupt is the PME interrupt

				 * for network wakeup, connected to the TLMM.

				 * for network wakeup, connected to the TLMM.

				 */

				 */

				interrupts-extended = <&pmicintc 198 IRQ_TYPE_EDGE_FALLING>,

				interrupts-extended = <&pm8058 198 IRQ_TYPE_EDGE_FALLING>,

						    <&tlmm 29 IRQ_TYPE_EDGE_RISING>;

						    <&tlmm 29 IRQ_TYPE_EDGE_RISING>;

				reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;

				reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;

				vdd33a-supply = <&dragon_veth>;

				vdd33a-supply = <&dragon_veth>;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ 
	};

	};

};

};





&pmicintc {

&pm8058 {

	keypad@148 {

	keypad@148 {

		linux,keymap = <

		linux,keymap = <

			MATRIX_KEY(0, 0, KEY_FN_F1)

			MATRIX_KEY(0, 0, KEY_FN_F1)

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ 
			reg = <0x500000 0x1000>;

			reg = <0x500000 0x1000>;

			qcom,controller-type = "pmic-arbiter";

			qcom,controller-type = "pmic-arbiter";





			pmicintc: pmic@0 {

			pm8058: pmic@0 {

				compatible = "qcom,pm8058";

				compatible = "qcom,pm8058";

				interrupt-parent = <&tlmm>;

				interrupt-parent = <&tlmm>;

				interrupts = <88 8>;

				interrupts = <88 8>;
@@ -176,7 +176,7 @@ 
					compatible = "qcom,pm8058-gpio",

					compatible = "qcom,pm8058-gpio",

						     "qcom,ssbi-gpio";

						     "qcom,ssbi-gpio";

					reg = <0x150>;

					reg = <0x150>;

					interrupt-parent = <&pmicintc>;

					interrupt-parent = <&pm8058>;

					interrupts = <192 IRQ_TYPE_NONE>,

					interrupts = <192 IRQ_TYPE_NONE>,

						     <193 IRQ_TYPE_NONE>,

						     <193 IRQ_TYPE_NONE>,

						     <194 IRQ_TYPE_NONE>,

						     <194 IRQ_TYPE_NONE>,
@@ -232,7 +232,7 @@ 
					reg = <0x50>;

					reg = <0x50>;

					gpio-controller;

					gpio-controller;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					interrupt-parent = <&pmicintc>;

					interrupt-parent = <&pm8058>;

					interrupts =

					interrupts =

					<128 IRQ_TYPE_NONE>,

					<128 IRQ_TYPE_NONE>,

					<129 IRQ_TYPE_NONE>,

					<129 IRQ_TYPE_NONE>,
@@ -251,7 +251,7 @@ 
				pwrkey@1c {

				pwrkey@1c {

					compatible = "qcom,pm8058-pwrkey";

					compatible = "qcom,pm8058-pwrkey";

					reg = <0x1c>;

					reg = <0x1c>;

					interrupt-parent = <&pmicintc>;

					interrupt-parent = <&pm8058>;

					interrupts = <50 1>, <51 1>;

					interrupts = <50 1>, <51 1>;

					debounce = <15625>;

					debounce = <15625>;

					pull-up;

					pull-up;
@@ -260,7 +260,7 @@ 
				keypad@148 {

				keypad@148 {

					compatible = "qcom,pm8058-keypad";

					compatible = "qcom,pm8058-keypad";

					reg = <0x148>;

					reg = <0x148>;

					interrupt-parent = <&pmicintc>;

					interrupt-parent = <&pm8058>;

					interrupts = <74 1>, <75 1>;

					interrupts = <74 1>, <75 1>;

					debounce = <15>;

					debounce = <15>;

					scan-delay = <32>;

					scan-delay = <32>;
@@ -270,7 +270,7 @@ 
				rtc@1e8 {

				rtc@1e8 {

					compatible = "qcom,pm8058-rtc";

					compatible = "qcom,pm8058-rtc";

					reg = <0x1e8>;

					reg = <0x1e8>;

					interrupt-parent = <&pmicintc>;

					interrupt-parent = <&pm8058>;

					interrupts = <39 1>;

					interrupts = <39 1>;

					allow-set-time;

					allow-set-time;

				};

				};