Merge tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc arch/arm/boot/dts/msm8660-surf.dts
index d347082,8931906..cdc010e
--- 1/arch/arm/boot/dts/msm8660-surf.dts
--- 2/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@@ -26,7 -26,18 +26,18 @@@
                cpu-offset = <0x40000>;
        };
  
 -      serial@19c400000 {
+       msmgpio: gpio@800000 {
+               compatible = "qcom,msm-gpio";
+               reg = <0x00800000 0x1000>;
+               gpio-controller;
+               #gpio-cells = <2>;
+               ngpio = <173>;
+               interrupts = <0 32 0x4>;
+               interrupt-controller;
+               #interrupt-cells = <2>;
+       };
+ 
 +      serial@19c40000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x19c40000 0x1000>,
                      <0x19c00000 0x1000>;

diff --cc arch/arm/boot/dts/msm8960-cdp.dts
index 7c9ef9b,52fe253..e9eb835
--- 1/arch/arm/boot/dts/msm8960-cdp.dts
--- 2/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@@ -26,7 -26,18 +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@19c400000 {
++      serial@19440000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x16440000 0x1000>,
                      <0x16400000 0x1000>;

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/ssbi/ssbi.c
Simple merge