From patchwork Tue Mar 19 10:11:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10859273 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 B34841708 for ; Tue, 19 Mar 2019 10:12:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F702295FA for ; Tue, 19 Mar 2019 10:12:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93C5B29603; Tue, 19 Mar 2019 10:12:17 +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 5052D295FA for ; Tue, 19 Mar 2019 10:12:17 +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=qUsKkstzjoVvv/UUsMYVlvs9DZZ0d7kCzYJuEHYNk0M=; b=FoFbtVtBYMk9KH ed4f+4X3We8gDkhYSti7r0k4YyLOTySE3wfKOAAqhmGiRVGhNWQi2aR40eEVB1rUG0hdU77Q/RPck WcDAQ0eUofGQjKrW64a3/umfTSZVmEKwRtd4wIFs5GO1PxHhlqGJYFUMB+H3U4RqTDufQPRtI0NxF Qk8RONQ819/3C6Zs5dZOLqE48LB/cfsqLD0RA7oR2WgCZ7YJWaSlECsocdy+2Wy+AHadr4OioGmyS +7oNNaqQlf+KIFFrExFb3i+/OXmiAVbNI4fdXC1XHUQ67yP5sUgX3/E/jnXmjYkx+WFYuRBIX+ULp VghS6HeLFfq0fmVE66KQ==; 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 1h6BjD-0008Jq-R2; Tue, 19 Mar 2019 10:12:15 +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 1h6Biq-0007vN-C8 for linux-arm-kernel@lists.infradead.org; Tue, 19 Mar 2019 10:11:57 +0000 Received: by mail-wm1-x342.google.com with SMTP id a184so2007117wma.2 for ; Tue, 19 Mar 2019 03:11:52 -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=Yzff3i2PZkBeTqGtwPOqQ3j+XCInyjGqJpt75KA6x3Wi4/yB/Agb2kr+MuD1TBLdpU YgYXNPHo4dHtLViLE7GuWBZwPpDE5einCa9RiFhgib2LgmXwV0KDHuNVYZAwuEq/XXry d57tSGALrwsnHn8NT+XJrEd9jXhlB5+CDXHZLoJqhZMMSgmpJrKtejHaiOOTJ3BuG8/Q /UXCYgyxcTpuIUGzWZ9QtlqEDCm7hmc2SskCXsyY2qpaY6F2CKKUjwXUBG2yjEPHsSK0 BqynV/Fv1O6R42iwoiW3gHU/pELm8A9wB68+A0Uk/7ezW8pBrL3cGNsC6rUB+PLDZpOc rtfA== 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=Qf02WHfPHbiwuftMeRsWr/fW9VC8QY0uOsNUPwBx70DOGr9qX1Vc+RpEjEINZsWllq Ew1ANML3doX8vaPDGwucyFGpZjKIIgGlmWQorpyvF4cp00y01FWDxjKdnzm9qYeGbLbB 48GzPubcOLtgZ3RqFIJbRquXCGKZs/4GKFDB1sdShajnT8kAvoTiCFAbuntnAYVd2ky+ JOnrEZLDIjcwwaGSxz73XKJ39Z4xgIvkcqEXcZwWtXiwHmcSUF0oslrjdh6F8mHau/45 c4QJ4qHef/6FLShWigeUY436ktNtCnMfmkE6n/9Zlk4R9cRKsW6vfgaeA6j2Cr/n8tBT aDFw== X-Gm-Message-State: APjAAAXcR0Unuijdf43t+iK61ypPRLej1mKDpM4N1Z3qlMNfsV/Ndoci mxD5wkWrbzqCKpy4LSaJwvc/Bg== X-Google-Smtp-Source: APXvYqwpFmH36r17EpnbWypN9BNTp/txPpd62YnFCcbyy5KtOAXjRmASH8ayjcpFinwMcEVSZ1VEPw== X-Received: by 2002:a7b:c192:: with SMTP id y18mr2941028wmi.50.1552990310936; Tue, 19 Mar 2019 03:11:50 -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 h10sm3911245wmf.2.2019.03.19.03.11.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 03:11:49 -0700 (PDT) From: Maxime Jourdan To: Neil Armstrong , Jerome Brunet , devicetree@vger.kernel.org Subject: [PATCH v2 1/2] dt-bindings: clk: g12a-clkc: add VDEC clock IDs Date: Tue, 19 Mar 2019 11:11:37 +0100 Message-Id: <20190319101138.27520-2-mjourdan@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319101138.27520-1-mjourdan@baylibre.com> References: <20190319101138.27520-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_031154_685868_9083F1F5 X-CRM114-Status: GOOD ( 10.60 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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 Reviewed-by: Rob Herring --- 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 10:11:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Jourdan X-Patchwork-Id: 10859275 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 258EB1708 for ; Tue, 19 Mar 2019 10:12:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 032E929600 for ; Tue, 19 Mar 2019 10:12:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB55A29603; Tue, 19 Mar 2019 10:12:31 +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 78AF929600 for ; Tue, 19 Mar 2019 10:12:31 +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=Wi0x7eC6IiJO6IeuC8TQqsxudVDqB2wB2evIFWZauUE=; b=Z5le2FZbzLZaXX Qf+D3LAZyhTZ22O4q0xNO3CB0h/nGevaxp/OcaJtYUT3GFUNfSYkGfE2hiv3TaCZb4f2/Xun6IgIK aY7eFZkVH4xEXguEerbVINCkf4vZxQxqksXgDdtNhFhM2S+Vzge8NBVTuJ5lZhcJtWQTuSqZp0CNn 2ZhCMU0KvY5UAhbsFXx/KMdG8g43q6Wm0c7wGcZGRNAZ7RarPpsuCRQwhwQLMBJjMKYktglBYhzlr QbrGXFh1U4O8AWIP0UcI4tHFaqVKSsxyimCoA5yx7ne6OXjhbMwxaa/6OnAyNDV7edtfktWYejhjB 0Uykj1dcsjxJbIkzEEnA==; 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 1h6BjM-0008UM-6c; Tue, 19 Mar 2019 10:12:24 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h6Bir-0007vT-JT for linux-arm-kernel@lists.infradead.org; Tue, 19 Mar 2019 10:11:58 +0000 Received: by mail-wm1-x341.google.com with SMTP id z6so4120971wmi.0 for ; Tue, 19 Mar 2019 03:11:53 -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=My8ASarnpw2B62d9qiE1akdMtnJMYlnHeiI3/dBbjIo=; b=QHv/C1ZhzO0Qd7Xf5ev2t286jsI9+TByfKUHUcFOrC+T39Cz0+FWhfY2+hZcUBeUsL yG0R/BU+87PNQJkE3LrhMV1B9/pez4t0LH6Luf+v0biuMWtbPrJhQzziJznf9AndFLOU XXGolcV2kmCZcG4xCm2kg3OJINnK6V5dhr8jYIidQFSdpD/6sbGQu8MR0gbw6okmNjG0 FEnzaAaJ10vxORd2OPRvCuyn7sm5ORsUvLku57W8Y9vAxxCEaJRy5aYbZlXHYSe680LA tv//cjKlJESNK7GRqI4yH8KXlJfCY1bszMK8lTcuaAH3GH2/RrmWdOnBw5k8Q5nbHjdl LEDA== 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=My8ASarnpw2B62d9qiE1akdMtnJMYlnHeiI3/dBbjIo=; b=bXCSXcFlLtOnKQrlhG3X93EhB1MoSXDjbmPxqP/IXcU+Wrwmfa6+LlnCACxw9WA8nI 4qSN1zLFH3GK1ChjaUZ1ANBtVC1216/ZcT2/hhydp4iKT6xvCRG+nAshfaGPwr3CDOkf tqtYHsd1i4/4rLHBno47fk1JmY7YLzxHaU0ZFeoWJP+G0kUrtQWRfMw+cc2t+of2pw7a DcCjBjjPptlvszmu4zkmjVc84/bXz2NP+WYWORYQLnp2bWEpB3Nn+YxDMHz8VtZsLyDC 6d+fQORM6TmlOpqKnSDNznGpxCtrjHV/NK9aHAVinRt4PMFvdyIZf9sdBRrIZQ45eQ0i LCwQ== X-Gm-Message-State: APjAAAW5rfImGYuKTsN4yBK7fs6j14HKPC+Jz5FBJlyEgCesCcfYmKIQ 6HeETATGrk0HKzhk4K4qOYOFfw== X-Google-Smtp-Source: APXvYqx2hGwUdqmMih+I2PLfVexMx5FpNZim3pJM0gM9QmW3oQG5DtDIQqQ/zbIiuxZDqmmUY/O4TQ== X-Received: by 2002:a7b:c34e:: with SMTP id l14mr3024778wmj.68.1552990312067; Tue, 19 Mar 2019 03:11:52 -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 h10sm3911245wmf.2.2019.03.19.03.11.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 03:11:51 -0700 (PDT) From: Maxime Jourdan To: Neil Armstrong , Jerome Brunet Subject: [PATCH v2 2/2] clk: meson-g12a: add video decoder clocks Date: Tue, 19 Mar 2019 11:11:38 +0100 Message-Id: <20190319101138.27520-3-mjourdan@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190319101138.27520-1-mjourdan@baylibre.com> References: <20190319101138.27520-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_031154_695646_99FCDAB7 X-CRM114-Status: GOOD ( 12.90 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add the necessary clock parts for: - VDEC_1: used to feed VDEC_1 - VDEC_HEVC: the "back" part of the VDEC_HEVC block - VDEC_HEVCF: the "front" part of the VDEC_HEVC block In previous SoC generations (GXL, GXBB), there was only one VDEC_HEVC clock, which got split in two parts for G12A. Signed-off-by: Maxime Jourdan Acked-by: Neil Armstrong --- drivers/clk/meson/g12a.c | 163 +++++++++++++++++++++++++++++++++++++++ drivers/clk/meson/g12a.h | 8 +- 2 files changed, 170 insertions(+), 1 deletion(-) diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index 3a3134976534..6c762a8b32b9 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -1495,6 +1495,151 @@ 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, + .flags = CLK_DIVIDER_ROUND_CLOSEST, + }, + .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, + .flags = CLK_DIVIDER_ROUND_CLOSEST, + }, + .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, + .flags = CLK_DIVIDER_ROUND_CLOSEST, + }, + .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 +2760,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 +2957,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