projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-samsung
[oweals/u-boot.git]
/
board
/
teejet
/
mt_ventoux
/
mt_ventoux.c
diff --git
a/board/teejet/mt_ventoux/mt_ventoux.c
b/board/teejet/mt_ventoux/mt_ventoux.c
index b4e01d1562569514486568aaff65cf921c96ff6e..6b05541964ccf5d2a4fb226221823199f056c048 100644
(file)
--- a/
board/teejet/mt_ventoux/mt_ventoux.c
+++ b/
board/teejet/mt_ventoux/mt_ventoux.c
@@
-102,9
+102,10
@@
static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
};
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
};
-int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
+int ehci_hcd_init(int index, enum usb_init_type init,
+ struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{
{
- return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);
+ return omap_ehci_hcd_init(
index,
&usbhs_bdata, hccr, hcor);
}
int ehci_hcd_stop(int index)
}
int ehci_hcd_stop(int index)
@@
-189,7
+190,7
@@
int fpga_clk_fn(int assert_clk, int flush, int cookie)
return assert_clk;
}
return assert_clk;
}
-
Xilinx_Spartan3_Slave_S
erial_fns mt_ventoux_fpga_fns = {
+
xilinx_spartan3_slave_s
erial_fns mt_ventoux_fpga_fns = {
fpga_pre_config_fn,
fpga_pgm_fn,
fpga_clk_fn,
fpga_pre_config_fn,
fpga_pgm_fn,
fpga_clk_fn,
@@
-199,7
+200,7
@@
Xilinx_Spartan3_Slave_Serial_fns mt_ventoux_fpga_fns = {
fpga_post_config_fn,
};
fpga_post_config_fn,
};
-
X
ilinx_desc fpga = XILINX_XC6SLX4_DESC(slave_serial,
+
x
ilinx_desc fpga = XILINX_XC6SLX4_DESC(slave_serial,
(void *)&mt_ventoux_fpga_fns, 0);
/* Initialize the FPGA */
(void *)&mt_ventoux_fpga_fns, 0);
/* Initialize the FPGA */
@@
-256,7
+257,7
@@
int misc_init_r(void)
int ret;
TAM3517_READ_EEPROM(&info, ret);
int ret;
TAM3517_READ_EEPROM(&info, ret);
-
dieid_num_r
();
+
omap_die_id_display
();
if (ret)
return 0;
if (ret)
return 0;
@@
-290,7
+291,7
@@
int board_eth_init(bd_t *bis)
return 0;
}
return 0;
}
-#if defined(CONFIG_
OMAP_HSMMC
) && \
+#if defined(CONFIG_
MMC_OMAP_HS
) && \
!defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
!defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{