From patchwork Mon Sep 3 20:07:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasper Mattsson X-Patchwork-Id: 10586351 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 D9F2E112B for ; Mon, 3 Sep 2018 20:08:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7C4F292F1 for ; Mon, 3 Sep 2018 20:08:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB4D6292F7; Mon, 3 Sep 2018 20:08:44 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 63E16292F1 for ; Mon, 3 Sep 2018 20:08:44 +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:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=EQZkuJvtliBhezQW6SimGZxRrqaqf7ggcR+QKaLxLf0=; b=okMy6YF7rYb3qu 2RDaWrS8pTzu0G8x5vNWeLyDVCYOPK7Y6iCgxBVisuwENuO0xpVJWMnUABLD1dcVhUm3q6r69CF9n Sf11T2AxeDI3T9TRbwhWRhmZnyHb/4kyaKgQlC/qrkxaDxc7I2rQpjdsa0/eajYjpOgtyPZIz07ei UWaVUiYGuuY9j7RfEljeRhkoTmNVVsAf/YACP/EM+gPuEu4X8WseqyBEcvXEIqLt+IxDRa8tP/gvi NPghfUpsfjXSl3GhyYJPLij3oYW1ocviZtN6s044NXm+XragfH39lvuTwuHRRejM65rQJTObuBhAK oOfvC1GBg3ytYTg79zpw==; 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 1fwv9P-00070c-2j for patchwork-linux-mediatek@patchwork.kernel.org; Mon, 03 Sep 2018 20:08:43 +0000 Received: from xn--njmtys-xxab.info ([178.62.196.236]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fwv9M-0006nK-8n for linux-mediatek@lists.infradead.org; Mon, 03 Sep 2018 20:08:41 +0000 Received: by xn--njmtys-xxab.info (Postfix, from userid 1000) id 7A8B543FE9; Mon, 3 Sep 2018 23:07:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=njomotys.info; s=mail; t=1536005279; bh=+KmWkXaoZBDgp0nNYq5osaXCNZg6pjXcIV8wCAOG+Fo=; h=Date:From:To:Cc:Subject; b=nIuS+s6RC86Q0mG9o4KkllamOmKkJs2hHfRAUqSJN70rhF0yUEoVVVrvRTHudKcWK jTSNMMHHBKwJRQjozFU41gqzkHP40dBuNB5JfXRjUYSQAvgKWVvIh45M95NScJ9CgQ l2fSwYU9zK/VwrtMG9gyxjDFzw7GocnEo+pQPEaA= Date: Mon, 3 Sep 2018 23:07:59 +0300 From: Jasper Mattsson To: linux-mediatek@lists.infradead.org Subject: [PATCH 1/3] soc: mediatek: Bind missing clocks to scpsys on the MT6797 Message-ID: <20180903200759.GA6703@xn--njmtys-xxab.info> MIME-Version: 1.0 Content-Disposition: inline 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-20180903_130840_456550_9937923E X-CRM114-Status: UNSURE ( 8.00 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthias.bgg@gmail.com Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add missing clocks to MJC, AUDIO, VENC, VDEC domains. Also add MM clock to VENC and VDEC domains, since the power domains are initially turned on in the order of the scp_domain_data array, not in dependency order. VENC and VDEC are subdomains of MM, but MM is defined after them, so they are turned on before their parent. If the MM domain is not initially on, boot will fail. This is the case e.g. with kexec boot. Signed-off-by: Jasper Mattsson addclk --- drivers/soc/mediatek/mtk-scpsys.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index 5b24bb4bf..4808d71c5 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -97,6 +97,7 @@ enum clk_id { CLK_HIFSEL, CLK_JPGDEC, CLK_AUDIO, + CLK_MJC, CLK_MAX, }; @@ -111,6 +112,7 @@ static const char * const clk_names[] = { "hif_sel", "jpgdec", "audio", + "mjc", NULL, }; @@ -690,7 +692,7 @@ static const struct scp_domain_data scp_domain_data_mt6797[] = { .ctl_offs = 0x300, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_VDEC}, + .clk_id = {CLK_MM, CLK_VDEC}, }, [MT6797_POWER_DOMAIN_VENC] = { .name = "venc", @@ -698,7 +700,7 @@ static const struct scp_domain_data scp_domain_data_mt6797[] = { .ctl_offs = 0x304, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, + .clk_id = {CLK_MM, CLK_VENC}, }, [MT6797_POWER_DOMAIN_ISP] = { .name = "isp", @@ -706,7 +708,7 @@ static const struct scp_domain_data scp_domain_data_mt6797[] = { .ctl_offs = 0x308, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, + .clk_id = {CLK_MM}, }, [MT6797_POWER_DOMAIN_MM] = { .name = "mm", @@ -723,7 +725,7 @@ static const struct scp_domain_data scp_domain_data_mt6797[] = { .ctl_offs = 0x314, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, + .clk_id = {CLK_AUDIO}, }, [MT6797_POWER_DOMAIN_MFG_ASYNC] = { .name = "mfg_async", @@ -739,7 +741,7 @@ static const struct scp_domain_data scp_domain_data_mt6797[] = { .ctl_offs = 0x310, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_NONE}, + .clk_id = {CLK_MJC}, }, }; From patchwork Mon Sep 3 20:08:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasper Mattsson X-Patchwork-Id: 10586355 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 2A3F55A4 for ; Mon, 3 Sep 2018 20:09:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 195DE292F1 for ; Mon, 3 Sep 2018 20:09:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DA70292F6; Mon, 3 Sep 2018 20:09:02 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 B42EB292F1 for ; Mon, 3 Sep 2018 20:09:01 +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:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=IerW8lLS8G14EqR4fUaoXDHjZtp+Lt3PB8Qbus6j5jQ=; b=AlTwDszZh4bLtG nl0MQcsPZUVuLul1zHSyRzsR5655ZIqA8UduXo5hn240MXHNvEsOYME3YUhopWAKN3KnJBki37uzB zfCBb5caS3T70sTu6EpJKc95l9y79T65oL5s6QhtqII+aKO0pyA9Kdks4ixkbCQDCkayW6ch4bx0f MBhTEvlY7RIyWyGgMhr8NSvMM8rg2G6yScLRqd1e6NQiQNBcZDV3CRgIvtFVREYFBDewkYBPDYYNy n1lmIn8kQYQIcb52CKrdq/xeKGEkMm8OISmEj2BdsJqfXxll269o4Eklfv41axtgScNT/kTVBOjL2 pf1MMAo3+/V34HQVI7AA==; 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 1fwv9g-00076S-En for patchwork-linux-mediatek@patchwork.kernel.org; Mon, 03 Sep 2018 20:09:00 +0000 Received: from xn--njmtys-xxab.info ([178.62.196.236]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fwv9d-00073l-P5 for linux-mediatek@lists.infradead.org; Mon, 03 Sep 2018 20:08:59 +0000 Received: by xn--njmtys-xxab.info (Postfix, from userid 1000) id 0330143FEA; Mon, 3 Sep 2018 23:08:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=njomotys.info; s=mail; t=1536005297; bh=bIfJFHQHjmz6eUiHHha1+JMzQ+jymGfddd+oY2rgu1A=; h=Date:From:To:Cc:Subject; b=jAzoF5x17GCMvoXK01vUyFVcf5i+nJZGCaM+degSEvZYc2nFMvZGzuNCgenQX5TkX tNd2gmC0UKOIvwVZBkMxj1WHyTPExoSMuhrYdeCZyVEtBZLUaoU2D27FWL8WJOOh9m B87C+gZdKWiSMVWXuS6MhViAQXgbAWLaIUh1ioQs= Date: Mon, 3 Sep 2018 23:08:16 +0300 From: Jasper Mattsson To: linux-mediatek@lists.infradead.org Subject: [PATCH 2/3] soc: mediatek: Allow gaps in SCP PDs Message-ID: <20180903200816.GA6752@xn--njmtys-xxab.info> MIME-Version: 1.0 Content-Disposition: inline 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-20180903_130857_967721_20DC9FB6 X-CRM114-Status: UNSURE ( 7.45 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthias.bgg@gmail.com Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The power domains array for MT6797 contains gaps, since most MFG-related power domains are missing. This causes a lookup for a regulator with a NULL name fail, and this will cause the probe of SCPSYS to fail. This patch skips gaps in the array by detecting if the power domain name is NULL. This could all be easily solved by reordering the #defines in dt-bindings, but that could break existing DTBs. Signed-off-by: Jasper Mattsson --- drivers/soc/mediatek/mtk-scpsys.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index 4808d71c5..c60a17e56 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -402,6 +402,9 @@ static struct scp *init_scp(struct platform_device *pdev, struct scp_domain *scpd = &scp->domains[i]; const struct scp_domain_data *data = &scp_domain_data[i]; + if (!data->name) + continue; + scpd->supply = devm_regulator_get_optional(&pdev->dev, data->name); if (IS_ERR(scpd->supply)) { if (PTR_ERR(scpd->supply) == -ENODEV) @@ -420,6 +423,9 @@ static struct scp *init_scp(struct platform_device *pdev, struct generic_pm_domain *genpd = &scpd->genpd; const struct scp_domain_data *data = &scp_domain_data[i]; + if (!data->name) + continue; + pd_data->domains[i] = genpd; scpd->scp = scp; @@ -457,6 +463,9 @@ static void mtk_register_power_domains(struct platform_device *pdev, struct scp_domain *scpd = &scp->domains[i]; struct generic_pm_domain *genpd = &scpd->genpd; + if (!genpd->name) + continue; + /* * Initially turn on all domains to make the domains usable * with !CONFIG_PM and to get the hardware in sync with the From patchwork Mon Sep 3 20:08:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasper Mattsson X-Patchwork-Id: 10586353 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 C8CC4112B for ; Mon, 3 Sep 2018 20:08:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B90F6292F1 for ; Mon, 3 Sep 2018 20:08:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD94B292F6; Mon, 3 Sep 2018 20:08:47 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 60BC3292F1 for ; Mon, 3 Sep 2018 20:08:47 +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:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=VSlG5uuokGIHIl7OlTzLPSrcKu1NI6jI1EozbA0T9ZE=; b=Xw2HXkGg/50GeS pBmJHFNIdC12a/hmuJBxL32dq9FJOmu68OQfFpTKkzqu7yf7y6KktpqHtSHUs0wPhMNANBnN6B6xJ G9+rc59U6lkLR628Y65VibtiI9Pi9t1TAJPOP1haLC9DcXk0UU29rlTFnkTsD9WI6M1TTvyiNoBut yuY4LU0hdBZ6VPE9EW/boI4DLInMASCeI/NyFRsF0YnzmwhS+73BuB07xPReVao/bpHFCu2AY4Xjk jWL1tLLWR1HWgxqvP1ocZgjwDhY91JBG/6T3QycKaAchpVRmaGJEOmFFumtDAlW1h6jLP6MjAy23h fx3kn3lAVyD7rxv4zg9Q==; 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 1fwv9R-000735-Np for patchwork-linux-mediatek@patchwork.kernel.org; Mon, 03 Sep 2018 20:08:45 +0000 Received: from xn--njmtys-xxab.info ([178.62.196.236]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fwv9M-0006rk-It for linux-mediatek@lists.infradead.org; Mon, 03 Sep 2018 20:08:42 +0000 Received: by xn--njmtys-xxab.info (Postfix, from userid 1000) id D364543FEB; Mon, 3 Sep 2018 23:08:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=njomotys.info; s=mail; t=1536005313; bh=Yy8Mqkm9T4zwC0zgHML2cN1YrU5daXcfr2VTJIbybDo=; h=Date:From:To:Cc:Subject; b=gT7EGD2YrZatU+m8fQB6KGrFM8GIyZ8Nnv7YDV5NM5DXhRwHn+Vtr9YCcVjwBs92u KUAiv7C5W+/PeSmcTDLWJTocTMnjN73VfQmjkOihJWP0HErbPHpYPUwUGoF4LEl1N0 sQ9DF+lGavhEMmW9BYV8P53rXxpr3O0sn8FRJ/+0= Date: Mon, 3 Sep 2018 23:08:33 +0300 From: Jasper Mattsson To: linux-mediatek@lists.infradead.org Subject: [PATCH 3/3] dts: mediatek: mt6797: Bind audio, mjc, and venc clocks to SCPSYS Message-ID: <20180903200833.GA6792@xn--njmtys-xxab.info> MIME-Version: 1.0 Content-Disposition: inline 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-20180903_130840_784617_3E0E0EF1 X-CRM114-Status: UNSURE ( 7.01 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthias.bgg@gmail.com Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add newly supported SCPSYS clocks to mt6797.dtsi and devicetree bindings documentation. Signed-off-by: Jasper Mattsson --- .../devicetree/bindings/soc/mediatek/scpsys.txt | 2 +- arch/arm64/boot/dts/mediatek/mt6797.dtsi | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt index d6fe16f09..07121f7a4 100644 --- a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt +++ b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt @@ -32,7 +32,7 @@ Required properties: enabled before enabling certain power domains. Required clocks for MT2701 or MT7623: "mm", "mfg", "ethif" Required clocks for MT2712: "mm", "mfg", "venc", "jpgdec", "audio", "vdec" - Required clocks for MT6797: "mm", "mfg", "vdec" + Required clocks for MT6797: "mm", "mfg", "vdec", "mjc", "audio", "vdec" Required clocks for MT7622: "hif_sel" Required clocks for MT7622A: "ethif" Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt" diff --git a/arch/arm64/boot/dts/mediatek/mt6797.dtsi b/arch/arm64/boot/dts/mediatek/mt6797.dtsi index 4beaa7110..9c05c4fa2 100644 --- a/arch/arm64/boot/dts/mediatek/mt6797.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt6797.dtsi @@ -133,10 +133,13 @@ compatible = "mediatek,mt6797-scpsys"; #power-domain-cells = <1>; reg = <0 0x10006000 0 0x1000>; - clocks = <&topckgen CLK_TOP_MUX_MFG>, + clocks = <&infrasys CLK_INFRA_AUDIO_26M>, + <&topckgen CLK_TOP_MUX_MFG>, + <&topckgen CLK_TOP_MUX_MJC>, <&topckgen CLK_TOP_MUX_MM>, - <&topckgen CLK_TOP_MUX_VDEC>; - clock-names = "mfg", "mm", "vdec"; + <&topckgen CLK_TOP_MUX_VDEC>, + <&topckgen CLK_TOP_MUX_VENC>; + clock-names = "audio", "mfg", "mjc", "mm", "vdec", "venc"; infracfg = <&infrasys>; };