From patchwork Sun Apr 23 01:10:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 753851 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w9WdG4q3jz9s2P for ; Sun, 23 Apr 2017 11:11:14 +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="DHYvjuzB"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 32D01C21C54; Sun, 23 Apr 2017 01:11:07 +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=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 4EE09C21C1F; Sun, 23 Apr 2017 01:11:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7A166C21C1F; Sun, 23 Apr 2017 01:11:03 +0000 (UTC) Received: from mail-oi0-f41.google.com (mail-oi0-f41.google.com [209.85.218.41]) by lists.denx.de (Postfix) with ESMTPS id BE6CEC21BE6 for ; Sun, 23 Apr 2017 01:11:02 +0000 (UTC) Received: by mail-oi0-f41.google.com with SMTP id w12so20258850oiw.3 for ; Sat, 22 Apr 2017 18:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=ilZrMumXahpnD1ZADVLA9+kYzP08tAKYkipjwEYHrZQ=; b=DHYvjuzBPWZTiZfHdXrFwib5AsI/kWERfinDN4JG8KAwRexsIFWaFFaZM7GsPHoQbo 6eUKp8swz77vRjSuqn6o4+9uPPNLziFL7ug1bp2Dm2AvvrmUqQYp0DSvu6GxeJEZhIVa O0OAytMBDuiWkxD79FM1BC+dydlAZauoYKFkcXrnqupf3KhqUZEnPssY9HoydiYgAQ3+ +EYitbg/hB4cgDZYHw6j7hVJPkplEcX4p7MR1l7KgPwM+NrPNaPRwzfUYQHh+afIGjuH uokph3HQsghrXk5K2/tif0nPtd7ma1yFsqer+7hYgBdbW4QEQCA+QgHIl/FBKaKhxeNe hvEA== 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=ilZrMumXahpnD1ZADVLA9+kYzP08tAKYkipjwEYHrZQ=; b=NKWx77YCAFF1ZtxNQ7bGk5g/MFfQAK5kTsawZ80BKW/rl8QPJXSa7yXwlcVL1gLaC0 aJJ/gKwMDbgyJM+9sBAzqFKl6RWLLMIrcroxmpyDnmeR4E4dK+trDYYPAD4Zf5/oDmBo NPjZHuAt5602+blxbDug+VM5zyHLEuBov5ooj+9a5PkCRYz9LJAZd+ZeM5p8ux9Mi1dA 0PljAncza1Ixw5h9MoAGr5M/OGjo5hXi11XkwLMEwjw66W72x1dMjAEmXfrAwTbKJKlW g/4auw0ktdgus7A954s1i1oe+m0bu6zLXu7NZYPVdI5UK2HJ6QMqKLgm3xn5Qf3C1Bl6 wDzQ== X-Gm-Message-State: AN3rC/4Gmx9J4I/YEP2a+zlQkTw/WaBICv87MRuUCyJMU7x3Xrm6H7jL rUpwWcsgLW+2PeEG X-Received: by 10.157.56.151 with SMTP id p23mr1446744otc.239.1492909861533; Sat, 22 Apr 2017 18:11:01 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.184.96]) by smtp.gmail.com with ESMTPSA id i32sm78620otd.43.2017.04.22.18.11.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Apr 2017 18:11:00 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 5D02D40519; Sat, 22 Apr 2017 19:10:59 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 22 Apr 2017 19:10:56 -0600 Message-Id: <20170423011056.7057-1-sjg@chromium.org> X-Mailer: git-send-email 2.12.2.816.g2cccc81164-goog Cc: Andy Shevchenko Subject: [U-Boot] [PATCH] dm: mmc: Don't call board_mmc_power_init() with driver model 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" We should not call out to board code from drivers. With driver model, mmc_power_init() already has code to use a named regulator, but the legacy code path remains. Update the code to make this clear. Signed-off-by: Simon Glass --- drivers/mmc/mmc.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 72fc17716e..3cdf6a4f3b 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1608,17 +1608,17 @@ static int mmc_send_if_cond(struct mmc *mmc) return 0; } +#ifndef CONFIG_DM_MMC /* board-specific MMC power initializations. */ __weak void board_mmc_power_init(void) { } +#endif static int mmc_power_init(struct mmc *mmc) { - board_mmc_power_init(); - -#if defined(CONFIG_DM_MMC) && defined(CONFIG_DM_REGULATOR) && \ - !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_DM_MMC) +#if defined(CONFIG_DM_REGULATOR) && !defined(CONFIG_SPL_BUILD) struct udevice *vmmc_supply; int ret; @@ -1635,6 +1635,13 @@ static int mmc_power_init(struct mmc *mmc) return ret; } #endif +#else /* !CONFIG_DM_MMC */ + /* + * Driver model should use a regulator, as above, rather than calling + * out to board code. + */ + board_mmc_power_init(); +#endif return 0; }