From patchwork Fri Mar 21 12:14:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 26809 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B37BE203AB for ; Fri, 21 Mar 2014 12:14:50 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id if11sf5340760vcb.8 for ; Fri, 21 Mar 2014 05:14:50 -0700 (PDT) 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:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sZGHiTtmWrxHy2MZvuTRolErXjJPn+OQkQI8niyZXqk=; b=hxpRZp4EXWhZy4gzO4x1YFLhH+Yt3QBZ6WY7xp5446mL59YMXCQw+HhopNrmEZip+9 1FKKFpM2qo2CKVc4pxshjFyDxetJ2QTlrWjON+/n41usr2xGGaPPVcYen8hJeAjNZJCn yXPiONuVRrH5IoSj4mkWVt9X0g754W5XWzLHFB/NaqHMCU1cutPntx7hilB8ObU9jgxk MwH3rBGgmpKfMAZ/HrhE/iPE8B7+Hhb+TMg+ECX0Qda+U/eDIaQB0mKkvPe8l4FSPKvv O5DMndTUBxfr/eymqeqRgLIcgX8xK+TnhFgdS9N+paIFRUd/K1M2qIIXumlWEGHrJihu f4fA== X-Gm-Message-State: ALoCoQm+Ho21gt2UL6P4CQUaPLgQNKC6ORqnxWJ9nQwcj4cO0XHKo/bV1SqpiO7uinsrcykOw7ho X-Received: by 10.58.58.41 with SMTP id n9mr9644077veq.23.1395404090449; Fri, 21 Mar 2014 05:14:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.138 with SMTP id c10ls606233qga.63.gmail; Fri, 21 Mar 2014 05:14:50 -0700 (PDT) X-Received: by 10.220.92.135 with SMTP id r7mr37270529vcm.11.1395404089721; Fri, 21 Mar 2014 05:14:49 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id tz5si1106324vdc.205.2014.03.21.05.14.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:14:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so2433761veb.31 for ; Fri, 21 Mar 2014 05:14:49 -0700 (PDT) X-Received: by 10.58.57.67 with SMTP id g3mr36849160veq.3.1395404089647; Fri, 21 Mar 2014 05:14:49 -0700 (PDT) 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.78.9 with SMTP id i9csp25962vck; Fri, 21 Mar 2014 05:14:48 -0700 (PDT) X-Received: by 10.112.118.198 with SMTP id ko6mr32244998lbb.6.1395404088015; Fri, 21 Mar 2014 05:14:48 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by mx.google.com with ESMTPS id le2si3898684lbc.124.2014.03.21.05.14.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:14:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.43 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id e16so1619543lan.30 for ; Fri, 21 Mar 2014 05:14:47 -0700 (PDT) X-Received: by 10.112.39.97 with SMTP id o1mr1078860lbk.38.1395404087429; Fri, 21 Mar 2014 05:14:47 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id tq9sm3255263lbb.10.2014.03.21.05.14.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:14:46 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Cc: devicetree@vger.kernel.org, Ulf Hansson Subject: [PATCH 04/20] mmc: mmci: Move signal directions bits into DT include file Date: Fri, 21 Mar 2014 13:14:01 +0100 Message-Id: <1395404057-27835-5-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> References: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 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 bits is currently used from platform data, but will be needed from DT as well, so let's make them available. Signed-off-by: Ulf Hansson --- include/dt-bindings/mmc/mmci.h | 21 +++++++++++++++++++++ include/linux/amba/mmci.h | 14 +------------- 2 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 include/dt-bindings/mmc/mmci.h diff --git a/include/dt-bindings/mmc/mmci.h b/include/dt-bindings/mmc/mmci.h new file mode 100644 index 0000000..8c55254 --- /dev/null +++ b/include/dt-bindings/mmc/mmci.h @@ -0,0 +1,21 @@ +/* + * This header provides constants for the mmci bindings. + * + */ + +#ifndef _DT_BINDINGS_MMC_MMCI_H +#define _DT_BINDINGS_MMC_MMCI_H + +/* + * Bus signal direction bits. + * The ST Micro version does not have ROD and reuse the voltage registers + * for direction settings. + */ +#define MCI_ST_DATA2DIREN (1 << 2) +#define MCI_ST_CMDDIREN (1 << 3) +#define MCI_ST_DATA0DIREN (1 << 4) +#define MCI_ST_DATA31DIREN (1 << 5) +#define MCI_ST_FBCLKEN (1 << 7) +#define MCI_ST_DATA74DIREN (1 << 8) + +#endif diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 32a89cf..47ff176 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -5,19 +5,7 @@ #define AMBA_MMCI_H #include - - -/* - * These defines is places here due to access is needed from machine - * configuration files. The ST Micro version does not have ROD and - * reuse the voltage registers for direction settings. - */ -#define MCI_ST_DATA2DIREN (1 << 2) -#define MCI_ST_CMDDIREN (1 << 3) -#define MCI_ST_DATA0DIREN (1 << 4) -#define MCI_ST_DATA31DIREN (1 << 5) -#define MCI_ST_FBCLKEN (1 << 7) -#define MCI_ST_DATA74DIREN (1 << 8) +#include /* Just some dummy forwarding */ struct dma_chan;