]> git.sur5r.net Git - u-boot/blobdiff - arch/arm/cpu/armv7/exynos/clock.c
Merge branch 'u-boot/master'
[u-boot] / arch / arm / cpu / armv7 / exynos / clock.c
index 83e5b18d6ba9c55f3a5b0e3b6720e992315218af..df4d4739ffb1ca8c38aa989f4cf6c5e2977a4e51 100644 (file)
@@ -14,7 +14,6 @@
 #define PLL_DIV_1024   1024
 #define PLL_DIV_65535  65535
 #define PLL_DIV_65536  65536
-
 /* *
  * This structure is to store the src bit, div bit and prediv bit
  * positions of the peripheral clocks of the src and div registers
@@ -366,8 +365,8 @@ static struct clk_bit_info *get_clk_bit_info(int peripheral)
 static unsigned long exynos5_get_periph_rate(int peripheral)
 {
        struct clk_bit_info *bit_info = get_clk_bit_info(peripheral);
-       unsigned long sclk, sub_clk = 0;
-       unsigned int src, div, sub_div = 0;
+       unsigned long sclk = 0;
+       unsigned int src = 0, div = 0, sub_div = 0;
        struct exynos5_clock *clk =
                        (struct exynos5_clock *)samsung_get_base_clock();
 
@@ -389,30 +388,30 @@ static unsigned long exynos5_get_periph_rate(int peripheral)
                break;
        case PERIPH_ID_I2S0:
                src = readl(&clk->src_mau);
-               div = readl(&clk->div_mau);
+               div = sub_div = readl(&clk->div_mau);
        case PERIPH_ID_SPI0:
        case PERIPH_ID_SPI1:
                src = readl(&clk->src_peric1);
-               div = readl(&clk->div_peric1);
+               div = sub_div = readl(&clk->div_peric1);
                break;
        case PERIPH_ID_SPI2:
                src = readl(&clk->src_peric1);
-               div = readl(&clk->div_peric2);
+               div = sub_div = readl(&clk->div_peric2);
                break;
        case PERIPH_ID_SPI3:
        case PERIPH_ID_SPI4:
                src = readl(&clk->sclk_src_isp);
-               div = readl(&clk->sclk_div_isp);
+               div = sub_div = readl(&clk->sclk_div_isp);
                break;
        case PERIPH_ID_SDMMC0:
        case PERIPH_ID_SDMMC1:
                src = readl(&clk->src_fsys);
-               div = readl(&clk->div_fsys1);
+               div = sub_div = readl(&clk->div_fsys1);
                break;
        case PERIPH_ID_SDMMC2:
        case PERIPH_ID_SDMMC3:
                src = readl(&clk->src_fsys);
-               div = readl(&clk->div_fsys2);
+               div = sub_div = readl(&clk->div_fsys2);
                break;
        case PERIPH_ID_I2C0:
        case PERIPH_ID_I2C1:
@@ -422,12 +421,10 @@ static unsigned long exynos5_get_periph_rate(int peripheral)
        case PERIPH_ID_I2C5:
        case PERIPH_ID_I2C6:
        case PERIPH_ID_I2C7:
-               sclk = exynos5_get_pll_clk(MPLL);
-               sub_div = ((readl(&clk->div_top1) >> bit_info->div_bit)
-                           & bit_info->div_mask) + 1;
-               div = ((readl(&clk->div_top0) >> bit_info->prediv_bit)
-                       & bit_info->prediv_mask) + 1;
-               return (sclk / sub_div) / div;
+               src = EXYNOS_SRC_MPLL;
+               div = readl(&clk->div_top1);
+               sub_div = readl(&clk->div_top0);
+               break;
        default:
                debug("%s: invalid peripheral %d", __func__, peripheral);
                return -1;
@@ -447,28 +444,28 @@ static unsigned long exynos5_get_periph_rate(int peripheral)
                sclk = exynos5_get_pll_clk(VPLL);
                break;
        default:
+               debug("%s: EXYNOS_SRC %d not supported\n", __func__, src);
                return 0;
        }
 
-       /* Ratio clock division for this peripheral */
-       if (bit_info->div_bit >= 0) {
-               sub_div = (div >> bit_info->div_bit) & bit_info->div_mask;
-               sub_clk = sclk / (sub_div + 1);
-       }
+       /* Clock divider ratio for this peripheral */
+       if (bit_info->div_bit >= 0)
+               div = (div >> bit_info->div_bit) & bit_info->div_mask;
 
-       if (bit_info->prediv_bit >= 0) {
-               div = (div >> bit_info->prediv_bit) & bit_info->prediv_mask;
-               return sub_clk / (div + 1);
-       }
+       /* Clock pre-divider ratio for this peripheral */
+       if (bit_info->prediv_bit >= 0)
+               sub_div = (sub_div >> bit_info->prediv_bit)
+                         & bit_info->prediv_mask;
 
