aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/Kconfig1
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 464b6b36ce6e..af2a8132eaba 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -80,6 +80,7 @@ config MACH_GONI
80 select S3C_DEV_HSMMC 80 select S3C_DEV_HSMMC
81 select S3C_DEV_HSMMC1 81 select S3C_DEV_HSMMC1
82 select S3C_DEV_HSMMC2 82 select S3C_DEV_HSMMC2
83 select S3C_DEV_USB_HSOTG
83 select S5P_DEV_ONENAND 84 select S5P_DEV_ONENAND
84 select SAMSUNG_DEV_KEYPAD 85 select SAMSUNG_DEV_KEYPAD
85 select S5PV210_SETUP_FB_24BPP 86 select S5PV210_SETUP_FB_24BPP
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index b0ae20889a3a..e68791855d22 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -37,6 +37,7 @@
37#include <plat/fb.h> 37#include <plat/fb.h>
38#include <plat/keypad.h> 38#include <plat/keypad.h>
39#include <plat/sdhci.h> 39#include <plat/sdhci.h>
40#include <plat/clock.h>
40 41
41/* Following are default values for UCON, ULCON and UFCON UART registers */ 42/* Following are default values for UCON, ULCON and UFCON UART registers */
42#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ 43#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -487,6 +488,7 @@ static struct platform_device *goni_devices[] __initdata = {
487 &s3c_device_hsmmc0, 488 &s3c_device_hsmmc0,
488 &s3c_device_hsmmc1, 489 &s3c_device_hsmmc1,
489 &s3c_device_hsmmc2, 490 &s3c_device_hsmmc2,
491 &s3c_device_usb_hsotg,
490 &samsung_device_keypad, 492 &samsung_device_keypad,
491}; 493};
492 494
@@ -512,6 +514,8 @@ static void __init goni_machine_init(void)
512 /* KEYPAD */ 514 /* KEYPAD */
513 samsung_keypad_set_platdata(&keypad_data); 515 samsung_keypad_set_platdata(&keypad_data);
514 516
517 clk_xusbxti.rate = 24000000;
518
515 platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices)); 519 platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices));
516} 520}
517 521