From patchwork Fri Jul 19 10:08:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1133988 X-Patchwork-Delegate: ykai007@gmail.com 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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M+wA19kB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qmtT3Tq6z9s4Y for ; Fri, 19 Jul 2019 20:08:49 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 26DB8C21DC1; Fri, 19 Jul 2019 10:08:46 +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=T_DKIM_INVALID 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 19A0FC21C27; Fri, 19 Jul 2019 10:08:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E04EAC21C27; Fri, 19 Jul 2019 10:08:42 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 50735C21BE5 for ; Fri, 19 Jul 2019 10:08:42 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id l21so14255361pgm.3 for ; Fri, 19 Jul 2019 03:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=gSR6skMIbEETmXR9XZ/Nq9j/GMzTLEoMJNoRaRw0iH8=; b=M+wA19kBSrWd3tkiZmHKWbkBp6dqwn2DBTrEJ0gA3pq1Wfeor1H8C55JgU7ExSspn6 87M3jKOWgXWOhWSniy8uYhTOrE3yZSRX6hf+2VWXKDOyT6u1IKqIzvxdz7JFyNuVtbvz x0l/Lb5ci++FMsCMiZHJ/VE0tYk4rbF63a258kmNs0ffVOc1fJyBKVaNYfLPC7Tf0mru JlXAsqhP/NdtLFimdlR4oDUKyjM/PVWrxb36Sh2L7tf5JlFAxzqU3efvSynyiEVbxbHX vAlCTlgXOe5fE4BlKCZFDIMMXI9EgT1YsR1AlczS2KSzzsWZ7n8z9TZqBrhb6jeqtbl9 uuwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=gSR6skMIbEETmXR9XZ/Nq9j/GMzTLEoMJNoRaRw0iH8=; b=HphEbAcU10gcPGPrqvaamDrUSXG86abwtZxGTCr9o6MdJebngEDwy9MKWHr/2uYjNP Y3CvPsbp56q0aRv1Hr0W0eqecR4Z3ch00L250Q87N5ewjD6AJOPL8d6VP45TISqZ7zO0 E+tqzM8PuKsk1xdldUqfHQOX1AtxDoN4FAHNpcfvdvvlECo+R/ud1yZv5hzN/y1kTFwW w6FFb5gOYfWo3lmw4Yy5ZMXz2aV61G/WkIebhnNouUmHyU1UKUol/7mLHwefif64/BpW IqB8yPfbQRSHJJMTb+RhMqFzw+hhpiwlPG6O6pQ/VOcEkSQ25wM72vwXnQ9h27nomMiw z76w== X-Gm-Message-State: APjAAAXZQ/GVAx85uA58BBDO5Hotri4xIF9w0RNEijok2WMOjCq0Jg4p j5yiu63gVxCDbnLdwL9SZU934kFH X-Google-Smtp-Source: APXvYqwOyRQBTloCKshNQG3QVtdNtx2+6S3MnkQ0an4uEoUccETXMsQ3f27zU57SHyvcdg7PxNZIQQ== X-Received: by 2002:a17:90a:bb8a:: with SMTP id v10mr57711407pjr.78.1563530920194; Fri, 19 Jul 2019 03:08:40 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id 22sm35199873pfu.179.2019.07.19.03.08.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Jul 2019 03:08:39 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Fri, 19 Jul 2019 18:08:30 +0800 Message-Id: <20190719100830.17435-1-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.17.1 Subject: [U-Boot] [PATCH] rockchip: sdhci: Fix sdhci mmc driver probe abort 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch fix mmc driver abort caused by below patch: 3d296365e4 mmc: sdhci: Add support for sdhci-caps-mask After the patch sdhci_setup_cfg() access to host->mmc->dev, so we have to do init before make the call to the function() Signed-off-by: Kever Yang Tested-by: Jagan Teki # Rockpro64, --- drivers/mmc/rockchip_sdhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index cb623d589b..dd3d5574db 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -68,15 +68,15 @@ static int arasan_sdhci_probe(struct udevice *dev) if (host->bus_width == 8) host->host_caps |= MMC_MODE_8BIT; - ret = sdhci_setup_cfg(&plat->cfg, host, 0, EMMC_MIN_FREQ); - host->mmc = &plat->mmc; - if (ret) - return ret; host->mmc->priv = &prv->host; host->mmc->dev = dev; upriv->mmc = host->mmc; + ret = sdhci_setup_cfg(&plat->cfg, host, 0, EMMC_MIN_FREQ); + if (ret) + return ret; + return sdhci_probe(dev); }