projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Merge next-s3c24xx-dev-rtp
[linux-2.6-block.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-bast.c
diff --git
a/arch/arm/mach-s3c2410/mach-bast.c
b/arch/arm/mach-s3c2410/mach-bast.c
index c425eefb9f89d7f79fa8be026b9e0acfe5c523ef..4c79ac8a6c336bb9efd5a9d45452bb4670bf3139 100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-bast.c
+++ b/
arch/arm/mach-s3c2410/mach-bast.c
@@
-248,7
+248,7
@@
static int chip0_map[] = { 1 };
static int chip1_map[] = { 2 };
static int chip2_map[] = { 3 };
static int chip1_map[] = { 2 };
static int chip2_map[] = { 3 };
-static struct mtd_partition bast_default_nand_part[] = {
+static struct mtd_partition
__initdata
bast_default_nand_part[] = {
[0] = {
.name = "Boot Agent",
.size = SZ_16K,
[0] = {
.name = "Boot Agent",
.size = SZ_16K,
@@
-274,7
+274,7
@@
static struct mtd_partition bast_default_nand_part[] = {
* socket.
*/
* socket.
*/
-static struct s3c2410_nand_set bast_nand_sets[] = {
+static struct s3c2410_nand_set
__initdata
bast_nand_sets[] = {
[0] = {
.name = "SmartMedia",
.nr_chips = 1,
[0] = {
.name = "SmartMedia",
.nr_chips = 1,
@@
-324,7
+324,7
@@
static void bast_nand_select(struct s3c2410_nand_set *set, int slot)
__raw_writeb(tmp, BAST_VA_CTRL2);
}
__raw_writeb(tmp, BAST_VA_CTRL2);
}
-static struct s3c2410_platform_nand bast_nand_info = {
+static struct s3c2410_platform_nand
__initdata
bast_nand_info = {
.tacls = 30,
.twrph0 = 60,
.twrph1 = 60,
.tacls = 30,
.twrph0 = 60,
.twrph1 = 60,
@@
-631,7
+631,6
@@
static void __init bast_map_io(void)
s3c24xx_register_clocks(bast_clocks, ARRAY_SIZE(bast_clocks));
s3c24xx_register_clocks(bast_clocks, ARRAY_SIZE(bast_clocks));
- s3c_device_nand.dev.platform_data = &bast_nand_info;
s3c_device_hwmon.dev.platform_data = &bast_hwmon_info;
s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));
s3c_device_hwmon.dev.platform_data = &bast_hwmon_info;
s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));
@@
-645,6
+644,7
@@
static void __init bast_init(void)
sysdev_register(&bast_pm_sysdev);
s3c_i2c0_set_platdata(&bast_i2c_info);
sysdev_register(&bast_pm_sysdev);
s3c_i2c0_set_platdata(&bast_i2c_info);
+ s3c_nand_set_platdata(&bast_nand_info);
s3c24xx_fb_set_platdata(&bast_fb_info);
platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));
s3c24xx_fb_set_platdata(&bast_fb_info);
platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));