@@ -27,10 +27,10 @@ static void __iomem *ccm __initdata;
27
27
static const char * vpu_sel_clks [] = { "spll" , "mpll_main2" , };
28
28
static const char * cpu_sel_clks [] = { "mpll_main2" , "mpll" , };
29
29
static const char * mpll_sel_clks [] = { "fpm" , "mpll_osc_sel" , };
30
- static const char * mpll_osc_sel_clks [] = { "ckih " , "ckih_div1p5" , };
30
+ static const char * mpll_osc_sel_clks [] = { "ckih_gate " , "ckih_div1p5" , };
31
31
static const char * clko_sel_clks [] = {
32
- "ckil" , "fpm" , "ckih " , "ckih " ,
33
- "ckih " , "mpll" , "spll" , "cpu_div" ,
32
+ "ckil" , "fpm" , "ckih_gate " , "ckih_gate " ,
33
+ "ckih_gate " , "mpll" , "spll" , "cpu_div" ,
34
34
"ahb" , "ipg" , "per1_div" , "per2_div" ,
35
35
"per3_div" , "per4_div" , "ssi1_div" , "ssi2_div" ,
36
36
"nfc_div" , "mshc_div" , "vpu_div" , "60m" ,
@@ -50,11 +50,12 @@ static void __init _mx27_clocks_init(unsigned long fref)
50
50
clk [IMX27_CLK_CKIH ] = imx_clk_fixed ("ckih" , fref );
51
51
clk [IMX27_CLK_CKIL ] = imx_clk_fixed ("ckil" , 32768 );
52
52
clk [IMX27_CLK_FPM ] = imx_clk_fixed_factor ("fpm" , "ckil" , 1024 , 1 );
53
- clk [IMX27_CLK_CKIH_DIV1P5 ] = imx_clk_fixed_factor ("ckih_div1p5" , "ckih" , 2 , 3 );
53
+ clk [IMX27_CLK_CKIH_DIV1P5 ] = imx_clk_fixed_factor ("ckih_div1p5" , "ckih_gate" , 2 , 3 );
54
+ clk [IMX27_CLK_CKIH_GATE ] = imx_clk_gate_dis ("ckih_gate" , "ckih" , CCM_CSCR , 3 );
54
55
clk [IMX27_CLK_MPLL_OSC_SEL ] = imx_clk_mux ("mpll_osc_sel" , CCM_CSCR , 4 , 1 , mpll_osc_sel_clks , ARRAY_SIZE (mpll_osc_sel_clks ));
55
56
clk [IMX27_CLK_MPLL_SEL ] = imx_clk_mux ("mpll_sel" , CCM_CSCR , 16 , 1 , mpll_sel_clks , ARRAY_SIZE (mpll_sel_clks ));
56
57
clk [IMX27_CLK_MPLL ] = imx_clk_pllv1 ("mpll" , "mpll_sel" , CCM_MPCTL0 );
57
- clk [IMX27_CLK_SPLL ] = imx_clk_pllv1 ("spll" , "ckih " , CCM_SPCTL0 );
58
+ clk [IMX27_CLK_SPLL ] = imx_clk_pllv1 ("spll" , "ckih_gate " , CCM_SPCTL0 );
58
59
clk [IMX27_CLK_SPLL_GATE ] = imx_clk_gate ("spll_gate" , "spll" , CCM_CSCR , 1 );
59
60
clk [IMX27_CLK_MPLL_MAIN2 ] = imx_clk_fixed_factor ("mpll_main2" , "mpll" , 2 , 3 );
60
61
0 commit comments