Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932793AbbHJTzV (ORCPT ); Mon, 10 Aug 2015 15:55:21 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:36211 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932764AbbHJTzU (ORCPT ); Mon, 10 Aug 2015 15:55:20 -0400 Message-ID: <55C901A4.4050605@gmail.com> Date: Mon, 10 Aug 2015 21:55:16 +0200 From: Sebastian Hesselbarth User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 To: Antoine Tenart , mturquette@baylibre.com, sboyd@codeaurora.org CC: zmxu@marvell.com, jszhang@marvell.com, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] clk: berlin: add cpuclk References: <1438259752-16320-1-git-send-email-antoine.tenart@free-electrons.com> <1438259752-16320-2-git-send-email-antoine.tenart@free-electrons.com> In-Reply-To: <1438259752-16320-2-git-send-email-antoine.tenart@free-electrons.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2320 Lines: 68 On 30.07.2015 14:35, Antoine Tenart wrote: > Add cpuclk in the Berlin BG2Q clock driver. This clk has a divider > fixed to 1. > > Signed-off-by: Antoine Tenart > --- > drivers/clk/berlin/bg2q.c | 14 +++++++------- > include/dt-bindings/clock/berlin2q.h | 3 ++- > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c > index 221f40c2b850..72d2f3500db8 100644 > --- a/drivers/clk/berlin/bg2q.c > +++ b/drivers/clk/berlin/bg2q.c > @@ -45,7 +45,7 @@ > #define REG_SDIO0XIN_CLKCTL 0x0158 > #define REG_SDIO1XIN_CLKCTL 0x015c > > -#define MAX_CLKS 27 > +#define MAX_CLKS 28 Following Stephen's suggesting, how about moving this to the dt-bindings include? > static struct clk *clks[MAX_CLKS]; > static struct clk_onecell_data clk_data; > static DEFINE_SPINLOCK(lock); > @@ -356,13 +356,13 @@ static void __init berlin2q_clock_setup(struct device_node *np) > gd->bit_idx, 0, &lock); > } > > - /* > - * twdclk is derived from cpu/3 > - * TODO: use cpupll until cpuclk is not available > - */ > + /* cpuclk divider is fixed to 1 */ > + clks[CLKID_CPU] = > + clk_register_fixed_factor(NULL, "cpu", clk_names[CPUPLL], > + 0, 1, 1); > + /* twdclk is derived from cpu/3 */ > clks[CLKID_TWD] = > - clk_register_fixed_factor(NULL, "twd", clk_names[CPUPLL], > - 0, 1, 3); > + clk_register_fixed_factor(NULL, "twd", "cpu", 0, 1, 3); > > /* check for errors on leaf clocks */ > for (n = 0; n < MAX_CLKS; n++) { > diff --git a/include/dt-bindings/clock/berlin2q.h b/include/dt-bindings/clock/berlin2q.h > index 287fc3b4afb2..a80c3272794d 100644 > --- a/include/dt-bindings/clock/berlin2q.h > +++ b/include/dt-bindings/clock/berlin2q.h > @@ -28,4 +28,5 @@ > #define CLKID_NFC 23 > #define CLKID_SMEMC 24 > #define CLKID_PCIE 25 > -#define CLKID_TWD 26 > +#define CLKID_CPU 26 > +#define CLKID_TWD 27 Is there any good reason to brake existing dts[i] by moving TWD to 27 instead of adding CPU as 27? Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/