From patchwork Sat Feb 8 20:13:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24380 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D379F20967 for ; Sat, 8 Feb 2014 20:13:35 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id h16sf21683105oag.4 for ; Sat, 08 Feb 2014 12:13:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=PLsC/Bj2ljAJ1wNpMdkjrFOPWJxcsDQz9nb0JyjSG/c=; b=l/Ps3z8z4UOOrasPZKIThNLQq22wpgd+zHi9r6xOYqFZ/F8/KpuCinIqsU6Ui8fmYX OE21EY0/fsq1fgz24SHB5i/UNWsm7Zgd9NUhhZj8MNgkhM8z+QDCy0NNgZiWMfGXoRuE 4AuZHG5ltid7WvNI+VyyUkJaoMdKkiJK6g9pOXWZSI6Xvgr/t2+mLQKAarZhoDpoJs/Y 1VeKKg1wt2EuPwSFh0lcdjDtn0hRfsgPmpnQ6EZT0ySL0KofdfwyQfkvhMzYYikHDyBX KdrPAyFWvpsJWwynUchFRDpVOlxuW+DIFG4fIlnQ1VadI3OJ6nhJ5QObwx3eojJkEdJy b2pw== X-Gm-Message-State: ALoCoQlQZaxlsYGbmJqNfN/lfdsbdaQH1UbJBXdIudGRC9JDwuWqaCvALVzU9if6Rm/NKgjkSqSh X-Received: by 10.182.66.73 with SMTP id d9mr8743431obt.8.1391890414922; Sat, 08 Feb 2014 12:13:34 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.25.198 with SMTP id 64ls1516349qgt.31.gmail; Sat, 08 Feb 2014 12:13:34 -0800 (PST) X-Received: by 10.220.58.202 with SMTP id i10mr17545vch.23.1391890414821; Sat, 08 Feb 2014 12:13:34 -0800 (PST) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id a8si2840113vej.131.2014.02.08.12.13.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Feb 2014 12:13:34 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.52; Received: by mail-vb0-f52.google.com with SMTP id p14so3585617vbm.25 for ; Sat, 08 Feb 2014 12:13:34 -0800 (PST) X-Received: by 10.58.37.67 with SMTP id w3mr2376062vej.22.1391890414732; Sat, 08 Feb 2014 12:13:34 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4cs57583vcz; Sat, 8 Feb 2014 12:13:34 -0800 (PST) X-Received: by 10.180.219.66 with SMTP id pm2mr4486810wic.60.1391890413645; Sat, 08 Feb 2014 12:13:33 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id c4si4490835wjb.13.2014.02.08.12.13.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Feb 2014 12:13:33 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id n12so3197590wgh.12 for ; Sat, 08 Feb 2014 12:13:33 -0800 (PST) X-Received: by 10.195.13.113 with SMTP id ex17mr15866093wjd.0.1391890413152; Sat, 08 Feb 2014 12:13:33 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id pm2sm22464370wic.0.2014.02.08.12.13.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Feb 2014 12:13:32 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, Chris Ball Cc: Per Forlin , Ulf Hansson , Linus Walleij Subject: [PATCH] mmc: mmci: rename some extended flags Date: Sat, 8 Feb 2014 21:13:28 +0100 Message-Id: <1391890408-10321-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , These four (so far unused) flags are only found in the ST Micro versions of MMCI, so infix them properly with the _ST_ infix. Signed-off-by: Linus Walleij --- drivers/mmc/host/mmci.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 168bc72f7a94..84c0e59b792a 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -38,10 +38,11 @@ #define MCI_CPSM_INTERRUPT (1 << 8) #define MCI_CPSM_PENDING (1 << 9) #define MCI_CPSM_ENABLE (1 << 10) -#define MCI_SDIO_SUSP (1 << 11) -#define MCI_ENCMD_COMPL (1 << 12) -#define MCI_NIEN (1 << 13) -#define MCI_CE_ATACMD (1 << 14) +/* Argument flag extenstions in the ST Micro versions */ +#define MCI_ST_SDIO_SUSP (1 << 11) +#define MCI_ST_ENCMD_COMPL (1 << 12) +#define MCI_ST_NIEN (1 << 13) +#define MCI_ST_CE_ATACMD (1 << 14) #define MMCIRESPCMD 0x010 #define MMCIRESPONSE0 0x014