From patchwork Sat Feb 8 20:13:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24379 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9CADB20967 for ; Sat, 8 Feb 2014 20:13:15 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf21688021oag.1 for ; Sat, 08 Feb 2014 12:13:14 -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=nM6Izua5Nkwco4yh1OpJ+yn+B84smsfKfgjZ62xcElY5NsJtR9/psJlHzaergo/cYb kexDlnY6WHAbcC3gDQPWCKxYAjxohXadJndsVxwUwTO1iUw1iqCoIasqD4R8qn4vrpax LeSU8FpmJgAVQ2h+s5fS0KNG7s016EiAshsRrMqHW+W5/Axt+mjIENeFD5jbxv+KzXNy O/AZoOHBFVuHU1i7E+TJnv3O1jaMRONDglQM1au7HbxBOD3ymmb11zPR4yuv80OG6+OQ WMJCngqLGqLbCzEX8gJ6AFXkgP1VqpZQilHzSYy/bijA8PbGtA5Y2+A7TjHVy7LA82Xh FM8g== X-Gm-Message-State: ALoCoQlUxytf4La8cVia3lxRRS/paY81BV6PjjrnUoQJgdn2YoRlb6WvnbQ3l0jzdUoB2ZkK0VH3 X-Received: by 10.182.19.164 with SMTP id g4mr8756155obe.21.1391890394575; Sat, 08 Feb 2014 12:13:14 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.5 with SMTP id r5ls1458472qga.22.gmail; Sat, 08 Feb 2014 12:13:14 -0800 (PST) X-Received: by 10.58.90.202 with SMTP id by10mr15769628veb.6.1391890394493; Sat, 08 Feb 2014 12:13:14 -0800 (PST) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by mx.google.com with ESMTPS id kn3si2843156veb.92.2014.02.08.12.13.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Feb 2014 12:13:14 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.47 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.47; Received: by mail-vb0-f47.google.com with SMTP id p6so3611143vbe.6 for ; Sat, 08 Feb 2014 12:13:14 -0800 (PST) X-Received: by 10.220.99.72 with SMTP id t8mr16365234vcn.10.1391890394427; Sat, 08 Feb 2014 12:13:14 -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 u4csp51119vcz; Sat, 8 Feb 2014 12:13:14 -0800 (PST) X-Received: by 10.180.79.7 with SMTP id f7mr4654321wix.20.1391890393590; Sat, 08 Feb 2014 12:13:13 -0800 (PST) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by mx.google.com with ESMTPS id wc6si4489612wjc.10.2014.02.08.12.13.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Feb 2014 12:13:13 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.173 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.173; Received: by mail-wi0-f173.google.com with SMTP id hn9so1775851wib.0 for ; Sat, 08 Feb 2014 12:13:13 -0800 (PST) X-Received: by 10.180.103.105 with SMTP id fv9mr509902wib.17.1391890393050; Sat, 08 Feb 2014 12:13:13 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id t6sm20143214wix.4.2014.02.08.12.13.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Feb 2014 12:13:12 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij Subject: [PATCH] mmc: mmci: rename some extended flags Date: Sat, 8 Feb 2014 21:13:03 +0100 Message-Id: <1391890383-10280-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.47 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