mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'msm/fixes' into next/late

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

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-06-27 17:04:00 -07:00
commit fbd1a04b21
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/msm8660-surf.dts
View file

@ -15,7 +15,7 @@ intc: interrupt-controller@2080000 {
< 0x02081000 0x1000 >;
};
timer@2000004 {
timer@2000000 {
compatible = "qcom,scss-timer", "qcom,msm-timer";
interrupts = <1 0 0x301>,
<1 1 0x301>,
@ -26,7 +26,7 @@ timer@2000004 {
cpu-offset = <0x40000>;
};
serial@19c400000 {
serial@19c40000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x19c40000 0x1000>,
<0x19c00000 0x1000>;

2
arch/arm/boot/dts/msm8960-cdp.dts
View file

@ -26,7 +26,7 @@ timer@200a000 {
cpu-offset = <0x80000>;
};
serial@19c400000 {
serial@16440000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x16440000 0x1000>,
<0x16400000 0x1000>;

2
arch/arm/mach-msm/clock-debug.c
View file

@ -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);

2
drivers/gpio/gpio-msm-v1.c
View file

@ -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);

1
drivers/ssbi/ssbi.c
View file

@ -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,