1 files changed, 13 insertions, 11 deletions

diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index 8d9a0cada668..05b17528041e 100644
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -36,7 +36,7 @@
  * ext_xtal_mux for want of an actual name from the manual.
 */
 
-struct clk clk_ext_xtal_mux = {
+static struct clk clk_ext_xtal_mux = {
         .name           = "ext_xtal",
         .id             = -1,
 };
@@ -63,7 +63,7 @@ struct clksrc_clk {
         void __iomem            *reg_divider;
 };
 
-struct clk clk_fout_apll = {
+static struct clk clk_fout_apll = {
         .name           = "fout_apll",
         .id             = -1,
 };
@@ -78,7 +78,7 @@ static struct clk_sources clk_src_apll = {
         .nr_sources     = ARRAY_SIZE(clk_src_apll_list),
 };
 
-struct clksrc_clk clk_mout_apll = {
+static struct clksrc_clk clk_mout_apll = {
         .clk    = {
                 .name           = "mout_apll",
                 .id             = -1,
@@ -88,7 +88,7 @@ struct clksrc_clk clk_mout_apll = {
         .sources        = &clk_src_apll,
 };
 
-struct clk clk_fout_epll = {
+static struct clk clk_fout_epll = {
         .name           = "fout_epll",
         .id             = -1,
 };
@@ -103,7 +103,7 @@ static struct clk_sources clk_src_epll = {
         .nr_sources     = ARRAY_SIZE(clk_src_epll_list),
 };
 
-struct clksrc_clk clk_mout_epll = {
+static struct clksrc_clk clk_mout_epll = {
         .clk    = {
                 .name           = "mout_epll",
                 .id             = -1,
@@ -123,7 +123,7 @@ static struct clk_sources clk_src_mpll = {
         .nr_sources     = ARRAY_SIZE(clk_src_mpll_list),
 };
 
-struct clksrc_clk clk_mout_mpll = {
+static struct clksrc_clk clk_mout_mpll = {
         .clk = {
                 .name           = "mout_mpll",
                 .id             = -1,
@@ -145,7 +145,7 @@ static unsigned long s3c64xx_clk_doutmpll_get_rate(struct clk *clk)
         return rate;
 }
 
-struct clk clk_dout_mpll = {
+static struct clk clk_dout_mpll = {
         .name           = "dout_mpll",
         .id             = -1,
         .parent         = &clk_mout_mpll.clk,
@@ -189,10 +189,10 @@ static struct clk_sources clkset_uart = {
 };
 
 static struct clk *clkset_uhost_list[] = {
+        &clk_48m,
         &clk_mout_epll.clk,
         &clk_dout_mpll,
         &clk_fin_epll,
-        &clk_48m,
 };
 
 static struct clk_sources clkset_uhost = {
@@ -239,10 +239,12 @@ static int s3c64xx_setrate_clksrc(struct clk *clk, unsigned long rate)
 
         rate = clk_round_rate(clk, rate);
         div = clk_get_rate(clk->parent) / rate;
+        if (div > 16)
+                return -EINVAL;
 
         val = __raw_readl(reg);
-        val &= ~sclk->mask;
-        val |= (rate - 1) << sclk->shift;
+        val &= ~(0xf << sclk->shift);
+        val |= (div - 1) << sclk->shift;
         __raw_writel(val, reg);
 
         return 0;
@@ -351,7 +353,7 @@ static struct clksrc_clk clk_mmc2 = {
 
 static struct clksrc_clk clk_usbhost = {
         .clk    = {
-                .name           = "usb-host-bus",
+                .name           = "usb-bus-host",
                 .id             = -1,
                 .ctrlbit        = S3C_CLKCON_SCLK_UHOST,
                 .enable         = s3c64xx_sclk_ctrl,