1 files changed, 8 insertions, 3 deletions

diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index bf5087c2b7fe..822a55950685 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -859,12 +859,19 @@ static struct s5p_platform_fimc goni_fimc_md_platdata __initdata = {
         .num_clients    = ARRAY_SIZE(goni_camera_sensors),
 };
 
+/* Audio device */
+static struct platform_device goni_device_audio = {
+        .name = "smdk-audio",
+        .id = -1,
+};
+
 static struct platform_device *goni_devices[] __initdata = {
         &s3c_device_fb,
         &s5p_device_onenand,
         &goni_spi_gpio,
         &goni_i2c_gpio_pmic,
         &goni_i2c_gpio5,
+        &goni_device_audio,
         &mmc2_fixed_voltage,
         &goni_device_gpiokeys,
         &s5p_device_mfc,
@@ -901,7 +908,7 @@ static void __init goni_sound_init(void)
 static void __init goni_map_io(void)
 {
         s5pv210_init_io(NULL, 0);
-        s3c24xx_init_clocks(24000000);
+        s3c24xx_init_clocks(clk_xusbxti.rate);
         s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));
         s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
 }
@@ -959,8 +966,6 @@ static void __init goni_machine_init(void)
         /* KEYPAD */
         samsung_keypad_set_platdata(&keypad_data);
 
-        clk_xusbxti.rate = 24000000;
-
         platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices));
 }