Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'msm/fixes' into next/late 



Merging in msm/fixes to avoid silly conflicts at top level.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b8892345 7ba655fc

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
		      < 0x02081000 0x1000 >;

		      < 0x02081000 0x1000 >;

	};

	};





	timer@2000004 {

	timer@2000000 {

		compatible = "qcom,scss-timer", "qcom,msm-timer";

		compatible = "qcom,scss-timer", "qcom,msm-timer";

		interrupts = <1 0 0x301>,

		interrupts = <1 0 0x301>,

			     <1 1 0x301>,

			     <1 1 0x301>,
@@ -26,7 +26,7 @@ 
		cpu-offset = <0x40000>;

		cpu-offset = <0x40000>;

	};

	};





	serial@19c400000 {

	serial@19c40000 {

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

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

		reg = <0x19c40000 0x1000>,

		reg = <0x19c40000 0x1000>,

		      <0x19c00000 0x1000>;

		      <0x19c00000 0x1000>;

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

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

		cpu-offset = <0x80000>;

	};

	};





	serial@19c400000 {

	serial@16440000 {

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

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

		reg = <0x16440000 0x1000>,

		reg = <0x16440000 0x1000>,

		      <0x16400000 0x1000>;

		      <0x16400000 0x1000>;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ int __init clock_debug_add(struct clk *clock) 
	if (!debugfs_base)

	if (!debugfs_base)

		return -ENOMEM;

		return -ENOMEM;





	strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);

	strlcpy(temp, clock->dbg_name, ARRAY_SIZE(temp));

	for (ptr = temp; *ptr; ptr++)

	for (ptr = temp; *ptr; ptr++)

		*ptr = tolower(*ptr);

		*ptr = tolower(*ptr);

drivers/gpio/gpio-msm-v1.c

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

	.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;

	int i, j = 0;

	const struct platform_device_id *dev_id = platform_get_device_id(pdev);

	const struct platform_device_id *dev_id = platform_get_device_id(pdev);

drivers/ssbi/ssbi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -350,6 +350,7 @@ static struct of_device_id ssbi_match_table[] = { 
	{ .compatible = "qcom,ssbi" },

	{ .compatible = "qcom,ssbi" },

	{}

	{}

};

};

MODULE_DEVICE_TABLE(of, ssbi_match_table);





static struct platform_driver ssbi_driver = {

static struct platform_driver ssbi_driver = {

	.probe		= ssbi_probe,

	.probe		= ssbi_probe,