From: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
linaro-dev-cunTk1MwBs8s++Sfvej+rw@public.gmane.org
Cc: nicolas.pitre-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
Subject: [PATCH 5/7] mmc: support sdhci-esdhc-imx as an OF device
Date: Mon, 14 Mar 2011 22:25:57 +0800 [thread overview]
Message-ID: <1300112759-3495-6-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1300112759-3495-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Signed-off-by: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
drivers/mmc/host/Kconfig | 7 ++++---
drivers/mmc/host/Makefile | 3 ++-
drivers/mmc/host/sdhci-of-core.c | 3 +++
drivers/mmc/host/sdhci-of.h | 1 +
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index afe8c6f..9746ec1 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -133,12 +133,13 @@ config MMC_SDHCI_CNS3XXX
If unsure, say N.
config MMC_SDHCI_ESDHC_IMX
- bool "SDHCI platform support for the Freescale eSDHC i.MX controller"
- depends on MMC_SDHCI_PLTFM && (ARCH_MX25 || ARCH_MX35 || ARCH_MX5)
+ bool "SDHCI support for the Freescale eSDHC i.MX controller"
+ depends on ARCH_MX25 || ARCH_MX35 || ARCH_MX5
+ depends on MMC_SDHCI_PLTFM || MMC_SDHCI_OF
select MMC_SDHCI_IO_ACCESSORS
help
This selects the Freescale eSDHC controller support on the platform
- bus, found on platforms like mx35/51.
+ or OF bus, found on platforms like mx35/51.
If unsure, say N.
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index e834fb2..cca8dfd 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_MMC_USHC) += ushc.o
obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o
sdhci-platform-y := sdhci-pltfm.o
sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o
-sdhci-platform-$(CONFIG_MMC_SDHCI_ESDHC_IMX) += sdhci-esdhc-imx.o
sdhci-platform-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o
sdhci-platform-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o
@@ -48,6 +47,8 @@ sdhci-of-y := sdhci-of-core.o
sdhci-of-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o
sdhci-of-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o
+obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX) += sdhci-esdhc-imx.o
+
ifeq ($(CONFIG_CB710_DEBUG),y)
CFLAGS-cb710-mmc += -DDEBUG
endif
diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c
index 0b32ad7..d803fa5 100644
--- a/drivers/mmc/host/sdhci-of-core.c
+++ b/drivers/mmc/host/sdhci-of-core.c
@@ -32,6 +32,9 @@
#include "sdhci.h"
static const struct of_device_id sdhci_of_match[] = {
+#ifdef CONFIG_MMC_SDHCI_ESDHC_IMX
+ { .compatible = "fsl,imx-esdhc", .data = &sdhci_esdhc_imx_data, },
+#endif
#ifdef CONFIG_MMC_SDHCI_OF_ESDHC
{ .compatible = "fsl,mpc8379-esdhc", .data = &sdhci_esdhc_data, },
{ .compatible = "fsl,mpc8536-esdhc", .data = &sdhci_esdhc_data, },
diff --git a/drivers/mmc/host/sdhci-of.h b/drivers/mmc/host/sdhci-of.h
index e88fe2e..90fb2eb 100644
--- a/drivers/mmc/host/sdhci-of.h
+++ b/drivers/mmc/host/sdhci-of.h
@@ -31,6 +31,7 @@ extern void sdhci_be32bs_writel(struct sdhci_host *host, u32 val, int reg);
extern void sdhci_be32bs_writew(struct sdhci_host *host, u16 val, int reg);
extern void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg);
+extern struct sdhci_data sdhci_esdhc_imx_data;
extern struct sdhci_data sdhci_esdhc_data;
extern struct sdhci_data sdhci_hlwd_data;
--
1.7.1
next prev parent reply other threads:[~2011-03-14 14:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-14 14:25 [PATCH 0/7] support sdhci-esdhc-imx as an OF device Shawn Guo
[not found] ` <1300112759-3495-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-03-14 14:25 ` [PATCH 1/7] mx51 enchance the sd/mmc HW timing compatibility on mx51 boards Shawn Guo
2011-03-14 14:25 ` [PATCH 2/7] arm/dt: add pad configurations for mx51 babbage Shawn Guo
[not found] ` <1300112759-3495-3-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-03-14 15:20 ` Rob Herring
[not found] ` <4D7E3230.6040505-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-03-14 15:53 ` Shawn Guo
[not found] ` <20110314155313.GC3674-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2011-03-15 0:57 ` Shawn Guo
2011-03-15 7:57 ` Grant Likely
2011-03-14 14:25 ` [PATCH 3/7] mmc: make the reference to sdhci_tegra_dt_pdata conditional Shawn Guo
[not found] ` <1300112759-3495-4-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-03-15 7:58 ` Grant Likely
[not found] ` <20110315075859.GL23050-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-03-17 19:59 ` Grant Likely
[not found] ` <AANLkTi=umf9nDpExLEBgJEMgUP-CJUUEbAQrQfdBw7Fd-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-18 1:22 ` Shawn Guo
[not found] ` <20110318012202.GA26951-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2011-03-18 4:58 ` Grant Likely
2011-03-14 14:25 ` [PATCH 4/7] mmc: consolidate sdhci_pltfm_data and sdhci_of_data into one Shawn Guo
[not found] ` <1300112759-3495-5-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-03-15 19:55 ` Grant Likely
[not found] ` <20110315195513.GA20845-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-03-17 6:33 ` Shawn Guo
2011-03-17 20:29 ` Grant Likely
2011-03-14 14:25 ` Shawn Guo [this message]
[not found] ` <1300112759-3495-6-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-03-15 19:59 ` [PATCH 5/7] mmc: support sdhci-esdhc-imx as an OF device Grant Likely
[not found] ` <20110315195926.GB20845-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-03-16 14:39 ` Shawn Guo
2011-03-17 20:22 ` Grant Likely
2011-03-17 20:42 ` Rob Herring
2011-03-14 14:25 ` [PATCH 6/7] arm/dts: babbage: add device nodes for esdhc Shawn Guo
2011-03-14 14:25 ` [PATCH 7/7] dt: update fsl-esdhc bindings for imx esdhc OF support Shawn Guo
2011-03-14 15:46 ` [PATCH 0/7] support sdhci-esdhc-imx as an OF device Shawn Guo
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=1300112759-3495-6-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=linaro-dev-cunTk1MwBs8s++Sfvej+rw@public.gmane.org \
--cc=nicolas.pitre-QSEj5FYQhm4dnm+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).