From f9047306fd7332d682898dd689152bb3b45a3e73 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 15 Feb 2013 22:32:02 +0900 Subject: [PATCH] ARM: shmobile: r8a7779: Correct TMU clock support again After discussion on the linux-sh mailing list and reference to the hardware documentation it appears that 'TMU00', 'TMU01' and 'TMU02' use a common clock. The sh_tmu.1 portion of this change resolves a regression introduced in 58079fa7d54a0929d304054ee759187a2ccd3cdf (ARM: shmobile: r8a7779: Correct TMU clock support) and fixes a regression introduced by that patch. That patch is queued up for v3.9. ... hub 4-0:1.0: USB hub found hub 4-0:1.0: 2 ports detected INFO: rcu_sched self-detected stall on CPUINFO: rcu_sched detected stalls on +CPUs/tasks: { 1} (detected by 2, t=279640 jiffies, g=4294967052, c=4294967051, +q=38) Task dump for CPU 1: swapper/0 R running 0 1 0 0x00000002 [] (__schedule+0x1b0/0x4c0) from [] (__loop_delay+0x4/0xc) { 1} (t=279640 jiffies g=4294967052 c=4294967052 q=37) [] (unwind_backtrace+0x0/0xf8) from [] +(rcu_check_callbacks+0x218/0x6b8) [] (rcu_check_callbacks+0x218/0x6b8) from [] +(update_process_times+0x38/0x4c) [] (update_process_times+0x38/0x4c) from [] +(tick_nohz_handler+0xb4/0x11c) [] (tick_nohz_handler+0xb4/0x11c) from [] +(twd_handler+0x34/0x44) [] (twd_handler+0x34/0x44) from [] +(handle_percpu_devid_irq+0x68/0x80) [] (handle_percpu_devid_irq+0x68/0x80) from [] +(generic_handle_irq+0x20/0x30) [] (generic_handle_irq+0x20/0x30) from [] +(handle_IRQ+0x40/0x90) [] (handle_IRQ+0x40/0x90) from [] (gic_handle_irq+0x2c/0x5c) [] (gic_handle_irq+0x2c/0x5c) from [] (__irq_svc+0x40/0x50) Exception stack(0xef03ddf8 to 0xef03de40) dde0: 000001c1 ffffffff de00: 000001d8 01bf01bf ef35ec40 ef35e800 ef35ec6c 0000002b ef35ec68 c013c560 de20: c0392994 60000113 00000000 ef03de40 c01a5d40 c013c590 20000113 ffffffff [] (__irq_svc+0x40/0x50) from [] (__loop_delay+0x4/0xc) Cc: Denis Oliver Kropp Cc: Magnus Damm Cc: Kuninori Morimoto Cc: Paul Mundt Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 202370de32f0..1db36537255c 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -161,8 +161,8 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ CLKDEV_DEV_ID("ohci-platform.0", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */ CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */ - CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP015]), /* TMU01 */ - CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP014]), /* TMU02 */ + CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */ + CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP016]), /* TMU02 */ CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */ CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */ CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP028]), /* I2C2 */