ARC: [plat-axs103] use clk driver #1: Get rid of platform specific cpu clk setting

historically axs103 platform code used to set the cpu clk by writing to
PLL registers directly. however the axs10x clk driver is now upstream so
no need to do this amymore.

Driver is selected automatically when CONFIG_ARC_PLAT_AXS10X is set

Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
[vgupta: deleted more code not needed anymore]

diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c
index 38ff349..6c0cb08 100644 (file)
--- a/arch/arc/plat-axs10x/axs10x.c
+++ b/arch/arc/plat-axs10x/axs10x.c
@@ -80,22 +80,6 @@ static void __init axs10x_enable_gpio_intc_wire(void)
        iowrite32(1 << MB_TO_GPIO_IRQ, (void __iomem *) GPIO_INTEN);
 }
 
-static inline void __init
-write_cgu_reg(uint32_t value, void __iomem *reg, void __iomem *lock_reg)
-{
-       unsigned int loops = 128 * 1024, ctr;
-
-       iowrite32(value, reg);
-
-       ctr = loops;
-       while (((ioread32(lock_reg) & 1) == 1) && ctr--) /* wait for unlock */
-               cpu_relax();
-
-       ctr = loops;
-       while (((ioread32(lock_reg) & 1) == 0) && ctr--) /* wait for re-lock */
-               cpu_relax();
-}
-
 static void __init axs10x_print_board_ver(unsigned int creg, const char *str)
 {
        union ver {
@@ -314,7 +298,6 @@ static void __init axs101_early_init(void)
 
 #ifdef CONFIG_AXS103
 
-#define AXC003_CGU     0xF0000000
 #define AXC003_CREG    0xF0001000
 #define AXC003_MST_AXI_TUNNEL  0
 #define AXC003_MST_HS38                1
@@ -324,72 +307,12 @@ static void __init axs101_early_init(void)
 #define CREG_CPU_TUN_IO_CTRL   (AXC003_CREG + 0x494)
 
 
-union pll_reg {
-       struct {
-#ifdef CONFIG_CPU_BIG_ENDIAN
-               unsigned int pad:17, noupd:1, bypass:1, edge:1, high:6, low:6;
-#else
-               unsigned int low:6, high:6, edge:1, bypass:1, noupd:1, pad:17;
-#endif
-       };
-       unsigned int val;
-};
-
-static unsigned int __init axs103_get_freq(void)
-{
-       union pll_reg idiv, fbdiv, odiv;
-       unsigned int f = 33333333;
-
-       idiv.val = ioread32((void __iomem *)AXC003_CGU + 0x80 + 0);
-       fbdiv.val = ioread32((void __iomem *)AXC003_CGU + 0x80 + 4);
-       odiv.val = ioread32((void __iomem *)AXC003_CGU + 0x80 + 8);
-
-       if (idiv.bypass != 1)
-               f = f / (idiv.low + idiv.high);
-
-       if (fbdiv.bypass != 1)
-               f = f * (fbdiv.low + fbdiv.high);
-
-       if (odiv.bypass != 1)
-               f = f / (odiv.low + odiv.high);
-
-       f = (f + 500000) / 1000000; /* Rounding */
-       return f;
-}
-
-static inline unsigned int __init encode_div(unsigned int id, int upd)
-{
-       union pll_reg div;
-
-       div.val = 0;
-
-       div.noupd = !upd;
-       div.bypass = id == 1 ? 1 : 0;
-       div.edge = (id%2 == 0) ? 0 : 1;  /* 0 = rising */
-       div.low = (id%2 == 0) ? id >> 1 : (id >> 1)+1;
-       div.high = id >> 1;
-
-       return div.val;
-}
-
-noinline static void __init
-axs103_set_freq(unsigned int id, unsigned int fd, unsigned int od)
-{
-       write_cgu_reg(encode_div(id, 0),
-                     (void __iomem *)AXC003_CGU + 0x80 + 0,
-                     (void __iomem *)AXC003_CGU + 0x110);
-
-       write_cgu_reg(encode_div(fd, 0),
-                     (void __iomem *)AXC003_CGU + 0x80 + 4,
-                     (void __iomem *)AXC003_CGU + 0x110);
-
-       write_cgu_reg(encode_div(od, 1),
-                     (void __iomem *)AXC003_CGU + 0x80 + 8,
-                     (void __iomem *)AXC003_CGU + 0x110);
-}
-
 static void __init axs103_early_init(void)
 {
+       /*
+        * TODO: use cpu node "cpu-freq" param instead of platform-specific
+        * "/cpu_card/core_clk" as it works only if we use fixed-clock for cpu.
+        */
        int offset = fdt_path_offset(initial_boot_params, "/cpu_card/core_clk");
        const struct fdt_property *prop = fdt_get_property(initial_boot_params,
                                                           offset,
@@ -399,7 +322,7 @@ static void __init axs103_early_init(void)
 
        /*
         * AXS103 configurations for SMP/QUAD configurations share device tree
-        * which defaults to 90 MHz. However recent failures of Quad config
+        * which defaults to 100 MHz. However recent failures of Quad config
         * revealed P&R timing violations so clamp it down to safe 50 MHz
         * Instead of duplicating defconfig/DT for SMP/QUAD, add a small hack
         *
@@ -412,37 +335,6 @@ static void __init axs103_early_init(void)
                freq = 50;
 #endif
 
-       switch (freq) {
-       case 33:
-               axs103_set_freq(1, 1, 1);
-               break;
-       case 50:
-               axs103_set_freq(1, 30, 20);
-               break;
-       case 75:
-               axs103_set_freq(2, 45, 10);
-               break;
-       case 90:
-               axs103_set_freq(2, 54, 10);
-               break;
-       case 100:
-               axs103_set_freq(1, 30, 10);
-               break;
-       case 125:
-               axs103_set_freq(2, 45,  6);
-               break;
-       default:
-               /*
-                * In this case, core_frequency derived from
-                * DT "clock-frequency" might not match with board value.
-                * Hence update it to match the board value.
-                */
-               freq = axs103_get_freq();
-               break;
-       }
-
-       pr_info("Freq is %dMHz\n", freq);
-
        /* Patching .dtb in-place with new core clock value */
        if (freq != orig ) {
                freq = cpu_to_be32(freq * 1000000);