Merge branch '2021-02-01-assorted-fixes'

[J-u-boot.git] / board / toradex / colibri_imx6 / colibri_imx6.c

diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 6522af416a8642189edce1f17eb6db1af4303228..57d3e526b4c00f847ff0ed887dae34356b313cf0 100644 (file)
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -310,7 +310,7 @@ int board_mmc_getcd(struct mmc *mmc)
        return ret;
 }
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
        struct src *psrc = (struct src *)SRC_BASE_ADDR;
        unsigned reg = readl(&psrc->sbmr1) >> 11;
@@ -652,7 +652,7 @@ int checkboard(void)
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
        u32 cma_size;
 
@@ -1086,12 +1086,12 @@ void reset_cpu(ulong addr)
 
 #endif /* CONFIG_SPL_BUILD */
 
-static struct mxc_serial_platdata mxc_serial_plat = {
+static struct mxc_serial_plat mxc_serial_plat = {
        .reg = (struct mxc_uart *)UART1_BASE,
        .use_dte = true,
 };
 
-U_BOOT_DEVICE(mxc_serial) = {
+U_BOOT_DRVINFO(mxc_serial) = {
        .name = "serial_mxc",
-       .platdata = &mxc_serial_plat,
+       .plat = &mxc_serial_plat,
 };