Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B25AAC433F5 for ; Tue, 21 Dec 2021 12:33:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3BFF4830F5; Tue, 21 Dec 2021 13:33:17 +0100 (CET) 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="l26JNXYX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1263A811A7; Tue, 21 Dec 2021 13:33:08 +0100 (CET) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 23F4583034 for ; Tue, 21 Dec 2021 13:32:59 +0100 (CET) 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-wm1-x335.google.com with SMTP id y196so8944688wmc.3 for ; Tue, 21 Dec 2021 04:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1laNoT3rPmw2h4714HQESO3LsDNfiO1N9cEhfmo9oDg=; b=l26JNXYX4MOunkezhAzZJZN0Aid7jkT1q3UvfyUXU/v4dadBREURtOXQ1g0/o4IbRw DRaK7V2eUclmAzxEv4iSj6ltMC+BpIpc53o4fCZRmvUbyoEN/z9TRISx3rZhVI97Cm5b qjx5ld8/ugARkkZ3r4rnDgJ4ZnaaTAIoLkeMsO8x7KNHYE+j4ese655Bz1za6jD/d5ZD Zh56oz62sWjAYgeOOjBIvKA6dvcZtndN8kqkd6+VffK8v9kiPJRTuUWG9sUqR4oryH2S U0xgadWVLK/3mztv+TcNdAHC6Hduojx6oC+05Vp3ONE3RCL2CefWSHSw74hjhq5Ztbua 5kLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1laNoT3rPmw2h4714HQESO3LsDNfiO1N9cEhfmo9oDg=; b=y1Vn/VAXVfe5dMa+mtzJnT1RchoVIOOy0IZoQsrbQdsQoUcK1XHQB9oB96QV0RuOae l1aByJUZzrpRT5o8UIqAXC7oW0mIRDnC186LWAIxrPy3Fvq+EH7FS6JnTOzFWD7xbPeP 0bcAwt59shLovlYeeFFvmYuLROaQrjMohb4/bRufF5/MZUqBjalIgOw9UU0eOSwbFBSO um6BRwgXFNceAGzeC9o7SVB98ccWZ0QrIka3g7XH/eTJh30/Q03kb4JuAxTQ4HVtG6Ae g4T9KWrDU3il7Ld5lyuBkHtGn+t80sCNV7gG23jtKIALmHR+d2CBvfu9LtAa0caM8PBF ZtFQ== X-Gm-Message-State: AOAM533C8TliY3wIIBe9e78iiVKgDgFEQ8yrLvWVnRcEm5FpBushioBi HoGjVGVwaLCPUlWnA7xQAZE= X-Google-Smtp-Source: ABdhPJxiFLVWtl0bDxnjG3Lf6qnn6jTiwqIDHd5zs2TLXWAtDig5THpd9GZRFtmHmCnLErNTUovdZQ== X-Received: by 2002:a7b:ca57:: with SMTP id m23mr2608783wml.0.1640089978674; Tue, 21 Dec 2021 04:32:58 -0800 (PST) Received: from morpheus.home.roving-it.com (a.7.4.5.7.2.7.b.4.1.9.2.a.3.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:3a:2914:b727:547a]) by smtp.googlemail.com with ESMTPSA id az11sm2168479wmb.30.2021.12.21.04.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 04:32:58 -0800 (PST) From: Peter Robinson To: Stefano Babic , Fabio Estevam , Breno Lima , Francesco Montefoschi , u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCH 2/4] udoo_neo: Fixes for booting from the mSD card Date: Tue, 21 Dec 2021 12:32:47 +0000 Message-Id: <20211221123249.455347-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221123249.455347-1-pbrobinson@gmail.com> References: <20211221123249.455347-1-pbrobinson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.103.2 at phobos.denx.de X-Virus-Status: Clean This fixes booting from the mSD card from both SPL and when using it for the OS booting. It also cleans up a few mmc booting bits that are no longer needed. Signed-off-by: Peter Robinson --- arch/arm/dts/imx6sx-udoo-neo-u-boot.dtsi | 7 ----- board/udoo/neo/neo.c | 40 ++++++++++++++++++++++++ configs/udoo_neo_defconfig | 1 + include/configs/udoo_neo.h | 4 +-- 4 files changed, 43 insertions(+), 9 deletions(-) delete mode 100644 arch/arm/dts/imx6sx-udoo-neo-u-boot.dtsi diff --git a/arch/arm/dts/imx6sx-udoo-neo-u-boot.dtsi b/arch/arm/dts/imx6sx-udoo-neo-u-boot.dtsi deleted file mode 100644 index daf2489cfd..0000000000 --- a/arch/arm/dts/imx6sx-udoo-neo-u-boot.dtsi +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/ { - aliases { - mmc0 = &usdhc2; - }; -}; diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 61195be744..8b0d13b1ca 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include #include #include @@ -214,6 +216,19 @@ static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_GPIO1_IO05__UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), }; +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_DATA0__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX6_PAD_SD2_DATA1__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX6_PAD_SD2_DATA2__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX6_PAD_SD2_DATA3__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + /* CD pin */ + MX6_PAD_SD1_DATA0__GPIO6_IO_2 | MUX_PAD_CTRL(NO_PAD_CTRL), + /* Power */ + MX6_PAD_SD1_CMD__GPIO6_IO_1 | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + static iomux_v3_cfg_t const phy_control_pads[] = { /* 25MHz Ethernet PHY Clock */ MX6_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M | @@ -327,6 +342,31 @@ int board_early_init_f(void) return 0; } +static struct fsl_esdhc_cfg usdhc_cfg[1] = { + {USDHC2_BASE_ADDR}, +}; + +#define USDHC2_PWR_GPIO IMX_GPIO_NR(6, 1) +#define USDHC2_CD_GPIO IMX_GPIO_NR(6, 2) + +int board_mmc_getcd(struct mmc *mmc) +{ + return !gpio_get_value(USDHC2_CD_GPIO); +} + +int board_mmc_init(struct bd_info *bis) +{ + SETUP_IOMUX_PADS(usdhc2_pads); + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); + usdhc_cfg[0].max_bus_width = 4; + gpio_request(IMX_GPIO_NR(6, 1), "usdhc2_pwr"); + gpio_request(IMX_GPIO_NR(6, 2), "usdhc2_cd"); + gpio_direction_input(USDHC2_CD_GPIO); + gpio_direction_output(USDHC2_PWR_GPIO, 1); + + return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); +} + static char *board_string(void) { switch (get_board_value()) { diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index b2a3e9be4c..f01d2e22e9 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_BOUNCE_BUFFER=y CONFIG_SYS_I2C_LEGACY=y diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index b06abc9286..e2b432e1c4 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -29,7 +29,7 @@ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ "ip_dyn=yes\0" \ - "mmcdev=0\0" \ + "mmcdev=1\0" \ "mmcrootfstype=ext4\0" \ "findfdt="\ "if test $board_name = BASIC; then " \ @@ -49,7 +49,7 @@ BOOTENV #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ func(DHCP, dhcp, na) #include -- 2.33.1