| From 19e79687de22f23bcfb5e79cce3daba20af228d1 Mon Sep 17 00:00:00 2001 |
| From: Ben Dooks <ben.dooks@codethink.co.uk> |
| Date: Tue, 29 Sep 2015 15:01:08 +0100 |
| Subject: clk: ti: fix dual-registration of uart4_ick |
| |
| From: Ben Dooks <ben.dooks@codethink.co.uk> |
| |
| commit 19e79687de22f23bcfb5e79cce3daba20af228d1 upstream. |
| |
| On the OMAP AM3517 platform the uart4_ick gets registered |
| twice, causing any power management to /dev/ttyO3 to fail |
| when trying to wake the device up. |
| |
| This solves the following oops: |
| |
| [] Unhandled fault: external abort on non-linefetch (0x1028) at 0xfa09e008 |
| [] PC is at serial_omap_pm+0x48/0x15c |
| [] LR is at _raw_spin_unlock_irqrestore+0x30/0x5c |
| |
| Fixes: aafd900cab87 ("CLK: TI: add omap3 clock init file") |
| Cc: mturquette@baylibre.com |
| Cc: sboyd@codeaurora.org |
| Cc: linux-clk@vger.kernel.org |
| Cc: linux-omap@vger.kernel.org |
| Cc: linux-kernel@lists.codethink.co.uk |
| Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> |
| Signed-off-by: Tero Kristo <t-kristo@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/clk/ti/clk-3xxx.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/clk/ti/clk-3xxx.c |
| +++ b/drivers/clk/ti/clk-3xxx.c |
| @@ -174,7 +174,6 @@ static struct ti_dt_clk omap3xxx_clks[] |
| DT_CLK(NULL, "gpio2_ick", "gpio2_ick"), |
| DT_CLK(NULL, "wdt3_ick", "wdt3_ick"), |
| DT_CLK(NULL, "uart3_ick", "uart3_ick"), |
| - DT_CLK(NULL, "uart4_ick", "uart4_ick"), |
| DT_CLK(NULL, "gpt9_ick", "gpt9_ick"), |
| DT_CLK(NULL, "gpt8_ick", "gpt8_ick"), |
| DT_CLK(NULL, "gpt7_ick", "gpt7_ick"), |
| @@ -317,6 +316,7 @@ static struct ti_dt_clk am35xx_clks[] = |
| static struct ti_dt_clk omap36xx_clks[] = { |
| DT_CLK(NULL, "omap_192m_alwon_fck", "omap_192m_alwon_fck"), |
| DT_CLK(NULL, "uart4_fck", "uart4_fck"), |
| + DT_CLK(NULL, "uart4_ick", "uart4_ick"), |
| { .node_name = NULL }, |
| }; |
| |
