From patchwork Tue Mar 19 08:50:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10859121 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 D4D2915AC for ; Tue, 19 Mar 2019 08:51:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2C2F294FB for ; Tue, 19 Mar 2019 08:51:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A43F1295AA; Tue, 19 Mar 2019 08:51:20 +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=ham 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 45E1F294FB for ; Tue, 19 Mar 2019 08:51:20 +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=V8w/TOTQnstcEWucJMb0+WAiNy68fxHnTZEwyRd8XFI=; b=OuhhblUXi4aCu5 54k2dTWbMOSJ5BMrdHMvRC11U0mctCgb5f4EB8npKNCmi9/3mpgpKFDrURZfxOF+ikslVVASQEFT+ pAHQ+rkp42nLTxPVoM2NNLxmTh1CzSUiELrPo8twDFZtjfj8s/SIzodr+EvG5eNAmJ4kgKwfBaYbs Iid+Le8UoK+PeB+u7Y7QQ/WJdvAR3Qe4m4apE0QmEPF4jprCeGuY1PWdVJDJp1Cwh5w7bEi9xWxlz 95aZiDrCDzrYdj6DL0cGGIYPdydMcuBp929RcRS2OEp0zvtXvcDCIC2BVgyFv27ev3Fsnx4wGUOG1 EXKp/NZGwoSkX7w5qs+g==; 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 1h6ASs-00085u-FD; Tue, 19 Mar 2019 08:51:18 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h6ASU-0007cO-Sr for linux-amlogic@lists.infradead.org; Tue, 19 Mar 2019 08:50:56 +0000 Received: by mail-wm1-x342.google.com with SMTP id z6so3958802wmi.0 for ; Tue, 19 Mar 2019 01:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SvHHOPdjX31+8rEIKUG20XZp/bt/In6fypqaOoH+9BU=; b=LPqwZncP48YbBVdGto3gLx4EesNFzYGcq3CWvVdtZF/9cW9yE/v5xmftFjqXquxr3f yb9Nkt9FB7yQbQPs4wagzhglDWFIBh9730VZniZdgVIcQnzhIKWjtqpcajgtbEq+iTgW BPfOVMCkzkiKLB8uzgrny4vnemApV6hX3LuCHAxYLd+qp4SK9cBlYuVdYg5BmZkVcALW /euhWk5CZDZjuH2n3hK9F+QE5a1uIW4Y8SzRKGXg1cOzhxkqSAKZivJaQ5XJvqJvyj2H vvKJqWFhZ8tkvi/KQwYhuSbjM8Xzz77SUBCNpjNr5YxEYSUo3xEfH86+5p7sB6kcy+UA Ov6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SvHHOPdjX31+8rEIKUG20XZp/bt/In6fypqaOoH+9BU=; b=hDTlwomqrCvkACH3oo2wx7JnHM49vQblrW9A9ki9zLYDy8jGcUVgrIeumCmjl/qCMd DfrmTB0sWrX6WfJhmVMFrCxz+hYfni2OrBSX3aoRnZyxGs9cCmG7XIIKy0uq+ku3MaB+ hBIGm/1nFFwvj2hBk0q/dF+C3qrijd312RX6ddi7Tld+ee3B6thYK4mr5vmK+S6+mwrl 7x7/VgVSLnz/wMMb0c4Nrrl/GwM56mgPnigqPFKmiz58Pr0qDpgWff9sS7WAEb+f8aq7 QuAQKaeOdEYBhKTyE1W/Sx0WrPO/vf1BtQVlmUK35hINhsWJz3KR7BsRfBjvpx1s8r5A d/Dg== X-Gm-Message-State: APjAAAXe+Ip7JCCb3NKcNr13efEQmzdUIA+hL3U+Yw40Zuj5A/Ibwjrj 1g4rCp2HOXKHumx4IV14TtP/Ug== X-Google-Smtp-Source: APXvYqw83qHRKWh0mRm2INlgYcqK32PwGK7PWt2hJbmf1chMs+hSs96ZfVB7FWfICvoe7jKj03H1VQ== X-Received: by 2002:a1c:9d4c:: with SMTP id g73mr2710540wme.48.1552985453234; Tue, 19 Mar 2019 01:50:53 -0700 (PDT) Received: from mjourdan-pc.numericable.fr (abo-99-183-68.mtp.modulonet.fr. [85.68.183.99]) by smtp.gmail.com with ESMTPSA id n4sm9411047wrx.39.2019.03.19.01.50.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 01:50:52 -0700 (PDT) From: Maxime Jourdan To: Neil Armstrong , Jerome Brunet , devicetree@vger.kernel.org Subject: [PATCH 1/2] dt-bindings: clk: g12a-clkc: add VDEC clock IDs Date: Tue, 19 Mar 2019 09:50:43 +0100 Message-Id: <20190319085044.8581-2-mjourdan@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319085044.8581-1-mjourdan@baylibre.com> References: <20190319085044.8581-1-mjourdan@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190319_015054_933542_3A4DD826 X-CRM114-Status: UNSURE ( 9.12 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Jourdan , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Expose the three clocks related to the video decoder. Signed-off-by: Maxime Jourdan --- include/dt-bindings/clock/g12a-clkc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index 30303728fe09..82c9e0c020b2 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -133,5 +133,8 @@ #define CLKID_MPLL_5OM 177 #define CLKID_CPU_CLK 187 #define CLKID_PCIE_PLL 201 +#define CLKID_VDEC_1 204 +#define CLKID_VDEC_HEVC 207 +#define CLKID_VDEC_HEVCF 210 #endif /* __G12A_CLKC_H */ From patchwork Tue Mar 19 08:50:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10859123 X-Patchwork-Delegate: neil.armstrong@linaro.org 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 6810F6C2 for ; Tue, 19 Mar 2019 08:51:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46CEE294FB for ; Tue, 19 Mar 2019 08:51:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B055295AA; Tue, 19 Mar 2019 08:51:22 +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 C26DA294FB for ; Tue, 19 Mar 2019 08:51:21 +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=5+cYG197E5QkxHfGeSCx3yUFaBqwkyUYJVfKj8dIfK4=; b=l7SP1T/E0OWMYJ HuMm73lCr9VzON+jmMuYI9ctP9pPrpR5ftA5pAYokxny8k9FR75WvgjpV0F79eCOy+wBSB9NHw+DJ ZCYs3M3u4IH+AvMcCQkAmKT2CojIIi1MrNa0X1RmqoU4W08ja/HlRtaiDJn7RCq1iAEEgUvbjahYD AG91bUa+46/L3K3Ad+LbkjfsGNg33UWcBKXJGj7EWbGVUkeWI72MUM4/tQEHg7HZb/eqaPM0JSza3 w10iv2Pri0OTzojl452mi9+SZbvPHyY+9m5D2QwcZKLE59HUGmd+Y5JKk7Xw06lBPfS8LEk58ag74 LAMeLR7M30k4c6eACvjA==; 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 1h6ASu-00088w-Ia; Tue, 19 Mar 2019 08:51:20 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h6ASV-0007d2-SI for linux-amlogic@lists.infradead.org; Tue, 19 Mar 2019 08:50:59 +0000 Received: by mail-wr1-x444.google.com with SMTP id j9so5868735wrn.6 for ; Tue, 19 Mar 2019 01:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gf72ZmXlmqyXLuvApTF83s8RrJ6agdJoOCHA3jp5SbQ=; b=Q4aJ07IPwy8bvxdm74BHj4ulAtlWJQmIDQehcs7jnHnjhGM4FqLpEsM01meRYGwcBr QwF5g4Mcqu8/b/9wjf2zjZlfCpbeTjudVBgbQTmfntS0hVzdBGkMgWNMe78uw3CYzAxf dyBwLLBTT6n08oO8b4Wy03gcUccSvZjrKH4O4W8zXzAt1m5pdAZpqonZDHf9vUCzNFy/ uHQ69UDhbn8vk2hoFsts6C2Rfk2ARRv+jc1bNBIfXBqXi9cqW1yt53J/UTdIBzMjwCe5 NVI1hOGqFgHe7fOHMdthLVyQwmHoIRpyhhZIO5vCOq73KhVcQW3LeUlVjZ89xjeWWUko wqKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gf72ZmXlmqyXLuvApTF83s8RrJ6agdJoOCHA3jp5SbQ=; b=RCrnqkK7eCrHdXoI+/TqSfa/tDtWrpZUMhXHLdOKmEjEoZ+7W9wjReNV+0eTT8orLQ x2kt707BKP42rawxXZ3QJ7IEdk8+eWvZ1HEqTmG4PbCGIsM90xcKo1IY7V7iRHrIGkoj z6qmKp/JFjLGSfqP1O2WPHfcc76EAnMTf04AppA8YCP6HIpx8FqvQM88RDTYzP/j+eQE MwznSViR/YCO/5khCiPu2eLgpvxTpBiQ1F5azOUWyex+LEL5iWasXCuECrvOUUejSKi1 sFQPHevI9JthW9YSiHh9cLb0zxOq8dIFGlr4Fm1S7cjTGnBE8t36QrgqxMIMy+K6iYrs nEiw== X-Gm-Message-State: APjAAAXMcO8hEwJVCy4HkjraVqGu1kTXS4vqbzlnVwRydeYnhGpv05I4 rIoWdfSSwgjbrzHk+8ZkmAKumg== X-Google-Smtp-Source: APXvYqx/7t5grdSDpDYvOILI7Edw+w3pkGcR+XzTJQOlmDcDhBJ+dZ/uOumBdpO46981UECl7uUrNA== X-Received: by 2002:adf:a147:: with SMTP id r7mr15213268wrr.5.1552985454569; Tue, 19 Mar 2019 01:50:54 -0700 (PDT) Received: from mjourdan-pc.numericable.fr (abo-99-183-68.mtp.modulonet.fr. [85.68.183.99]) by smtp.gmail.com with ESMTPSA id n4sm9411047wrx.39.2019.03.19.01.50.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 01:50:54 -0700 (PDT) From: Maxime Jourdan To: Neil Armstrong , Jerome Brunet Subject: [PATCH 2/2] clk: meson-g12a: add video decoder clocks Date: Tue, 19 Mar 2019 09:50:44 +0100 Message-Id: <20190319085044.8581-3-mjourdan@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319085044.8581-1-mjourdan@baylibre.com> References: <20190319085044.8581-1-mjourdan@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190319_015056_089910_EF59F274 X-CRM114-Status: GOOD ( 11.90 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Jourdan , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Mostly like meson-gx, except that the VDEC_HEVC clock is now split in two: HEVC and HEVCF. Signed-off-by: Maxime Jourdan --- drivers/clk/meson/g12a.c | 160 +++++++++++++++++++++++++++++++++++++++ drivers/clk/meson/g12a.h | 8 +- 2 files changed, 167 insertions(+), 1 deletion(-) diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index 3a3134976534..cfb91df884cb 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -1495,6 +1495,148 @@ static struct clk_regmap g12a_vpu = { }, }; +/* VDEC clocks */ + +static const char * const g12a_vdec_parent_names[] = { + "fclk_div2p5", "fclk_div3", "fclk_div4", "fclk_div5", "fclk_div7", + "hifi_pll", "gp0_pll", +}; + +static struct clk_regmap g12a_vdec_1_sel = { + .data = &(struct clk_regmap_mux_data){ + .offset = HHI_VDEC_CLK_CNTL, + .mask = 0x7, + .shift = 9, + .flags = CLK_MUX_ROUND_CLOSEST, + }, + .hw.init = &(struct clk_init_data){ + .name = "vdec_1_sel", + .ops = &clk_regmap_mux_ops, + .parent_names = g12a_vdec_parent_names, + .num_parents = ARRAY_SIZE(g12a_vdec_parent_names), + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_1_div = { + .data = &(struct clk_regmap_div_data){ + .offset = HHI_VDEC_CLK_CNTL, + .shift = 0, + .width = 7, + }, + .hw.init = &(struct clk_init_data){ + .name = "vdec_1_div", + .ops = &clk_regmap_divider_ops, + .parent_names = (const char *[]){ "vdec_1_sel" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_1 = { + .data = &(struct clk_regmap_gate_data){ + .offset = HHI_VDEC_CLK_CNTL, + .bit_idx = 8, + }, + .hw.init = &(struct clk_init_data) { + .name = "vdec_1", + .ops = &clk_regmap_gate_ops, + .parent_names = (const char *[]){ "vdec_1_div" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_hevcf_sel = { + .data = &(struct clk_regmap_mux_data){ + .offset = HHI_VDEC2_CLK_CNTL, + .mask = 0x7, + .shift = 9, + .flags = CLK_MUX_ROUND_CLOSEST, + }, + .hw.init = &(struct clk_init_data){ + .name = "vdec_hevcf_sel", + .ops = &clk_regmap_mux_ops, + .parent_names = g12a_vdec_parent_names, + .num_parents = ARRAY_SIZE(g12a_vdec_parent_names), + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_hevcf_div = { + .data = &(struct clk_regmap_div_data){ + .offset = HHI_VDEC2_CLK_CNTL, + .shift = 0, + .width = 7, + }, + .hw.init = &(struct clk_init_data){ + .name = "vdec_hevcf_div", + .ops = &clk_regmap_divider_ops, + .parent_names = (const char *[]){ "vdec_hevcf_sel" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_hevcf = { + .data = &(struct clk_regmap_gate_data){ + .offset = HHI_VDEC2_CLK_CNTL, + .bit_idx = 8, + }, + .hw.init = &(struct clk_init_data) { + .name = "vdec_hevcf", + .ops = &clk_regmap_gate_ops, + .parent_names = (const char *[]){ "vdec_hevcf_div" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_hevc_sel = { + .data = &(struct clk_regmap_mux_data){ + .offset = HHI_VDEC2_CLK_CNTL, + .mask = 0x7, + .shift = 25, + .flags = CLK_MUX_ROUND_CLOSEST, + }, + .hw.init = &(struct clk_init_data){ + .name = "vdec_hevc_sel", + .ops = &clk_regmap_mux_ops, + .parent_names = g12a_vdec_parent_names, + .num_parents = ARRAY_SIZE(g12a_vdec_parent_names), + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_hevc_div = { + .data = &(struct clk_regmap_div_data){ + .offset = HHI_VDEC2_CLK_CNTL, + .shift = 16, + .width = 7, + }, + .hw.init = &(struct clk_init_data){ + .name = "vdec_hevc_div", + .ops = &clk_regmap_divider_ops, + .parent_names = (const char *[]){ "vdec_hevc_sel" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + +static struct clk_regmap g12a_vdec_hevc = { + .data = &(struct clk_regmap_gate_data){ + .offset = HHI_VDEC2_CLK_CNTL, + .bit_idx = 24, + }, + .hw.init = &(struct clk_init_data) { + .name = "vdec_hevc", + .ops = &clk_regmap_gate_ops, + .parent_names = (const char *[]){ "vdec_hevc_div" }, + .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, + }, +}; + /* VAPB Clock */ static const char * const g12a_vapb_parent_names[] = { @@ -2615,6 +2757,15 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = { [CLKID_PCIE_PLL_DCO_DIV2] = &g12a_pcie_pll_dco_div2.hw, [CLKID_PCIE_PLL_OD] = &g12a_pcie_pll_od.hw, [CLKID_PCIE_PLL] = &g12a_pcie_pll.hw, + [CLKID_VDEC_1_SEL] = &g12a_vdec_1_sel.hw, + [CLKID_VDEC_1_DIV] = &g12a_vdec_1_div.hw, + [CLKID_VDEC_1] = &g12a_vdec_1.hw, + [CLKID_VDEC_HEVC_SEL] = &g12a_vdec_hevc_sel.hw, + [CLKID_VDEC_HEVC_DIV] = &g12a_vdec_hevc_div.hw, + [CLKID_VDEC_HEVC] = &g12a_vdec_hevc.hw, + [CLKID_VDEC_HEVCF_SEL] = &g12a_vdec_hevcf_sel.hw, + [CLKID_VDEC_HEVCF_DIV] = &g12a_vdec_hevcf_div.hw, + [CLKID_VDEC_HEVCF] = &g12a_vdec_hevcf.hw, [NR_CLKS] = NULL, }, .num = NR_CLKS, @@ -2803,6 +2954,15 @@ static struct clk_regmap *const g12a_clk_regmaps[] = { &g12a_cpu_clk_trace, &g12a_pcie_pll_od, &g12a_pcie_pll_dco, + &g12a_vdec_1_sel, + &g12a_vdec_1_div, + &g12a_vdec_1, + &g12a_vdec_hevc_sel, + &g12a_vdec_hevc_div, + &g12a_vdec_hevc, + &g12a_vdec_hevcf_sel, + &g12a_vdec_hevcf_div, + &g12a_vdec_hevcf, }; static const struct meson_eeclkc_data g12a_clkc_data = { diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h index 1393a09730a6..39c41af70804 100644 --- a/drivers/clk/meson/g12a.h +++ b/drivers/clk/meson/g12a.h @@ -189,8 +189,14 @@ #define CLKID_PCIE_PLL_DCO 198 #define CLKID_PCIE_PLL_DCO_DIV2 199 #define CLKID_PCIE_PLL_OD 200 +#define CLKID_VDEC_1_SEL 202 +#define CLKID_VDEC_1_DIV 203 +#define CLKID_VDEC_HEVC_SEL 205 +#define CLKID_VDEC_HEVC_DIV 206 +#define CLKID_VDEC_HEVCF_SEL 208 +#define CLKID_VDEC_HEVCF_DIV 209 -#define NR_CLKS 202 +#define NR_CLKS 211 /* include the CLKIDs that have been made part of the DT binding */ #include