forked from Minki/linux
3cc3b617dc
use of_platform_populate to populate platform devices, it is suitable
for creating devices which are children of the root node, then makes
things like pcm work.
this patch removes sirfsoc_mach_init() function and lets arm core do
of_platform_populate:
static int __init customize_machine(void)
{
/*
* customizes platform devices, or adds new ones
* On DT based machines, we fall back to populating the
* machine from the device tree, if no callback is provided,
* otherwise we would always need an init_machine callback.
*/
if (machine_desc->init_machine)
machine_desc->init_machine();
else
of_platform_populate(NULL, of_default_bus_match_table,
NULL, NULL);
return 0;
}
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Rongjun Ying <Rongjun.Ying@csr.com>
92 lines
2.1 KiB
C
92 lines
2.1 KiB
C
/*
|
|
* Defines machines for CSR SiRFprimaII
|
|
*
|
|
* Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
|
|
*
|
|
* Licensed under GPLv2 or later.
|
|
*/
|
|
|
|
#include <linux/clocksource.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/irqchip.h>
|
|
#include <asm/sizes.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include "common.h"
|
|
|
|
void __init sirfsoc_init_late(void)
|
|
{
|
|
sirfsoc_pm_init();
|
|
}
|
|
|
|
static __init void sirfsoc_init_time(void)
|
|
{
|
|
/* initialize clocking early, we want to set the OS timer */
|
|
sirfsoc_of_clk_init();
|
|
clocksource_of_init();
|
|
}
|
|
|
|
static __init void sirfsoc_map_io(void)
|
|
{
|
|
sirfsoc_map_lluart();
|
|
sirfsoc_map_scu();
|
|
}
|
|
|
|
#ifdef CONFIG_ARCH_ATLAS6
|
|
static const char *atlas6_dt_match[] __initdata = {
|
|
"sirf,atlas6",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
|
|
/* Maintainer: Barry Song <baohua.song@csr.com> */
|
|
.nr_irqs = 128,
|
|
.map_io = sirfsoc_map_io,
|
|
.init_irq = irqchip_init,
|
|
.init_time = sirfsoc_init_time,
|
|
.init_late = sirfsoc_init_late,
|
|
.dt_compat = atlas6_dt_match,
|
|
.restart = sirfsoc_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_PRIMA2
|
|
static const char *prima2_dt_match[] __initdata = {
|
|
"sirf,prima2",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
|
|
/* Maintainer: Barry Song <baohua.song@csr.com> */
|
|
.nr_irqs = 128,
|
|
.map_io = sirfsoc_map_io,
|
|
.init_irq = irqchip_init,
|
|
.init_time = sirfsoc_init_time,
|
|
.dma_zone_size = SZ_256M,
|
|
.init_late = sirfsoc_init_late,
|
|
.dt_compat = prima2_dt_match,
|
|
.restart = sirfsoc_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_MARCO
|
|
static const char *marco_dt_match[] __initdata = {
|
|
"sirf,marco",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
|
|
/* Maintainer: Barry Song <baohua.song@csr.com> */
|
|
.smp = smp_ops(sirfsoc_smp_ops),
|
|
.map_io = sirfsoc_map_io,
|
|
.init_irq = irqchip_init,
|
|
.init_time = sirfsoc_init_time,
|
|
.init_late = sirfsoc_init_late,
|
|
.dt_compat = marco_dt_match,
|
|
.restart = sirfsoc_restart,
|
|
MACHINE_END
|
|
#endif
|