Commit 3526f74f authored by Kelvin Cheung's avatar Kelvin Cheung Committed by Ralf Baechle

clk: ls1x: Update relationship among all clocks

- Add clock lookups for APB devices.
 - Update clock relationship to make it more exact and clear.
                                 _____
         _______________________|     |
 OSC ___/                       | MUX |___ XXX CLK
        \___ PLL ___ XXX DIV ___|     |
                                |_____|
Signed-off-by: default avatarKelvin Cheung <keguang.zhang@gmail.com>
Cc: linux-kernel@vger.kernel.org
Cc: mturquette@linaro.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8026/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c5d58e9e
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
#include <loongson1.h> #include <loongson1.h>
#define OSC 33 #define OSC (33 * 1000000)
#define DIV_APB 2
static DEFINE_SPINLOCK(_lock); static DEFINE_SPINLOCK(_lock);
...@@ -34,8 +35,7 @@ static unsigned long ls1x_pll_recalc_rate(struct clk_hw *hw, ...@@ -34,8 +35,7 @@ static unsigned long ls1x_pll_recalc_rate(struct clk_hw *hw,
u32 pll, rate; u32 pll, rate;
pll = __raw_readl(LS1X_CLK_PLL_FREQ); pll = __raw_readl(LS1X_CLK_PLL_FREQ);
rate = ((12 + (pll & 0x3f)) * 1000000) + rate = 12 + (pll & 0x3f) + (((pll >> 8) & 0x3ff) >> 10);
((((pll >> 8) & 0x3ff) * 1000000) >> 10);
rate *= OSC; rate *= OSC;
rate >>= 1; rate >>= 1;
...@@ -48,8 +48,10 @@ static const struct clk_ops ls1x_pll_clk_ops = { ...@@ -48,8 +48,10 @@ static const struct clk_ops ls1x_pll_clk_ops = {
.recalc_rate = ls1x_pll_recalc_rate, .recalc_rate = ls1x_pll_recalc_rate,
}; };
static struct clk * __init clk_register_pll(struct device *dev, static struct clk *__init clk_register_pll(struct device *dev,
const char *name, const char *parent_name, unsigned long flags) const char *name,
const char *parent_name,
unsigned long flags)
{ {
struct clk_hw *hw; struct clk_hw *hw;
struct clk *clk; struct clk *clk;
...@@ -78,34 +80,83 @@ static struct clk * __init clk_register_pll(struct device *dev, ...@@ -78,34 +80,83 @@ static struct clk * __init clk_register_pll(struct device *dev,
return clk; return clk;
} }
static const char const *cpu_parents[] = { "cpu_clk_div", "osc_33m_clk", };
static const char const *ahb_parents[] = { "ahb_clk_div", "osc_33m_clk", };
static const char const *dc_parents[] = { "dc_clk_div", "osc_33m_clk", };
void __init ls1x_clk_init(void) void __init ls1x_clk_init(void)
{ {
struct clk *clk; struct clk *clk;
clk = clk_register_pll(NULL, "pll_clk", NULL, CLK_IS_ROOT); clk = clk_register_fixed_rate(NULL, "osc_33m_clk", NULL, CLK_IS_ROOT,
clk_prepare_enable(clk); OSC);
clk_register_clkdev(clk, "osc_33m_clk", NULL);
clk = clk_register_divider(NULL, "cpu_clk", "pll_clk", /* clock derived from 33 MHz OSC clk */
CLK_SET_RATE_PARENT, LS1X_CLK_PLL_DIV, DIV_CPU_SHIFT, clk = clk_register_pll(NULL, "pll_clk", "osc_33m_clk", 0);
DIV_CPU_WIDTH, CLK_DIVIDER_ONE_BASED, &_lock); clk_register_clkdev(clk, "pll_clk", NULL);
clk_prepare_enable(clk);
clk_register_clkdev(clk, "cpu", NULL);
clk = clk_register_divider(NULL, "dc_clk", "pll_clk", /* clock derived from PLL clk */
CLK_SET_RATE_PARENT, LS1X_CLK_PLL_DIV, DIV_DC_SHIFT, /* _____
* _______________________| |
* OSC ___/ | MUX |___ CPU CLK
* \___ PLL ___ CPU DIV ___| |
* |_____|
*/
clk = clk_register_divider(NULL, "cpu_clk_div", "pll_clk",
CLK_GET_RATE_NOCACHE, LS1X_CLK_PLL_DIV,
DIV_CPU_SHIFT, DIV_CPU_WIDTH,
CLK_DIVIDER_ONE_BASED |
CLK_DIVIDER_ROUND_CLOSEST, &_lock);
clk_register_clkdev(clk, "cpu_clk_div", NULL);
clk = clk_register_mux(NULL, "cpu_clk", cpu_parents,
ARRAY_SIZE(cpu_parents),
CLK_SET_RATE_NO_REPARENT, LS1X_CLK_PLL_DIV,
BYPASS_CPU_SHIFT, BYPASS_CPU_WIDTH, 0, &_lock);
clk_register_clkdev(clk, "cpu_clk", NULL);
/* _____
* _______________________| |
* OSC ___/ | MUX |___ DC CLK
* \___ PLL ___ DC DIV ___| |
* |_____|
*/
clk = clk_register_divider(NULL, "dc_clk_div", "pll_clk",
0, LS1X_CLK_PLL_DIV, DIV_DC_SHIFT,
DIV_DC_WIDTH, CLK_DIVIDER_ONE_BASED, &_lock); DIV_DC_WIDTH, CLK_DIVIDER_ONE_BASED, &_lock);
clk_prepare_enable(clk); clk_register_clkdev(clk, "dc_clk_div", NULL);
clk_register_clkdev(clk, "dc", NULL); clk = clk_register_mux(NULL, "dc_clk", dc_parents,
ARRAY_SIZE(dc_parents),
clk = clk_register_divider(NULL, "ahb_clk", "pll_clk", CLK_SET_RATE_NO_REPARENT, LS1X_CLK_PLL_DIV,
CLK_SET_RATE_PARENT, LS1X_CLK_PLL_DIV, DIV_DDR_SHIFT, BYPASS_DC_SHIFT, BYPASS_DC_WIDTH, 0, &_lock);
DIV_DDR_WIDTH, CLK_DIVIDER_ONE_BASED, &_lock); clk_register_clkdev(clk, "dc_clk", NULL);
clk_prepare_enable(clk);
clk_register_clkdev(clk, "ahb", NULL); /* _____
* _______________________| |
* OSC ___/ | MUX |___ DDR CLK
* \___ PLL ___ DDR DIV ___| |
* |_____|
*/
clk = clk_register_divider(NULL, "ahb_clk_div", "pll_clk",
0, LS1X_CLK_PLL_DIV, DIV_DDR_SHIFT,
DIV_DDR_WIDTH, CLK_DIVIDER_ONE_BASED,
&_lock);
clk_register_clkdev(clk, "ahb_clk_div", NULL);
clk = clk_register_mux(NULL, "ahb_clk", ahb_parents,
ARRAY_SIZE(ahb_parents),
CLK_SET_RATE_NO_REPARENT, LS1X_CLK_PLL_DIV,
BYPASS_DDR_SHIFT, BYPASS_DDR_WIDTH, 0, &_lock);
clk_register_clkdev(clk, "ahb_clk", NULL);
clk_register_clkdev(clk, "stmmaceth", NULL); clk_register_clkdev(clk, "stmmaceth", NULL);
clk = clk_register_fixed_factor(NULL, "apb_clk", "ahb_clk", 0, 1, 2); /* clock derived from AHB clk */
clk_prepare_enable(clk); /* APB clk is always half of the AHB clk */
clk_register_clkdev(clk, "apb", NULL); clk = clk_register_fixed_factor(NULL, "apb_clk", "ahb_clk", 0, 1,
DIV_APB);
clk_register_clkdev(clk, "apb_clk", NULL);
clk_register_clkdev(clk, "ls1x_i2c", NULL);
clk_register_clkdev(clk, "ls1x_pwmtimer", NULL);
clk_register_clkdev(clk, "ls1x_spi", NULL);
clk_register_clkdev(clk, "ls1x_wdt", NULL);
clk_register_clkdev(clk, "serial8250", NULL); clk_register_clkdev(clk, "serial8250", NULL);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment