From: Paul Mundt Date: Mon, 9 Jan 2012 01:03:09 +0000 (+0900) Subject: Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen X-Git-Tag: v3.3-rc1~90^2~2^3~11 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9;p=linux.git Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen Conflicts: arch/arm/mach-shmobile/clock-sh73a0.c Signed-off-by: Paul Mundt --- e0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9 diff --cc arch/arm/mach-shmobile/clock-sh73a0.c index 1370a89ca358,61a846bb30f2,8ea8c810144b..34944d01bf1e --- a/arch/arm/mach-shmobile/clock-sh73a0.c +++ b/arch/arm/mach-shmobile/clock-sh73a0.c @@@@ -113,12 -113,6 -131,11 +131,12 @@@@ static struct clk main_clk = .ops = &main_clk_ops, }; ++/* Divide Main clock by two */ + static struct clk main_div2_clk = { + .ops = &div2_clk_ops, + .parent = &main_clk, + }; + /* PLL0, PLL1, PLL2, PLL3 */ static unsigned long pll_recalc(struct clk *clk) { @@@@ -246,27 -239,27 -284,84 +285,84 @@@@ enum { DIV6_VCK1, DIV6_VCK2, DIV6_VCK3 DIV6_DSIT, DIV6_DSI0P, DIV6_DSI1P, DIV6_NR }; ++ static struct clk *vck_parent[8] = { ++ [0] = &pll1_div2_clk, ++ [1] = &pll2_clk, ++ [2] = &sh73a0_extcki_clk, ++ [3] = &sh73a0_extal2_clk, ++ [4] = &main_div2_clk, ++ [5] = &sh73a0_extalr_clk, ++ [6] = &main_clk, ++ }; ++ ++ static struct clk *pll_parent[4] = { ++ [0] = &pll1_div2_clk, ++ [1] = &pll2_clk, ++ [2] = &pll1_div13_clk, ++ }; ++ ++ static struct clk *hsi_parent[4] = { ++ [0] = &pll1_div2_clk, ++ [1] = &pll2_clk, ++ [2] = &pll1_div7_clk, ++ }; ++ ++ static struct clk *pll_extal2_parent[] = { ++ [0] = &pll1_div2_clk, ++ [1] = &pll2_clk, ++ [2] = &sh73a0_extal2_clk, ++ [3] = &sh73a0_extal2_clk, ++ }; ++ ++ static struct clk *dsi_parent[8] = { ++ [0] = &pll1_div2_clk, ++ [1] = &pll2_clk, ++ [2] = &main_clk, ++ [3] = &sh73a0_extal2_clk, ++ [4] = &sh73a0_extcki_clk, ++ }; ++ static struct clk div6_clks[DIV6_NR] = { -- [DIV6_VCK1] = SH_CLK_DIV6(&pll1_div2_clk, VCLKCR1, 0), -- [DIV6_VCK2] = SH_CLK_DIV6(&pll1_div2_clk, VCLKCR2, 0), -- [DIV6_VCK3] = SH_CLK_DIV6(&pll1_div2_clk, VCLKCR3, 0), - [DIV6_ZB1] = SH_CLK_DIV6(&pll1_div2_clk, ZBCKCR, CLK_ENABLE_ON_INIT), - [DIV6_ZB1] = SH_CLK_DIV6(&pll1_div2_clk, ZBCKCR, 0), -- [DIV6_FLCTL] = SH_CLK_DIV6(&pll1_div2_clk, FLCKCR, 0), -- [DIV6_SDHI0] = SH_CLK_DIV6(&pll1_div2_clk, SD0CKCR, 0), -- [DIV6_SDHI1] = SH_CLK_DIV6(&pll1_div2_clk, SD1CKCR, 0), -- [DIV6_SDHI2] = SH_CLK_DIV6(&pll1_div2_clk, SD2CKCR, 0), -- [DIV6_FSIA] = SH_CLK_DIV6(&pll1_div2_clk, FSIACKCR, 0), -- [DIV6_FSIB] = SH_CLK_DIV6(&pll1_div2_clk, FSIBCKCR, 0), -- [DIV6_SUB] = SH_CLK_DIV6(&sh73a0_extal2_clk, SUBCKCR, 0), -- [DIV6_SPUA] = SH_CLK_DIV6(&pll1_div2_clk, SPUACKCR, 0), -- [DIV6_SPUV] = SH_CLK_DIV6(&pll1_div2_clk, SPUVCKCR, 0), -- [DIV6_MSU] = SH_CLK_DIV6(&pll1_div2_clk, MSUCKCR, 0), -- [DIV6_HSI] = SH_CLK_DIV6(&pll1_div2_clk, HSICKCR, 0), -- [DIV6_MFG1] = SH_CLK_DIV6(&pll1_div2_clk, MFCK1CR, 0), -- [DIV6_MFG2] = SH_CLK_DIV6(&pll1_div2_clk, MFCK2CR, 0), -- [DIV6_DSIT] = SH_CLK_DIV6(&pll1_div2_clk, DSITCKCR, 0), -- [DIV6_DSI0P] = SH_CLK_DIV6(&pll1_div2_clk, DSI0PCKCR, 0), -- [DIV6_DSI1P] = SH_CLK_DIV6(&pll1_div2_clk, DSI1PCKCR, 0), ++ [DIV6_VCK1] = SH_CLK_DIV6_EXT(VCLKCR1, 0, ++ vck_parent, ARRAY_SIZE(vck_parent), 12, 3), ++ [DIV6_VCK2] = SH_CLK_DIV6_EXT(VCLKCR2, 0, ++ vck_parent, ARRAY_SIZE(vck_parent), 12, 3), ++ [DIV6_VCK3] = SH_CLK_DIV6_EXT(VCLKCR3, 0, ++ vck_parent, ARRAY_SIZE(vck_parent), 12, 3), - [DIV6_ZB1] = SH_CLK_DIV6_EXT(ZBCKCR, 0, +++ [DIV6_ZB1] = SH_CLK_DIV6_EXT(ZBCKCR, CLK_ENABLE_ON_INIT, ++ pll_parent, ARRAY_SIZE(pll_parent), 7, 1), ++ [DIV6_FLCTL] = SH_CLK_DIV6_EXT(FLCKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 7, 1), ++ [DIV6_SDHI0] = SH_CLK_DIV6_EXT(SD0CKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 6, 2), ++ [DIV6_SDHI1] = SH_CLK_DIV6_EXT(SD1CKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 6, 2), ++ [DIV6_SDHI2] = SH_CLK_DIV6_EXT(SD2CKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 6, 2), ++ [DIV6_FSIA] = SH_CLK_DIV6_EXT(FSIACKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 6, 1), ++ [DIV6_FSIB] = SH_CLK_DIV6_EXT(FSIBCKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 6, 1), ++ [DIV6_SUB] = SH_CLK_DIV6_EXT(SUBCKCR, 0, ++ pll_extal2_parent, ARRAY_SIZE(pll_extal2_parent), 6, 2), ++ [DIV6_SPUA] = SH_CLK_DIV6_EXT(SPUACKCR, 0, ++ pll_extal2_parent, ARRAY_SIZE(pll_extal2_parent), 6, 2), ++ [DIV6_SPUV] = SH_CLK_DIV6_EXT(SPUVCKCR, 0, ++ pll_extal2_parent, ARRAY_SIZE(pll_extal2_parent), 6, 2), ++ [DIV6_MSU] = SH_CLK_DIV6_EXT(MSUCKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 7, 1), ++ [DIV6_HSI] = SH_CLK_DIV6_EXT(HSICKCR, 0, ++ hsi_parent, ARRAY_SIZE(hsi_parent), 6, 2), ++ [DIV6_MFG1] = SH_CLK_DIV6_EXT(MFCK1CR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 7, 1), ++ [DIV6_MFG2] = SH_CLK_DIV6_EXT(MFCK2CR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 7, 1), ++ [DIV6_DSIT] = SH_CLK_DIV6_EXT(DSITCKCR, 0, ++ pll_parent, ARRAY_SIZE(pll_parent), 7, 1), ++ [DIV6_DSI0P] = SH_CLK_DIV6_EXT(DSI0PCKCR, 0, ++ dsi_parent, ARRAY_SIZE(dsi_parent), 12, 3), ++ [DIV6_DSI1P] = SH_CLK_DIV6_EXT(DSI1PCKCR, 0, ++ dsi_parent, ARRAY_SIZE(dsi_parent), 12, 3), }; enum { MSTP001,