aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorJonas Bonn <jonas.bonn@gmail.com>2008-11-19 17:11:04 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:11:04 +0000
commita610c47f0745c82e934f3859a3bea7dc7649cf1f (patch)
tree8a657b2a18c4ad3feaf5dd036ab88526add5943d /arch/arm/mach-s3c2410
parent75f1d376da807a9b4ca218527ce7d5ea4d78a931 (diff)
Carry over changes from asm/arch/regs-sdi.h
This pulls the Moko changes to regs-sdi.h that were in include/asm-arm/arch-s3c2410 over to the file at arch/arm/../mach and deletes the file at include/asm-arm. Note: we have been using a mix of regs-sdi.h from the two different locations. The unification of these two files may have some unknown consequences... keep your eyes open for oddities after applying this. Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/regs-sdi.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-sdi.h b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
index cbf2d8884e3..4da3b28a551 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
@@ -30,6 +30,7 @@
#define S3C2410_SDIFSTA (0x38)
#define S3C2410_SDIDATA (0x3C)
+#define S3C2410_SDIDATA_BYTE (0x3C)
#define S3C2410_SDIIMSK (0x40)
#define S3C2440_SDIDATA (0x40)
@@ -37,6 +38,8 @@
#define S3C2440_SDICON_SDRESET (1<<8)
#define S3C2440_SDICON_MMCCLOCK (1<<5)
+#define S3C2440_SDIDATA_BYTE (0x48)
+
#define S3C2410_SDICON_BYTEORDER (1<<4)
#define S3C2410_SDICON_SDIOIRQ (1<<3)
#define S3C2410_SDICON_RWAITEN (1<<2)