diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-10 14:10:43 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-10 14:10:48 -0800 |
| commit | c2147624d52787d0bec777dea654235e0749d855 (patch) | |
| tree | 13dcc14e0008350e6f78cb2295014ca005d94221 /arch/arm | |
| parent | a87010ef3261912999302b3d82bd2e155898f816 (diff) | |
| parent | 296441255ae3ed7f4c1013ae9604e680de51d063 (diff) | |
| download | linux-c2147624d52787d0bec777dea654235e0749d855.tar.bz2 | |
Merge branch 'qcom/fixes' into next/fixes-non-critical
* qcom/fixes:
ARM: dts: msm: Fix gpio interrupt and reg length
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm')
| -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>; |