diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-27 17:04:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-27 17:04:00 -0700 |
| commit | fbd1a04b210d56ef84200df56fc0291746d4d4dc (patch) | |
| tree | d3e963a13fb2c027129c9342a204a430b88c2f90 /arch | |
| parent | b88923451f792643a4b23fd2cab266a4cd4350da (diff) | |
| parent | 7ba655fc965b073292349fa49fb9d16d701185bc (diff) | |
Merge branch 'msm/fixes' into next/late
Merging in msm/fixes to avoid silly conflicts at top level.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/msm8660-surf.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msm8960-cdp.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-msm/clock-debug.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts index 9bf49b3826e..d347082d28f 100644 --- 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 2e4d87a125d..7c9ef9b80c1 100644 --- 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 4886404d42f..b0fbdf1cbdd 100644 --- 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); |