forked from Minki/linux
6f69a1815a
the early_param() call in board-omap3touchbook.c expands to: static const char __setup_str_early_touchbook_revision[] __section(.init.rodata) _aligned(1) = tbr; [...] and we have a non-const variable being added to the same section: static struct ehci_hcd_omap_platform_data ehci_pdata __section(.init.rodata); because of that, gcc generates a section type conflict which can (and actually should) be avoided by marking const every variable marked with __initconst. This patch fixes that for the ehci_hdc_omap_platform_data. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
114 lines
2.6 KiB
C
Executable File
114 lines
2.6 KiB
C
Executable File
/*
|
|
* Copyright (C) 2009 Texas Instruments Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/input.h>
|
|
#include <linux/gpio.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include <plat/common.h>
|
|
#include <plat/board.h>
|
|
#include <plat/gpmc-smc91x.h>
|
|
#include <plat/mux.h>
|
|
#include <plat/usb.h>
|
|
|
|
#include <mach/board-zoom.h>
|
|
|
|
#include "mux.h"
|
|
#include "sdram-hynix-h8mbx00u0mer-0em.h"
|
|
|
|
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
|
|
|
|
static struct omap_smc91x_platform_data board_smc91x_data = {
|
|
.cs = 3,
|
|
.flags = GPMC_MUX_ADD_DATA | IORESOURCE_IRQ_LOWLEVEL,
|
|
};
|
|
|
|
static void __init board_smc91x_init(void)
|
|
{
|
|
board_smc91x_data.gpio_irq = 158;
|
|
gpmc_smc91x_init(&board_smc91x_data);
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void board_smc91x_init(void)
|
|
{
|
|
}
|
|
|
|
#endif /* defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) */
|
|
|
|
static void enable_board_wakeup_source(void)
|
|
{
|
|
/* T2 interrupt line (keypad) */
|
|
omap_mux_init_signal("sys_nirq",
|
|
OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);
|
|
}
|
|
|
|
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
|
|
|
|
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
|
|
.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
|
|
.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
|
|
|
|
.phy_reset = true,
|
|
.reset_gpio_port[0] = 126,
|
|
.reset_gpio_port[1] = 61,
|
|
.reset_gpio_port[2] = -EINVAL
|
|
};
|
|
|
|
static void __init omap_sdp_map_io(void)
|
|
{
|
|
omap2_set_globals_36xx();
|
|
omap34xx_map_common_io();
|
|
}
|
|
|
|
static struct omap_board_config_kernel sdp_config[] __initdata = {
|
|
};
|
|
|
|
static void __init omap_sdp_init_irq(void)
|
|
{
|
|
omap_board_config = sdp_config;
|
|
omap_board_config_size = ARRAY_SIZE(sdp_config);
|
|
omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
|
|
h8mbx00u0mer0em_sdrc_params);
|
|
omap_init_irq();
|
|
omap_gpio_init();
|
|
}
|
|
|
|
#ifdef CONFIG_OMAP_MUX
|
|
static struct omap_board_mux board_mux[] __initdata = {
|
|
{ .reg_offset = OMAP_MUX_TERMINATOR },
|
|
};
|
|
#else
|
|
#define board_mux NULL
|
|
#endif
|
|
|
|
static void __init omap_sdp_init(void)
|
|
{
|
|
omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
|
|
zoom_peripherals_init();
|
|
board_smc91x_init();
|
|
enable_board_wakeup_source();
|
|
usb_ehci_init(&ehci_pdata);
|
|
}
|
|
|
|
MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")
|
|
.phys_io = 0x48000000,
|
|
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
|
|
.boot_params = 0x80000100,
|
|
.map_io = omap_sdp_map_io,
|
|
.init_irq = omap_sdp_init_irq,
|
|
.init_machine = omap_sdp_init,
|
|
.timer = &omap_timer,
|
|
MACHINE_END
|