hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This tag contains two MTU patches based on top of the ux500 sparse IRQ 

commit to avoid merge clashes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJQpkOmAAoJEEEQszewGV1zVQ8P/0WGwb+qp2iSMGQUzw2UOx7i
 POYaWiOPoVd6+WwhS4Y87j8BkD5jswPILK6rudyt3fBU9SmwinmF4OFYVbv07LXe
 qI+BjxS8Y2VyGM/xZLQmx/M7jzu3d9MF0mSIv9KBW5rQppBr8XBd0wtO2g7bPuuu
 BI77QoX8zClVdoid0qgwQWjsHtdrXqZ0p6iFGLMbUlAl26uzhGS7bzow7kufUJtM
 NdfzfJprdMYSDc1+1Krw4Zb4MTsCfKKhJJsDnfv83nnTqAxoZ2Ml676RYvj8inR1
 ptuA+1kT0BJqGyLCI3okMzp3z1vHodeE8NpAAItMgTdZ2b5hX8Tclzrf+byPqgJN
 xk+hmDne/I4Hl+JyG7E5dJHhLa+xdeIPte+7h/qvBvQzKeNuBRiSbjaKGw0KBLrB
 w773p70IaMFGDcBOU1akuP4Q9jU3S9VQkkTaCGH7jNxzsyvYFV9BOjlMzjDMVFc2
 APc9f0ARd3Ww014TDBC6X4L4OEkyN6/F6NnHJfFd+G+/zLSQG1+GnB9NiIrIwBmF
 FBYIsna1holAP239zWoBP23+GhH+OF46xRvt8TGIJO5E+p/KSJJU2VZkcsjOm15F
 ZJnfUeF9kE61QGgV4bQzNBw3Gc7Plk0GczAkqKDPX74oxtNsGI60aDi0UgMVa+G/
 L6cu+2gIUytKI+5Pr4r8
 =7BtO
 -----END PGP SIGNATURE-----

Merge tag 'mtu-clk-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/multiplatform

From Linus Walleij <linus.walleij@linaro.org>:

This tag contains two MTU patches based on top of the ux500 sparse IRQ
commit to avoid merge clashes.

* tag 'mtu-clk-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  clocksource/mtu-nomadik: use apb_pclk
  clk: ux500: Register mtu apb_pclocks

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-11-16 17:14:37 +01:00
parent f75ed2d395 16defa668d
commit 794c1539ab
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/clk/ux500/u8500_clk.c
View File

@ -160,12 +160,6 @@ void u8500_clk_init(void)
clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, CLK_IS_ROOT);
clk_register_clkdev(clk, NULL, "uicc");
/*
* FIXME: The MTU clocks might need some kind of "parent muxed join"
* and these have no K-clocks. For now, we ignore the missing
* connection to the corresponding P-clocks, p6_mtu0_clk and
* p6_mtu1_clk. Instead timclk is used which is the valid parent.
*/
clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, CLK_IS_ROOT);
clk_register_clkdev(clk, NULL, "mtu0");
clk_register_clkdev(clk, NULL, "mtu1");
@ -379,8 +373,11 @@ void u8500_clk_init(void)
clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", U8500_CLKRST6_BASE,
BIT(6), 0);
clk_register_clkdev(clk, "apb_pclk", "mtu0");
clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", U8500_CLKRST6_BASE,
BIT(7), 0);
clk_register_clkdev(clk, "apb_pclk", "mtu1");
/* PRCC K-clocks
*

8
drivers/clocksource/nomadik-mtu.c
View File

@ -177,9 +177,15 @@ void nmdk_clksrc_reset(void)
void __init nmdk_timer_init(void __iomem *base, int irq)
{
unsigned long rate;
struct clk *clk0;
struct clk *clk0, *pclk0;
mtu_base = base;
pclk0 = clk_get_sys("mtu0", "apb_pclk");
BUG_ON(IS_ERR(pclk0));
BUG_ON(clk_prepare(pclk0) < 0);
BUG_ON(clk_enable(pclk0) < 0);
clk0 = clk_get_sys("mtu0", NULL);
BUG_ON(IS_ERR(clk0));
BUG_ON(clk_prepare(clk0) < 0);