From: Kishon Vijay Abraham I <kishon@ti.com>
To: Tony Lindgren <tony@atomide.com>, nsekhar@ti.com
Cc: Rob Herring <robh+dt@kernel.org>,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Ulf Hansson <ulf.hansson@linaro.org>,
linux-mmc@vger.kernel.org, Russell King <linux@armlinux.org.uk>,
kishon@ti.com
Subject: [PATCH 05/12] ARM: dts: dra7-evm: Add pinmux configuration for MMC
Date: Fri, 16 Jun 2017 17:24:32 +0530 [thread overview]
Message-ID: <20170616115439.8508-6-kishon@ti.com> (raw)
In-Reply-To: <20170616115439.8508-1-kishon@ti.com>
Include dra74x-mmc-iodelay.dtsi which has pinmux and IODelay
configuration values for the various MMC modes for dra74 SoC
and use it in the pinctrl properties of MMC devicetree
nodes present in dra7-evm.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7-evm.dts | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index e4c4037e6314..e74feb7ed53c 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -8,6 +8,7 @@
/dts-v1/;
#include "dra74x.dtsi"
+#include "dra74x-mmc-iodelay.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clk/ti-dra7-atl.h>
#include <dt-bindings/input/input.h>
@@ -443,8 +444,6 @@
&mmc1 {
status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_default>;
vmmc-supply = <&evm_3v3_sd>;
vqmmc-supply = <&ldo1_reg>;
bus-width = <4>;
@@ -453,14 +452,29 @@
* is always hardwired.
*/
cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50-rev11", "sdr104-rev11", "ddr50", "sdr104";
+ pinctrl-0 = <&mmc1_pins_default>;
+ pinctrl-1 = <&mmc1_pins_hs>;
+ pinctrl-2 = <&mmc1_pins_sdr12>;
+ pinctrl-3 = <&mmc1_pins_sdr25>;
+ pinctrl-4 = <&mmc1_pins_sdr50>;
+ pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev11_conf>;
+ pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev11_conf>;
+ pinctrl-7 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>;
+ pinctrl-8 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;
};
&mmc2 {
status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_default>;
vmmc-supply = <&evm_1v8_sw>;
bus-width = <8>;
+ pinctrl-names = "default", "hs", "ddr_1_8v-rev11", "ddr_1_8v", "hs200_1_8v-rev11", "hs200_1_8v";
+ pinctrl-0 = <&mmc2_pins_default>;
+ pinctrl-1 = <&mmc2_pins_hs>;
+ pinctrl-2 = <&mmc2_pins_ddr_1_8v_rev11 &mmc2_iodelay_ddr_1_8v_rev11_conf>;
+ pinctrl-3 = <&mmc2_pins_ddr_rev20>;
+ pinctrl-4 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_rev11_conf>;
+ pinctrl-5 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_rev20_conf>;
};
&cpu0 {
--
2.11.0
next prev parent reply other threads:[~2017-06-16 11:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 11:54 [PATCH 00/12] ARM: dts: Add iodelay data for MMC Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 01/12] ARM: OMAP2+: Select PINCTRL_TI_IODELAY for SOC_DRA7XX Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 02/12] ARM: dts: Add dra7 iodelay configuration Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 03/12] ARM: dts: dra72x: Create a common file with MMC/SD IOdelay data Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 04/12] ARM: dts: dra74x: " Kishon Vijay Abraham I
2017-06-16 11:54 ` Kishon Vijay Abraham I [this message]
[not found] ` <20170616115439.8508-1-kishon-l0cyMroinI0@public.gmane.org>
2017-06-16 11:54 ` [PATCH 06/12] ARM: dts: am57xx-beagle-x15: Add pinmux configuration for MMC Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 07/12] ARM: dts: am57xx-idk: Move common MMC/SD properties to common file Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 08/12] ARM: dts: am571x-idk: Add pinmux configuration for MMC Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 09/12] ARM: dts: am572x-idk: " Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 10/12] ARM: dts: dra72-evm: " Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 11/12] ARM: dts: dra72-evm-revc: " Kishon Vijay Abraham I
2017-06-16 11:54 ` [PATCH 12/12] ARM: dts: dra71-evm: " Kishon Vijay Abraham I
2017-08-10 16:33 ` [PATCH 00/12] ARM: dts: Add iodelay data " Tony Lindgren
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=20170616115439.8508-6-kishon@ti.com \
--to=kishon@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=nsekhar@ti.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.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).