diff options
-rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 10 | ||||
-rw-r--r-- | drivers/serial/s3c2410.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index ba9afb870a6..302cdd95cef 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -880,14 +880,14 @@ static struct s3c2410_nand_set gta02_nand_sets[] = { }, }; -/* choose a set of timings which should suit most 512Mbit - * chips and beyond. +/* choose a set of timings derived from S3C@2442B MCP54 + * data sheet (K5D2G13ACM-D075 MCP Memory) */ static struct s3c2410_platform_nand gta02_nand_info = { - .tacls = 20, - .twrph0 = 60, - .twrph1 = 20, + .tacls = 0, + .twrph0 = 25, + .twrph1 = 15, .nr_sets = ARRAY_SIZE(gta02_nand_sets), .sets = gta02_nand_sets, .software_ecc = 1, diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index be9e1b97405..791661ebe9e 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -22,7 +22,7 @@ #include <mach/hardware.h> -#include <asm/plat-s3c/regs-serial.h> +#include <plat/regs-serial.h> #include <mach/regs-gpio.h> #include "samsung.h" |