-       return sub_clk;
+       /* Calculate and return required clock rate */
+       return (sclk / (div + 1)) / (sub_div + 1);
 }
 
 static unsigned long exynos542x_get_periph_rate(int peripheral)
 {
        struct clk_bit_info *bit_info = get_clk_bit_info(peripheral);
-       unsigned long sclk, sub_clk = 0;
-       unsigned int src, div, sub_div = 0;
+       unsigned long sclk = 0;
+       unsigned int src = 0, div = 0, sub_div = 0;
        struct exynos5420_clock *clk =
                        (struct exynos5420_clock *)samsung_get_base_clock();
 
@@ -516,10 +513,9 @@ static unsigned long exynos542x_get_periph_rate(int peripheral)
        case PERIPH_ID_I2C8:
        case PERIPH_ID_I2C9:
        case PERIPH_ID_I2C10:
-               sclk = exynos542x_get_pll_clk(MPLL);
-               sub_div = ((readl(&clk->div_top1) >> bit_info->div_bit)
-                           & bit_info->div_mask) + 1;
-               return sclk / sub_div;
+               src = EXYNOS542X_SRC_MPLL;
+               div = readl(&clk->div_top1);
+               break;
        default:
                debug("%s: invalid peripheral %d", __func__, peripheral);
                return -1;
@@ -542,22 +538,21 @@ static unsigned long exynos542x_get_periph_rate(int peripheral)
                sclk = exynos542x_get_pll_clk(RPLL);
                break;
        default:
+               debug("%s: EXYNOS542X_SRC %d not supported", __func__, src);
                return 0;
        }
 
-       /* Ratio clock division for this peripheral */
-       if (bit_info->div_bit >= 0) {
+       /* Clock divider ratio for this peripheral */
+       if (bit_info->div_bit >= 0)
                div = (div >> bit_info->div_bit) & bit_info->div_mask;
-               sub_clk = sclk / (div + 1);
-       }
 
-       if (bit_info->prediv_bit >= 0) {
+       /* Clock pre-divider ratio for this peripheral */
+       if (bit_info->prediv_bit >= 0)
                sub_div = (sub_div >> bit_info->prediv_bit)
-                                               & bit_info->prediv_mask;
-               return sub_clk / (sub_div + 1);
-       }
+                         & bit_info->prediv_mask;
 
-       return sub_clk;
+       /* Calculate and return required clock rate */
+       return (sclk / (div + 1)) / (sub_div + 1);
 }
 
 unsigned long clock_get_periph_rate(int peripheral)
@@ -1032,6 +1027,40 @@ static unsigned long exynos5420_get_lcd_clk(void)
        return pclk;
 }
 
+static unsigned long exynos5800_get_lcd_clk(void)
+{
+       struct exynos5420_clock *clk =
+               (struct exynos5420_clock *)samsung_get_base_clock();
+       unsigned long sclk;
+       unsigned int sel;
+       unsigned int ratio;
+
+       /*
+        * CLK_SRC_DISP10
+        * CLKMUX_FIMD1 [6:4]
+        */
+       sel = (readl(&clk->src_disp10) >> 4) & 0x7;
+
+       if (sel) {
+               /*
+                * Mapping of CLK_SRC_DISP10 CLKMUX_FIMD1 [6:4] values into
+                * PLLs. The first element is a placeholder to bypass the
+                * default settig.
+                */
+               const int reg_map[] = {0, CPLL, DPLL, MPLL, SPLL, IPLL, EPLL,
+                                                                       RPLL};
+               sclk = get_pll_clk(reg_map[sel]);
+       } else
+               sclk = CONFIG_SYS_CLK_FREQ;
+       /*
+        * CLK_DIV_DISP10
+        * FIMD1_RATIO [3:0]
+        */
+       ratio = readl(&clk->div_disp10) & 0xf;
+
+       return sclk / (ratio + 1);
+}
+
 void exynos4_set_lcd_clk(void)
 {
        struct exynos4_clock *clk =
@@ -1163,6 +1192,28 @@ void exynos5420_set_lcd_clk(void)
        writel(cfg, &clk->div_disp10);
 }
 
+void exynos5800_set_lcd_clk(void)
+{
+       struct exynos5420_clock *clk =
+               (struct exynos5420_clock *)samsung_get_base_clock();
+       unsigned int cfg;
+
+       /*
+        * Use RPLL for pixel clock
+        * CLK_SRC_DISP10 CLKMUX_FIMD1 [6:4]
+        * ==================
+        * 111: SCLK_RPLL
+        */
+       cfg = readl(&clk->src_disp10) | (0x7 << 4);
+       writel(cfg, &clk->src_disp10);
+
+       /*
+        * CLK_DIV_DISP10
+        * FIMD1_RATIO          [3:0]
+        */
+       clrsetbits_le32(&clk->div_disp10, 0xf << 0, 0x0 << 0);
+}
+
 void exynos4_set_mipi_clk(void)
 {
        struct exynos4_clock *clk =
@@ -1650,8 +1701,10 @@ unsigned long get_lcd_clk(void)
        if (cpu_is_exynos4())
                return exynos4_get_lcd_clk();
        else {
-               if (proid_is_exynos5420() || proid_is_exynos5800())
+               if (proid_is_exynos5420())
                        return exynos5420_get_lcd_clk();
+               else if (proid_is_exynos5800())
+                       return exynos5800_get_lcd_clk();
                else
                        return exynos5_get_lcd_clk();
        }
@@ -1664,8 +1717,10 @@ void set_lcd_clk(void)
        else {
                if (proid_is_exynos5250())
                        exynos5_set_lcd_clk();
-               else if (proid_is_exynos5420() || proid_is_exynos5800())
+               else if (proid_is_exynos5420())
                        exynos5420_set_lcd_clk();
+               else
+                       exynos5800_set_lcd_clk();
        }
 }