Merge branch 'next-samsung-clkdev-fix' into next-samsung-cleanup

diff --combined arch/arm/plat-s5p/s5p-time.c
index 612934c48b0d25fc3d2bacbb1eed22e2806f191d,b0866751523756c1b33f6c5f144c0cbfce2204ae..7c82f06baf570dddaf2f7c0fc4cb71230cede2db
--- 1/arch/arm/plat-s5p/s5p-time.c
--- 2/arch/arm/plat-s5p/s5p-time.c
+++ b/arch/arm/plat-s5p/s5p-time.c
@@@ -370,11 -370,11 +370,11 @@@ static void __init s5p_clocksource_init
  
        clock_rate = clk_get_rate(tin_source);
  
 -      init_sched_clock(&cd, s5p_update_sched_clock, 32, clock_rate);
 -
        s5p_time_setup(timer_source.source_id, TCNT_MAX);
        s5p_time_start(timer_source.source_id, PERIODIC);
  
 +      init_sched_clock(&cd, s5p_update_sched_clock, 32, clock_rate);
 +
        if (clocksource_register_hz(&time_clocksource, clock_rate))
                panic("%s: can't register clocksource\n", time_clocksource.name);
  }
@@@ -384,6 -384,7 +384,7 @@@ static void __init s5p_timer_resources(
  
        unsigned long event_id = timer_source.event_id;
        unsigned long source_id = timer_source.source_id;
+       char devname[15];
  
        timerclk = clk_get(NULL, "timers");
        if (IS_ERR(timerclk))
@@@ -391,6 -392,10 +392,10 @@@
  
        clk_enable(timerclk);
  
+       sprintf(devname, "s3c24xx-pwm.%lu", event_id);
+       s3c_device_timer[event_id].id = event_id;
+       s3c_device_timer[event_id].dev.init_name = devname;
+ 
        tin_event = clk_get(&s3c_device_timer[event_id].dev, "pwm-tin");
        if (IS_ERR(tin_event))
                panic("failed to get pwm-tin clock for event timer");
@@@ -401,6 -406,10 +406,10 @@@
  
        clk_enable(tin_event);
  
+       sprintf(devname, "s3c24xx-pwm.%lu", source_id);
+       s3c_device_timer[source_id].id = source_id;
+       s3c_device_timer[source_id].dev.init_name = devname;
+ 
        tin_source = clk_get(&s3c_device_timer[source_id].dev, "pwm-tin");
        if (IS_ERR(tin_source))
                panic("failed to get pwm-tin clock for source timer");

diff --combined drivers/tty/serial/s5pv210.c
index dd194dc80ee9a4f0adbbeae30e4c222756b20d19,d6b24230b022fd5b4490441a709f05eb308e8612..8dd160c96e873f66f2657d444d4ddbc53ab5c8e0
--- 1/drivers/tty/serial/s5pv210.c
--- 2/drivers/tty/serial/s5pv210.c
+++ b/drivers/tty/serial/s5pv210.c
@@@ -30,7 -30,7 +30,7 @@@ static int s5pv210_serial_setsource(str
        struct s3c2410_uartcfg *cfg = port->dev->platform_data;
        unsigned long ucon = rd_regl(port, S3C2410_UCON);
  
 -      if ((cfg->clocks_size) == 1)
 +      if (cfg->flags & NO_NEED_CHECK_CLKSRC)
                return 0;
  
        if (strcmp(clk->name, "pclk") == 0)
@@@ -55,7 -55,7 +55,7 @@@ static int s5pv210_serial_getsource(str
  
        clk->divisor = 1;
  
 -      if ((cfg->clocks_size) == 1)
 +      if (cfg->flags & NO_NEED_CHECK_CLKSRC)
                return 0;
  
        switch (ucon & S5PV210_UCON_CLKMASK) {
@@@ -135,13 -135,6 +135,6 @@@ static struct platform_driver s5p_seria
        },
  };
  
- static int __init s5pv210_serial_console_init(void)
- {
-       return s3c24xx_serial_initconsole(&s5p_serial_driver, s5p_uart_inf);
- }
- 
- console_initcall(s5pv210_serial_console_init);
- 
  static int __init s5p_serial_init(void)
  {
        return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf);