Commit bae994b1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'msm-fix-for-3.11' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 19a7ab61 7ba655fc

arch/arm/boot/dts/msm8660-surf.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/msm8960-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		cpu-offset = <0x80000>;

	};



	serial@19c400000 {

	serial@16440000 {

		compatible = "qcom,msm-hsuart", "qcom,msm-uart";

		reg = <0x16440000 0x1000>,

		      <0x16400000 0x1000>;

arch/arm/mach-msm/clock-debug.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpio/gpio-msm-v1.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/ssbi/ssbi.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE