This is Loongson 1A's bug that the pll register can't be read,
so we set the cpu clk in the inline command line.
The command line format is cpu_clk=osc_clk,cpu_mul, the osc_clk standby cpu clock
and the cpu_mul repect the clock multiplier.
For example, we use the command is cpu_clk=33333333,8
Signed-off-by: Chunbo Cui <cuicb@xxxxxxxxxx>
Signed-off-by: Binbin Zhou <zhoubb@xxxxxxxxxx>
Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
---
arch/mips/include/asm/mach-loongson1/loongson1.h | 2 ++
arch/mips/loongson1/common/platform.c | 8 +++++++-
arch/mips/loongson1/common/time.c | 11 +++++++++++
arch/mips/loongson1/ls1a/board.c | 2 ++
drivers/clk/clk-ls1x.c | 19 +++++++++++++++----
5 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/arch/mips/include/asm/mach-loongson1/loongson1.h b/arch/mips/include/asm/mach-loongson1/loongson1.h
index c7689ad..c7ce66e 100644
--- a/arch/mips/include/asm/mach-loongson1/loongson1.h
+++ b/arch/mips/include/asm/mach-loongson1/loongson1.h
@@ -165,6 +165,8 @@
#define ls1x_writew(val, addr) (*(volatile u16 *)CKSEG1ADDR(addr) = (val))
#define ls1x_writel(val, addr) (*(volatile u32 *)CKSEG1ADDR(addr) = (val))
+extern unsigned int ls1a_osc_clk, ls1a_cpu_mul;
+
#include <regs-clk.h>
#include <regs-mux.h>
#include <regs-pwm.h>
diff --git a/arch/mips/loongson1/common/platform.c b/arch/mips/loongson1/common/platform.c
index 97d8c01..a5bb1eb 100644
--- a/arch/mips/loongson1/common/platform.c
+++ b/arch/mips/loongson1/common/platform.c
@@ -63,9 +63,14 @@ struct platform_device ls1x_uart_pdev = {
void __init ls1x_serial_setup(struct platform_device *pdev)
{
- struct clk *clk;
struct plat_serial8250_port *p;
+#ifdef CONFIG_CPU_LOONGSON1A
+ for (p = pdev->dev.platform_data; p->flags != 0; ++p)
+ p->uartclk = ls1a_osc_clk * 2;
+#else
+ struct clk *clk;
+
clk = clk_get(&pdev->dev, pdev->name);
if (IS_ERR(clk)) {
pr_err("unable to get %s clock, err=%ld",
@@ -76,6 +81,7 @@ void __init ls1x_serial_setup(struct platform_device *pdev)
for (p = pdev->dev.platform_data; p->flags != 0; ++p)
p->uartclk = clk_get_rate(clk);
+#endif
}
/* CPUFreq */
diff --git a/arch/mips/loongson1/common/time.c b/arch/mips/loongson1/common/time.c
index df0f850..c9f2ee4 100644
--- a/arch/mips/loongson1/common/time.c
+++ b/arch/mips/loongson1/common/time.c
@@ -224,3 +224,14 @@ void __init plat_time_init(void)
mips_hpt_frequency = clk_get_rate(clk) / 2;
#endif /* CONFIG_CEVT_CSRC_LS1X */
}
+
+#ifdef CONFIG_CPU_LOONGSON1A
+unsigned int ls1a_osc_clk = 0, ls1a_cpu_mul = 0;
+
+static int __init get_cpu_clk(char *string)
+{
+ sscanf(string, "%u,%u", &ls1a_osc_clk, &ls1a_cpu_mul);
+ return 1;
+}
+__setup("cpu_clk=", get_cpu_clk);
+#endif
diff --git a/arch/mips/loongson1/ls1a/board.c b/arch/mips/loongson1/ls1a/board.c
index 98fb86c..9c53ecc 100644
--- a/arch/mips/loongson1/ls1a/board.c
+++ b/arch/mips/loongson1/ls1a/board.c
@@ -95,6 +95,8 @@ int __init ls1a_platform_init(void)
{
ls1a_route_setting();
+ ls1x_serial_setup(&ls1x_uart_pdev);
+
i2c_register_board_info(1, &ls1a_pcf8563, 1);
spi_register_board_info(ls1a_spi_info, ARRAY_SIZE(ls1a_spi_info));
diff --git a/drivers/clk/clk-ls1x.c b/drivers/clk/clk-ls1x.c
index ca80103..93eda9e 100644
--- a/drivers/clk/clk-ls1x.c
+++ b/drivers/clk/clk-ls1x.c
@@ -32,6 +32,14 @@ static void ls1x_pll_clk_disable(struct clk_hw *hw)
static unsigned long ls1x_pll_recalc_rate(struct clk_hw *hw,
unsigned long parent_rate)
{
+#ifdef CONFIG_CPU_LOONGSON1A
+ /* workaround, loongson 1A pll register can't be read,
+ * on gateway board, multi is set to 11 */
+ if (ls1a_osc_clk != 0 && ls1a_cpu_mul != 0)
+ return ls1a_osc_clk * ls1a_cpu_mul;
+ else
+ return 33333333 * 8;
+#else
u32 pll, rate;
pll = __raw_readl(LS1X_CLK_PLL_FREQ);
@@ -40,6 +48,7 @@ static unsigned long ls1x_pll_recalc_rate(struct clk_hw *hw,
rate >>= 1;
return rate;
+#endif
}
static const struct clk_ops ls1x_pll_clk_ops = {
@@ -107,7 +116,8 @@ void __init ls1x_clk_init(void)
CLK_GET_RATE_NOCACHE, LS1X_CLK_PLL_DIV,
DIV_CPU_SHIFT, DIV_CPU_WIDTH,
CLK_DIVIDER_ONE_BASED |
- CLK_DIVIDER_ROUND_CLOSEST, &_lock);
+ CLK_DIVIDER_ROUND_CLOSEST |
+ CLK_DIVIDER_ALLOW_ZERO, &_lock);
clk_register_clkdev(clk, "cpu_clk_div", NULL);
clk = clk_register_mux(NULL, "cpu_clk", cpu_parents,
ARRAY_SIZE(cpu_parents),
@@ -123,7 +133,8 @@ void __init ls1x_clk_init(void)
*/
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 |
+ CLK_DIVIDER_ALLOW_ZERO, &_lock);
clk_register_clkdev(clk, "dc_clk_div", NULL);
clk = clk_register_mux(NULL, "dc_clk", dc_parents,
ARRAY_SIZE(dc_parents),
@@ -139,8 +150,8 @@ void __init ls1x_clk_init(void)
*/
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);
+ DIV_DDR_WIDTH, CLK_DIVIDER_ONE_BASED |
+ CLK_DIVIDER_ALLOW_ZERO, &_lock);
clk_register_clkdev(clk, "ahb_clk_div", NULL);
clk = clk_register_mux(NULL, "ahb_clk", ahb_parents,
ARRAY_SIZE(ahb_parents),
--
1.9.0
