mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
421b759b86
Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
68 lines
1.8 KiB
C
68 lines
1.8 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 <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <plat/irqs.h>
|
|
#include <plat/board.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 struct omap_board_config_kernel ti81xx_evm_config[] __initdata = {
|
|
};
|
|
|
|
static void __init ti81xx_evm_init(void)
|
|
{
|
|
omap_serial_init();
|
|
omap_sdrc_init(NULL, NULL);
|
|
omap_board_config = ti81xx_evm_config;
|
|
omap_board_config_size = ARRAY_SIZE(ti81xx_evm_config);
|
|
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,
|
|
.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,
|
|
.restart = omap_prcm_restart,
|
|
MACHINE_END
|