1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index e8b5a6bfcc8a..24baeb56a1b3 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -313,13 +313,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", CLK_IGNORE_UNUSED,
+        COMPOSITE_NOMUX(0, "atclk", "armclk", 0,
                         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", CLK_IGNORE_UNUSED,
+        GATE(0, "pclk_dbg", "pclk_dbg_pre", 0,
                         RK3288_CLKGATE_CON(12), 9, GFLAGS),
         GATE(0, "cs_dbg", "pclk_dbg_pre", CLK_IGNORE_UNUSED,
                         RK3288_CLKGATE_CON(12), 10, GFLAGS),
@@ -647,7 +647,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", CLK_IGNORE_UNUSED,
+        GATE(0, "jtag", "ext_jtag", 0,
                         RK3288_CLKGATE_CON(4), 14, GFLAGS),
 
         COMPOSITE_NODIV(SCLK_USBPHY480M_SRC, "usbphy480m_src", mux_usbphy480m_p, 0,
@@ -656,7 +656,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", CLK_IGNORE_UNUSED,
+        GATE(0, "hsicphy12m_xin12m", "xin12m", 0,
                         RK3288_CLKGATE_CON(13), 9, GFLAGS),
         DIV(0, "hsicphy12m_usbphy", "sclk_hsicphy480m", 0,
                         RK3288_CLKSEL_CON(11), 8, 6, DFLAGS),
@@ -837,11 +837,6 @@ static const char *const rk3288_critical_clocks[] __initconst = {
         "pclk_alive_niu",
         "pclk_pd_pmu",
         "pclk_pmu_niu",
-        "pclk_core_niu",
-        "pclk_ddrupctl0",
-        "pclk_publ0",
-        "pclk_ddrupctl1",
-        "pclk_publ1",
         "pmu_hclk_otg0",
         /* pwm-regulators on some boards, so handoff-critical later */
         "pclk_rkpwm",