ARM: imx: novena: Convert block devices to DM

[platform/kernel/u-boot.git] / board / kosagi / novena / novena.c

diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 0750c46..d897f8f 100644 (file)
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -6,6 +6,9 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <dm/device-internal.h>
+#include <ahci.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
@@ -20,6 +23,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/sata.h>
 #include <asm/mach-imx/video.h>
+#include <dwc_ahsata.h>
 #include <environment.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
@@ -101,60 +105,6 @@ int drv_keyboard_init(void)
 }
 #endif
 
-/*
- * SDHC
- */
-#ifdef CONFIG_FSL_ESDHC
-static struct fsl_esdhc_cfg usdhc_cfg[] = {
-       { USDHC3_BASE_ADDR, 0, 4 },     /* Micro SD */
-       { USDHC2_BASE_ADDR, 0, 4 },     /* Big SD */
-};
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-
-       /* There is no CD for a microSD card, assume always present. */
-       if (cfg->esdhc_base == USDHC3_BASE_ADDR)
-               return 1;
-       else
-               return !gpio_get_value(NOVENA_SD_CD);
-}
-
-int board_mmc_getwp(struct mmc *mmc)
-{
-       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-
-       /* There is no WP for a microSD card, assume always read-write. */
-       if (cfg->esdhc_base == USDHC3_BASE_ADDR)
-               return 0;
-       else
-               return gpio_get_value(NOVENA_SD_WP);
-}
-
-
-int board_mmc_init(bd_t *bis)
-{
-       s32 status = 0;
-       int index;
-
-       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-       usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-
-       /* Big SD write-protect and card-detect */
-       gpio_direction_input(NOVENA_SD_WP);
-       gpio_direction_input(NOVENA_SD_CD);
-
-       for (index = 0; index < ARRAY_SIZE(usdhc_cfg); index++) {
-               status = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
-               if (status)
-                       return status;
-       }
-
-       return status;
-}
-#endif
-
 int board_early_init_f(void)
 {
 #if defined(CONFIG_VIDEO_IPUV3)
@@ -169,10 +119,6 @@ int board_init(void)
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-#ifdef CONFIG_SATA
-       setup_sata();
-#endif
-
        return 0;
 }