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>

diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts
index 386d428..1187185 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts
@@ -28,11 +28,11 @@
 
        msmgpio: gpio@800000 {
                compatible = "qcom,msm-gpio";
-               reg = <0x00800000 0x1000>;
+               reg = <0x00800000 0x4000>;
                gpio-controller;
                #gpio-cells = <2>;
                ngpio = <173>;
-               interrupts = <0 32 0x4>;
+               interrupts = <0 16 0x4>;
                interrupt-controller;
                #interrupt-cells = <2>;
        };

diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
index 93e9f7e..6ccbac7 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
@@ -31,7 +31,7 @@
                gpio-controller;
                #gpio-cells = <2>;
                ngpio = <150>;
-               interrupts = <0 32 0x4>;
+               interrupts = <0 16 0x4>;
                interrupt-controller;
                #interrupt-cells = <2>;
                reg = <0x800000 0x4000>;