mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
omap2/3: Fix initcalls for multi-omap
Otherwise the wrong initcalls can run. Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
140455fa00
commit
4323e9f719
2 changed files with 9 additions and 1 deletions
|
@ -510,7 +510,12 @@ static struct platform_device dummy_pdev = {
|
||||||
**/
|
**/
|
||||||
static void __init omap_hsmmc_reset(void)
|
static void __init omap_hsmmc_reset(void)
|
||||||
{
|
{
|
||||||
u32 i, nr_controllers = cpu_is_omap44xx() ? OMAP44XX_NR_MMC :
|
u32 i, nr_controllers;
|
||||||
|
|
||||||
|
if (cpu_is_omap242x())
|
||||||
|
return;
|
||||||
|
|
||||||
|
nr_controllers = cpu_is_omap44xx() ? OMAP44XX_NR_MMC :
|
||||||
(cpu_is_omap34xx() ? OMAP34XX_NR_MMC : OMAP24XX_NR_MMC);
|
(cpu_is_omap34xx() ? OMAP34XX_NR_MMC : OMAP24XX_NR_MMC);
|
||||||
|
|
||||||
for (i = 0; i < nr_controllers; i++) {
|
for (i = 0; i < nr_controllers; i++) {
|
||||||
|
|
|
@ -56,6 +56,9 @@ static struct amba_device omap3_etm_device = {
|
||||||
|
|
||||||
static int __init emu_init(void)
|
static int __init emu_init(void)
|
||||||
{
|
{
|
||||||
|
if (!cpu_is_omap34xx())
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
amba_device_register(&omap3_etb_device, &iomem_resource);
|
amba_device_register(&omap3_etb_device, &iomem_resource);
|
||||||
amba_device_register(&omap3_etm_device, &iomem_resource);
|
amba_device_register(&omap3_etm_device, &iomem_resource);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue