From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Date: Thu, 29 Oct 2015 16:29:53 +0900 Subject: [U-Boot] [PATCH 2/2] s5p sdhci: call pinmux for card's gpio pins before use them In-Reply-To: <1446043310-21519-2-git-send-email-p.marczak@samsung.com> References: <1446043310-21519-1-git-send-email-p.marczak@samsung.com> <1446043310-21519-2-git-send-email-p.marczak@samsung.com> Message-ID: <5631CAF1.6080708@samsung.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, Looks good to me. Acked-by: Jaehoon Chung Best Regards, Jaehoon Chung On 10/28/2015 11:41 PM, Przemyslaw Marczak wrote: > The SD card detection depends on checking one pin state. > But the pin was configured after card was detected, which is wrong. > > This commit fixes this, by moving call to pinmux before use the pin. > > Tested-on: Odroid U3 and Odroid X2. > > Signed-off-by: Przemyslaw Marczak > Cc: Guillaume GARDET > Cc: Lukasz Majewski > Cc: Jaehoon Chung > Cc: Minkyu Kang > Cc: Simon Glass > --- > drivers/mmc/s5p_sdhci.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c > index 15ecfee..44353c7 100644 > --- a/drivers/mmc/s5p_sdhci.c > +++ b/drivers/mmc/s5p_sdhci.c > @@ -106,6 +106,12 @@ static int do_sdhci_init(struct sdhci_host *host) > flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE : PINMUX_FLAG_NONE; > dev_id = host->index + PERIPH_ID_SDMMC0; > > + ret = exynos_pinmux_config(dev_id, flag); > + if (ret) { > + printf("external SD not configured\n"); > + return ret; > + } > + > if (dm_gpio_is_valid(&host->pwr_gpio)) { > dm_gpio_set_value(&host->pwr_gpio, 1); > ret = exynos_pinmux_config(dev_id, flag); > @@ -121,12 +127,6 @@ static int do_sdhci_init(struct sdhci_host *host) > debug("no SD card detected (%d)\n", ret); > return -ENODEV; > } > - > - ret = exynos_pinmux_config(dev_id, flag); > - if (ret) { > - printf("external SD not configured\n"); > - return ret; > - } > } > > return s5p_sdhci_core_init(host); > @@ -193,7 +193,7 @@ static int process_nodes(const void *blob, int node_list[], int count) > } > > ret = do_sdhci_init(host); > - if (ret) { > + if (ret && ret != -ENODEV) { > printf("%s: failed to initialize dev %d (%d)\n", __func__, i, ret); > failed++; > } >