From: David Brown <davidb@codeaurora.org>
Date: Mon, 17 Jun 2013 20:24:51 +0000 (-0700)
Subject: Merge branch 'msm-fix' into for-next
X-Git-Tag: next-20130619~12^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5f7535199553892cc942f09d22b9c4464ceaac99;p=karo-tx-linux.git

Merge branch 'msm-fix' into for-next

* msm-fix:
  gpio: msm-v1: Remove errant __devinit to fix compile
  mfd: ssbi: Add MODULE_DEVICE_TABLE
  ARM: dts: msm: Fix bad register addresses
  arch: arm: mach-msm: using strlcpy instead of strncpy

Conflicts:
	arch/arm/boot/dts/msm8660-surf.dts
	arch/arm/boot/dts/msm8960-cdp.dts
---

5f7535199553892cc942f09d22b9c4464ceaac99
diff --cc arch/arm/boot/dts/msm8660-surf.dts
index 8931906b9263,d347082d28f3..cdc010e0f93e
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@@ -26,18 -26,7 +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 52fe25328883,7c9ef9b80c15..db2060c46540
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@@ -26,18 -26,7 +26,18 @@@
  		cpu-offset = <0x80000>;
  	};
  
 +	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@16440000 {
  		compatible = "qcom,msm-hsuart", "qcom,msm-uart";
  		reg = <0x16440000 0x1000>,
  		      <0x16400000 0x1000>;