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,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH V3 08/19] ARM: ux500: Convert to the common mmc DT bindings for highspeed mode
Date: Thu, 10 Apr 2014 14:20:51 +0200	[thread overview]
Message-ID: <1397132462-8005-9-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1397132462-8005-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>
Acked-by: Linus Walleij <linus.walleij-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 46dce42..3f07c58 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -116,8 +116,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;
 			st,sig-dir-dat0;
 			st,sig-dir-dat2;
 			st,sig-dir-cmd;
@@ -148,7 +148,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>;
@@ -161,7 +161,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-04-10 12:20 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-10 12:20 [PATCH V3 00/19] mmc: mmci: Improve DT support Ulf Hansson
     [not found] ` <1397132462-8005-1-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-04-10 12:20   ` [PATCH V3 01/19] mmc: mmci: Convert to the mmc gpio API Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 02/19] mmc: mmci: Convert to devm functions Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 03/19] mmc: mmci: Update DT documentation Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 04/19] mmc: mmci: Add DT bindings for signal direction Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 05/19] mmc: mmci: Add DT bindings for feedback clock pin Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 06/19] mmc: mmci: Use the common mmc DT parser Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 07/19] ARM: ux500: Add mmci signal directions and feeback clock in DT for href Ulf Hansson
2014-04-10 12:20   ` Ulf Hansson [this message]
2014-04-10 12:20   ` [PATCH V3 09/19] ARM: nomadik: Convert to the common mmc DT bindings for highspeed mode Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 10/19] ARM: u300: " Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 11/19] mmc: mmci: Mark the DT bindings for highspeed mode as deprecated Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 12/19] mmc: mmci: Enable MMC_CAP_CMD23 Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 13/19] ARM: ux500: Add the mmc capabilities flags to DT Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 14/19] ARM: ux500: Add a vmmc regulator through DT for the poped eMMC for href Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 15/19] ARM: ux500: Remove redundant board file for mmci platform data Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 16/19] mmc: mmci: Enforce DT for signal direction and feedback clock Ulf Hansson
2014-04-10 12:21   ` [PATCH V3 17/19] mmc: mmci: Enforce mmc capabilities through DT Ulf Hansson
2014-04-10 12:21   ` [PATCH V3 18/19] mmc: mmci: Enforce DMA configuration " Ulf Hansson
     [not found]     ` <1397132462-8005-19-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-05-20  4:24       ` Ulf Hansson
2014-04-10 12:21   ` [PATCH V3 19/19] mmc: mmci: Enforce max frequency " Ulf Hansson
2014-04-10 12:26   ` [PATCH V3 00/19] mmc: mmci: Improve DT support 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=1397132462-8005-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 \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@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).