aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arc/kernel/devtree.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arc/kernel/devtree.c')
-rw-r--r--arch/arc/kernel/devtree.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index 7e844fd8213f..f1e07c2344f8 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -14,7 +14,6 @@
14#include <linux/memblock.h> 14#include <linux/memblock.h>
15#include <linux/of.h> 15#include <linux/of.h>
16#include <linux/of_fdt.h> 16#include <linux/of_fdt.h>
17#include <asm/clk.h>
18#include <asm/mach_desc.h> 17#include <asm/mach_desc.h>
19 18
20#ifdef CONFIG_SERIAL_EARLYCON 19#ifdef CONFIG_SERIAL_EARLYCON
@@ -28,14 +27,12 @@ unsigned int __init arc_early_base_baud(void)
28 27
29static void __init arc_set_early_base_baud(unsigned long dt_root) 28static void __init arc_set_early_base_baud(unsigned long dt_root)
30{ 29{
31 unsigned int core_clk = arc_get_core_freq();
32
33 if (of_flat_dt_is_compatible(dt_root, "abilis,arc-tb10x")) 30 if (of_flat_dt_is_compatible(dt_root, "abilis,arc-tb10x"))
34 arc_base_baud = core_clk/3; 31 arc_base_baud = 166666666; /* Fixed 166.6MHz clk (TB10x) */
35 else if (of_flat_dt_is_compatible(dt_root, "snps,arc-sdp")) 32 else if (of_flat_dt_is_compatible(dt_root, "snps,arc-sdp"))
36 arc_base_baud = 33333333; /* Fixed 33MHz clk (AXS10x) */ 33 arc_base_baud = 33333333; /* Fixed 33MHz clk (AXS10x) */
37 else 34 else
38 arc_base_baud = core_clk; 35 arc_base_baud = 50000000; /* Fixed default 50MHz */
39} 36}
40#else 37#else
41#define arc_set_early_base_baud(dt_root) 38#define arc_set_early_base_baud(dt_root)
@@ -65,8 +62,6 @@ const struct machine_desc * __init setup_machine_fdt(void *dt)
65{ 62{
66 const struct machine_desc *mdesc; 63 const struct machine_desc *mdesc;
67 unsigned long dt_root; 64 unsigned long dt_root;
68 const void *clk;
69 int len;
70 65
71 if (!early_init_dt_scan(dt)) 66 if (!early_init_dt_scan(dt))
72 return NULL; 67 return NULL;
@@ -76,10 +71,6 @@ const struct machine_desc * __init setup_machine_fdt(void *dt)
76 machine_halt(); 71 machine_halt();
77 72
78 dt_root = of_get_flat_dt_root(); 73 dt_root = of_get_flat_dt_root();
79 clk = of_get_flat_dt_prop(dt_root, "clock-frequency", &len);
80 if (clk)
81 arc_set_core_freq(of_read_ulong(clk, len/4));
82
83 arc_set_early_base_baud(dt_root); 74 arc_set_early_base_baud(dt_root);
84 75
85 return mdesc; 76 return mdesc;