| Message ID | 1433544745-325-4-git-send-email-bjorn.andersson@sonymobile.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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 --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;
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(-)