diff options
| author | Kefeng Wang <wangkefeng.wang@huawei.com> | 2016-06-01 14:53:04 +0800 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2016-06-23 15:00:36 -0500 |
| commit | 69d99e6c0d621febb2b6a22e27c4035da970e589 (patch) | |
| tree | 9d3e2b12734299b559e67b7d15fd33d4a22a04e8 | |
| parent | 2b658932356c54155dfec227316eaf81b3f17d83 (diff) | |
xtensa: Remove unnecessary of_platform_populate with default match table
After patch "of/platform: Add common method to populate default bus",
it is possible for arch code to remove unnecessary callers of
of_platform_populate with default match table.
Move of_clk_init() into time_init(), then drop xtensa_device_probe() fully.
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 11 | ||||
| -rw-r--r-- | arch/xtensa/kernel/time.c | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 9735691f37f1..18af563110a1 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -22,10 +22,8 @@ #include <linux/bootmem.h> #include <linux/kernel.h> #include <linux/percpu.h> -#include <linux/clk-provider.h> #include <linux/cpu.h> #include <linux/of_fdt.h> -#include <linux/of_platform.h> #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) # include <linux/console.h> @@ -252,15 +250,6 @@ void __init early_init_devtree(void *params) strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); } -static int __init xtensa_device_probe(void) -{ - of_clk_init(NULL); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); - return 0; -} - -device_initcall(xtensa_device_probe); - #endif /* CONFIG_OF */ /* diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index b9ad9feadc2d..6ec73c9f415d 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -15,6 +15,7 @@ #include <linux/errno.h> #include <linux/sched.h> #include <linux/time.h> +#include <linux/clk-provider.h> #include <linux/clocksource.h> #include <linux/clockchips.h> #include <linux/interrupt.h> @@ -148,6 +149,7 @@ void __init time_init(void) local_timer_setup(0); setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction); sched_clock_register(ccount_sched_clock_read, 32, ccount_freq); + of_clk_init(NULL); clocksource_probe(); } |