diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-15 01:26:26 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-15 01:28:02 (GMT) |
| commit | e45600107b6700237f22f2d1d853bd49d8168f68 (patch) | |
| tree | 078d1d011e9e197b3758ba22b7e11621fccab13f /arch/arm/boot/dts/msm8960-cdp.dts | |
| parent | bae994b1990d55931c420c3c82fcd073b1529f89 (diff) | |
| parent | 1aa3d1a3c7d235c47e30c7c8c6b5ef02fb1536b3 (diff) | |
| download | linux-fsl-qoriq-e45600107b6700237f22f2d1d853bd49d8168f68.tar.xz | |
Merge tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup
From David Brown:
Cleanups for MSM for 3.11
These are a handful of cleanups to the MSM tree. The gpio cleanups
get us closer to having proper pinmux and gpio support.
* tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
mfd: ssbi: Use devm_* and simplify code
gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
msm: iomap: Remove unused bases and mappings
msm: Remove unused file core.h
ARM: msm: Remove init_irq declaration in machine description
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/boot/dts/msm8660-surf.dts
arch/arm/boot/dts/msm8960-cdp.dts
Diffstat (limited to 'arch/arm/boot/dts/msm8960-cdp.dts')
| -rw-r--r-- | arch/arm/boot/dts/msm8960-cdp.dts | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts index 7c9ef9b..e9eb835 100644 --- a/arch/arm/boot/dts/msm8960-cdp.dts +++ b/arch/arm/boot/dts/msm8960-cdp.dts @@ -26,7 +26,18 @@ cpu-offset = <0x80000>; }; - serial@16440000 { + msmgpio: gpio@fd510000 { + compatible = "qcom,msm-gpio"; + gpio-controller; + #gpio-cells = <2>; + ngpio = <150>; + interrupts = <0 32 0x4>; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0xfd510000 0x4000>; + }; + + serial@19440000 { compatible = "qcom,msm-hsuart", "qcom,msm-uart"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>; |