From patchwork Fri Dec 15 10:45:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 179167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9180154dys; Fri, 15 Dec 2023 02:46:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJR/SCYRshwksdWv7VwAtNd5JGp/PNX9JyjVCDYLnzqUTvMjM2ZXjITP7MLq7c/a6X2ONt X-Received: by 2002:a50:9b1d:0:b0:551:7f8c:fb63 with SMTP id o29-20020a509b1d000000b005517f8cfb63mr3019869edi.5.1702637211238; Fri, 15 Dec 2023 02:46:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702637211; cv=none; d=google.com; s=arc-20160816; b=Gf2ftnO8yxhozZjw0uQW9DtNJfGTrJAcTULseISLFkjloNiULFjz6ahM4YuH5tJQwd uje3vJfPp95djS50lgbX8Eby1RT6JU+53vjanUhTo7T2QGjuYI9hrXWlvdymr5pqpwno sMW3JZOrdXXdNOvYn9s6tOJAkvSXxnN29Vdt3/Afkdlf2OE9SL1SnRoH2Ex1HQAzbr8+ wH6VIUtv70cJIDCsszKTyyP41sszhuntmfgfmiIKRwqV5tcx9dC6q7LKO67rlS22xDlB kIl684SGzwgJJ7yqkgdk5+5GZ2ATjKRWTxhnG9/3QKIlEaIRFz82Rv4jiUw9orO91Y+1 k8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=LdJTPTDnLTf9kEJ7PkTvN4wTkh0mh5SbB73dk5lwsxI=; fh=uXuiAKCIzcls/bVWehiPG5bGSzwyo88Xr298kNzj2n4=; b=P+RsEzBR3pAFehdoE2Go2GxyjXcpBT4BLikxhurG3VgWvKvgcCXm/ZHSuSN7AN/D+U 2enk8+r53KtRB4SBGCdu1wa1IGu4ivGyMVFA4Yb7ssCBi17jWThznTr09+YmB/lwc1ia dDYvVOMP+F6iWMUi08oE+0BsH4N3Cp40B/btPunufAZI06hrDeF6hU/kWBi899JOFCo/ ZwSd2YClaplmhYKdZbSy/DRE/9Okf1X7JFdXb6+A7tlyV63gdsXq4Azz216QefScsJlx 3rg6V7Y5mhvul5NzD5/i2UuUMf2zl3Ix0TJV42AOYJd7t0gzSna/OhBS3wIoNxT0BBSq 7tXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=pb8PJbqp; spf=pass (google.com: domain of linux-kernel+bounces-776-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-776-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ch5-20020a0564021bc500b0055290b37b57si857054edb.243.2023.12.15.02.46.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:46:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-776-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=pb8PJbqp; spf=pass (google.com: domain of linux-kernel+bounces-776-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-776-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id D45A71F2170D for ; Fri, 15 Dec 2023 10:46:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B1533250E8; Fri, 15 Dec 2023 10:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="pb8PJbqp" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6350C1A70D; Fri, 15 Dec 2023 10:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1702637164; bh=vBgnugLtJ2ksG5oto5YXrGX8SezSV/Kyn/381DDZeYc=; h=From:To:Cc:Subject:Date:From; b=pb8PJbqphVWYId84ZtJMvFx1CSLEHxwibQFvmpAV6BPTT5zPu4AEd59vDh7i6d1By y53CNsHbMrgc2CEi94oADY0uGtBCNQpWRRCyDBK/Zc0BcZ891quCtKhe6q+6gcLx+j L2UJkfxoaFXO69OGz+62j0dy0CsX1J8KsDhd6ZBEAokxqtSSZU+rJvmefOEwkb9D7W FS6I+6ZMMAuNnWIMGFxtMOw+IKwTr/On/GaIMWe2x+10JqnFqyfnqnqtitpUjs3b8L xbvoEaKKSxY7c9Q9sonGldx3Bg0Gs+GfsA6nhU9zxm2IwMAbsSe9imTTo99Ty3Q72y K0Hq1FGidKiCA== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id B3207378107D; Fri, 15 Dec 2023 10:46:03 +0000 (UTC) From: Eugen Hristev To: linux-mediatek@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, Eugen Hristev Subject: [PATCH v2 1/7] media: mediatek: vcodec: fix possible unbalanced PM counter Date: Fri, 15 Dec 2023 12:45:45 +0200 Message-Id: <20231215104551.233679-1-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785344516801843444 X-GMAIL-MSGID: 1785344516801843444 It is possible that mtk_vcodec_enc_pw_on fails, and in that scenario the PM counter is not incremented, and subsequent call to mtk_vcodec_enc_pw_off decrements the counter, leading to a PM imbalance. Fix by bailing out of venc_if_encode in the case when mtk_vcodec_enc_pw_on fails. Fixes: 4e855a6efa54 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver") Signed-off-by: Eugen Hristev Reviewed-by: AngeloGioacchino Del Regno --- Changes in v2: - collect R-b .../platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c | 4 +++- .../platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h | 2 +- drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.c | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c index a22b7dfc656e..1a2b14a3e219 100644 --- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c +++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c @@ -58,13 +58,15 @@ int mtk_vcodec_init_enc_clk(struct mtk_vcodec_enc_dev *mtkdev) return 0; } -void mtk_vcodec_enc_pw_on(struct mtk_vcodec_pm *pm) +int mtk_vcodec_enc_pw_on(struct mtk_vcodec_pm *pm) { int ret; ret = pm_runtime_resume_and_get(pm->dev); if (ret) dev_err(pm->dev, "pm_runtime_resume_and_get fail: %d", ret); + + return ret; } void mtk_vcodec_enc_pw_off(struct mtk_vcodec_pm *pm) diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h index 157ea08ba9e3..2e28f25e36cc 100644 --- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h +++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h @@ -10,7 +10,7 @@ #include "mtk_vcodec_enc_drv.h" int mtk_vcodec_init_enc_clk(struct mtk_vcodec_enc_dev *dev); -void mtk_vcodec_enc_pw_on(struct mtk_vcodec_pm *pm); +int mtk_vcodec_enc_pw_on(struct mtk_vcodec_pm *pm); void mtk_vcodec_enc_pw_off(struct mtk_vcodec_pm *pm); void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm); void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm); diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.c b/drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.c index c402a686f3cb..e83747b8d69a 100644 --- a/drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.c +++ b/drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.c @@ -64,7 +64,9 @@ int venc_if_encode(struct mtk_vcodec_enc_ctx *ctx, ctx->dev->curr_ctx = ctx; spin_unlock_irqrestore(&ctx->dev->irqlock, flags); - mtk_vcodec_enc_pw_on(&ctx->dev->pm); + ret = mtk_vcodec_enc_pw_on(&ctx->dev->pm); + if (ret) + goto venc_if_encode_pw_on_err; mtk_vcodec_enc_clock_on(&ctx->dev->pm); ret = ctx->enc_if->encode(ctx->drv_handle, opt, frm_buf, bs_buf, result); @@ -75,6 +77,7 @@ int venc_if_encode(struct mtk_vcodec_enc_ctx *ctx, ctx->dev->curr_ctx = NULL; spin_unlock_irqrestore(&ctx->dev->irqlock, flags); +venc_if_encode_pw_on_err: mtk_venc_unlock(ctx); return ret; } From patchwork Fri Dec 15 10:45:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 179168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9180353dys; Fri, 15 Dec 2023 02:47:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IG4QxkDDO5w5CtjYhxOKtVx1br5YpW+vyCrOxcUGlej25k+u/3UIaa9xtwgAS5t6mAzoNWL X-Received: by 2002:a17:906:3559:b0:a19:a19b:c727 with SMTP id s25-20020a170906355900b00a19a19bc727mr4815846eja.119.1702637239393; Fri, 15 Dec 2023 02:47:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702637239; cv=none; d=google.com; s=arc-20160816; b=GaI6R6xx1x7FdEkB6SrQIRcPLi65Y3SY9t1uQlMlEuvJKCwrVkYsKv1+1cwhZv95dq KrSZX5/Egngu3038pEm23oh+KplEkpbnqg5aOBCgaRH1PN5rYpTmiPvXZrGTYot0R8Oq 9lvPHkTSomv3q1NpppMOv04hkBjA5OV6bDbEV+X6rKG6TLvN3Hy3mW0PgJ9R/r0gp+zL jYYEyNHVCO8vU0+2Sm7udjkTVWXFF+33kzd4+808qyF5vnrU/8zIV/ws2EF2UxannPEz NU4wTyb3sKFpiZZfcNxCsyYkMRgiFlSXEBo8qlncL8CcoXdZKnSvj4DjR9Pxbww5vUYF IcPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=rdj61HWUi/unJWhfYCXF7F+ls5p7CncvRKLnBR99P/w=; fh=uXuiAKCIzcls/bVWehiPG5bGSzwyo88Xr298kNzj2n4=; b=a9geWwZusbhO036KnptIqn2Fz3Qqa91/blWPdnO1V/imAdkkI0XhlYfFZ8xUl/2fOL fsqno1Q/8woklm9PQdAMZN6G0Dr7eDvcVxvpwwWtWB3DxLE6d1G3ST2/0eZ3YrAaFaEs W0tlcXx3OfI0ll3Pa+wGzBevIbAR6pJ2Y2uy3t8BOAimXLgQF7l0BzAo9llw2v3PDbqL LyzqyVpkv2HuygTtyK2PlyQQeeKxw+31Ncv1pvaxypVjaAvJJyOwFkeovFKPlUPfDrMG rpOH5Ia9RwZ7fFmY06Wd7O8pW5pmPv/EboycYbzOLZonXINzw+K5PJMuyB/y/XRwPLxb 7KpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=tI07Sy1t; spf=pass (google.com: domain of linux-kernel+bounces-777-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-777-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id e14-20020a1709067e0e00b00a1e48049805si7369757ejr.644.2023.12.15.02.47.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:47:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-777-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=tI07Sy1t; spf=pass (google.com: domain of linux-kernel+bounces-777-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-777-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 07FC01F2254F for ; Fri, 15 Dec 2023 10:47:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DD55328DA9; Fri, 15 Dec 2023 10:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="tI07Sy1t" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50C9A1A711; Fri, 15 Dec 2023 10:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1702637165; bh=Sv5bStRniU7BlQ2lH9mBsZ8VDZEclT6+b2lYCvkM7yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tI07Sy1tbkkyJC92kNuBzpUFvGbbH845ZXpo/Qo15BSqjgRDo0ZDSqIJuLWLl4pcw lWp75z2xZjLU+JWhEC7Xcvs8V6oAR3Gr3lb9zjGySN1VA1yYJN1pfC81eBRpZ8QXQK Mm4bQWvHEP/epNMd/kAp3cY+kDM5BU0WiFKiinomSJqysURg5M+jSPWvx8cEu5wYE8 Av2Lkfl5K/KCa87lrF396h73z1xtmlzNwubZ2G3Vq7DxKhLdk+toFfLaQbkCj2TEg9 82QrCctaJBsmmTMZKsCSJnCTyMPTcZfhUr2xqsC+Por97/hK3msX6JnxsnTOWz0bWW qFXmmp3dB6lHw== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id B198F3781FD5; Fri, 15 Dec 2023 10:46:04 +0000 (UTC) From: Eugen Hristev To: linux-mediatek@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, Eugen Hristev Subject: [PATCH v2 2/7] dt-bindings: media: mtk-vcodec-encoder: add dma-ranges Date: Fri, 15 Dec 2023 12:45:46 +0200 Message-Id: <20231215104551.233679-2-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215104551.233679-1-eugen.hristev@collabora.com> References: <20231215104551.233679-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785344546275887954 X-GMAIL-MSGID: 1785344546275887954 As IOMMUs are supported, dma-ranges is not mentioned but additionalProperties=false, thus we have an error when adding dma-ranges. Add dma-ranges as a possible property because this may be present. Signed-off-by: Eugen Hristev Acked-by: Rob Herring --- Changes in v2: - none. .../devicetree/bindings/media/mediatek,vcodec-encoder.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml index a2051b31fa29..403530de5624 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml @@ -38,6 +38,8 @@ properties: minItems: 1 maxItems: 5 + dma-ranges: true + assigned-clocks: true assigned-clock-parents: true From patchwork Fri Dec 15 10:45:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 179169 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9180414dys; Fri, 15 Dec 2023 02:47:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IELY2zcg+HehmtUgXetGKbk9WeTZeS2sDU4aoUei7RRAWCfgGl2g6Fa+TvHqGvrrBfCeg3H X-Received: by 2002:a05:620a:40c4:b0:77f:6810:dcff with SMTP id g4-20020a05620a40c400b0077f6810dcffmr16688836qko.28.1702637250668; Fri, 15 Dec 2023 02:47:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702637250; cv=none; d=google.com; s=arc-20160816; b=DkIg2ZCF15bk9gb+5rekbI3LSiwFon2wXW8vhCBtrhNr6clny7tEsAOd972bhU9Mee dN3CIcPoVmSQJngdI/7cgAzKxB1sU5LUlH11TawHgL1iVt8d/iDha/vpjQtQY+HlF1fu X5m/TOLGwtEE12QWbdKwgP+cJJyEjAukOkvyuaG89/KvaG2fyiT/ftacC94l77+pBd6V HXr2q/LT+khuY+wZYGxScc0A7fblueJI1K1vZyhkPcsMMFW8InvniIiBnztSS3bZ6omu k8z1jYFC1SFyt0cHyPlwPa1QsLJKyBrXhc3QbwJopOyXLu9MU53wo5k/YbYizRhd+fMa qGJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Ryh1iGTa7kF9idOemql3ilVj21B/Zv9mQQDRw2KtiZk=; fh=uXuiAKCIzcls/bVWehiPG5bGSzwyo88Xr298kNzj2n4=; b=YSzhu64wWCOK1UMVIM3tvOlMESpcxf3rH6YPByKq+gS9Cwa+kpR8kWDEY7bSboVqhA vT8hj6vu8BoZLFhb15C/BaZB3VxsXO7w0kEt0wJyAmtP5JIo+QgjcSxM40rQsqlGdqdr NvCyHmQIQMiqXPh/lVITMJz6Fp8l65yKRx0sILFsMB1byMgv/R/0puYJkfyvV6aQwdPt /rl4i+XCdWnWfr82QobUlM5cUoOjgPBOxUZOufOq47Rf0KGbkyCmEn/Io+yaIeHtxlzE Qw+eqPjIdlXhi6gl2YQ4xEE4dDZKKnLvq6zXCeExLKYSfQMo/QQzRUPoyw0gnmxZH5hQ nidA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="kVTRpd/Q"; spf=pass (google.com: domain of linux-kernel+bounces-778-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-778-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id s17-20020a05620a29d100b0077f63268fd3si14759267qkp.48.2023.12.15.02.47.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:47:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-778-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="kVTRpd/Q"; spf=pass (google.com: domain of linux-kernel+bounces-778-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-778-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 724C01C231E1 for ; Fri, 15 Dec 2023 10:47:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5721A2C699; Fri, 15 Dec 2023 10:46:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="kVTRpd/Q" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41DE01A73F; Fri, 15 Dec 2023 10:46:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1702637166; bh=/CmNXLjXKNYtE3QqvhH1lwezEnrtQSIJkJcxeOmHOgs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kVTRpd/QXiE/fuAxIqthRZXkouBjFQYgItywSZsLJrn7P2ek1WFaczYYy6AezJwvu z1n1jckY6JH9ZDRGuMPKp2I4IiRmEqGd+sDufnJa1aB49oanAmcIERk5gWE6ajzSC+ JRG7lL7NYb2XVWbX2jyon60DbIkHTnyIaCaWQqqTnpvlPoXufRHv9zczg85fDebCRI +s/hW2SvwIhpf1qyaQ7xwlvqVSCLrOjVIXxaNgaTcq3Yyi05skff9e9l9RQbFqX8DN SGsmV24D01n7jHIYh4GlSGG77R37fan293irVkgoYmLdHWrtMJVIU6zCWdDD/fbNVM 3HVsXNzZWiR9g== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id BDE013781FD6; Fri, 15 Dec 2023 10:46:05 +0000 (UTC) From: Eugen Hristev To: linux-mediatek@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, Eugen Hristev Subject: [PATCH v2 3/7] dt-bindings: media: mtk-vcodec-encoder: fix non-vp8 clock name Date: Fri, 15 Dec 2023 12:45:47 +0200 Message-Id: <20231215104551.233679-3-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215104551.233679-1-eugen.hristev@collabora.com> References: <20231215104551.233679-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785344558150415758 X-GMAIL-MSGID: 1785344558150415758 Looking at the binding it makes sense that the `-vp8` compatible has the `venc_lt_sel` while the other bindings have the `venc_sel` as name for the clock. This was also mentioned in the txt version of the binding before the conversion: ` clock-names: avc encoder must contain "venc_sel", vp8 encoder must contain "venc_lt_sel", decoder must contain "vcodecpll", "univpll_d2", ` So it is easier to check for compatible that includes vp8, since that's just one, to have the requirement for the clock name property as `venc_lt_sel`, rather than for all the others, some of which are missing, thus for them, the requirement is wrongly `venc_lt_sel`. Reordered the if/then/else to match `-vp8` and have all the rest of the compatibles using the other clock name (`venc_sel`). Signed-off-by: Eugen Hristev Reviewed-by: Rob Herring --- Changes in v2: - new patch. .../bindings/media/mediatek,vcodec-encoder.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml index 403530de5624..5166c1c6934e 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml @@ -111,10 +111,7 @@ allOf: properties: compatible: enum: - - mediatek,mt8173-vcodec-enc - - mediatek,mt8188-vcodec-enc - - mediatek,mt8192-vcodec-enc - - mediatek,mt8195-vcodec-enc + - mediatek,mt8173-vcodec-enc-vp8 then: properties: @@ -124,8 +121,8 @@ allOf: maxItems: 1 clock-names: items: - - const: venc_sel - else: # for vp8 hw encoder + - const: venc_lt_sel + else: properties: clock: items: @@ -133,7 +130,7 @@ allOf: maxItems: 1 clock-names: items: - - const: venc_lt_sel + - const: venc_sel additionalProperties: false From patchwork Fri Dec 15 10:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 179170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9180544dys; Fri, 15 Dec 2023 02:47:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXO6yI2clkLrNZCgDizYJNRKcFad5NUMvB6assflidNgMvYdDSuPtT/ki+pUrP57/cUysg X-Received: by 2002:a17:906:73dd:b0:a22:fb1b:81e3 with SMTP id n29-20020a17090673dd00b00a22fb1b81e3mr2230244ejl.68.1702637271786; Fri, 15 Dec 2023 02:47:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702637271; cv=none; d=google.com; s=arc-20160816; b=Y2izBcECnNzk53F7rEEpTGqNdGeXWGBracWaizGR+jPT5uUlb3wb3O53wudeAm+TEr zf2GpmCNarKnoRLBsbBTS5t7gmwZ9EcNl7v2oI81Jyq+PFp9WmJjACkN9Kr6GWIOmO7b E5uLmXbkqtO20YbQ8esrf9DpxEu9/1YloXVza9dTFC3ca1TrM49yMLhJnsA6BoexRgnr gMfSItzYW+VvBAEZD6Tp0MA8WhuG/3dXCoOLHPKvNdqJ2vHXsdm5XxxGLIFovQh+XfLD oJ6USnWDVzUGLgXqsT6pKkU3CD7htqLOzDQufC5KkFK0zJHuixdoQXZB3Mpzjk77Lljd 9dcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=dV6tSYTNC+uhm1CMTDZ9AT7yKRQ0JyoGRL/4zUU3x+M=; fh=uXuiAKCIzcls/bVWehiPG5bGSzwyo88Xr298kNzj2n4=; b=e0cGqSiq1oSpJnx2Su3AdZbSyewRlx0bwHQ0HI62u/qPN3WYLkyr0aXFoyhuNIqevK 21dOGsgyccYbwxr4EiMnxrPM0IxFdpVtHbnu7jhyA8cpNTQlPcmZgFNqIl59EvmhC6Cx 3SkbfoDvS9AdwogQlrRaFlo5Mn7Sn+xamFptOJApojLCkfNVtLZWtDq0kKahwWmfW0u8 WRlmanXw4ml1aBd96GmO6+lPKjssqyYl/Rmzf0GEksbYJ/0H6RvT35aQ/6FJvGxap+oc lxVsYdIq7lcCxY9kJZJ/BseZ8T7lrI4PC3Y6Ci9bE8+RQL3/BC5QnYKuAqaNUw86xs5p oavQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="owmenZs/"; spf=pass (google.com: domain of linux-kernel+bounces-779-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-779-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id e16-20020a1709067e1000b00a1ce4f00fa2si7359424ejr.969.2023.12.15.02.47.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:47:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-779-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="owmenZs/"; spf=pass (google.com: domain of linux-kernel+bounces-779-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-779-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 62F011F2395D for ; Fri, 15 Dec 2023 10:47:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E03B2D78D; Fri, 15 Dec 2023 10:46:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="owmenZs/" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50A3A200AD; Fri, 15 Dec 2023 10:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1702637167; bh=rGGTCz6fC8SqIRMnJnpTvc4YBHRGm94VHUh76jbuvmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=owmenZs/XRyWFRAzR+B8F5jaIondhoqwxKoJn4Iu33rTXYsNJ/cWJ/BVvFCGh2HUQ Bf5hRoK9Ko5WM4Eh/DixCiVAy50kiXpeXiRzYzRj6X0lNe+yIsFMDSly48U+B6ejqQ 0Ay+gDRHlJ0tQlMM9SvCPbESKCzHSnYAbX4LSHQlQJz82hFFm32U70eNgzsHmYKNFs sY3AChb6IERBsrGuCCOKuEo7I5eWP2b7EC/1tYjqPp/5NNU62KmaNhH1RVAHcHPo9P cRcc3KIWWM/z0WbPlwyXVekPIzTEagxYzo+wrvxBd7cyF313v9UA3Wwc0QPJ+nh3GG rCjLluIsAoQRQ== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id BF2043781FD7; Fri, 15 Dec 2023 10:46:06 +0000 (UTC) From: Eugen Hristev To: linux-mediatek@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, Eugen Hristev Subject: [PATCH v2 4/7] arm64: dts: mediatek: mt8192: fix vencoder clock name Date: Fri, 15 Dec 2023 12:45:48 +0200 Message-Id: <20231215104551.233679-4-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215104551.233679-1-eugen.hristev@collabora.com> References: <20231215104551.233679-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785344579759865844 X-GMAIL-MSGID: 1785344579759865844 Clock name should be `venc_sel` as per binding. Fix the warning message : arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dtb: vcodec@17020000: clock-names:0: 'venc_sel' was expected from schema $id: http://devicetree.org/schemas/media/mediatek,vcodec-encoder.yaml# Fixes: aa8f3711fc87 ("arm64: dts: mt8192: Add H264 venc device node") Signed-off-by: Eugen Hristev --- Changes in v2: - new patch. arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi index 69f4cded5dbb..f1fc14e53f8c 100644 --- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi @@ -1770,7 +1770,7 @@ vcodec_enc: vcodec@17020000 { mediatek,scp = <&scp>; power-domains = <&spm MT8192_POWER_DOMAIN_VENC>; clocks = <&vencsys CLK_VENC_SET1_VENC>; - clock-names = "venc-set1"; + clock-names = "venc_sel"; assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>; assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D4>; }; From patchwork Fri Dec 15 10:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 179171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9180649dys; Fri, 15 Dec 2023 02:48:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKAJBu5GTonArTANW8SmpTM5NxXppMorCc7oR23smr7Jf3d/krZKLRrBML+uIdV7g8FhqZ X-Received: by 2002:a05:6870:169c:b0:203:4809:7577 with SMTP id j28-20020a056870169c00b0020348097577mr3257235oae.101.1702637289498; Fri, 15 Dec 2023 02:48:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702637289; cv=none; d=google.com; s=arc-20160816; b=QBzfr2qnog7zU+HGXt0h+7ig7QNXqsAscbEymC09wZMb5igJeeuftPkqjRNZX8pETJ kQhG0lBvvbJ8d6maGDfvb+iSzS5XHnkPt0BgykCJ9bcRd3GmA4fVvyt250gkJWAQHZ2m bYDTKXwPNT5BJDWDSLGE7gzbHVkNvTHmKJ2VLoN5EWJarFMBTaWFRv5OiXPElYbWwvNm J3CxpN2/IiUc8OsLX0gn0RPo6EazLbSn5VEHs621avMWdFlkaXW8UidiP+ZGlVaDYURj N//pgMf3MWd3pSWB9PLY+hy3vYgL0nQD/7QCDoEBNoxM2Rxtms3orPrh/16/sCLAofnQ LjUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=YgF02T78B0wnNhgy6a8gbjkvk3s3L9Nk9V3Xd0plTjU=; fh=uXuiAKCIzcls/bVWehiPG5bGSzwyo88Xr298kNzj2n4=; b=SlvmtQZVvrghyXglMfBQ110aADkHBJYwNJM+Lkl2WBwAdokIZRK9P4txSBZWnKRjvy dKLToREoWxmfiUTqGV4eB9Kfd8+IwIeWjV6pqiDPH7tenIT/t45DBnxFAVGLzvsz/jHW bN3ehToWbN/vdRRI2LC1RKxL5SfdIxQh+jHHCHTb9Vxy8cYWoQBgQ+Cf+vC3F2FAMxPn KzHH2K34r6q8vLUmVPLpBgeYSx7GV3lEH694u/X5lsVZEqBz2IZb9/5T4W0kqh91XP5+ VNbfz/hjvT9IrhP0xsMxNVoo6r2zRGR/J66Tpvw8TpE2/qOXQS7XI66BoIBqxv5AiOHp ZOzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=VGwLRoad; spf=pass (google.com: domain of linux-kernel+bounces-780-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-780-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id c37-20020a634e25000000b005c645e1ff20si12606412pgb.73.2023.12.15.02.48.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:48:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-780-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=VGwLRoad; spf=pass (google.com: domain of linux-kernel+bounces-780-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-780-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 087C52858DD for ; Fri, 15 Dec 2023 10:48:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2DBFB2DB7B; Fri, 15 Dec 2023 10:46:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="VGwLRoad" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3027D24B46; Fri, 15 Dec 2023 10:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1702637168; bh=oXswsuW1anVDQblcp1XlaqlIZub/1g335nE50zD4/kU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VGwLRoadvlKFpw29V4QaM/mr5XBEqcnnxpzWyA7o+qpLCSFEiY9+qxBn1LO6uWmpJ keLPBznLC99dLayG8ywwlErBJL07Vz3mIwXGbK+j+EtigulikTMppMCuBpdMr90zQz qyeHO5HmT3ujs8QqmStlDrxczx3Z0jre+6cMI5nFzqBg1WyJo75LMVsP4tJOQ7Miw3 lFcVicD+CW0Cl2h8VgZdUyUWUy0M4s1bL2wiEoVW/WtI5ULZ5kjyAqsdHe9ky6EQH1 YjQ0zLUQzGKZO0rxx0QHNFv3ZGXEan050MO6n8TeSXXz6TrDSjf6fi3ZOFgs0+lEvu gFOxjUHq1ve2A== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id C16F73781FD9; Fri, 15 Dec 2023 10:46:07 +0000 (UTC) From: Eugen Hristev To: linux-mediatek@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, Eugen Hristev Subject: [PATCH v2 5/7] dt-bindings: media: mtk-vcodec-encoder: add compatible for mt8186 Date: Fri, 15 Dec 2023 12:45:49 +0200 Message-Id: <20231215104551.233679-5-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215104551.233679-1-eugen.hristev@collabora.com> References: <20231215104551.233679-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785344598372954079 X-GMAIL-MSGID: 1785344598372954079 Add compatible for the mt8186 encoder which currently works in the same way as mt8183. Signed-off-by: Eugen Hristev Reviewed-by: Rob Herring --- Changes in v2: - new patch. .../media/mediatek,vcodec-encoder.yaml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml index 5166c1c6934e..dfabc2faea6c 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml @@ -16,14 +16,18 @@ description: |+ properties: compatible: - enum: - - mediatek,mt8173-vcodec-enc-vp8 - - mediatek,mt8173-vcodec-enc - - mediatek,mt8183-vcodec-enc - - mediatek,mt8188-vcodec-enc - - mediatek,mt8192-vcodec-enc - - mediatek,mt8195-vcodec-enc - + oneOf: + - items: + - enum: + - mediatek,mt8173-vcodec-enc-vp8 + - mediatek,mt8173-vcodec-enc + - mediatek,mt8183-vcodec-enc + - mediatek,mt8188-vcodec-enc + - mediatek,mt8192-vcodec-enc + - mediatek,mt8195-vcodec-enc + - items: + - const: mediatek,mt8186-vcodec-enc + - const: mediatek,mt8183-vcodec-enc reg: maxItems: 1 From patchwork Fri Dec 15 10:45:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 179173 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9180828dys; Fri, 15 Dec 2023 02:48:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFKISH/LZQ1kyw6SOauzBFbdnraD4bk2AmZhbotEdEbuWGmiprYl1vhx9+fGSixlhDDRfNA X-Received: by 2002:a05:6e02:1bad:b0:35d:62f2:1f45 with SMTP id n13-20020a056e021bad00b0035d62f21f45mr17299153ili.20.1702637318695; Fri, 15 Dec 2023 02:48:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702637318; cv=none; d=google.com; s=arc-20160816; b=baeBouodyuf3lL3oiayLi4dgHsncrsc7OshL+Utoe/1ujm3y17FF7e6rmtX2C45FI8 rxlTLY/BWYT/J42UuSU9FGTEgD3dQBwDE4oKBP+y4mc8Y4fR9nKXGdRZzIeGS8RCHoyv MbAjBfoiGaIGjpohwFus8jtXXfTcZbwTm9W7THNKHi6eyy1AaH7tYfOXFLWudKI0+ft8 wV29aK5MDkpCeVMzCAUEC87jTsmKamj++DEwHOcPafUTVFH2hqC+ySSmYl3b0X6naFaT 92vuaTc5Eey8/K+sWqQ0h8ca2MHJk5LMJsihjK9tSFqN/A1Gp1OaAtv7jHT0uazpbTdR lhBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=IXjBWxOEF7mlppCMxEYI67u55dHKI+aDAAXS3eAqO4I=; fh=uXuiAKCIzcls/bVWehiPG5bGSzwyo88Xr298kNzj2n4=; b=tTJZSEcEaeRe0MF692SqSWayRxe/hKTZVyi4W4fn/fJA0yC8gGybQamwpgDrCH+g47 ux6/QqkQ4+dxfuYuAFvCzvyTNuzIHQE2Ki7sh/JzM/Ijfp7VGvevy2s/XAklTqF4ZmEx 0fUmPjC4/b+ygd2HS/7s0WjCbyUWEFYCSfinpj0YeCttNjdbMBNAoJJozlVvJbbBhPa/ 2qu9jPHiVXEEvWyXsRE7pKBTE5lne8Q7vJHs9ZXuJV/11XDUdpd+1ZVNgatrpVxHL09j boN0xiy5vCKPwDZ0h36ciRG9aIJJkmjZFTiv2kEAAy92XclT6rbRr+0mqGsl0GWTuvte q6Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LzfpBTQB; spf=pass (google.com: domain of linux-kernel+bounces-781-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-781-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id 19-20020a631253000000b0056da0ae25a2si12651478pgs.32.2023.12.15.02.48.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:48:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-781-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LzfpBTQB; spf=pass (google.com: domain of linux-kernel+bounces-781-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-781-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id A97F4B22D4E for ; Fri, 15 Dec 2023 10:48:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EE4422DB90; Fri, 15 Dec 2023 10:46:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="LzfpBTQB" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA7B025101; Fri, 15 Dec 2023 10:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1702637169; bh=7++2TugOuHBscBWsZZMksH52fjmuIFEskx09aH3Ys30=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LzfpBTQBc6jdcVCXkrYHf/DB73UDXAgYxMpB4zdubXqQk6gqm7xufDuIzDI9Eb4Gh X9dQNsWyvFfzw/M606wMrQS974OEISUk9cWmbVzXZe2sMcp+OW3NH+SlJdCmZf1744 jr1yafbqlvIpCZxFp/S10MthewqPfztEU2kc93XKMgmJlUkxxkEhrQa9vRcniteDLw vTA7yM6D09SwmYUI7UFoKr09tVbH5yMy+kziVSBn2pWrVGsA7y47i8xEqtPcNwYmH8 9tutou3gHpRbCBjO4iKR+7FQPNWit3PfjtZaXnBHOM6UrMRjvTgHgzbCpZbyQj9OnP RMW7KRghQGegA== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id C1B0F3781FDA; Fri, 15 Dec 2023 10:46:08 +0000 (UTC) From: Eugen Hristev To: linux-mediatek@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, Eugen Hristev Subject: [PATCH v2 6/7] arm64: dts: mediatek: mt8186: fix VENC power domain clocks Date: Fri, 15 Dec 2023 12:45:50 +0200 Message-Id: <20231215104551.233679-6-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215104551.233679-1-eugen.hristev@collabora.com> References: <20231215104551.233679-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785344629082477148 X-GMAIL-MSGID: 1785344629082477148 The larb clock is in fact a subsys clock, so it must be prefixed by 'subsys-' to be correctly identified in the driver. Fixes: d9e43c1e7a38 ("arm64: dts: mt8186: Add power domains controller") Signed-off-by: Eugen Hristev --- Changes in v2: - none. arch/arm64/boot/dts/mediatek/mt8186.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8186.dtsi b/arch/arm64/boot/dts/mediatek/mt8186.dtsi index df0c04f2ba1d..66ead3f23336 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8186.dtsi @@ -1061,7 +1061,7 @@ power-domain@MT8186_POWER_DOMAIN_VENC { reg = ; clocks = <&topckgen CLK_TOP_VENC>, <&vencsys CLK_VENC_CKE1_VENC>; - clock-names = "venc0", "larb"; + clock-names = "venc0", "subsys-larb"; mediatek,infracfg = <&infracfg_ao>; #power-domain-cells = <0>; }; From patchwork Fri Dec 15 10:45:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 179172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9180764dys; Fri, 15 Dec 2023 02:48:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUWNi92VmGVxxLPR+gxwLfYrwb+Pxp6ixDurjlEmBY1pmBA4YhxvgX5hNfdpA93xzzXi3u X-Received: by 2002:a05:6402:5c6:b0:54d:2c63:782e with SMTP id n6-20020a05640205c600b0054d2c63782emr6721349edx.44.1702637307560; Fri, 15 Dec 2023 02:48:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702637307; cv=none; d=google.com; s=arc-20160816; b=KOXfp2vdhp+gSADnbCBNcfEGXc9AlQip6h5jwO0tQjCRJ8mEn4oq2VjvSVdlH38PBQ LpYKc1FErTWK/7AU0VFsYFYNvzqaz4u9mS3reB6SHDtvBhXExETUCSmB74LEZ56czy4c 2wMigUBalL2ae42t/1sX0he+m/3pce9772rjPX4aqeuBmyE7SDTDFjLslOA7vrg7i742 Uts0kWfFE1p7cMKBgRJmy/cE9NDnqH6k6lyghfFc8sW8CiLRP2Jffk3usKISsHeubV+q Xm36YGAc3Ufnex5xtWBwvfY7PIa/5f6UVa7yXuCFaGTcYr5APBixpxKXUZCBLuT+mB/m uG0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=kIdDAaKUkxqdu19pWDFh3PJFKl/yfMhwsN3WS1z18wY=; fh=DVMuOSIdP0bcMhVlvXm8u5WqF6P8uAgIrMS/P30pt5E=; b=ViFREa5Kb8yUiH4YxrOi1sr6Y6ZKfWrZxir/6KZVMN4VFcLuW/RIDUHgU/5I3YdL9i vx2GACL2DIl1ilXxY8N6DX88xKVOujZiintFzkb1YeCSnO9Oq1+Qs6BCXhTcn+IOJxxX +UkTl9lyX1jBnXtNEjJL2ta+K6SZur+ka1ufhFRZLMOzIyU9I+J12CPrWKtqRfasg3+N tEMErjJ/HY1REsaKj/oEH73vSQp4bzmMPC+T9g12vDBFeT9VBkcMk+5mpJujAYITWlft id/y3Md2SRqg6FSz/ODVpIe+IfacKVHs5TkQhRaRTnlN5q1fcMukK19cZlmZWUvA13q1 h3Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=GtEIaGzI; spf=pass (google.com: domain of linux-kernel+bounces-782-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-782-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id cb23-20020a0564020b7700b0055285b162fesi1083181edb.311.2023.12.15.02.48.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 02:48:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-782-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=GtEIaGzI; spf=pass (google.com: domain of linux-kernel+bounces-782-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-782-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 298661F2363B for ; Fri, 15 Dec 2023 10:48:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2F34D2DF72; Fri, 15 Dec 2023 10:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="GtEIaGzI" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D6D428E3F; Fri, 15 Dec 2023 10:46:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1702637170; bh=UNr7RTkECrw2TxwP67coHpk8jV76hI6PEfp00kugbrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GtEIaGzILk5FFGMwWx9fvBPAp9iHXtyDK3mpOnzpcpO2uO5vXIaA2CnnSR2WZzpEw SCqkcJl54LvKv4+duzvjeGYo5YkC63Tmao2CuC77YoOIUb6qEtLBr7v31ZYK+d+JDT 0Rp0aem4p3JExjssdjU9TE9ySkkITrkpL2Anti4Hm7dt/5G4RmXbeGMCyEycG4mhVT H5Umqz2GAdodHVnArWDJWU5YbM17PlWNfhku56sQwfR0Kzz6ScQ1Xl/IGIOZRh8jaM pJGin0TH9qyVJei87hjzUl0bnJZpdTzgaqH6Wnwqpa0kTeRfxHXL2Z1jK/7Yrd4/6T 46aNNJU4jwLdQ== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id C10383781FDB; Fri, 15 Dec 2023 10:46:09 +0000 (UTC) From: Eugen Hristev To: linux-mediatek@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, Kyrie Wu , Allen-KH Cheng , Hsin-Yi Wang , Eugen Hristev Subject: [PATCH v2 7/7] arm64: dts: mediatek: mt8186: Add venc node Date: Fri, 15 Dec 2023 12:45:51 +0200 Message-Id: <20231215104551.233679-7-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215104551.233679-1-eugen.hristev@collabora.com> References: <20231215104551.233679-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785344617408042081 X-GMAIL-MSGID: 1785344617408042081 From: Kyrie Wu Add video encoder node. Signed-off-by: Kyrie Wu Signed-off-by: Allen-KH Cheng Reviewed-by: Hsin-Yi Wang [eugen.hristev@collabora.com: minor cleanup] Signed-off-by: Eugen Hristev --- Changes in v2: - change node name - change compatible to include 8186 - change props order - change clock name to cope with binding arch/arm64/boot/dts/mediatek/mt8186.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8186.dtsi b/arch/arm64/boot/dts/mediatek/mt8186.dtsi index 66ead3f23336..ebd07bf3d9d2 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8186.dtsi @@ -1993,6 +1993,30 @@ larb7: smi@17010000 { power-domains = <&spm MT8186_POWER_DOMAIN_VENC>; }; + venc: video-encoder@17020000 { + compatible = "mediatek,mt8186-vcodec-enc", "mediatek,mt8183-vcodec-enc"; + reg = <0 0x17020000 0 0x2000>; + #address-cells = <2>; + #size-cells = <2>; + interrupts = ; + iommus = <&iommu_mm IOMMU_PORT_L7_VENC_RCPU>, + <&iommu_mm IOMMU_PORT_L7_VENC_REC>, + <&iommu_mm IOMMU_PORT_L7_VENC_BSDMA>, + <&iommu_mm IOMMU_PORT_L7_VENC_SV_COMV>, + <&iommu_mm IOMMU_PORT_L7_VENC_RD_COMV>, + <&iommu_mm IOMMU_PORT_L7_VENC_CUR_LUMA>, + <&iommu_mm IOMMU_PORT_L7_VENC_CUR_CHROMA>, + <&iommu_mm IOMMU_PORT_L7_VENC_REF_LUMA>, + <&iommu_mm IOMMU_PORT_L7_VENC_REF_CHROMA>; + dma-ranges = <0x1 0x0 0x1 0x0 0x1 0x0>; + clocks = <&vencsys CLK_VENC_CKE1_VENC>; + clock-names = "venc_sel"; + assigned-clocks = <&topckgen CLK_TOP_VENC>; + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D3>; + power-domains = <&spm MT8186_POWER_DOMAIN_VENC>; + mediatek,scp = <&scp>; + }; + camsys: clock-controller@1a000000 { compatible = "mediatek,mt8186-camsys"; reg = <0 0x1a000000 0 0x1000>;