From patchwork Fri Feb 8 17:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1038844 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43x2hm1vJYz9sMp for ; Sat, 9 Feb 2019 04:48:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D411BC2206A; Fri, 8 Feb 2019 17:46:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4F114C22031; Fri, 8 Feb 2019 17:43:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EC319C2205F; Fri, 8 Feb 2019 17:42:57 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 3A951C2203F for ; Fri, 8 Feb 2019 17:42:53 +0000 (UTC) Received: from localhost.localdomain ([81.221.139.23]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Le3w2-1hSG4z3Ghg-00prQz; Fri, 08 Feb 2019 18:42:50 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 8 Feb 2019 18:42:14 +0100 Message-Id: <20190208174229.23562-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208174229.23562-1-marcel@ziswiler.com> References: <20190208174229.23562-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:3Sv37vE08udQ569jSb3Yz00meyJJicazbSKgRBhGKbhgrMPx7dY 7b8mjxNeGMOHDiN5dARYPCibG+dwMQinKcjrDviwHXFpj3WUT+SNX7xwJMqSAIeEqK9lOeM hRQkR0KCuqqBGv7/dkwFhlktbjSNZFEC83sb+MnHzbnUI44xJp7e/dSQZ8T0OfkAfUkyG+J zP6LTwMRMzKThtu5qRdIg== X-UI-Out-Filterresults: notjunk:1; V03:K0:6ClnMUdbN/8=:ZMPGmAmTWDjBOvVhQfG8FM JlbI0dIIUTNbTiZK9mgSJ6EPZ0FDAQKb2GTlnEdWqANEjRGCRbLFb8SFX8nAnP3V9C9vb2fQ7 0atKwW1ZIVAMCmDc8WMRUMi7/l8CIOcVKLRwRRpTnjIKqRorQ6JXPEUenfvuEQ8uBhRXkIvW4 ljexAZhneKN5SAKCntxAQdxeOgEi2Lk1xjoiSlQA3zVJX1zvN3VDIFXi3YfUvCpxhGvHmU8Zc 2SfJ6vXKygrh2l1Uh3D3cr4GrfHepifa4Fv7C5LdPYt2mEMg3cL+NA2h34o36KHvMFEM/w4H2 zBCdRLfxvd25N/53VlCVHEWo1mLWRAODSXYd2TuBOLyK725Lsyq+0Ix46UVtqKKLsrlBRr+Ji HFWFuwnKJE+tqLM7FJmBr/Q3PB/sQ33YccEFQLk18/dtbeIfCFHhfH9yvbpTok+zn0+EtrGxe /qjiaGSkzHRJRYcxM65zCDI8c3ONGMqLckkwhT1FPY8OkUCmddqxyqvT3ViP7UoQgN956h0DX X1bg/Eemw5gp8t3dUllEZ/+tgtEPI/JooTEJnMDwI2rTAVAK1U2zCuwvb41YfJPPcqwAm1ktH RKWQuK4UDYrWazZJbpOekmtmqiQySOpCqiYFdIOCtyF4fCOuIn4em3fuF+9gjsoZpTuFKn+ZF MJjtC/HgcZo+5KrZN3EL94GMm+7DEvfha6mHFVnIqO3wLwSYoqTiTcvY+grDhDs2akADgUKBK 19xxrEYcX8DSV0TfZM77ha9hCfu1p8lmHX/8Iw== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 11/26] colibri_imx6: migrate mmc to using driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Migrate MMC to using driver model. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_imx6/colibri_imx6.c | 38 +++-------------------- configs/colibri_imx6_defconfig | 1 + 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index f5cfeb30bc..ef4dd0c87c 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -77,6 +77,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), }; +#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) /* Colibri MMC */ iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -103,6 +104,7 @@ iomux_v3_cfg_t const usdhc3_pads[] = { MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD3_RST__SD3_RESET | MUX_PAD_CTRL(USDHC_PAD_CTRL), }; +#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ iomux_v3_cfg_t const enet_pads[] = { MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), @@ -310,7 +312,7 @@ int board_ehci_power(int port, int on) } #endif /* CONFIG_USB_EHCI_MX6 */ -#ifdef CONFIG_FSL_ESDHC +#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) /* use the following sequence: eMMC, MMC */ struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { {USDHC3_BASE_ADDR}, @@ -335,37 +337,6 @@ int board_mmc_getcd(struct mmc *mmc) int board_mmc_init(bd_t *bis) { -#ifndef CONFIG_SPL_BUILD - s32 status = 0; - u32 index = 0; - - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - - usdhc_cfg[0].max_bus_width = 8; - usdhc_cfg[1].max_bus_width = 4; - - for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) { - switch (index) { - case 0: - imx_iomux_v3_setup_multiple_pads( - usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); - break; - case 1: - imx_iomux_v3_setup_multiple_pads( - usdhc1_pads, ARRAY_SIZE(usdhc1_pads)); - break; - default: - printf("Warning: you configured more USDHC controllers (%d) then supported by the board (%d)\n", - index + 1, CONFIG_SYS_FSL_USDHC_NUM); - return status; - } - - status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]); - } - - return status; -#else /* !CONFIG_SPL_BUILD */ struct src *psrc = (struct src *)SRC_BASE_ADDR; unsigned reg = readl(&psrc->sbmr1) >> 11; /* @@ -397,9 +368,8 @@ int board_mmc_init(bd_t *bis) } return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); -#endif /* !CONFIG_SPL_BUILD */ } -#endif /* CONFIG_FSL_ESDHC */ +#endif /* CONFIG_FSL_ESDHC & CONFIG_SPL_BUILD */ int board_phy_config(struct phy_device *phydev) { diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 6fd050a99f..2ab7db44a8 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -54,6 +54,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y