From patchwork Sun Sep 15 13:12:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 1162463 X-Patchwork-Delegate: van.freenix@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="XKkLK+cP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46WVHH4Zd4z9sP4 for ; Sun, 15 Sep 2019 23:15:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 117E6C21FCC; Sun, 15 Sep 2019 13:15:37 +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_MSPIKE_H2, 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 D969DC21FB1; Sun, 15 Sep 2019 13:13:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5B13BC21FC6; Sun, 15 Sep 2019 13:13:50 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 7AD36C21F93 for ; Sun, 15 Sep 2019 13:12:43 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id b9so2620268wrs.0 for ; Sun, 15 Sep 2019 06:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=dKryEOwuurhnp17Z5arsVlie5cLbwBUWpOZddUPlGc4=; b=XKkLK+cPSZFc1qeR73F4KNxVExh+8CfTxItRVgPhSt35f3RED5Y0mxiIHsOm7w8zCo cYPTECzvQGZGGwHrJEGokLJRoIfMGc7jB2cBfuYagFSITgwqTSpihoiOnvORG4CPjiHY OsP+TwavCAFIQC/WDayqjPeMfs3iVJ+WpQcz4= 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; bh=dKryEOwuurhnp17Z5arsVlie5cLbwBUWpOZddUPlGc4=; b=QkSEDzL6kLDOY0a0xwcdQXLJnhCmSsTCNzLuVKOmAl+itXXD23OpYZfrVVejo4Xs9N M1LwLXPzK8cIu2SYtLrtSyz/zapgOjWUJcLT3LB6sUlDa+DBNirOeIWNRqr7h+Hc9hSd 6j2jsmGd1qgufxeFEw9bZ633JSoykvFP8vmGi2on3KXvXxEUkzLX3OhO7W+/siu9THjh 2rQc6x1o7fSwjpJzgMrkYHPP060QJu7wxNGgG2tR9/REuddylNyC8cmy5EjuawSNX8zU aS8T3yxAj159Kyjx+O4WJVyBMKwR3KJ9MEwNwlQoD3vtHZVQUuyOxotcCBuT/dh5uMoi aBNA== X-Gm-Message-State: APjAAAVGFXRt2k3QB6H50TdtraxQIpaxiPPqlmlTbW7JAQVRME2loTUt qeuH9DZJLnSOnJJ9d24Xg9y+hw== X-Google-Smtp-Source: APXvYqw8TK35NFNul66dYiv46/hp/0S88vucOYowBBuZiDACEnkere6pg0xBaKe4PzQCFSgjBmZTgg== X-Received: by 2002:adf:e5c3:: with SMTP id a3mr8943993wrn.217.1568553162879; Sun, 15 Sep 2019 06:12:42 -0700 (PDT) Received: from panicking.lan ([2001:b07:5d2e:7c18:142d:44d3:863:a190]) by smtp.gmail.com with ESMTPSA id m11sm3744586wrn.59.2019.09.15.06.12.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2019 06:12:42 -0700 (PDT) From: Michael Trimarchi To: Peng Fan Date: Sun, 15 Sep 2019 15:12:41 +0200 Message-Id: <20190915131241.11983-1-michael@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] mmc: dw_mmc: Clean up variable name 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" Signed-off-by: Michael Trimarchi --- drivers/mmc/dw_mmc.c | 4 ++-- include/dwmmc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index ebe7bcdd90..e5b532a862 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -86,7 +86,7 @@ static void dwmci_prepare_data(struct dwmci_host *host, flush_dcache_range(data_start, roundup(data_end, ARCH_DMA_MINALIGN)); ctrl = dwmci_readl(host, DWMCI_CTRL); - ctrl |= DWMCI_IDMAC_EN | DWMCI_DMA_EN; + ctrl |= DWMCI_CTRL_USE_IDMAC | DWMCI_CTRL_DMA_EN; dwmci_writel(host, DWMCI_CTRL, ctrl); ctrl = dwmci_readl(host, DWMCI_BMOD); @@ -383,7 +383,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, dwmci_writel(host, DWMCI_IDSTS, DWMCI_IDINTEN_MASK); ctrl = dwmci_readl(host, DWMCI_CTRL); - ctrl &= ~(DWMCI_DMA_EN); + ctrl &= ~(DWMCI_CTRL_DMA_EN); dwmci_writel(host, DWMCI_CTRL, ctrl); bounce_buffer_stop(&bbstate); } diff --git a/include/dwmmc.h b/include/dwmmc.h index f06720dc0d..2f57b6e774 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -75,9 +75,9 @@ #define DWMCI_CTRL_RESET (1 << 0) #define DWMCI_CTRL_FIFO_RESET (1 << 1) #define DWMCI_CTRL_DMA_RESET (1 << 2) -#define DWMCI_DMA_EN (1 << 5) +#define DWMCI_CTRL_DMA_EN (1 << 5) #define DWMCI_CTRL_SEND_AS_CCSD (1 << 10) -#define DWMCI_IDMAC_EN (1 << 25) +#define DWMCI_CTRL_USE_IDMAC (1 << 25) #define DWMCI_RESET_ALL (DWMCI_CTRL_RESET | DWMCI_CTRL_FIFO_RESET |\ DWMCI_CTRL_DMA_RESET)