mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
ARM: socfgpa: prepare for arch-wide .init_time callback
Current socfpga board init calls of_clk_init() from .machine_init. To allow consolidation of DT driven .time_init, move of_clock_init() to a temporary .time_init that will be removed when arch-wide callback is available. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Dinh Nguyen <dinguyen@altera.com>
This commit is contained in:
parent
27966ffe43
commit
8e7b25f1aa
1 changed files with 8 additions and 1 deletions
|
@ -15,6 +15,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <linux/clk-provider.h>
|
#include <linux/clk-provider.h>
|
||||||
|
#include <linux/clocksource.h>
|
||||||
#include <linux/irqchip.h>
|
#include <linux/irqchip.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
#include <linux/of_irq.h>
|
#include <linux/of_irq.h>
|
||||||
|
@ -90,6 +91,12 @@ static void __init socfpga_init_irq(void)
|
||||||
socfpga_sysmgr_init();
|
socfpga_sysmgr_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void __init socfpga_init_time(void)
|
||||||
|
{
|
||||||
|
of_clk_init(NULL);
|
||||||
|
clocksource_of_init();
|
||||||
|
}
|
||||||
|
|
||||||
static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)
|
static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)
|
||||||
{
|
{
|
||||||
u32 temp;
|
u32 temp;
|
||||||
|
@ -107,7 +114,6 @@ static void __init socfpga_cyclone5_init(void)
|
||||||
{
|
{
|
||||||
l2x0_of_init(0, ~0UL);
|
l2x0_of_init(0, ~0UL);
|
||||||
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
||||||
of_clk_init(NULL);
|
|
||||||
socfpga_init_clocks();
|
socfpga_init_clocks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,6 +126,7 @@ DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA")
|
||||||
.smp = smp_ops(socfpga_smp_ops),
|
.smp = smp_ops(socfpga_smp_ops),
|
||||||
.map_io = socfpga_map_io,
|
.map_io = socfpga_map_io,
|
||||||
.init_irq = socfpga_init_irq,
|
.init_irq = socfpga_init_irq,
|
||||||
|
.init_time = socfpga_init_time,
|
||||||
.init_machine = socfpga_cyclone5_init,
|
.init_machine = socfpga_cyclone5_init,
|
||||||
.restart = socfpga_cyclone5_restart,
|
.restart = socfpga_cyclone5_restart,
|
||||||
.dt_compat = altera_dt_match,
|
.dt_compat = altera_dt_match,
|
||||||
|
|
Loading…
Reference in a new issue