devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
	Linus Walleij
	<linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH 08/20] ARM: ux500: Convert to the common mmc DT bindings for highspeed mode
Date: Fri, 21 Mar 2014 13:14:05 +0100	[thread overview]
Message-ID: <1395404057-27835-9-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1395404057-27835-1-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

The mmci host driver supports the common mmc DT parser, which enables
us to use the use common names instead.

Signed-off-by: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 arch/arm/boot/dts/ste-ccu9540.dts  |    6 +++---
 arch/arm/boot/dts/ste-href.dtsi    |    8 ++++----
 arch/arm/boot/dts/ste-snowball.dts |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts
index 2295087..651c56d 100644
--- a/arch/arm/boot/dts/ste-ccu9540.dts
+++ b/arch/arm/boot/dts/ste-ccu9540.dts
@@ -38,8 +38,8 @@
 			arm,primecell-periphid = <0x10480180>;
 			max-frequency = <100000000>;
 			bus-width = <4>;
-			mmc-cap-sd-highspeed;
-			mmc-cap-mmc-highspeed;
+			cap-sd-highspeed;
+			cap-mmc-highspeed;
 			vmmc-supply = <&ab8500_ldo_aux3_reg>;
 
 			cd-gpios  = <&gpio7 6 0x4>; // 230
@@ -63,7 +63,7 @@
 			arm,primecell-periphid = <0x10480180>;
 		        max-frequency = <100000000>;
 			bus-width = <8>;
-			mmc-cap-mmc-highspeed;
+			cap-mmc-highspeed;
 			vmmc-supply = <&ab8500_ldo_aux2_reg>;
 
 			status = "okay";
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index d50fe24..e830c37 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -117,8 +117,8 @@
 			arm,primecell-periphid = <0x10480180>;
 			max-frequency = <100000000>;
 			bus-width = <4>;
