From patchwork Wed Sep 7 16:53:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 9319685 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 B069E60752 for ; Wed, 7 Sep 2016 16:55:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A90E52940B for ; Wed, 7 Sep 2016 16:55:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C3362940E; Wed, 7 Sep 2016 16:55:40 +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=ham 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 7E72D2940B for ; Wed, 7 Sep 2016 16:55:39 +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 1bhg8O-00025V-Vy; Wed, 07 Sep 2016 16:55:37 +0000 Received: from dougal.metanate.com ([90.155.101.14] helo=metanate.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhg7L-0000nk-46; Wed, 07 Sep 2016 16:54:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=jBTOAOE/XbSB0ymVeK4pvlTBPAmHpG3oWEG8AcnM/VM=; b=KIq2EKsvxKbqnXFgzgQTvQ/9h9tFUjHUbPRO33uUQf5hJlyIJaGXNpq1w8831LT9bhFjI8TPj++1qNYOcFzJhbC4OUZkyRpPlqdBSJdkDNmQWgsmxwSU8TSW/9VKCRCwKW0FISHA//YrH8Hkerrj4HHSm/8pUlrUQx+GT3039KuNyTV2Ckx/Nc3D4LL+tdoLfqlvOZomGBWHMg3n1IJVQhveEI6ZnnKZl0nihHI3GaNfjKBLcP87+c5GHZQBbV9asXEny71YUK/j3dwOxBKd0xH1fOg3hTeyY4iYEUT+sxePsRk1HonbuT6pE38GRPkX3ilu4g2ue9VD691/NdPiwA==; Received: from brian ([192.168.88.1] helo=leela.metanate.com) by shrek.metanate.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1bhg6O-00023z-MQ; Wed, 07 Sep 2016 17:53:32 +0100 From: John Keeping To: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] clk: rockchip: use identifiers for rk3288 I2S clocks Date: Wed, 7 Sep 2016 17:53:30 +0100 Message-Id: <20160907165330.14607-2-john@metanate.com> X-Mailer: git-send-email 2.9.3.728.g30b24b4.dirty In-Reply-To: <20160907165330.14607-1-john@metanate.com> References: <20160907165330.14607-1-john@metanate.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160907_095431_523428_449702E6 X-CRM114-Status: UNSURE ( 7.83 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Heiko Stuebner , Michael Turquette , Stephen Boyd , linux-rockchip@lists.infradead.org, Rob Herring , John Keeping , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Export these so that the rates can be set via the device tree. Signed-off-by: John Keeping --- drivers/clk/rockchip/clk-rk3288.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index 39af05a589b3..8817a5b3bd0f 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -229,7 +229,7 @@ static struct clk_div_table div_hclk_cpu_t[] = { #define IFLAGS ROCKCHIP_INVERTER_HIWORD_MASK static struct rockchip_clk_branch rk3288_i2s_fracmux __initdata = - MUX(0, "i2s_pre", mux_i2s_pre_p, CLK_SET_RATE_PARENT, + MUX(SCLK_I2S_PRE, "i2s_pre", mux_i2s_pre_p, CLK_SET_RATE_PARENT, RK3288_CLKSEL_CON(4), 8, 2, MFLAGS); static struct rockchip_clk_branch rk3288_spdif_fracmux __initdata = @@ -338,10 +338,10 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { FACTOR(0, "xin12m", "xin24m", 0, 1, 2), - COMPOSITE(0, "i2s_src", mux_pll_src_cpll_gpll_p, 0, + COMPOSITE(SCLK_I2S_SRC, "i2s_src", mux_pll_src_cpll_gpll_p, 0, RK3288_CLKSEL_CON(4), 15, 1, MFLAGS, 0, 7, DFLAGS, RK3288_CLKGATE_CON(4), 1, GFLAGS), - COMPOSITE_FRACMUX(0, "i2s_frac", "i2s_src", CLK_SET_RATE_PARENT, + COMPOSITE_FRACMUX(SCLK_I2S_FRAC, "i2s_frac", "i2s_src", CLK_SET_RATE_PARENT, RK3288_CLKSEL_CON(8), 0, RK3288_CLKGATE_CON(4), 2, GFLAGS, &rk3288_i2s_fracmux),