diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-17 02:37:26 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-17 02:37:26 +0400 |
| commit | 2ff1cf12c9fe70e75e600404e6a4274b19d293ed (patch) | |
| tree | beafddac0a8098e3f07d2ec60e44a2a7d006e605 /arch/arm/boot/dts/msm8960-cdp.dts | |
| parent | 16b304f3404f8e0243d5ee2b70b68767b7b59b2b (diff) | |
| parent | 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a (diff) | |
| download | linux-2ff1cf12c9fe70e75e600404e6a4274b19d293ed.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/boot/dts/msm8960-cdp.dts')
| -rw-r--r-- | arch/arm/boot/dts/msm8960-cdp.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts index db2060c46540..9c1167b0459b 100644 --- a/arch/arm/boot/dts/msm8960-cdp.dts +++ b/arch/arm/boot/dts/msm8960-cdp.dts @@ -26,7 +26,7 @@ cpu-offset = <0x80000>; }; - msmgpio: gpio@fd510000 { + msmgpio: gpio@800000 { compatible = "qcom,msm-gpio"; gpio-controller; #gpio-cells = <2>; @@ -34,7 +34,7 @@ interrupts = <0 32 0x4>; interrupt-controller; #interrupt-cells = <2>; - reg = <0xfd510000 0x4000>; + reg = <0x800000 0x4000>; }; serial@16440000 { |