aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authormokopatches <mokopatches@openmoko.org>2008-11-19 17:03:13 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:03:13 +0000
commit0a4a9b785a24a7c87a2c69c2cf7afa1b38248f30 (patch)
tree3d87fe116071ebf3ae919512dd471d4df64a1d52 /arch/arm
parentc63474bdc3d45e06d0b0f8a4dc8cace828b780d2 (diff)
s3c_mci.patch
This is a MMC/SD driver for the Samsung S3C24xx SD/MMC controller, originally developed years ago by Thomas Kleffel <tk@maintech.de>. Due to time restraints, he had no time to further maintain the driver and follow the mainline Linux changes in the SD/MMC stack. With his authorization, I have taken over the task of making it compliant to the current mainline SD/MMC API and take care of the mainline kernel merge. After a potential kernel inclusion, we would co-maintain the driver. Acked-by: Thomas Kleffel <tk@maintech.de> Signed-off-by: Harald Welte <laforge@gnumonks.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2412/s3c2412.c3
-rw-r--r--arch/arm/mach-s3c2440/s3c2440.c3
-rw-r--r--arch/arm/mach-s3c2442/s3c2442.c4
3 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c
index 5b5aba69ec3..257cf702854 100644
--- a/arch/arm/mach-s3c2412/s3c2412.c
+++ b/arch/arm/mach-s3c2412/s3c2412.c
@@ -231,5 +231,8 @@ int __init s3c2412_init(void)
{
printk("S3C2412: Initialising architecture\n");
+ /* make sure SD/MMC driver can distinguish 2412 from 2410 */
+ s3c_device_sdi.name = "s3c2412-sdi";
+
return sysdev_register(&s3c2412_sysdev);
}
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
index ac1f7ea5f40..f7f8f312c39 100644
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -46,6 +46,9 @@ int __init s3c2440_init(void)
s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
s3c_device_wdt.resource[1].end = IRQ_S3C2440_WDT;
+ /* make sure SD/MMC driver can distinguish 2440 from 2410 */
+ s3c_device_sdi.name = "s3c2440-sdi";
+
/* register our system device for everything else */
return sysdev_register(&s3c2440_sysdev);
diff --git a/arch/arm/mach-s3c2442/s3c2442.c b/arch/arm/mach-s3c2442/s3c2442.c
index 4663bdc7fff..9602d575d3b 100644
--- a/arch/arm/mach-s3c2442/s3c2442.c
+++ b/arch/arm/mach-s3c2442/s3c2442.c
@@ -21,6 +21,7 @@
#include <plat/s3c2442.h>
#include <plat/cpu.h>
+#include <plat/devs.h>
static struct sys_device s3c2442_sysdev = {
.cls = &s3c2442_sysclass,
@@ -30,5 +31,8 @@ int __init s3c2442_init(void)
{
printk("S3C2442: Initialising architecture\n");
+ /* make sure SD/MMC driver can distinguish 2440 from 2410 */
+ s3c_device_sdi.name = "s3c2440-sdi";
+
return sysdev_register(&s3c2442_sysdev);
}