From patchwork Sun May 1 19:52:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 617254 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3qydV7433hz9t5V for ; Mon, 2 May 2016 05:56:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=MeodY4aW; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CECCFB387D; Sun, 1 May 2016 21:54:59 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OFUd0yg4i9PB; Sun, 1 May 2016 21:54:59 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D69D2B389F; Sun, 1 May 2016 21:54:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 014CDB3841 for ; Sun, 1 May 2016 21:53:41 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e5mEqxtKAPnv for ; Sun, 1 May 2016 21:53:40 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ig0-f175.google.com (mail-ig0-f175.google.com [209.85.213.175]) by theia.denx.de (Postfix) with ESMTPS id 4B445B381B for ; Sun, 1 May 2016 21:53:25 +0200 (CEST) Received: by mail-ig0-f175.google.com with SMTP id u10so68226701igr.1 for ; Sun, 01 May 2016 12:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=aAypPRZB0hDE9j5l+tnG2K0tIsNFj6T8HRcKQqi7Xik=; b=MeodY4aW8+KTAYEcwCsmSO4vviIgSfo+fOqsTvbDgezsHm1rrKz+kkHCrViJUHl5bu P7sP6yDUvrgnaRQ/Aojx0tI9XXFXL6fLFzm/DdkQ/TWCCSeExXGqgJIWTkdFFnNlEi0R +WOg3eLahqgL9MqH8SGjdHaB+j8BYLWugQ8HV4v7HStXqi8jHYYejoF/tSPFseqc6gkr XW4aTPTehzGUxm3cF6YRkFw2EFfRNFCN1k3WAYR8XWcT//z7YPLcZxYJ4kuM1mqTsvP/ gYjSA3peidr0DH9qVIIUWwsCEA1G/8dLz+TnyeFzNBTFd6tsEFxz6BS4yM3U95+IgLJz o7TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=aAypPRZB0hDE9j5l+tnG2K0tIsNFj6T8HRcKQqi7Xik=; b=Deb3Fw6HI0fZhIKYwzWXr6nTDULLzXrbOEskL742XyZDgRoD0tfn/YZrgUL/9eQnQX X5NM0vyJymFXa8zd7F6SYLe1Xe8YxTDUe4zbYpEErgYG4nbTyElTNaR4tdrCdS8YuNwO nlPSuqg9+PE7b/SHMQNS0F58ZtNRR07547rysWhMMjCaveH9i293Tj+ClGapoyHs/QYH Z0erbZ4EMT8xormlRijTqojIl5oGamQa8zy5tCI58PSdsR3g6m/i4NsX23AEOlj1yMMF cm5CKw3oYGKupaUr92nNEYzj+boOz9ek3gE0J/dMU9qagzeMPywxmq9CvqtOSSRFqMlA Qr/Q== X-Gm-Message-State: AOPr4FVa7EDjAxrogFr2ZRsUrU/7umtx21vb4/Mq09w6OVjU57HsrnMRFoZlrSSfp3qzJ/OP X-Received: by 10.50.221.169 with SMTP id qf9mr16490443igc.13.1462132403671; Sun, 01 May 2016 12:53:23 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.202.57]) by smtp.gmail.com with ESMTPSA id b202sm16412953ioe.27.2016.05.01.12.53.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 May 2016 12:53:19 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 1F3AE2210BB; Sun, 1 May 2016 13:53:18 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 1 May 2016 13:52:34 -0600 Message-Id: <1462132365-11536-14-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1462132365-11536-1-git-send-email-sjg@chromium.org> References: <1462132365-11536-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , Stephen Warren , Pantelis Antoniou Subject: [U-Boot] [PATCH v2 13/24] dm: mmc: Set up the device pointer when using the MMC uclass X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Update the existing drivers to set up this new pointer. This will be required by the MMC uclass. Signed-off-by: Simon Glass --- Changes in v2: None drivers/mmc/omap_hsmmc.c | 1 + drivers/mmc/pic32_sdhci.c | 7 ++++++- drivers/mmc/rockchip_dw_mmc.c | 1 + drivers/mmc/socfpga_dw_mmc.c | 1 + drivers/mmc/uniphier-sd.c | 1 + drivers/mmc/zynq_sdhci.c | 1 + include/mmc.h | 3 +++ 7 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 85a832b..be34057 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -825,6 +825,7 @@ static int omap_hsmmc_probe(struct udevice *dev) gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN); #endif + mmc->dev = dev; upriv->mmc = mmc; return 0; diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c index e03d6dd..abe7429 100644 --- a/drivers/mmc/pic32_sdhci.c +++ b/drivers/mmc/pic32_sdhci.c @@ -41,7 +41,12 @@ static int pic32_sdhci_probe(struct udevice *dev) return ret; } - return add_sdhci(host, f_min_max[1], f_min_max[0]); + ret = add_sdhci(host, f_min_max[1], f_min_max[0]); + if (ret) + return ret; + host->mmc->dev = dev; + + return 0; } static const struct udevice_id pic32_sdhci_ids[] = { diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index cb9e104..0a261c5 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -104,6 +104,7 @@ static int rockchip_dwmmc_probe(struct udevice *dev) if (ret) return ret; + host->mmc->dev = dev; upriv->mmc = host->mmc; return 0; diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index 097db81..6a0e971 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -108,6 +108,7 @@ static int socfpga_dwmmc_probe(struct udevice *dev) return ret; upriv->mmc = host->mmc; + host->mmc->dev = dev; return 0; } diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index 81a80cd..4978cca 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -725,6 +725,7 @@ int uniphier_sd_probe(struct udevice *dev) return -EIO; upriv->mmc = priv->mmc; + priv->mmc->dev = dev; return 0; } diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index b59feca..d405929 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -35,6 +35,7 @@ static int arasan_sdhci_probe(struct udevice *dev) CONFIG_ZYNQ_SDHCI_MIN_FREQ); upriv->mmc = host->mmc; + host->mmc->dev = dev; return 0; } diff --git a/include/mmc.h b/include/mmc.h index f01674d..6d1f05c 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -381,6 +381,9 @@ struct mmc { char init_in_progress; /* 1 if we have done mmc_start_init() */ char preinit; /* start init as early as possible */ int ddr_mode; +#ifdef CONFIG_DM_MMC + struct udevice *dev; /* Device for this MMC controller */ +#endif }; struct mmc_hwpart_conf {