diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-01 11:47:06 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-07-30 19:10:24 -0400 |
commit | 14077ea63b5aea1db0142c1085d24aa0d11b9d36 (patch) | |
tree | 110e40969a8cde0f3b1dd3da3bb553091412ed36 /arch/arm/mach-s3c6400/include | |
parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) |
ARM: S3C: move s3c_device_nand from plat-s3c24xx to plat-s3c
Move the s3c_device_nand platform device from plat-s3c24xx to plat-s3c,
now that the nand driver also support the s3c64xx devices.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c6400/include')
-rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index 5057d9948d35..fba241a71981 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h | |||
@@ -38,6 +38,7 @@ | |||
38 | #define S3C_VA_UART2 S3C_VA_UARTx(2) | 38 | #define S3C_VA_UART2 S3C_VA_UARTx(2) |
39 | #define S3C_VA_UART3 S3C_VA_UARTx(3) | 39 | #define S3C_VA_UART3 S3C_VA_UARTx(3) |
40 | 40 | ||
41 | #define S3C64XX_PA_NAND (0x70200000) | ||
41 | #define S3C64XX_PA_FB (0x77100000) | 42 | #define S3C64XX_PA_FB (0x77100000) |
42 | #define S3C64XX_PA_USB_HSOTG (0x7C000000) | 43 | #define S3C64XX_PA_USB_HSOTG (0x7C000000) |
43 | #define S3C64XX_PA_WATCHDOG (0x7E004000) | 44 | #define S3C64XX_PA_WATCHDOG (0x7E004000) |
@@ -72,6 +73,7 @@ | |||
72 | #define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2 | 73 | #define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2 |
73 | #define S3C_PA_IIC S3C64XX_PA_IIC0 | 74 | #define S3C_PA_IIC S3C64XX_PA_IIC0 |
74 | #define S3C_PA_IIC1 S3C64XX_PA_IIC1 | 75 | #define S3C_PA_IIC1 S3C64XX_PA_IIC1 |
76 | #define S3C_PA_NAND S3C64XX_PA_NAND | ||
75 | #define S3C_PA_FB S3C64XX_PA_FB | 77 | #define S3C_PA_FB S3C64XX_PA_FB |
76 | #define S3C_PA_USBHOST S3C64XX_PA_USBHOST | 78 | #define S3C_PA_USBHOST S3C64XX_PA_USBHOST |
77 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG | 79 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG |