projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mmc
[platform/kernel/u-boot.git]
/
board
/
quipos
/
cairo
/
cairo.c
diff --git
a/board/quipos/cairo/cairo.c
b/board/quipos/cairo/cairo.c
index
21793e8
..
6cf5409
100644
(file)
--- a/
board/quipos/cairo/cairo.c
+++ b/
board/quipos/cairo/cairo.c
@@
-26,18
+26,6
@@
DECLARE_GLOBAL_DATA_PTR;
/*
DECLARE_GLOBAL_DATA_PTR;
/*
- * MUSB port on OMAP3EVM Rev >= E requires extvbus programming.
- */
-u8 omap3_evm_need_extvbus(void)
-{
- u8 retval = 0;
-
- /* TODO: verify if cairo handheld platform needs extvbus programming */
-
- return retval;
-}
-
-/*
* Routine: board_init
* Description: Early hardware init.
*/
* Routine: board_init
* Description: Early hardware init.
*/
@@
-45,7
+33,7
@@
int board_init(void)
{
gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
/* board id for Linux */
{
gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
/* board id for Linux */
- gd->bd->bi_arch_number =
MACH_TYPE_OMAP3_CAIRO
;
+ gd->bd->bi_arch_number =
CONFIG_MACH_TYPE
;
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
return 0;
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
return 0;
@@
-62,7
+50,7
@@
void set_muxconf_regs(void)
MUX_CAIRO();
}
MUX_CAIRO();
}
-#if defined(CONFIG_
GENERIC_MMC) && !defined(CONFIG_SPL_BUILD
)
+#if defined(CONFIG_
MMC
)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
@@
-91,9
+79,10
@@
void get_board_mem_timings(struct board_sdrc_timings *timings)
#endif
static const struct ns16550_platdata cairo_serial = {
#endif
static const struct ns16550_platdata cairo_serial = {
- OMAP34XX_UART2,
- 2,
- V_NS16550_CLK
+ .base = OMAP34XX_UART2,
+ .reg_shift = 2,
+ .clock = V_NS16550_CLK,
+ .fcr = UART_FCR_DEFVAL,
};
U_BOOT_DEVICE(cairo_uart) = {
};
U_BOOT_DEVICE(cairo_uart) = {