Re: [PATCH 1/5] clk: mediatek: Add initial common clock support for Mediatek SoCs.
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: 2015-03-16 05:34:26
Also in:
linux-arm-kernel, lkml
Possibly related (same subject, not in this thread)
- 2015-03-16 · [PATCH 1/5] clk: mediatek: Add initial common clock support for Mediatek SoCs. · Sascha Hauer <s.hauer@pengutronix.de>
On Fri, Mar 13, 2015 at 05:46:32PM +0100, Matthias Brugger wrote:
On 22/02/15 12:49, Sascha Hauer wrote:quoted
From: James Liao <redacted>quoted
diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h new file mode 100644 index 0000000..c7c0d35 --- /dev/null +++ b/drivers/clk/mediatek/clk-mtk.h[...]quoted
+void __init mtk_clk_register_plls(struct device_node *node, + const struct mtk_pll_data *plls, int num_plls); + +#ifdef CONFIG_RESET_CONTROLLER +void mtk_register_reset_controller(struct device_node *np, + unsigned int num_regs, int regofs); +#else +static inline void mtk_register_reset_controller(struct device_node *np, + unsigned int num_regs, int regofs) +{ +} +#endifThis lines should only be added once in [2/5], compiling ends with: In file included from drivers/clk/mediatek/clk-mtk.c:24:0: drivers/clk/mediatek/clk-mtk.h:168:20: error: redefinition of ‘mtk_register_reset_controller’ drivers/clk/mediatek/clk-mtk.h:158:20: note: previous definition of ‘mtk_register_reset_controller’ was here
Hm, seems to be a rebase accident. Fixed, thanks Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |