mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 15:21:39 +00:00
55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
|
|
index 07469dc..adff1a3 100644
|
|
--- a/drivers/clk/rockchip/clk-rk3288.c
|
|
+++ b/drivers/clk/rockchip/clk-rk3288.c
|
|
@@ -291,13 +291,13 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
|
|
COMPOSITE_NOMUX(0, "aclk_core_mp", "armclk", CLK_IGNORE_UNUSED,
|
|
RK3288_CLKSEL_CON(0), 4, 4, DFLAGS | CLK_DIVIDER_READ_ONLY,
|
|
RK3288_CLKGATE_CON(12), 6, GFLAGS),
|
|
- COMPOSITE_NOMUX(0, "atclk", "armclk", 0,
|
|
+ COMPOSITE_NOMUX(0, "atclk", "armclk", CLK_IGNORE_UNUSED,
|
|
RK3288_CLKSEL_CON(37), 4, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
|
|
RK3288_CLKGATE_CON(12), 7, GFLAGS),
|
|
COMPOSITE_NOMUX(0, "pclk_dbg_pre", "armclk", CLK_IGNORE_UNUSED,
|
|
RK3288_CLKSEL_CON(37), 9, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
|
|
RK3288_CLKGATE_CON(12), 8, GFLAGS),
|
|
- GATE(0, "pclk_dbg", "pclk_dbg_pre", 0,
|
|
+ GATE(0, "pclk_dbg", "pclk_dbg_pre", CLK_IGNORE_UNUSED,
|
|
RK3288_CLKGATE_CON(12), 9, GFLAGS),
|
|
GATE(0, "cs_dbg", "pclk_dbg_pre", CLK_IGNORE_UNUSED,
|
|
RK3288_CLKGATE_CON(12), 10, GFLAGS),
|
|
@@ -627,7 +627,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
|
|
INVERTER(SCLK_HSADC, "sclk_hsadc", "sclk_hsadc_out",
|
|
RK3288_CLKSEL_CON(22), 7, IFLAGS),
|
|
|
|
- GATE(0, "jtag", "ext_jtag", 0,
|
|
+ GATE(0, "jtag", "ext_jtag", CLK_IGNORE_UNUSED,
|
|
RK3288_CLKGATE_CON(4), 14, GFLAGS),
|
|
|
|
COMPOSITE_NODIV(SCLK_USBPHY480M_SRC, "usbphy480m_src", mux_usbphy480m_p, 0,
|
|
@@ -636,7 +636,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
|
|
COMPOSITE_NODIV(SCLK_HSICPHY480M, "sclk_hsicphy480m", mux_hsicphy480m_p, 0,
|
|
RK3288_CLKSEL_CON(29), 0, 2, MFLAGS,
|
|
RK3288_CLKGATE_CON(3), 6, GFLAGS),
|
|
- GATE(0, "hsicphy12m_xin12m", "xin12m", 0,
|
|
+ GATE(0, "hsicphy12m_xin12m", "xin12m", CLK_IGNORE_UNUSED,
|
|
RK3288_CLKGATE_CON(13), 9, GFLAGS),
|
|
DIV(0, "hsicphy12m_usbphy", "sclk_hsicphy480m", 0,
|
|
RK3288_CLKSEL_CON(11), 8, 6, DFLAGS),
|
|
@@ -809,7 +809,15 @@ static const char *const rk3288_critical_clocks[] __initconst = {
|
|
"aclk_cpu",
|
|
"aclk_peri",
|
|
"hclk_peri",
|
|
- "pclk_pd_pmu",
|
|
+ "pclk_alive_niu",
|
|
+ "pclk_pd_pmu",
|
|
+ "pclk_pmu_niu",
|
|
+ "pclk_core_niu",
|
|
+ "pclk_ddrupctl0",
|
|
+ "pclk_publ0",
|
|
+ "pclk_ddrupctl1",
|
|
+ "pclk_publ1",
|
|
+ "pmu_hclk_otg0"
|
|
};
|
|
|
|
static void __iomem *rk3288_cru_base;
|