diff mbox

[3/3] ARM: dts: qcom: Replace gpio node with pinctrl node

Message ID 1433544745-325-4-git-send-email-bjorn.andersson@sonymobile.com (mailing list archive)
State Accepted, archived
Delegated to: Andy Gross
Headers show

Commit Message

Bjorn Andersson June 5, 2015, 10:52 p.m. UTC 
Replace the standalone gpio driver with pinctrl-msm as we now have
msm8660 support there.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
---
 arch/arm/boot/dts/qcom-msm8660.dtsi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Linus Walleij June 10, 2015, 8:20 a.m. UTC | #1 
On Sat, Jun 6, 2015 at 12:52 AM, Bjorn Andersson
<bjorn.andersson@sonymobile.com> wrote:

> Replace the standalone gpio driver with pinctrl-msm as we now have
> msm8660 support there.
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

please funnel this through the ARM SoC tree.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andy Gross July 23, 2015, 8:56 p.m. UTC | #2 
On Fri, Jun 05, 2015 at 03:52:25PM -0700, Bjorn Andersson wrote:
> Replace the standalone gpio driver with pinctrl-msm as we now have
> msm8660 support there.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> ---

Applied, thanks!
diff mbox

Patch

diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index 20bbd19b996e..28bba8b09854 100644
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -62,15 +62,16 @@ 
 			cpu-offset = <0x40000>;
 		};
 
-		msmgpio: gpio@800000 {
-			compatible = "qcom,msm-gpio";
-			reg = <0x00800000 0x4000>;
+		tlmm: pinctrl@800000 {
+			compatible = "qcom,msm8660-pinctrl";
+			reg = <0x800000 0x4000>;
+
 			gpio-controller;
 			#gpio-cells = <2>;
-			ngpio = <173>;
 			interrupts = <0 16 0x4>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
+
 		};
 
 		gcc: clock-controller@900000 {
@@ -110,7 +111,7 @@ 
 
 			pmicintc: pmic@0 {
 				compatible = "qcom,pm8058";
-				interrupt-parent = <&msmgpio>;
+				interrupt-parent = <&tlmm>;
 				interrupts = <88 8>;
 				#interrupt-cells = <2>;
 				interrupt-controller;