From patchwork Sat Jan 5 17:48:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ayaka X-Patchwork-Id: 10749323 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2ADA217E1 for ; Sat, 5 Jan 2019 17:49:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15CB9284F0 for ; Sat, 5 Jan 2019 17:49:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06BB4287F9; Sat, 5 Jan 2019 17:49:34 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 82FC1284F0 for ; Sat, 5 Jan 2019 17:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gBEAWfVtxQc4RHOFHlbLoEvQt48vSxwMgalU/ry+mEQ=; b=gwMPxg2wD5Hda/ myaBCzRxH7Hpx74653ptxZia5PC/dhIyiinnHiVtML00wumY3NX833wVl1x5JQMjHTEtwUYai4Unv brhCHFVlWYHTGpKt+a0vCsuX2mDiLpQvLA7FA3nCOjbixHn5gqPTVrLrczkX493zMbRIzRZwh4uqr KjjSJgKDEYJ87R+vmyC+pCqbvIiLXkC8tItuoRAkP31nu9tnE3c/CY3ObBc5Hd9TqGGIqIXE0diwZ k53rOgb7+B1qQNa9TsJ0/5EK87i9ZeM3RrQ3WGvb+th83B7LM3S/ZbZ2jkzutWq2FvEEagxIX9eJ6 Y/14EtcgvCiv4SxBcZJQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfq4c-0006rX-3Y; Sat, 05 Jan 2019 17:49:26 +0000 Received: from kozue.soulik.info ([108.61.200.231]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfq4C-0006Pp-LS; Sat, 05 Jan 2019 17:49:02 +0000 Received: from misaki.sumomo.pri (unknown [IPv6:2001:470:b30d:2:c604:15ff:0:a00]) by kozue.soulik.info (Postfix) with ESMTPA id 91048101714; Sun, 6 Jan 2019 02:49:36 +0900 (JST) From: Randy Li To: linux-rockchip@lists.infradead.org Subject: [PATCH 1/3] clk: rockchip: add video clk parents for rk3399 Date: Sun, 6 Jan 2019 01:48:35 +0800 Message-Id: <20190105174837.19378-2-ayaka@soulik.info> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190105174837.19378-1-ayaka@soulik.info> References: <20190105174837.19378-1-ayaka@soulik.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190105_094900_811827_DAA34140 X-CRM114-Status: UNSURE ( 7.43 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ulf.hansson@linaro.org, zhangqing@rock-chips.com, heiko@sntech.de, geert+renesas@glider.be, sboyd@kernel.org, mturquette@baylibre.com, Randy Li , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Video codec won't work properly with a clock too low nor too high. We need to export them, allowing the device tree to assign a suitable clocks for them. Signed-off-by: Randy Li --- drivers/clk/rockchip/clk-rk3399.c | 5 +++-- include/dt-bindings/clock/rk3399-cru.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 5a628148f3f0..fe6cebcb26b6 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -740,7 +740,8 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(15), 6, GFLAGS), /* vcodec */ - COMPOSITE(0, "aclk_vcodec_pre", mux_pll_src_cpll_gpll_npll_ppll_p, 0, + COMPOSITE(ACLK_VCODEC_PRE, "aclk_vcodec_pre", + mux_pll_src_cpll_gpll_npll_ppll_p, 0, RK3399_CLKSEL_CON(7), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(4), 0, GFLAGS), COMPOSITE_NOMUX(0, "hclk_vcodec_pre", "aclk_vcodec_pre", 0, @@ -764,7 +765,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(9), 14, 2, MFLAGS, 8, 5, DFLAGS, RK3399_CLKGATE_CON(4), 5, GFLAGS), - COMPOSITE(0, "aclk_vdu_pre", mux_pll_src_cpll_gpll_npll_ppll_p, 0, + COMPOSITE(ACLK_VDU_PRE, "aclk_vdu_pre", mux_pll_src_cpll_gpll_npll_ppll_p, 0, RK3399_CLKSEL_CON(8), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(4), 2, GFLAGS), COMPOSITE_NOMUX(0, "hclk_vdu_pre", "aclk_vdu_pre", 0, diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h index 22cb1dfa9004..dd13554aaf76 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -219,6 +219,8 @@ #define ACLK_GIC_PRE 262 #define ACLK_VOP0_PRE 263 #define ACLK_VOP1_PRE 264 +#define ACLK_VCODEC_PRE 265 +#define ACLK_VDU_PRE 266 /* pclk gates */ #define PCLK_PERIHP 320