summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c6400
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:06 +0100
committerBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:06 +0100
commitb282e29b547937d1610f38d6aa1c485426b62650 (patch)
tree62741a6d17e910e7b77a5cc4e94c44b7e587645c /arch/arm/mach-s3c6400
parentc378aa275e1476218a6b438056a4cd48eb1eca0f (diff)
parentc233d94931cebc8ec805fb98856f34ad16d49e4f (diff)
downloadop-kernel-dev-b282e29b547937d1610f38d6aa1c485426b62650.zip
op-kernel-dev-b282e29b547937d1610f38d6aa1c485426b62650.tar.gz
Merge branch 'next-s3c64xx-moves' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c6400')
-rw-r--r--arch/arm/mach-s3c6400/include/mach/map.h2
-rw-r--r--arch/arm/mach-s3c6400/s3c6400.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h
index 16c4630..fc8b223 100644
--- a/arch/arm/mach-s3c6400/include/mach/map.h
+++ b/arch/arm/mach-s3c6400/include/mach/map.h
@@ -38,6 +38,7 @@
#define S3C_VA_UART2 S3C_VA_UARTx(2)
#define S3C_VA_UART3 S3C_VA_UARTx(3)
+#define S3C64XX_PA_NAND (0x70200000)
#define S3C64XX_PA_FB (0x77100000)
#define S3C64XX_PA_USB_HSOTG (0x7C000000)
#define S3C64XX_PA_WATCHDOG (0x7E004000)
@@ -74,6 +75,7 @@
#define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2
#define S3C_PA_IIC S3C64XX_PA_IIC0
#define S3C_PA_IIC1 S3C64XX_PA_IIC1
+#define S3C_PA_NAND S3C64XX_PA_NAND
#define S3C_PA_FB S3C64XX_PA_FB
#define S3C_PA_USBHOST S3C64XX_PA_USBHOST
#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG
diff --git a/arch/arm/mach-s3c6400/s3c6400.c b/arch/arm/mach-s3c6400/s3c6400.c
index 1ece887..b42bdd0f 100644
--- a/arch/arm/mach-s3c6400/s3c6400.c
+++ b/arch/arm/mach-s3c6400/s3c6400.c
@@ -48,6 +48,8 @@ void __init s3c6400_map_io(void)
/* the i2c devices are directly compatible with s3c2440 */
s3c_i2c0_setname("s3c2440-i2c");
+
+ s3c_device_nand.name = "s3c6400-nand";
}
void __init s3c6400_init_clocks(int xtal)
OpenPOWER on IntegriCloud