![Tony Lindgren](/assets/img/avatar_default.png)
As the plat and mach includes need to disappear for single zImage work, we need to remove plat/hardware.h. Do this by splitting plat/hardware.h into omap1 and omap2+ specific files. The old plat/hardware.h already has omap1 only defines, so it gets moved to mach/hardware.h for omap1. For omap2+, we use the local soc.h that for now just includes the related SoC headers to keep this patch more readable. Note that the local soc.h still includes plat/cpu.h that can be dealt with in later patches. Let's also include plat/serial.h from common.h for all the board-*.c files. This allows making the include files local later on without patching these files again. Note that only minimal changes are done in this patch for the drivers/watchdog/omap_wdt.c driver to keep things compiling. Further patches are needed to eventually remove cpu_is_omap usage in the drivers. Also only minimal changes are done to sound/soc/omap/* to remove the unneeded includes and to define OMAP44XX_MCPDM_L3_BASE locally so there's no need to include omap44xx.h. While at it, also sort some of the includes in the standard way. Cc: linux-watchdog@vger.kernel.org Cc: alsa-devel@alsa-project.org Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Acked-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
62 lines
1.7 KiB
C
62 lines
1.7 KiB
C
/*
|
|
* Code for TI8168/TI8148 EVM.
|
|
*
|
|
* Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
* kind, whether express or implied; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "common.h"
|
|
#include <plat/usb.h>
|
|
|
|
static struct omap_musb_board_data musb_board_data = {
|
|
.set_phy_power = ti81xx_musb_phy_power,
|
|
.interface_type = MUSB_INTERFACE_ULPI,
|
|
.mode = MUSB_OTG,
|
|
.power = 500,
|
|
};
|
|
|
|
static void __init ti81xx_evm_init(void)
|
|
{
|
|
omap_serial_init();
|
|
omap_sdrc_init(NULL, NULL);
|
|
usb_musb_init(&musb_board_data);
|
|
}
|
|
|
|
MACHINE_START(TI8168EVM, "ti8168evm")
|
|
/* Maintainer: Texas Instruments */
|
|
.atag_offset = 0x100,
|
|
.map_io = ti81xx_map_io,
|
|
.init_early = ti81xx_init_early,
|
|
.init_irq = ti81xx_init_irq,
|
|
.timer = &omap3_timer,
|
|
.init_machine = ti81xx_evm_init,
|
|
.init_late = ti81xx_init_late,
|
|
.restart = omap_prcm_restart,
|
|
MACHINE_END
|
|
|
|
MACHINE_START(TI8148EVM, "ti8148evm")
|
|
/* Maintainer: Texas Instruments */
|
|
.atag_offset = 0x100,
|
|
.map_io = ti81xx_map_io,
|
|
.init_early = ti81xx_init_early,
|
|
.init_irq = ti81xx_init_irq,
|
|
.timer = &omap3_timer,
|
|
.init_machine = ti81xx_evm_init,
|
|
.init_late = ti81xx_init_late,
|
|
.restart = omap_prcm_restart,
|
|
MACHINE_END
|