diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-12-11 00:14:43 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-10 22:57:59 +0100 |
| commit | 296441255ae3ed7f4c1013ae9604e680de51d063 (patch) | |
| tree | c0af3a2085a6a96a4799f5827f7f8f195faf09a8 | |
| parent | ARM: msm: trout: fix uninit var warning (diff) | |
| download | linux-296441255ae3ed7f4c1013ae9604e680de51d063.tar.xz linux-296441255ae3ed7f4c1013ae9604e680de51d063.zip | |
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.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8960-cdp.dts | 2 |
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 @@ 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 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 @@ gpio-controller; #gpio-cells = <2>; ngpio = <150>; - interrupts = <0 32 0x4>; + interrupts = <0 16 0x4>; interrupt-controller; #interrupt-cells = <2>; reg = <0x800000 0x4000>; |