From mboxrd@z Thu Jan 1 00:00:00 1970 From: matthias.bgg@gmail.com (Matthias Brugger) Date: Fri, 13 Mar 2015 17:46:32 +0100 Subject: [PATCH 1/5] clk: mediatek: Add initial common clock support for Mediatek SoCs. In-Reply-To: <1424605765-19751-2-git-send-email-s.hauer@pengutronix.de> References: <1424605765-19751-1-git-send-email-s.hauer@pengutronix.de> <1424605765-19751-2-git-send-email-s.hauer@pengutronix.de> Message-ID: <55031468.2040109@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 22/02/15 12:49, Sascha Hauer wrote: > From: James Liao > 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 [...] > +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) > +{ > +} > +#endif This 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 Cheers, Matthias From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756844AbbCMQqh (ORCPT ); Fri, 13 Mar 2015 12:46:37 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:34931 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754063AbbCMQqf (ORCPT ); Fri, 13 Mar 2015 12:46:35 -0400 Message-ID: <55031468.2040109@gmail.com> Date: Fri, 13 Mar 2015 17:46:32 +0100 From: Matthias Brugger User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Sascha Hauer , Mike Turquette CC: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, YH Chen , kernel@pengutronix.de, Yingjoe Chen , Eddie Huang , Henry Chen , James Liao Subject: Re: [PATCH 1/5] clk: mediatek: Add initial common clock support for Mediatek SoCs. References: <1424605765-19751-1-git-send-email-s.hauer@pengutronix.de> <1424605765-19751-2-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1424605765-19751-2-git-send-email-s.hauer@pengutronix.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/02/15 12:49, Sascha Hauer wrote: > From: James Liao > 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 [...] > +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) > +{ > +} > +#endif This 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 Cheers, Matthias