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: 3611331 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 96FD8BF418 for ; Sat, 8 Feb 2014 20:13:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96FE720125 for ; Sat, 8 Feb 2014 20:13:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8CA82011D for ; Sat, 8 Feb 2014 20:13:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751776AbaBHUNe (ORCPT ); Sat, 8 Feb 2014 15:13:34 -0500 Received: from mail-wi0-f178.google.com ([209.85.212.178]:50519 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751696AbaBHUNe (ORCPT ); Sat, 8 Feb 2014 15:13:34 -0500 Received: by mail-wi0-f178.google.com with SMTP id cc10so1767637wib.5 for ; Sat, 08 Feb 2014 12:13:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PLsC/Bj2ljAJ1wNpMdkjrFOPWJxcsDQz9nb0JyjSG/c=; b=nGgHk1OaU8fk+bjXfzVnRMO2HGVFK1hvMAjuSUWwA7PLlNlI2o7KFZvcuSrswpZ+B6 VeQpdc04YuBHetiklI/EPaLRE6cMW6jS62tJwGGJjZE1u43PXa0d2NjkejYFTl4Heucd UZBZjdPbr7OgE0DidEw1+pkUv+qnDRylfWefpq4V66Dypxny2VRmcsas9JvyB4cbtQ7B cBoleJW6Mw35XU76pgCuu215c1tO8FMhJes0MrUFFJKvICZc4GclOXa1JnubQ0zqUFuB HH3RBGmgw9/xYRPo98ElKHVXLru4Nca5ePe0yioXQuUiira6piI+YRmrBxmaDy+Ji5lb zSKw== X-Gm-Message-State: ALoCoQkvCYM8hkj7l76D41U0YRh7o/W/+0oD6m/kscoh4KjHbnlgpU/Wrd+dPX2HZile5X3v2JX8 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 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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