ARM: Merge for-2635/s5pv210-clock

Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2

diff --combined arch/arm/plat-s5p/clock.c
index 3fef951,4ca0759..a8bfabf
--- 1/arch/arm/plat-s5p/clock.c
--- 2/arch/arm/plat-s5p/clock.c
+++ b/arch/arm/plat-s5p/clock.c
@@@ -33,11 -33,6 +33,11 @@@ struct clk clk_ext_xtal_mux = 
        .id             = -1,
  };
  
 +struct clk clk_xusbxti = {
 +      .name           = "xusbxti",
 +      .id             = -1,
 +};
 +
  static struct clk s5p_clk_27m = {
        .name           = "clk_27m",
        .id             = -1,
@@@ -74,6 -69,13 +74,13 @@@ struct clk clk_fout_epll = 
        .ctrlbit        = (1 << 31),
  };
  
+ /* VPLL clock output */
+ struct clk clk_fout_vpll = {
+       .name           = "fout_vpll",
+       .id             = -1,
+       .ctrlbit        = (1 << 31),
+ };
+ 
  /* ARM clock */
  struct clk clk_arm = {
        .name           = "armclk",
@@@ -138,6 -140,7 +145,7 @@@ static struct clk *s5p_clks[] __initdat
        &clk_fout_apll,
        &clk_fout_mpll,
        &clk_fout_epll,
+       &clk_fout_vpll,
        &clk_arm,
        &clk_vpll,
  };

diff --combined arch/arm/plat-s5p/include/plat/s5p-clock.h
index a476a9f,5ae8866..aa0447a
--- 1/arch/arm/plat-s5p/include/plat/s5p-clock.h
--- 2/arch/arm/plat-s5p/include/plat/s5p-clock.h
+++ b/arch/arm/plat-s5p/include/plat/s5p-clock.h
@@@ -23,11 -23,11 +23,12 @@@
  #define clk_fin_vpll clk_ext_xtal_mux
  
  extern struct clk clk_ext_xtal_mux;
 +extern struct clk clk_xusbxti;
  extern struct clk clk_48m;
  extern struct clk clk_fout_apll;
  extern struct clk clk_fout_mpll;
  extern struct clk clk_fout_epll;
+ extern struct clk clk_fout_vpll;
  extern struct clk clk_arm;
  extern struct clk clk_vpll;