ARM: tegra: a couple clock bug-fixes
Subsystems (3)
cover ARM: tegra: a couple clock bug-fixes
From: Stephen Warren <[email protected]>
Arnd, Olof,
The following two patches fix a couple issues in the Tegra20 clock driver that show up on specific platforms. They were sent a little late for 3.9, and I forgot to include them for 3.10 since they weren't reposted:-(
Patch 1 is clearly a bug-fix. Someone pedantic could argue that patch 2 is a new feature since it's the last piece to enabling AC'97 support, but I'd argue that it's a bug in the clock driver that it didn't support this clock when it was first written:-)
These patches logically belong to Tegra's for-3.10/clk branch, but feel free to apply them where is easiest; it'd be fine to defer them to a post- 3.10-rc1 fixes branch too if you want.
Lucas Stach (2):
clk: tegra: remove USB from clk init table
clk: tegra: add ac97 controller clock
drivers/clk/tegra/clk-tegra20.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/2 clk: tegra: remove USB from clk init table
From: Lucas Stach <[email protected]>
The USB clocks are just clock gates, so no need to set a specific clock. In fact trying to set a specific clock is just a NOP if the requested clockrate is the same as those of the parent (clk_m) or will trigger a WARN_ON() if rates don't match up.
As we are not setting a specific rate, nor activating the clocks at init, there is no point in keeping the the usb entries in the clock init table.
--- drivers/clk/tegra/clk-tegra20.c | 3 --- 1 file changed, 3 deletions(-)
drivers/clk/tegra/clk-tegra20.c +0 -3
@@ -1234,9 +1234,6 @@ static __initdata struct tegra_clk_init_table init_table[] = { {uartc, pll_p, 0, 0}, {uartd, pll_p, 0, 0}, {uarte, pll_p, 0, 0}, - {usbd, clk_max, 12000000, 0}, - {usb2, clk_max, 12000000, 0}, - {usb3, clk_max, 12000000, 0}, {pll_a, clk_max, 56448000, 1}, {pll_a_out0, clk_max, 11289600, 1}, {cdev1, clk_max, 0, 1},
Signature · 1 line
1.7.10.4
PATCH 2/2 clk: tegra: add ac97 controller clock
In reply to Stephen WarrenFrom: Lucas Stach <[email protected]>
AC97 controller clock is hardwired to pll_a_out0.
--- drivers/clk/tegra/clk-tegra20.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/tegra/clk-tegra20.c +8 -0
@@ -872,6 +872,14 @@ static void __init tegra20_periph_clk_init(void)struct clk *clk;int i; +/* ac97 */ + clk =tegra_clk_register_periph_gate ("ac97" ,"pll_a_out0" , +TEGRA_PERIPH_ON_APB , + clk_base,0 ,3 , &periph_l_regs, + periph_clk_enb_refcnt); +clk_register_clkdev (clk,NULL ,"tegra20-ac97" ); + clks[ac97] = clk; +/* apbdma */ clk = tegra_clk_register_periph_gate("apbdma", "pclk", 0, clk_base, 0, 34, &periph_h_regs,
Signature · 1 line
1.7.10.4
Olof Johansson
Appliedcover ARM: tegra: a couple clock bug-fixes
In reply to Stephen WarrenQuoted 7 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Arnd, Olof,
The following two patches fix a couple issues in the Tegra20 clock driver that show up on specific platforms. They were sent a little late for 3.9, and I forgot to include them for 3.10 since they weren't reposted:-(
Applied to fixes now, sorry for missing them earlier.
Quoted 4 lines
Patch 1 is clearly a bug-fix. Someone pedantic could argue that patch 2 is a new feature since it's the last piece to enabling AC'97 support, but I'd argue that it's a bug in the clock driver that it didn't support this clock when it was first written:-)
For very early -rc we can be a bit more flexible, so this is ok with me at the moment.
Quoted 3 lines
These patches logically belong to Tegra's for-3.10/clk branch, but feel free to apply them where is easiest; it'd be fine to defer them to a post- 3.10-rc1 fixes branch too if you want.
Postponed in effect due to missing them earlier.
Btw, since the drivers have moved and most of the churn is completed, fixes like these really can go straight to Mike Turquette from here on out.
-Olof
cover ARM: tegra: a couple clock bug-fixes
Quoted 10 lines · Olof Johansson
Quoted 7 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Arnd, Olof,
The following two patches fix a couple issues in the Tegra20 clock driver that show up on specific platforms. They were sent a little late for 3.9, and I forgot to include them for 3.10 since they weren't reposted:-(
Applied to fixes now, sorry for missing them earlier.
Great, thanks. Just to be clear; it was me who missed picking them up; I don't think they'd been forwarded to you before with all the acks in place.