Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 689a318c authored by Linus Walleij's avatar Linus Walleij Committed by Stephen Boyd
Browse files

clk: ux500: move AB8500 sysclk over to PRCMU clk driver 



The AB8500 sysclk is just another PRCMU-controlled clock, there
is no reason why it should be in the ABx500-controlled part of
the clock implementation. Doing this and the corresponding device
tree changes makes USB work on the Ux500 again.

Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 0c744ea4

drivers/clk/ux500/abx500-clk.c

+0 −8
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/mfd/abx500/ab8500-sysctrl.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/mfd/dbx500-prcmu.h>

#include "clk.h"



/* Clock definitions for ab8500 */
@@ -39,13 +38,6 @@ static int ab8500_reg_clks(struct device *dev) 
	if (ret)

		return ret;



	/* ab8500_sysclk */

	clk = clk_reg_prcmu_gate("ab8500_sysclk", NULL, PRCMU_SYSCLK, 0);

	clk_register_clkdev(clk, "sysclk", "ab8500-usb.0");

	clk_register_clkdev(clk, "sysclk", "ab-iddet.0");

	clk_register_clkdev(clk, "sysclk", "snd-soc-mop500.0");

	clk_register_clkdev(clk, "sysclk", "shrm_bus");



	/* ab8500_sysclk2 */

	clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk2", "ab8500_sysclk",

		AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ,

drivers/clk/ux500/u8500_of_clk.c

+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,9 @@ static void u8500_clk_init(struct device_node *np) 
	clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, 0);

	prcmu_clk[PRCMU_TIMCLK] = clk;



	clk = clk_reg_prcmu_gate("ab8500_sysclk", NULL, PRCMU_SYSCLK, 0);

	prcmu_clk[PRCMU_SYSCLK] = clk;



	clk = clk_reg_prcmu_opp_volt_scalable("sdmmcclk", NULL, PRCMU_SDMMCCLK,

					100000000, CLK_SET_RATE_GATE);

	prcmu_clk[PRCMU_SDMMCCLK] = clk;