diff options
| author | Bjorn Andersson <bjorn.andersson@sonymobile.com> | 2015-06-05 15:52:25 -0700 |
|---|---|---|
| committer | Andy Gross <agross@codeaurora.org> | 2015-07-23 16:34:12 -0500 |
| commit | 8e140c8e64d20ac17b003c0f5607d782f5c1f5b0 (patch) | |
| tree | 6dc9a4e947744a244222a4f458a632b030b377c7 | |
| parent | d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff) | |
| download | op-kernel-dev-8e140c8e64d20ac17b003c0f5607d782f5c1f5b0.zip op-kernel-dev-8e140c8e64d20ac17b003c0f5607d782f5c1f5b0.tar.gz | |
ARM: dts: qcom: Replace gpio node with pinctrl node
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>
Signed-off-by: Andy Gross <agross@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8660.dtsi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi index e0b2ce2..ef2fe72 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -67,15 +67,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 { @@ -115,7 +116,7 @@ pmicintc: pmic@0 { compatible = "qcom,pm8058"; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <88 8>; #interrupt-cells = <2>; interrupt-controller; |
