Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
drivers/clk/rockchip/clk.h and drivers/clk/rockchip/clk.c between commits like
fe94f974e9c8b8 ("clk: rockchip: protect critical clocks from getting disabled")
from the clk tree and "clk: rockchip: add restart handler" from the
akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc drivers/clk/rockchip/clk.c
index d9c6db2151ba,aa41433eb34f..000000000000
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@@ -297,15 -244,26 +298,39 @@@ void __init rockchip_clk_register_branc
}
}
+void __init rockchip_clk_protect_critical(const char *clocks[], int nclocks)
+{
+ int i;
+
+ /* Protect the clocks that needs to stay on */
+ for (i = 0; i < nclocks; i++) {
+ struct clk *clk = __clk_lookup(clocks[i]);
+
+ if (clk)
+ clk_prepare_enable(clk);
+ }
+}
++
+ static unsigned int reg_restart;
+ static int rockchip_restart_notify(struct notifier_block *this,
+ unsigned long mode, void *cmd)
+ {
+ writel(0xfdb9, reg_base + reg_restart);
+ return NOTIFY_DONE;
+ }
+
+ static struct notifier_block rockchip_restart_handler = {
+ .notifier_call = rockchip_restart_notify,
+ .priority = 128,
+ };
+
+ void __init rockchip_register_restart_notifier(unsigned int reg)
+ {
+ int ret;
+
+ reg_restart = reg;
+ ret = register_restart_handler(&rockchip_restart_handler);
+ if (ret)
+ pr_err("%s: cannot register restart handler, %d\n",
+ __func__, ret);
+ }
diff --cc drivers/clk/rockchip/clk.h
index 2b0bca19db47,0b5eab5b521f..000000000000
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@@ -329,7 -329,7 +329,8 @@@ void rockchip_clk_register_branches(str
unsigned int nr_clk);
void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list,
unsigned int nr_pll, int grf_lock_offset);
+void rockchip_clk_protect_critical(const char *clocks[], int nclocks);
+ void rockchip_register_restart_notifier(unsigned int reg);
#define ROCKCHIP_SOFTRST_HIWORD_MASK BIT(0)
pgp3OAk_uR99s.pgp
Description: PGP signature
