From: Kishon Vijay Abraham I <kishon@ti.com>
To: Tony Lindgren <tony@atomide.com>, nsekhar@ti.com
Cc: devicetree@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>,
kishon@ti.com, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Russell King <linux@armlinux.org.uk>,
Rob Herring <robh+dt@kernel.org>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/12] ARM: dts: am57xx-idk: Move common MMC/SD properties to common file
Date: Fri, 16 Jun 2017 17:24:34 +0530 [thread overview]
Message-ID: <20170616115439.8508-8-kishon@ti.com> (raw)
In-Reply-To: <20170616115439.8508-1-kishon@ti.com>
AM572x IDK and AM571x IDK boards have equivalent
design of how SD card and eMMC are connected.
The two EVMs mainly differ in IOdelay configuration
needed (because of difference in SoC used).
Move the common properties to am57xx-idk-common.dtsi
file which is common for both EVMs.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/am571x-idk.dts | 7 -------
arch/arm/boot/dts/am572x-idk.dts | 8 --------
arch/arm/boot/dts/am57xx-idk-common.dtsi | 8 ++++++++
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index ad68d1eb3bc3..e685c8e811b0 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -64,13 +64,6 @@
};
};
-&mmc1 {
- status = "okay";
- vmmc-supply = <&ldo1_reg>;
- bus-width = <4>;
- cd-gpios = <&gpio6 27 0>; /* gpio 219 */
-};
-
&omap_dwc3_2 {
extcon = <&extcon_usb2>;
};
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 8d538f5d9a5f..1c112eb25db4 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -76,14 +76,6 @@
vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
};
-&mmc1 {
- status = "okay";
- vmmc-supply = <&v3_3d>;
- vqmmc-supply = <&ldo1_reg>;
- bus-width = <4>;
- cd-gpios = <&gpio6 27 0>; /* gpio 219 */
-};
-
&sn65hvs882 {
load-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
};
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index c536b2f5389f..47b5b384809f 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -399,6 +399,14 @@
dr_mode = "peripheral";
};
+&mmc1 {
+ status = "okay";
+ vmmc-supply = <&v3_3d>;
+ vqmmc-supply = <&ldo1_reg>;
+ bus-width = <4>;
+ cd-gpios = <&gpio6 27 0>; /* gpio 219 */
+};
+
&mmc2 {
status = "okay";
vmmc-supply = <&v3_3d>;
--
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 ` [PATCH 05/12] ARM: dts: dra7-evm: Add pinmux configuration for MMC Kishon Vijay Abraham I
[not found] ` <20170616115439.8508-1-kishon-l0cyMroinI0@public.gmane.org>
2017-06-16 11:54 ` [PATCH 06/12] ARM: dts: am57xx-beagle-x15: " Kishon Vijay Abraham I
2017-06-16 11:54 ` Kishon Vijay Abraham I [this message]
2017-06-16 11:54 ` [PATCH 08/12] ARM: dts: am571x-idk: " 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-8-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).