-			mmc-cap-sd-highspeed;
-			mmc-cap-mmc-highspeed;
+			cap-sd-highspeed;
+			cap-mmc-highspeed;
 			signal-direction = <(MCI_ST_DATA2DIREN |
 						MCI_ST_CMDDIREN |
 						MCI_ST_DATA0DIREN |
@@ -149,7 +149,7 @@
 			arm,primecell-periphid = <0x10480180>;
 			max-frequency = <100000000>;
 			bus-width = <8>;
-			mmc-cap-mmc-highspeed;
+			cap-mmc-highspeed;
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <&sdi2_default_mode>;
 			pinctrl-1 = <&sdi2_sleep_mode>;
@@ -162,7 +162,7 @@
 			arm,primecell-periphid = <0x10480180>;
 		        max-frequency = <100000000>;
 			bus-width = <8>;
-			mmc-cap-mmc-highspeed;
+			cap-mmc-highspeed;
 			vmmc-supply = <&ab8500_ldo_aux2_reg>;
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <&sdi4_default_mode>;
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index a2f632d..474ef832 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -156,7 +156,7 @@
 			arm,primecell-periphid = <0x10480180>;
 			max-frequency = <100000000>;
 			bus-width = <4>;
-			mmc-cap-mmc-highspeed;
+			cap-mmc-highspeed;
 			vmmc-supply = <&ab8500_ldo_aux3_reg>;
 			vqmmc-supply = <&vmmci>;
 			pinctrl-names = "default", "sleep";
@@ -195,7 +195,7 @@
 			arm,primecell-periphid = <0x10480180>;
 		        max-frequency = <100000000>;
 			bus-width = <8>;
-			mmc-cap-mmc-highspeed;
+			cap-mmc-highspeed;
 			vmmc-supply = <&ab8500_ldo_aux2_reg>;
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <&sdi4_default_mode>;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2014-03-21 12:14 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-21 12:13 [PATCH 00/20] mmc: mmci: Improve DT support Ulf Hansson
     [not found] ` <1395404057-27835-1-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-21 12:13   ` [PATCH 01/20] mmc: mmci: Convert to the mmc gpio API Ulf Hansson
2014-03-21 12:13   ` [PATCH 02/20] mmc: mmci: Convert to devm functions Ulf Hansson
2014-03-21 12:14   ` [PATCH 03/20] mmc: mmci: Update DT documentation Ulf Hansson
     [not found]     ` <1395404057-27835-4-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-21 15:03       ` Rob Herring
     [not found]         ` <CAL_JsqJbaxayELNt+d1VSfFyD58eRYQM=d15RaFcFQKbot3iaw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-24  9:03           ` Ulf Hansson
2014-03-21 12:14   ` [PATCH 04/20] mmc: mmci: Move signal directions bits into DT include file Ulf Hansson
     [not found]     ` <1395404057-27835-5-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-25 21:22       ` Linus Walleij
     [not found]         ` <CACRpkdZSr380FVHkx3uOMFKxKYsExoL-1WYhxVpirFMVc+T3Yw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-25 23:05           ` Ulf Hansson
     [not found]             ` <CAPDyKFq=PUcFkT901W15KXThzS4cKMJvZToW3JDc3SkXck9VHA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-28 21:03               ` Linus Walleij
     [not found]                 ` <CACRpkdaNY1jM7xN00DEnOMdDxSf==3AqdrkRSXX3dghStvA4hw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-31 13:56                   ` Ulf Hansson
2014-03-21 12:14   ` [PATCH 05/20] mmc: mmci: Add DT bindings for signal direction Ulf Hansson
     [not found]     ` <1395404057-27835-6-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-21 15:20       ` Rob Herring
     [not found]         ` <CAL_JsqLFJbC=ZVgc1xu9MN6iYN2871mxvZoJnAQJw3BQU07B+w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-24  9:14           ` Ulf Hansson
     [not found]             ` <CAPDyKFrupT7sbT5eBsTC61ELCp_OZTe==Jc_6KUqo9Wb4Xf5dQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-24 13:45               ` Rob Herring
2014-03-21 12:14   ` [PATCH 06/20] mmc: mmci: Use the common mmc DT parser Ulf Hansson
2014-03-21 12:14   ` [PATCH 07/20] ARM: ux500: Add mmci signal directions in DT for href Ulf Hansson
2014-03-21 12:14   ` Ulf Hansson [this message]
     [not found]     ` <1395404057-27835-9-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-25 21:37       ` [PATCH 08/20] ARM: ux500: Convert to the common mmc DT bindings for highspeed mode Linus Walleij
2014-03-21 12:14   ` [PATCH 09/20] ARM: nomadik: " Ulf Hansson
     [not found]     ` <1395404057-27835-10-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-25 21:37       ` Linus Walleij
2014-03-21 12:14   ` [PATCH 10/20] ARM: u300: " Ulf Hansson
     [not found]     ` <1395404057-27835-11-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-25 21:38       ` Linus Walleij
2014-03-21 12:14   ` [PATCH 11/20] mmc: mmci: Mark the DT bindings for highspeed mode as deprecated Ulf Hansson
2014-03-21 12:14   ` [PATCH 12/20] mmc: mmci: Enable MMC_CAP_CMD23 Ulf Hansson
2014-03-21 12:14   ` [PATCH 13/20] ARM: ux500: Add the mmc capabilities flags to DT Ulf Hansson
     [not found]     ` <1395404057-27835-14-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-25 21:39       ` Linus Walleij
2014-03-21 12:14   ` [PATCH 14/20] regulator: db8500-prcmu: Set 1.8V as a fixed voltage for vsmps2 Ulf Hansson
     [not found]     ` <1395404057-27835-15-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-21 12:25       ` Mark Brown
     [not found]         ` <20140321122545.GP11706-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-03-21 13:03           ` Ulf Hansson
2014-03-21 17:47       ` Mark Brown
2014-03-21 12:14   ` [PATCH 15/20] ARM: ux500: Add a vmmc regulator through DT for the poped eMMC for href Ulf Hansson
     [not found]     ` <1395404057-27835-16-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-25 21:45       ` Linus Walleij
     [not found]         ` <CACRpkdbFFqQdWXOHyV8qmxnd0z2CKK9gZFS0ys5YLm2dES7bgQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-26  9:27           ` Ulf Hansson
2014-03-26  9:31             ` Ulf Hansson
2014-03-21 12:14   ` [PATCH 16/20] ARM: ux500: Remove redundant board file for mmci platform data Ulf Hansson
     [not found]     ` <1395404057-27835-17-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-25 21:45       ` Linus Walleij
2014-03-21 12:14   ` [PATCH 17/20] mmc: mmci: Enforce DT for signal direction Ulf Hansson
2014-03-21 12:14   ` [PATCH 18/20] mmc: mmci: Enforce mmc capabilities through DT Ulf Hansson
2014-03-21 12:14   ` [PATCH 19/20] mmc: mmci: Enforce DMA configuration " Ulf Hansson
2014-03-21 12:14   ` [PATCH 20/20] mmc: mmci: Enforce max frequency " Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1395404057-27835-9-git-send-email-ulf.hansson@linaro.org \
    --to=ulf.hansson-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).