From patchwork Fri May 12 11:48:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 761572 X-Patchwork-Delegate: sbabic@denx.de 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 3wPSty6SHBz9s75 for ; Fri, 12 May 2017 21:49:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9097EC21E82; Fri, 12 May 2017 11:49:23 +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 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 140FFC21EA1; Fri, 12 May 2017 11:49:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1A614C21EA3; Fri, 12 May 2017 11:49:11 +0000 (UTC) Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by lists.denx.de (Postfix) with ESMTPS id 6F4E1C21E23 for ; Fri, 12 May 2017 11:49:07 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id s62so7396963pgc.0 for ; Fri, 12 May 2017 04:49:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vhteFKMjjI0mEyrxA1t//sBh82yYu7w5SPOS8M7bhmw=; b=A+1qHCMKZ3nBLeK++gf4ZOSlx0Bfs58yizXd4hnyvNZqqhwk6PhnXlrfJ2AXMpT/Zy aDRHHNZ7LgVx0Ynfjxgko990e1VBg6iC+UqWkc6HsJhL5yRbqaiTbsDK5vDr6/dcAiDX 7mmlgCxy0zC6hYBvppvBc8Zna78DXp0Br15gVWvzSlNfFiArAlMBXWMZ1e1xToJqqjKY jAxV+k2WhTaCi3aNTCNxsaXIHOYme1eP4dl83cK8X3BmEJoIHZCyoB62HVn7UR8VkXLb 96aNCrXfh55fmeFHJQYNJWWQ2TtAGnbEL9mD4fqk4WjIgSNCM7iL/AJc6pU5k7S67df4 /+ag== X-Gm-Message-State: AODbwcA5lUljCKQfu2tqIr1JzJSqZnVRPa8fiUAgf9LGxSy+8383hz7U 7lfQhdRWr/2gKw== X-Received: by 10.84.176.100 with SMTP id u91mr5259363plb.39.1494589746152; Fri, 12 May 2017 04:49:06 -0700 (PDT) Received: from localhost.localdomain ([117.247.27.218]) by smtp.gmail.com with ESMTPSA id d3sm7127839pgc.37.2017.05.12.04.49.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 May 2017 04:49:04 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Fri, 12 May 2017 17:18:20 +0530 Message-Id: <1494589708-15276-2-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1494589708-15276-1-git-send-email-jagan@openedev.com> References: <1494589708-15276-1-git-send-email-jagan@openedev.com> Cc: u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH 1/9] mmc: fsl_esdhc: Move non DM_MMC code in #ifndef CONFIG_DM_MMC 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" From: Jagan Teki Don't build non DM_MMC code when DM_MMC defined so move them into #ifndef CONFIG_DM_MMC Cc: Jaehoon Chung Signed-off-by: Jagan Teki --- drivers/mmc/fsl_esdhc.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index f3c6358..87c96ad 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -723,20 +723,6 @@ static const struct mmc_ops esdhc_ops = { .getcd = esdhc_getcd, }; -static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg, - struct fsl_esdhc_priv *priv) -{ - if (!cfg || !priv) - return -EINVAL; - - priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base); - priv->bus_width = cfg->max_bus_width; - priv->sdhc_clk = cfg->sdhc_clk; - priv->wp_enable = cfg->wp_enable; - - return 0; -}; - static int fsl_esdhc_init(struct fsl_esdhc_priv *priv) { struct fsl_esdhc *regs; @@ -833,6 +819,21 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv) return 0; } +#ifndef CONFIG_DM_MMC +static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg, + struct fsl_esdhc_priv *priv) +{ + if (!cfg || !priv) + return -EINVAL; + + priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base); + priv->bus_width = cfg->max_bus_width; + priv->sdhc_clk = cfg->sdhc_clk; + priv->wp_enable = cfg->wp_enable; + + return 0; +}; + int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) { struct fsl_esdhc_priv *priv; @@ -871,6 +872,7 @@ int fsl_esdhc_mmc_init(bd_t *bis) cfg->sdhc_clk = gd->arch.sdhc_clk; return fsl_esdhc_initialize(bis, cfg); } +#endif #ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT void mmc_adapter_card_type_ident(void)