From: Olof Johansson <olof@lixom.net>
Date: Sat, 15 Jun 2013 01:26:26 +0000 (-0700)
Subject: Merge tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~5841^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e45600107b6700237f22f2d1d853bd49d8168f68;p=firefly-linux-kernel-4.4.55.git

Merge tag 'msm-cleanup-for-3.11' of git://git./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
---

e45600107b6700237f22f2d1d853bd49d8168f68
diff --cc arch/arm/boot/dts/msm8660-surf.dts
index d347082d28f3,8931906b9263..cdc010e0f93e
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@@ -26,7 -26,18 +26,18 @@@
  		cpu-offset = <0x40000>;
  	};
  
+ 	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@19c400000 {
 +	serial@19c40000 {
  		compatible = "qcom,msm-hsuart", "qcom,msm-uart";
  		reg = <0x19c40000 0x1000>,
  		      <0x19c00000 0x1000>;
diff --cc arch/arm/boot/dts/msm8960-cdp.dts
index 7c9ef9b80c15,52fe25328883..e9eb83541c97
--- a/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>;