From: dianders@chromium.org (Doug Anderson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] ARM: dts: exynos: Move the dwmmc aliases from smdk5250 dts to exynos
Date: Tue, 20 Nov 2012 09:22:30 -0800 [thread overview]
Message-ID: <1353432158-22999-1-git-send-email-dianders@chromium.org> (raw)
The aliases for dwmmc were placed in the SMDK5250 dts file but really
should be common for all exynos5250 boards. Move it to the common CPU
file.
Signed-off-by: Doug Anderson <dianders@chromium.org>
---
arch/arm/boot/dts/exynos5250-smdk5250.dts | 12 ++++--------
arch/arm/boot/dts/exynos5250.dtsi | 12 ++++++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 405009c..541fe39 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -17,10 +17,6 @@
compatible = "samsung,smdk5250", "samsung,exynos5250";
aliases {
- mshc0 = &dwmmc_0;
- mshc1 = &dwmmc_1;
- mshc2 = &dwmmc_2;
- mshc3 = &dwmmc_3;
};
memory {
@@ -97,7 +93,7 @@
};
};
- dwmmc_0: dwmmc0 at 12200000 {
+ dwmmc0 at 12200000 {
num-slots = <1>;
supports-highspeed;
broken-cd;
@@ -118,11 +114,11 @@
};
};
- dwmmc_1: dwmmc1 at 12210000 {
+ dwmmc1 at 12210000 {
status = "disabled";
};
- dwmmc_2: dwmmc2 at 12220000 {
+ dwmmc2 at 12220000 {
num-slots = <1>;
supports-highspeed;
fifo-depth = <0x80>;
@@ -143,7 +139,7 @@
};
};
- dwmmc_3: dwmmc3 at 12230000 {
+ dwmmc3 at 12230000 {
status = "disabled";
};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index cf6a02d..7c5664b 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -31,6 +31,10 @@
gsc1 = &gsc_1;
gsc2 = &gsc_2;
gsc3 = &gsc_3;
+ mshc0 = &dwmmc_0;
+ mshc1 = &dwmmc_1;
+ mshc2 = &dwmmc_2;
+ mshc3 = &dwmmc_3;
};
gic:interrupt-controller at 10481000 {
@@ -206,7 +210,7 @@
#size-cells = <0>;
};
- dwmmc0 at 12200000 {
+ dwmmc_0: dwmmc0 at 12200000 {
compatible = "samsung,exynos5250-dw-mshc";
reg = <0x12200000 0x1000>;
interrupts = <0 75 0>;
@@ -214,7 +218,7 @@
#size-cells = <0>;
};
- dwmmc1 at 12210000 {
+ dwmmc_1: dwmmc1 at 12210000 {
compatible = "samsung,exynos5250-dw-mshc";
reg = <0x12210000 0x1000>;
interrupts = <0 76 0>;
@@ -222,7 +226,7 @@
#size-cells = <0>;
};
- dwmmc2 at 12220000 {
+ dwmmc_2: dwmmc2 at 12220000 {
compatible = "samsung,exynos5250-dw-mshc";
reg = <0x12220000 0x1000>;
interrupts = <0 77 0>;
@@ -230,7 +234,7 @@
#size-cells = <0>;
};
- dwmmc3 at 12230000 {
+ dwmmc_3: dwmmc3 at 12230000 {
compatible = "samsung,exynos5250-dw-mshc";
reg = <0x12230000 0x1000>;
interrupts = <0 78 0>;
--
1.7.7.3
next reply other threads:[~2012-11-20 17:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-20 17:22 Doug Anderson [this message]
2012-11-20 17:22 ` [PATCH 2/2] ARM: dts: snow: Add board dts file for Snow board (ARM Chromebook) Doug Anderson
2012-11-20 18:43 ` Olof Johansson
2012-11-20 22:57 ` Kukjin Kim
2012-11-21 9:43 ` Kukjin Kim
2012-11-20 18:44 ` [PATCH 1/2] ARM: dts: exynos: Move the dwmmc aliases from smdk5250 dts to exynos Olof Johansson
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=1353432158-22999-1-git-send-email-dianders@chromium.org \
--to=dianders@chromium.org \
--cc=linux-arm-kernel@lists.infradead.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).