From patchwork Fri Apr 2 18:05:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1461839 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=u6+Rf4c6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FBp0W55gPz9sV5 for ; Sat, 3 Apr 2021 05:06:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7023981691; Fri, 2 Apr 2021 20:06:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u6+Rf4c6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3F738812B3; Fri, 2 Apr 2021 20:06:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2819B80C7A for ; Fri, 2 Apr 2021 20:05:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x434.google.com with SMTP id x16so5366371wrn.4 for ; Fri, 02 Apr 2021 11:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zsY3XV6AZSEMgmUi2XEP3SIyBDIN/+pR44weFpQq9W0=; b=u6+Rf4c6tBgEbwvGxwKHi8L22ZP/9PGAoKo5QTP6Z/SiCm5OAfRY0avxMdP4EoOhaA 9aU/ecGJV0Qd7c1cydJRSdOEV9W/GttkFtdwcE/Kke2r3q6IzFuimQ7enjOGyP1vCnIR goFyFCCpCt2s8KLnTVvmnu/UggygdPsD0ecaPHwWMc8CY6BzjZr9dGa+Bc7ui6f16P28 4VlZYxiY8PpyHLeUurBf6uCFSjXQ8N2k1ZoJ4JbL4zCTDbrqnaA8jodlcQfhpbdLZ8+V sfBE4HglhuCF1nwl+RY6BrMD7uzB/B63c/wlo34Dq3bIClh1ToDmG8gL3esW4QqixMb+ odxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zsY3XV6AZSEMgmUi2XEP3SIyBDIN/+pR44weFpQq9W0=; b=Ivp8rCedR1/7RLLn1ShZDaaqafsomH8IWOocLnkTTncXi7ZWAdcAhrNR2KJcvYnFYT VCnX5xOu68ynIfSrvrXQkYJ6uuy7upbRrwUqrWu5auM+ZQPeT1Hi66gdQlT3282THc4s HIp/qs/2WaJlIQoo3ett8eqChaO807XCqlQbBeJ1JUeMfyWXfJ/mvCTYSBJsYfSXjHS9 2/zyKyixkw5ya0ynr7cLeC/nZVBZMrgJNYSN/rtNlPx1sYaClU5hlv7o12RZhutYzfFb mmbiiHGnhnBgQ3Q4zCg0D970Mt6ddyeNUqXYr34LXvVpChT9y4vo5ZdSwyJ7IZJI2//Y m5dQ== X-Gm-Message-State: AOAM533IaPBjtpimDBWK0q/uSHnQqD4cwHorgpqZplAc+MnuYTA61/1A ZHb7lDlLF6WL+0Yujc+RguzudojCRtc= X-Google-Smtp-Source: ABdhPJwNWCa5sfAPI6Bz69rOt8aKaf0BcMexIQnzyaYOj7DyCFwCH12Ngh3lbYjtMnteQsUTVgJ+yg== X-Received: by 2002:a5d:65d2:: with SMTP id e18mr16151601wrw.256.1617386756777; Fri, 02 Apr 2021 11:05:56 -0700 (PDT) Received: from morpheus.home.roving-it.com (2.e.6.5.c.a.a.1.a.8.0.3.1.e.3.c.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:c3e1:308a:1aac:56e2]) by smtp.googlemail.com with ESMTPSA id f2sm13753832wmp.20.2021.04.02.11.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 11:05:56 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , Otavio Salvador , Fabio Estevam , Stefano Babic Subject: [PATCH 3/5] ARM: board: warp: convert to DM_MMC Date: Fri, 2 Apr 2021 19:05:50 +0100 Message-Id: <20210402180552.1075997-3-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402180552.1075997-1-pbrobinson@gmail.com> References: <20210402180552.1075997-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Convert Warp to use DM MMC. Signed-off-by: Peter Robinson Cc: Otavio Salvador Cc: Fabio Estevam Cc: Stefano Babic Reviewed-by: Jaehoon Chung --- arch/arm/dts/imx6sl-warp-u-boot.dtsi | 7 ++++++ board/warp/warp.c | 33 ---------------------------- configs/warp_defconfig | 1 + 3 files changed, 8 insertions(+), 33 deletions(-) create mode 100644 arch/arm/dts/imx6sl-warp-u-boot.dtsi diff --git a/arch/arm/dts/imx6sl-warp-u-boot.dtsi b/arch/arm/dts/imx6sl-warp-u-boot.dtsi new file mode 100644 index 0000000000..daf2489cfd --- /dev/null +++ b/arch/arm/dts/imx6sl-warp-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/ { + aliases { + mmc0 = &usdhc2; + }; +}; diff --git a/board/warp/warp.c b/board/warp/warp.c index 0f1d038fab..417f0e7507 100644 --- a/board/warp/warp.c +++ b/board/warp/warp.c @@ -21,9 +21,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -62,37 +60,6 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } -static struct fsl_esdhc_cfg usdhc_cfg[1] = { - {USDHC2_BASE_ADDR, 0, 0, 0, 1}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - return 1; /* Assume boot SD always present */ -} - -int board_mmc_init(struct bd_info *bis) -{ - static iomux_v3_cfg_t const usdhc2_pads[] = { - MX6_PAD_SD2_CLK__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_CMD__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_RST__USDHC2_RST | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT0__USDHC2_DAT0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT1__USDHC2_DAT1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT2__USDHC2_DAT2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT3__USDHC2_DAT3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT4__USDHC2_DAT4 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT5__USDHC2_DAT5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT6__USDHC2_DAT6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT7__USDHC2_DAT7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - }; - - imx_iomux_v3_setup_multiple_pads(usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); - - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); -} - int board_usb_phy_mode(int port) { return USB_INIT_DEVICE; diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 68ad71c27c..6efe400dd1 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -39,6 +39,7 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DFU_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_DM_MMC=y CONFIG_FSL_USDHC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y