aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-12-10 18:14:43 -0500
committerKevin Hilman <khilman@linaro.org>2014-01-10 16:57:59 -0500
commit296441255ae3ed7f4c1013ae9604e680de51d063 (patch)
treec0af3a2085a6a96a4799f5827f7f8f195faf09a8
parentc4b4ecbda50379b587ccff81663f3235582e5c66 (diff)
ARM: dts: msm: Fix gpio interrupt and reg length
The summary interrupt is #16 in the SPI space. Unfortunately, when this device was translated from board files to DT we forgot to subtract 16 from the interrupt number to translate it into a SPI interrupt. Also, the register space is larger than 4k, increase it appropriately so that the gpio driver doesn't try to access registers outside of its mapping. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r--arch/arm/boot/dts/qcom-msm8660-surf.dts4
-rw-r--r--arch/arm/boot/dts/qcom-msm8960-cdp.dts2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts
index 386d42870215..1187185cf25b 100644
--- a/arch/arm/boot/dts/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts
@@ -28,11 +28,11 @@
28 28
29 msmgpio: gpio@800000 { 29 msmgpio: gpio@800000 {
30 compatible = "qcom,msm-gpio"; 30 compatible = "qcom,msm-gpio";
31 reg = <0x00800000 0x1000>; 31 reg = <0x00800000 0x4000>;
32 gpio-controller; 32 gpio-controller;
33 #gpio-cells = <2>; 33 #gpio-cells = <2>;
34 ngpio = <173>; 34 ngpio = <173>;
35 interrupts = <0 32 0x4>; 35 interrupts = <0 16 0x4>;
36 interrupt-controller; 36 interrupt-controller;
37 #interrupt-cells = <2>; 37 #interrupt-cells = <2>;
38 }; 38 };
diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
index 93e9f7e0b7ad..6ccbac77931e 100644
--- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
@@ -31,7 +31,7 @@
31 gpio-controller; 31 gpio-controller;
32 #gpio-cells = <2>; 32 #gpio-cells = <2>;
33 ngpio = <150>; 33 ngpio = <150>;
34 interrupts = <0 32 0x4>; 34 interrupts = <0 16 0x4>;
35 interrupt-controller; 35 interrupt-controller;
36 #interrupt-cells = <2>; 36 #interrupt-cells = <2>;
37 reg = <0x800000 0x4000>; 37 reg = <0x800000 0x4000>;