summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-06-16 13:31:12 -0700
committerAndy Gross <agross@codeaurora.org>2015-07-23 16:34:12 -0500
commit2a39c9b3962402b2bbe530686858b906a6bddd0e (patch)
tree5cb76ab004326849cc9dbad7c7a85649bf435578
parent8e140c8e64d20ac17b003c0f5607d782f5c1f5b0 (diff)
downloadtalos-obmc-linux-2a39c9b3962402b2bbe530686858b906a6bddd0e.tar.gz
talos-obmc-linux-2a39c9b3962402b2bbe530686858b906a6bddd0e.zip
ARM: dts: qcom: Replace gpio node with pinctrl node
Now that we have a proper pinctrl driver for the gpio block we can change the compatible field here and configure the pinmux on msm8960 devices. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Andy Gross <agross@codeaurora.org>
-rw-r--r--arch/arm/boot/dts/qcom-msm8960.dtsi5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
index a02b984cc68d..1ae3fe828e59 100644
--- a/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -73,11 +73,10 @@
cpu-offset = <0x80000>;
};
- msmgpio: gpio@800000 {
- compatible = "qcom,msm-gpio";
+ msmgpio: pinctrl@800000 {
+ compatible = "qcom,msm8960-pinctrl";
gpio-controller;
#gpio-cells = <2>;
- ngpio = <150>;
interrupts = <0 16 0x4>;
interrupt-controller;
#interrupt-cells = <2>;
OpenPOWER on IntegriCloud