From patchwork Wed Nov 16 19:26:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9432443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 21C5B60471 for ; Wed, 16 Nov 2016 19:28:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF6629126 for ; Wed, 16 Nov 2016 19:28:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0189929128; Wed, 16 Nov 2016 19:28:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A3C7E2911C for ; Wed, 16 Nov 2016 19:28:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c75rf-0002gb-Tv; Wed, 16 Nov 2016 19:27:23 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c75ra-0002cc-3v for linux-arm-kernel@lists.infradead.org; Wed, 16 Nov 2016 19:27:19 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id AA15E614EA; Wed, 16 Nov 2016 19:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1479324417; bh=0uP2FpqRCvgJgzzQpWVQsVxTcuFgHzkaBCCB9QN6fm0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RuIzpBt2XLjTA6+zkXlmsY8g9m9l4OnM5kjIHBf5KVLyDiIut2NDGfuQZUtMzugJ0 ECeTq54aPkGxw1IegrBUiKbVwA95kVz4mCba0Q9X4KFtYkp1G8CiQU2Sd/dDLcV8KD 2EbiYNMnApemtz+9ZV5f/ndsUSn5nIqof11Pvq1Y= Received: from localhost (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 2B63D614E4; Wed, 16 Nov 2016 19:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1479324417; bh=0uP2FpqRCvgJgzzQpWVQsVxTcuFgHzkaBCCB9QN6fm0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RuIzpBt2XLjTA6+zkXlmsY8g9m9l4OnM5kjIHBf5KVLyDiIut2NDGfuQZUtMzugJ0 ECeTq54aPkGxw1IegrBUiKbVwA95kVz4mCba0Q9X4KFtYkp1G8CiQU2Sd/dDLcV8KD 2EbiYNMnApemtz+9ZV5f/ndsUSn5nIqof11Pvq1Y= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 2B63D614E4 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=sboyd@codeaurora.org Date: Wed, 16 Nov 2016 11:26:56 -0800 From: Stephen Boyd To: Maxime Ripard Subject: Re: [GIT PULL] Allwinner clock changes for 4.10 Message-ID: <20161116192656.GJ25626@codeaurora.org> References: <20161115212615.lm3guceyfmdjnhfp@lukather> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161115212615.lm3guceyfmdjnhfp@lukather> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161116_112718_267349_25613B47 X-CRM114-Status: GOOD ( 18.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mike Turquette , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On 11/15, Maxime Ripard wrote: > Hi Mike, Stephen, > > Please pull the following patches for the next merge window. > > Thanks! > Maxime > > The following changes since commit 1001354ca34179f3db924eb66672442a173147dc: > > Linux 4.9-rc1 (2016-10-15 12:17:50 -0700) > > are available in the git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git sunxi-clk-for-4.10 > > for you to fetch changes up to 0f6f9302b819ca352cfd4f42c18ec08d521f9cae: > > clk: sunxi-ng: sun8i-h3: Set CLK_SET_RATE_PARENT for audio module clocks (2016-11-11 21:47:41 +0100) Pulled into clk-next, but I get the following grumbles... ERROR: space prohibited before that ',' (ctx:WxW) #282: FILE: drivers/clk/sunxi-ng/ccu-sun50i-a64.c:206: + "pll-cpux" , "pll-cpux" }; ^ ERROR: space prohibited before that ',' (ctx:WxW) #289: FILE: drivers/clk/sunxi-ng/ccu-sun50i-a64.c:213: + "axi" , "pll-periph0" }; ^ ERROR: space prohibited before that ',' (ctx:WxE) #325: FILE: drivers/clk/sunxi-ng/ccu-sun50i-a64.c:249: + "pll-periph0-2x" , ^ ERROR: space prohibited before that ',' (ctx:WxW) #333: FILE: drivers/clk/sunxi-ng/ccu-sun50i-a64.c:257: +static const char * const ahb2_parents[] = { "ahb1" , "pll-periph0" }; ^ drivers/clk/sunxi-ng/ccu-sun50i-a64.c:160:16: warning: symbol 'pll_mipi_clk' was not declared. Should it be static? drivers/clk/sunxi-ng/ccu-sun50i-a64.c:507:16: warning: symbol 'tcon1_clk' was not declared. Should it be static? I'll go fix them this time, but please be more careful next time. ---8<---- diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c index 0674515e2bad..e3c084cc6da5 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c +++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c @@ -157,7 +157,7 @@ static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_gpu_clk, "pll-gpu", */ #define SUN50I_A64_PLL_MIPI_REG 0x040 -struct ccu_nkm pll_mipi_clk = { +static struct ccu_nkm pll_mipi_clk = { .enable = BIT(31), .lock = BIT(28), .n = _SUNXI_CCU_MULT(8, 4), @@ -203,14 +203,14 @@ static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", CLK_SET_RATE_UNGATE); static const char * const cpux_parents[] = { "osc32k", "osc24M", - "pll-cpux" , "pll-cpux" }; + "pll-cpux", "pll-cpux" }; static SUNXI_CCU_MUX(cpux_clk, "cpux", cpux_parents, 0x050, 16, 2, CLK_SET_RATE_PARENT | CLK_IS_CRITICAL); static SUNXI_CCU_M(axi_clk, "axi", "cpux", 0x050, 0, 2, 0); static const char * const ahb1_parents[] = { "osc32k", "osc24M", - "axi" , "pll-periph0" }; + "axi", "pll-periph0" }; static struct ccu_div ahb1_clk = { .div = _SUNXI_CCU_DIV_FLAGS(4, 2, CLK_DIVIDER_POWER_OF_TWO), @@ -246,7 +246,7 @@ static SUNXI_CCU_DIV_TABLE(apb1_clk, "apb1", "ahb1", 0x054, 8, 2, apb1_div_table, 0); static const char * const apb2_parents[] = { "osc32k", "osc24M", - "pll-periph0-2x" , + "pll-periph0-2x", "pll-periph0-2x" }; static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058, 0, 5, /* M */ @@ -254,7 +254,7 @@ static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058, 24, 2, /* mux */ 0); -static const char * const ahb2_parents[] = { "ahb1" , "pll-periph0" }; +static const char * const ahb2_parents[] = { "ahb1", "pll-periph0" }; static const struct ccu_mux_fixed_prediv ahb2_fixed_predivs[] = { { .index = 1, .div = 2 }, }; @@ -504,7 +504,7 @@ static SUNXI_CCU_MUX_TABLE_WITH_GATE(tcon0_clk, "tcon0", tcon0_parents, static const char * const tcon1_parents[] = { "pll-video0", "pll-video1" }; static const u8 tcon1_table[] = { 0, 2, }; -struct ccu_div tcon1_clk = { +static struct ccu_div tcon1_clk = { .enable = BIT(31), .div = _SUNXI_CCU_DIV(0, 4), .mux = _SUNXI_CCU_MUX_TABLE(24, 2, tcon1_table),