Merge branches 'clk-typo', 'clk-json-schema', 'clk-mtk-2712-eco' and 'clk-rockchip' into clk-next
- Convert a few clk bindings to JSON schema format - 3rd ECO fix for Mediatek MT2712 SoCs * clk-typo: clk: samsung: fix typo * clk-json-schema: dt-bindings: clock: Convert fixed-factor-clock to json-schema dt-bindings: clock: Convert fixed-clock binding to json-schema * clk-mtk-2712-eco: clk: mediatek: update clock driver of MT2712 dt-bindings: clock: add clock for MT2712 * clk-rockchip: clk: rockchip: add CLK_SET_RATE_PARENT for rk3066 lcdc dclks clk: rockchip: fix frac settings of GPLL clock for rk3328
这个提交包含在:

@@ -223,6 +223,8 @@ static const struct mtk_fixed_factor top_divs[] = {
|
||||
4),
|
||||
FACTOR(CLK_TOP_APLL1_D3, "apll1_d3", "apll1_ck", 1,
|
||||
3),
|
||||
FACTOR(CLK_TOP_APLL2_D3, "apll2_d3", "apll2_ck", 1,
|
||||
3),
|
||||
};
|
||||
|
||||
static const char * const axi_parents[] = {
|
||||
@@ -594,7 +596,8 @@ static const char * const a1sys_hp_parents[] = {
|
||||
"apll1_ck",
|
||||
"apll1_d2",
|
||||
"apll1_d4",
|
||||
"apll1_d8"
|
||||
"apll1_d8",
|
||||
"apll1_d3"
|
||||
};
|
||||
|
||||
static const char * const a2sys_hp_parents[] = {
|
||||
@@ -602,7 +605,8 @@ static const char * const a2sys_hp_parents[] = {
|
||||
"apll2_ck",
|
||||
"apll2_d2",
|
||||
"apll2_d4",
|
||||
"apll2_d8"
|
||||
"apll2_d8",
|
||||
"apll2_d3"
|
||||
};
|
||||
|
||||
static const char * const asm_l_parents[] = {
|
||||
|
@@ -586,12 +586,12 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = {
|
||||
COMPOSITE(0, "dclk_lcdc0_src", mux_pll_src_cpll_gpll_p, 0,
|
||||
RK2928_CLKSEL_CON(27), 0, 1, MFLAGS, 8, 8, DFLAGS,
|
||||
RK2928_CLKGATE_CON(3), 1, GFLAGS),
|
||||
MUX(DCLK_LCDC0, "dclk_lcdc0", mux_rk3066_lcdc0_p, 0,
|
||||
MUX(DCLK_LCDC0, "dclk_lcdc0", mux_rk3066_lcdc0_p, CLK_SET_RATE_PARENT,
|
||||
RK2928_CLKSEL_CON(27), 4, 1, MFLAGS),
|
||||
COMPOSITE(0, "dclk_lcdc1_src", mux_pll_src_cpll_gpll_p, 0,
|
||||
RK2928_CLKSEL_CON(28), 0, 1, MFLAGS, 8, 8, DFLAGS,
|
||||
RK2928_CLKGATE_CON(3), 2, GFLAGS),
|
||||
MUX(DCLK_LCDC1, "dclk_lcdc1", mux_rk3066_lcdc1_p, 0,
|
||||
MUX(DCLK_LCDC1, "dclk_lcdc1", mux_rk3066_lcdc1_p, CLK_SET_RATE_PARENT,
|
||||
RK2928_CLKSEL_CON(28), 4, 1, MFLAGS),
|
||||
|
||||
COMPOSITE_NOMUX(0, "cif1_pre", "cif_src", 0,
|
||||
|
@@ -78,17 +78,17 @@ static struct rockchip_pll_rate_table rk3328_pll_rates[] = {
|
||||
|
||||
static struct rockchip_pll_rate_table rk3328_pll_frac_rates[] = {
|
||||
/* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */
|
||||
RK3036_PLL_RATE(1016064000, 3, 127, 1, 1, 0, 134217),
|
||||
RK3036_PLL_RATE(1016064000, 3, 127, 1, 1, 0, 134218),
|
||||
/* vco = 1016064000 */
|
||||
RK3036_PLL_RATE(983040000, 24, 983, 1, 1, 0, 671088),
|
||||
RK3036_PLL_RATE(983040000, 24, 983, 1, 1, 0, 671089),
|
||||
/* vco = 983040000 */
|
||||
RK3036_PLL_RATE(491520000, 24, 983, 2, 1, 0, 671088),
|
||||
RK3036_PLL_RATE(491520000, 24, 983, 2, 1, 0, 671089),
|
||||
/* vco = 983040000 */
|
||||
RK3036_PLL_RATE(61440000, 6, 215, 7, 2, 0, 671088),
|
||||
RK3036_PLL_RATE(61440000, 6, 215, 7, 2, 0, 671089),
|
||||
/* vco = 860156000 */
|
||||
RK3036_PLL_RATE(56448000, 12, 451, 4, 4, 0, 9797894),
|
||||
RK3036_PLL_RATE(56448000, 12, 451, 4, 4, 0, 9797895),
|
||||
/* vco = 903168000 */
|
||||
RK3036_PLL_RATE(40960000, 12, 409, 4, 5, 0, 10066329),
|
||||
RK3036_PLL_RATE(40960000, 12, 409, 4, 5, 0, 10066330),
|
||||
/* vco = 819200000 */
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
|
@@ -26,7 +26,7 @@ struct samsung_clk_provider {
|
||||
void __iomem *reg_base;
|
||||
struct device *dev;
|
||||
spinlock_t lock;
|
||||
/* clk_data must be the last entry due to variable lenght 'hws' array */
|
||||
/* clk_data must be the last entry due to variable length 'hws' array */
|
||||
struct clk_hw_onecell_data clk_data;
|
||||
};
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户