aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChoi Jong-hwan <jhbird.choi@samsung.com>2010-08-03 15:00:49 +0900
committerArve Hjønnevåg <arve@android.com>2011-11-16 21:48:24 -0800
commitee64efcba48f78464271bcbc83d9e17c0600f844 (patch)
tree2bb55e25c0b202594fea323e7719f6f8d9edd3c9 /arch
parent9af1bb687dd455aa23833433dc76d53370a061e4 (diff)
downloadkernel_samsung_crespo-ee64efcba48f78464271bcbc83d9e17c0600f844.zip
kernel_samsung_crespo-ee64efcba48f78464271bcbc83d9e17c0600f844.tar.gz
kernel_samsung_crespo-ee64efcba48f78464271bcbc83d9e17c0600f844.tar.bz2
[CREPO] boot up, yaffs mount, android run Success
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5pv210/Kconfig1
-rw-r--r--arch/arm/mach-s5pv210/mach-herring.c7
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index f6c8ef0..607560d 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -183,6 +183,7 @@ config MACH_S5PC110_CRESPO
select S3C_DEV_WDT
select S3C_DEV_I2C1
select S3C_DEV_I2C2
+ select S5P_DEV_ONENAND
select S5P_DEV_CSIS0
select S5P_SETUP_MIPIPHY
help
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c
index 606d70b..f4813ba 100644
--- a/arch/arm/mach-s5pv210/mach-herring.c
+++ b/arch/arm/mach-s5pv210/mach-herring.c
@@ -2739,6 +2739,7 @@ EXPORT_SYMBOL(s3c_config_sleep_gpio);
static struct platform_device *herring_devices[] __initdata = {
+ &s5p_device_onenand,
#ifdef CONFIG_RTC_DRV_S3C
&s5p_device_rtc,
#endif
@@ -2855,7 +2856,7 @@ static void __init herring_map_io(void)
s5pv210_reserve_bootmem();
#ifdef CONFIG_MTD_ONENAND
- s3c_device_onenand.name = "s5pc110-onenand";
+ s5p_device_onenand.name = "s5pc110-onenand";
#endif
}
@@ -3089,7 +3090,9 @@ static void __init herring_machine_init(void)
#ifdef CONFIG_S5PV210_SETUP_SDHCI
s3c_sdhci_set_platdata();
#endif
-
+#ifdef CONFIG_BATTERY_S3C
+ &sec_device_battery,
+#endif
#if defined(CONFIG_HAVE_PWM)
smdk_backlight_register();
#endif