diff options
author | Mike Rapoport <mike@compulab.co.il> | 2010-11-07 16:57:12 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-01-08 21:48:48 -0500 |
commit | 985b1aa05bc47794780ac92eebdaf006a5187afb (patch) | |
tree | 5c40521dbba37fc34357b37dacc7e82d94677c7a | |
parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) |
mmc: Add support for the Marvell Dove SDHCI controller
Implement an sdhci-pltfm driver for the controller found in the
Marvell Dove SoC.
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
CC: Saeed Bishara <saeed@marvell.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/Kconfig | 11 | ||||
-rw-r--r-- | drivers/mmc/host/Makefile | 1 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-dove.c | 70 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-pltfm.c | 3 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-pltfm.h | 1 |
5 files changed, 86 insertions, 0 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index d618e8673996..f8fa9efca8ee 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -140,6 +140,17 @@ config MMC_SDHCI_ESDHC_IMX | |||
140 | 140 | ||
141 | If unsure, say N. | 141 | If unsure, say N. |
142 | 142 | ||
143 | config MMC_SDHCI_DOVE | ||
144 | bool "SDHCI support on Marvell's Dove SoC" | ||
145 | depends on ARCH_DOVE | ||
146 | depends on MMC_SDHCI_PLTFM | ||
147 | select MMC_SDHCI_IO_ACCESSORS | ||
148 | help | ||
149 | This selects the Secure Digital Host Controller Interface in | ||
150 | Marvell's Dove SoC. | ||
151 | |||
152 | If unsure, say N. | ||
153 | |||
143 | config MMC_SDHCI_S3C | 154 | config MMC_SDHCI_S3C |
144 | tristate "SDHCI support on Samsung S3C SoC" | 155 | tristate "SDHCI support on Samsung S3C SoC" |
145 | depends on MMC_SDHCI && PLAT_SAMSUNG | 156 | depends on MMC_SDHCI && PLAT_SAMSUNG |
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 7b645ff43b30..d91364d4bf39 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile | |||
@@ -39,6 +39,7 @@ obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o | |||
39 | sdhci-platform-y := sdhci-pltfm.o | 39 | sdhci-platform-y := sdhci-pltfm.o |
40 | sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o | 40 | sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o |
41 | sdhci-platform-$(CONFIG_MMC_SDHCI_ESDHC_IMX) += sdhci-esdhc-imx.o | 41 | sdhci-platform-$(CONFIG_MMC_SDHCI_ESDHC_IMX) += sdhci-esdhc-imx.o |
42 | sdhci-platform-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o | ||
42 | 43 | ||
43 | obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o | 44 | obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o |
44 | sdhci-of-y := sdhci-of-core.o | 45 | sdhci-of-y := sdhci-of-core.o |
diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c new file mode 100644 index 000000000000..2aeef4ffed8c --- /dev/null +++ b/drivers/mmc/host/sdhci-dove.c | |||
@@ -0,0 +1,70 @@ | |||
1 | /* | ||
2 | * sdhci-dove.c Support for SDHCI on Marvell's Dove SoC | ||
3 | * | ||
4 | * Author: Saeed Bishara <saeed@marvell.com> | ||
5 | * Mike Rapoport <mike@compulab.co.il> | ||
6 | * Based on sdhci-cns3xxx.c | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
20 | */ | ||
21 | |||
22 | #include <linux/io.h> | ||
23 | #include <linux/mmc/host.h> | ||
24 | |||
25 | #include "sdhci.h" | ||
26 | #include "sdhci-pltfm.h" | ||
27 | |||
28 | static u16 sdhci_dove_readw(struct sdhci_host *host, int reg) | ||
29 | { | ||
30 | u16 ret; | ||
31 | |||
32 | switch (reg) { | ||
33 | case SDHCI_HOST_VERSION: | ||
34 | case SDHCI_SLOT_INT_STATUS: | ||
35 | /* those registers don't exist */ | ||
36 | return 0; | ||
37 | default: | ||
38 | ret = readw(host->ioaddr + reg); | ||
39 | } | ||
40 | return ret; | ||
41 | } | ||
42 | |||
43 | static u32 sdhci_dove_readl(struct sdhci_host *host, int reg) | ||
44 | { | ||
45 | u32 ret; | ||
46 | |||
47 | switch (reg) { | ||
48 | case SDHCI_CAPABILITIES: | ||
49 | ret = readl(host->ioaddr + reg); | ||
50 | /* Mask the support for 3.0V */ | ||
51 | ret &= ~SDHCI_CAN_VDD_300; | ||
52 | break; | ||
53 | default: | ||
54 | ret = readl(host->ioaddr + reg); | ||
55 | } | ||
56 | return ret; | ||
57 | } | ||
58 | |||
59 | static struct sdhci_ops sdhci_dove_ops = { | ||
60 | .read_w = sdhci_dove_readw, | ||
61 | .read_l = sdhci_dove_readl, | ||
62 | }; | ||
63 | |||
64 | struct sdhci_pltfm_data sdhci_dove_pdata = { | ||
65 | .ops = &sdhci_dove_ops, | ||
66 | .quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER | | ||
67 | SDHCI_QUIRK_NO_BUSY_IRQ | | ||
68 | SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | | ||
69 | SDHCI_QUIRK_FORCE_DMA, | ||
70 | }; | ||
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 0502f89f662b..91c6766c660c 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c | |||
@@ -170,6 +170,9 @@ static const struct platform_device_id sdhci_pltfm_ids[] = { | |||
170 | #ifdef CONFIG_MMC_SDHCI_ESDHC_IMX | 170 | #ifdef CONFIG_MMC_SDHCI_ESDHC_IMX |
171 | { "sdhci-esdhc-imx", (kernel_ulong_t)&sdhci_esdhc_imx_pdata }, | 171 | { "sdhci-esdhc-imx", (kernel_ulong_t)&sdhci_esdhc_imx_pdata }, |
172 | #endif | 172 | #endif |
173 | #ifdef CONFIG_MMC_SDHCI_DOVE | ||
174 | { "sdhci-dove", (kernel_ulong_t)&sdhci_dove_pdata }, | ||
175 | #endif | ||
173 | { }, | 176 | { }, |
174 | }; | 177 | }; |
175 | MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids); | 178 | MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids); |
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index c1bfe48af56a..62118b9f9d0a 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h | |||
@@ -22,5 +22,6 @@ struct sdhci_pltfm_host { | |||
22 | 22 | ||
23 | extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata; | 23 | extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata; |
24 | extern struct sdhci_pltfm_data sdhci_esdhc_imx_pdata; | 24 | extern struct sdhci_pltfm_data sdhci_esdhc_imx_pdata; |
25 | extern struct sdhci_pltfm_data sdhci_dove_pdata; | ||
25 | 26 | ||
26 | #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */ | 27 | #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */ |