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

From David Brown:
Some minor fixes for MSM for 3.11

I don't expect these to be necessary for stable, since the fixes are
to recently added code.  The strncpy fix is only in debug code that
isn't normally compiled or used (and is being removed in upcoming
patches).

* tag 'msm-fix-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  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

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index 9bf49b3826eaf72dcf5cac5d56ac55e3462c9cf0..d347082d28f3a1a541297bd5c2c36b6d083adfe7 100644 (file)
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -15,7 +15,7 @@
                      < 0x02081000 0x1000 >;
        };
 
-       timer@2000004 {
+       timer@2000000 {
                compatible = "qcom,scss-timer", "qcom,msm-timer";
                interrupts = <1 0 0x301>,
                             <1 1 0x301>,
@@ -26,7 +26,7 @@
                cpu-offset = <0x40000>;
        };
 
-       serial@19c400000 {
+       serial@19c40000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x19c40000 0x1000>,
                      <0x19c00000 0x1000>;

diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
index 2e4d87a125d6a25b9582edd5c68c1e43a349f9cf..7c9ef9b80c159afa8f2de2b6ea31d157d7c64642 100644 (file)
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -26,7 +26,7 @@
                cpu-offset = <0x80000>;
        };
 
-       serial@19c400000 {
+       serial@16440000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x16440000 0x1000>,
                      <0x16400000 0x1000>;

diff --git a/arch/arm/mach-msm/clock-debug.c b/arch/arm/mach-msm/clock-debug.c
index 4886404d42f587533c175e5474fdedcc4ccd680b..b0fbdf1cbdd15040709940826fe013b4c637b51d 100644 (file)
--- a/arch/arm/mach-msm/clock-debug.c
+++ b/arch/arm/mach-msm/clock-debug.c
@@ -104,7 +104,7 @@ int __init clock_debug_add(struct clk *clock)
        if (!debugfs_base)
                return -ENOMEM;
 
-       strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
+       strlcpy(temp, clock->dbg_name, ARRAY_SIZE(temp));
        for (ptr = temp; *ptr; ptr++)
                *ptr = tolower(*ptr);
 

diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c
index c798585a3fe5902bcb65376fe87bf87636416af9..fb2cc90d013423ce15fe34c550493cd329ebb26d 100644 (file)
--- a/drivers/gpio/gpio-msm-v1.c
+++ b/drivers/gpio/gpio-msm-v1.c
@@ -630,7 +630,7 @@ static struct irq_chip msm_gpio_irq_chip = {
        .irq_set_type  = msm_gpio_irq_set_type,
 };
 
-static int __devinit gpio_msm_v1_probe(struct platform_device *pdev)
+static int gpio_msm_v1_probe(struct platform_device *pdev)
 {
        int i, j = 0;
        const struct platform_device_id *dev_id = platform_get_device_id(pdev);

diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
index f32da0258a8e785c6597016e39ec026c8ed81863..e561d3be54a59664b03e0aaba54bd5ee25099cb6 100644 (file)
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -350,6 +350,7 @@ static struct of_device_id ssbi_match_table[] = {
        { .compatible = "qcom,ssbi" },
        {}
 };
+MODULE_DEVICE_TABLE(of, ssbi_match_table);
 
 static struct platform_driver ssbi_driver = {
        .probe          = ssbi_probe,