From patchwork Thu Dec 28 11:32:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 183706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1938044dyb; Thu, 28 Dec 2023 03:41:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7mCd8LJJEl6+fWMmRNzLErM7NbfQgRfmU37p9QSGpo5P6rQTRUHM1y5hDKSF8CkvblcS3 X-Received: by 2002:a17:906:f244:b0:a26:a4bd:9ded with SMTP id gy4-20020a170906f24400b00a26a4bd9dedmr3977210ejb.90.1703763710869; Thu, 28 Dec 2023 03:41:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703763710; cv=none; d=google.com; s=arc-20160816; b=NbCq2os9bBX622g5+ot5dyCwxqIwxKPOYzRq9djNF90PMjQClNRKgO/THGrcfhYJYj Lq09cBk0hsa+MnFL47mXNMxCutECNCk9O01t3c8S6cTZ1FYgzibRg8Yh/ari223ZffS0 6FpCYBkIAxVtgnjX231be6HexQjgqWg+CTfOq7YG0/aymZayuwS8PnmTZjPDy+7PAqzA 6YztLbzTzl0i8rQb2jXXYdZq4EfcEMCw9W3P9HCZwm8TteIYQx6cLq2ZzkdIMMQmAApK +8Nln/03jPemrX7Bmon3QkjoJIz0i9PBDhpbRyEtrPpdazQ0R+LKVQ03BFtl9CLk+7qI Ep5Q== 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=YWvow56F+XHgnb3jwT4Oumm5FJmoLj2Qn24iDHya6HE=; fh=IuvxWylKxQEL53X9SQ+46bOfa5jRsbefefc79eZRGUs=; b=cXPLFwMWnREor6Y/eWPqQZ45F1LCDULDExEqv1jjofTqUcR7GzeWCbtD9MIOQLL+Ho d4PLu/6rWCEksBZZ54HYtAyiu8wh9LNKF4LWDeX3TZZgELNz1z0yK6LjffYpzDM0CO2/ 7YQTrOR+p7ycctaMGXpdDkPpT7i8A946R3Irsmn6TWz0dQ/p3JEUlUeJ47pJDc11fKfg lVJUYQyC/pV/iB1OTFHPN+1a318mwd6HyqQsDD4Az4fvP1ADFHOLbPgOmg0ZHXFAI2p8 2F4uPlXbp62BCDQXpxJJRqmkWudTriX5S936OzfJeVf/GKJ13ZOLxqf6PFSZ0bd9KSDB hnoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=4PEKwBpK; spf=pass (google.com: domain of linux-kernel+bounces-12610-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12610-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. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id l26-20020a1709062a9a00b00a26e21e4afasi3911507eje.220.2023.12.28.03.41.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 03:41:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12610-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=4PEKwBpK; spf=pass (google.com: domain of linux-kernel+bounces-12610-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12610-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 CA3741F24B95 for ; Thu, 28 Dec 2023 11:33:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6AEF58C15; Thu, 28 Dec 2023 11:33:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="4PEKwBpK" 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 4C3896FB2; Thu, 28 Dec 2023 11:32:58 +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=1703763176; bh=Aln5hXciMXJ2NlGpPPcv081En/LvaNsxb4BTGEvnc/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=4PEKwBpK+0p4JGroiKs928ZWShectmz65hA+k7SBkzcp7z6DjDI25HAEcXkN4ctI0 sJ8v4+TWY2LoXUHVUHO7CS1xKw2AC/bQ9yDMyYCGlkt1WtaJHrz+pnFPti1VO6AvkZ Zb1FleiSgi4gIQ/pOjCXTww26vXsFCz6KQwNcCqAG/4u594+crODUUy2hHMoEmuap2 KyiL5NjfbWyVFREJkekQBrcZFj4BC/0yT04N5VNRty6LjTIvM3UZ3YhiFmmLbLVvN8 XkUU15ZGSlyTMGBo943R6NtAOPlftWH/ZRj489Q+rjA7Cc302d+U5Aha3wNhasY1G5 LmsLJ0ripiKnw== 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 BF97D37813BC; Thu, 28 Dec 2023 11:32:55 +0000 (UTC) From: Eugen Hristev To: tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, linux-mediatek@lists.infradead.org Cc: eugen.hristev@collabora.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, kernel@collabora.com Subject: [PATCH v3 1/6] media: mediatek: vcodec: fix possible unbalanced PM counter Date: Thu, 28 Dec 2023 13:32:40 +0200 Message-Id: <20231228113245.174706-2-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231228113245.174706-1-eugen.hristev@collabora.com> References: <20231228113245.174706-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: 1786525736494953969 X-GMAIL-MSGID: 1786525736494953969 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 v3: -none 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 Thu Dec 28 11:32:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 183701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1937559dyb; Thu, 28 Dec 2023 03:40:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQAikyx5OnjQrajY/h3bzvdwfHyuMIZe+CJdLPx9pHR66KoFwoqTD/HwRevmLw4j+lDl55 X-Received: by 2002:a05:6a20:6a11:b0:196:3c15:d137 with SMTP id p17-20020a056a206a1100b001963c15d137mr1143938pzk.75.1703763628088; Thu, 28 Dec 2023 03:40:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703763628; cv=none; d=google.com; s=arc-20160816; b=V/KmVu7biFnYpKYxRgslelI4sNyTBHAjFpJYJlh72QTfaJSRRp0eKFVucd9F27QXhw nWTDabMX7Pkks3kCBdO5CUHc1t5nAIUclIWOYBnfq2xKlLSk80bmhetH8qiSZ4i1rgpT PeEaWiT7PW5qHxYzG32mMHlvy0V6S85bv78dlaJtpmljrwFkGCey4Q2f0UpqzQeFioVe ZCZWYzTRRmLNQ/0WxirJRHPwx3OjzXcOkG1wa9DnYz5B4t+MJ/KSFIW8tp/xqRA1WTTu wkX1CWckXgJOxxzdCkGt8lPPseysN3NtgTJPSWphyl/2cjwwwru75gpAtnu+TdWpG1SQ voyA== 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=2Bwu/KiE7IZ+EVdW3WwpCDfjQ3GV/AFOUh+OhmN90dQ=; fh=df08O5TvS7Xk7Gjqk+BbCEt//60wRFrC1fAXlcxai6U=; b=YgqAXo4bErz4za9VPLW8NmEk2xKtNnhLaXvF4meUpXaNS1AmRLbwNPwRSCNRFj2h1c J2NX2MT8hyvE2AiKt9YVwevOBYt9pq0G4DgGn8hBZVzfcwe1oHM+IXXKbWoHGB6t8+64 ImL0oTrK2fQtPK670CIb9rvaQETOsWN93ZomiLsvdkfbc/qLPU9F7udRsdBmk4F6dLR8 g++SLBpEZs2f2vUhheHN6M5W2ocjKm/tFWLYFqryhT5HNi+mCz4cjUwUU6K96TiiYDlo +xg7Da6xVRtl5BYcJc+VVup8Wum47UWjHoQmJTZor/AbWNfJsfdTQKarO5WxOTqVr+Lq GW9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=raq68Je8; spf=pass (google.com: domain of linux-kernel+bounces-12611-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12611-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 m4-20020a170902db0400b001d487c84104si1910889plx.75.2023.12.28.03.40.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 03:40:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12611-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=raq68Je8; spf=pass (google.com: domain of linux-kernel+bounces-12611-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12611-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 9ED07286E6C for ; Thu, 28 Dec 2023 11:34:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 736E6D514; Thu, 28 Dec 2023 11:33:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="raq68Je8" 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 660D96FCA; Thu, 28 Dec 2023 11:32:59 +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=1703763177; bh=8UVn3bqlJ8hPorONnus5laiB1PvUXo1CSznLEpz4ZA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=raq68Je83mcITqxOybvgxYCVSoMJ7WIAJhff4NUTXg3gLq+PK4x3U04LS7YWb8l7M GE6AGzmPGodTx0+56r0TXCRU+nuG8wltyQBNPD+wFICW5D9W70vgvbyKdQDbtLTmO7 V4BQpop7tAN2vu0PQYRUCyEDJ4+kui4HCUY8NTBVUhRFt82Y9NSVUKrRKdwWUkFg0B j5kylonE6ATE9Mf8WFz54m53MvP052WSh71vQIpBBliUuNn9kZiPsT6Q/A9YQRLr62 Tnh53chX3c+tX+WEEszAlmx9tGbiLsdx3tSsLQpkYD99BWrdc3gYnj6PtK26xqPEvW pxgF+QbUFlHVw== 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 CE75237813C4; Thu, 28 Dec 2023 11:32:56 +0000 (UTC) From: Eugen Hristev To: tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, linux-mediatek@lists.infradead.org Cc: eugen.hristev@collabora.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, kernel@collabora.com, Rob Herring Subject: [PATCH v3 2/6] dt-bindings: media: mtk-vcodec-encoder: fix non-vp8 clock name Date: Thu, 28 Dec 2023 13:32:41 +0200 Message-Id: <20231228113245.174706-3-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231228113245.174706-1-eugen.hristev@collabora.com> References: <20231228113245.174706-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: 1786525650313151007 X-GMAIL-MSGID: 1786525650313151007 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 Reviewed-by: AngeloGioacchino Del Regno --- Changes in v3: - collect R-B 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 a2051b31fa29..849721c0571a 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml @@ -109,10 +109,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: @@ -122,8 +119,8 @@ allOf: maxItems: 1 clock-names: items: - - const: venc_sel - else: # for vp8 hw encoder + - const: venc_lt_sel + else: properties: clock: items: @@ -131,7 +128,7 @@ allOf: maxItems: 1 clock-names: items: - - const: venc_lt_sel + - const: venc_sel additionalProperties: false From patchwork Thu Dec 28 11:32:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 183700 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1935783dyb; Thu, 28 Dec 2023 03:36:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmtqlHlKKJz97RF7VkNBH/AWH2vJRzisjoD7ZbeeSDkkCsQf3H2UqfSenKVEQEVrfqyJxP X-Received: by 2002:a05:6e02:160c:b0:360:1913:b5f7 with SMTP id t12-20020a056e02160c00b003601913b5f7mr4584560ilu.7.1703763364803; Thu, 28 Dec 2023 03:36:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703763364; cv=none; d=google.com; s=arc-20160816; b=HTwdd+kq9NRFd9K6Nw8OJn4Tia2pEHUfUQignS/MtpKLizf+a3da7DtR0bdNRJO1lw jnuq7N+EseCHavBoIwhAHKoXL2/Gcphxgv+dXh1ICcvgFtQjpvEPd9NJAlQzW53RaQIe m8c6PTOYALbA5y++zWkrXzVH3kXPfynuxpHfs2awgpKKfMPbmD7QjjY90x4eE2EKeyMu VrEi09QWGJl2IlmiQoGODZha2UOGt5qCenUttS3jTSvvIT22D05DV2TUlZhAif/wOLmm 9X9KS2mx57O++afdA577gZK4UOG+4d08+D98ZlPC2VR/nhjPgoxb9ZSpxdeObLWND/pg /9ow== 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=093or57AIqaXh1vKlIBxqkVoSx9Rw949ok5pyNS82k4=; fh=IuvxWylKxQEL53X9SQ+46bOfa5jRsbefefc79eZRGUs=; b=Dp0+O3uvbsE1vskyckyaOfn5rFe3bxKjkqb3u9IEAAZf8G5m7nZIakyBPmBpNvdXJQ GOitD3tvKdGAmkyBPKPWyQy8IPk//bDjq4cSAmo4zwPx+qxuoHDvW20Ui6NANVDEaQdc IzPt4geIf6dD0kV/urdc1bGdf81UR+GmwzdbWlt1km6GzvDxgBeQ1cD8eC0ivtOMEvx4 IYUDuDz6rKD37LLQn/7kDymROo5UpSyY+scv1lKydH2ZVBULmcyJl4idINS8h/UTAAJQ lkqZYKoVLKFfqkjwa4H9vj0BrSaX4qJngJiDGxUHrhWjim3uXYbADXionLrd38uQGNau nx/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fQAx2Lam; spf=pass (google.com: domain of linux-kernel+bounces-12612-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12612-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. [147.75.48.161]) by mx.google.com with ESMTPS id l3-20020a632503000000b005cdfe08f428si9736481pgl.645.2023.12.28.03.36.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 03:36:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12612-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fQAx2Lam; spf=pass (google.com: domain of linux-kernel+bounces-12612-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12612-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 02B00B22E16 for ; Thu, 28 Dec 2023 11:34:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6A141F4E3; Thu, 28 Dec 2023 11:33:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="fQAx2Lam" 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 62C9A7487; Thu, 28 Dec 2023 11:33:00 +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=1703763178; bh=UKLiDUqrGf0WLlbwWi1S7+Qnzm0QHjQnG9ZdogBAtm4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fQAx2LamhPw+Uj31n8b3jsi8mSzHVykF73+dbzIGT41sOhvzcoUIfKABJkiYj25GA 5KMHfMYMCDnlNLuVXTfm67uKTEAWuHxkjbxKxkqM/b6G+rUIkvZrFFiZfLSRESxe59 E17EImF0OiqlKUm9sy+LiXozFRV4qGabOFTbIuUzSLbmpHVB9W6KnsXdWv93sbfAVN /iHvLOXL2S0PpQOW8/v2BmvUqfUcaiY8GSWV087X6OU+SjzMw+g4SpLkCmmnHgwyot qfJi2jWHOb1LZN4dfQqlzwVdummMaV4+5cIMuUceGARfJUMkvIUoLI0e6EzxXqcP6x 6n/jVWLsSU47w== 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 E532437813CB; Thu, 28 Dec 2023 11:32:57 +0000 (UTC) From: Eugen Hristev To: tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, linux-mediatek@lists.infradead.org Cc: eugen.hristev@collabora.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, kernel@collabora.com Subject: [PATCH v3 3/6] arm64: dts: mediatek: mt8192: fix vencoder clock name Date: Thu, 28 Dec 2023 13:32:42 +0200 Message-Id: <20231228113245.174706-4-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231228113245.174706-1-eugen.hristev@collabora.com> References: <20231228113245.174706-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: 1786525373809250388 X-GMAIL-MSGID: 1786525373809250388 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 Reviewed-by: AngeloGioacchino Del Regno --- Changes in v3: none 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 Thu Dec 28 11:32:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 183702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1937772dyb; Thu, 28 Dec 2023 03:40:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZJQka1yuI7fQ5CefGhMI1SVfMhagMBBWxAVGvrcj6m6B0kK5R8d5gacqmaB5pm68yVjLU X-Received: by 2002:a50:d5c6:0:b0:54c:cc3c:357 with SMTP id g6-20020a50d5c6000000b0054ccc3c0357mr6859170edj.43.1703763659304; Thu, 28 Dec 2023 03:40:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703763659; cv=none; d=google.com; s=arc-20160816; b=XBXAsm5EpvZ2GVL+85/DupFa5c6bob9bV7OqrUEgnyNdXIwAKAWIGfmFJ5YER/sYZE WYkeH3zv5cnt58LipbnhhmCaud4Skri7EDMvXAyEVh5+qUmUU/4ofMaNwxX+VBnHB4zr VxjnxtHAcCfYawaWhecucAQ+YoJaGeNBSyf87OyBaRIOUJrd/RM0h0Z98Zo6k47MonNw b7ySrMo3FAUCL3amote9qgsITuO4zB0rDv3CnMoVM0QnLLMXt8c5J1GNzGUqHhfiAXaQ TLZtA5705gniHF0AX14UkxkazHdng5DrFOwJJ/6XoMccL6JY2028REEpOeLSVOi9ht8n rh6A== 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=2t1Go123KrbvwoQv/ZHc6CDGIwGg0c6HjALyiieqVng=; fh=df08O5TvS7Xk7Gjqk+BbCEt//60wRFrC1fAXlcxai6U=; b=qdLVp6vvzUUtLcI4CseFAZl9jFoWr60xKwmFMvumhmasrXtZrYZc/p1Z7TWTl12f35 w7eg9gPwNUyzqaE6aU8P72pucMWN6i1u+dqmOEo5cBsmE+w6c8WLLRrU1kLWiT0wfoRc pzrpRB2V/3/5teI0oMxtREByiaGbCvDEKZZfPUoWrmFEpMnN+vrim5DoBJ8NrdBZwMDA vsUGCtEie6ll+1MnGkFwi54xMGDoeFEiOZRXq+80thPx/SAUtlL2wNx4NTwUWmrdW6gS frUD2CuEnwO7wN8060aWGrc7l6mYuuUOQStChvw0xx2kyn6soAYC7jwlqQ/2IVZ4kWBD KFZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="P/Txb1Jl"; spf=pass (google.com: domain of linux-kernel+bounces-12613-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12613-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 m9-20020a056402510900b005536e93e190si7156018edd.642.2023.12.28.03.40.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 03:40:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12613-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="P/Txb1Jl"; spf=pass (google.com: domain of linux-kernel+bounces-12613-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12613-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 D59C61F25299 for ; Thu, 28 Dec 2023 11:34:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 217ADF9D1; Thu, 28 Dec 2023 11:33:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="P/Txb1Jl" 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 2FED58829; Thu, 28 Dec 2023 11:33:01 +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=1703763179; bh=1fDv/5V6e9fx+iroantkLNTc4mnm6R4J0fjeEoEc4gY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P/Txb1JlYklMHWMqG5aL1Rd6kvgcuOFKWHiJPZb2JM9vbOVhLzip4crXixn6QzW9f 0GD80b2W55XA+b1YY/FSIrSYlMBqWai6uxlxWh6zquqIaVFSb9UcTB/1he33Ecjs8G CCd+ApnsTMfWVQP+sMYDRwOpngI7oPH7ZNVOUnflTxoGJVDQ5/SetHH8vQPJLA4yBy R4I4SrQ33x5cSHDxi28A6FuRLJzL0NwZWR4l1zZBCcGkwjUeJDJrdvJIr5nC1RHtEY PGeKgHQxzc8zk9cIUvT08vnxbmhlT8nKOq14ZZnffXrvkUfmXD0nkQ10eCEqGtLapA Iy0zYYJjIL9Kg== 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 05F3D37813D0; Thu, 28 Dec 2023 11:32:58 +0000 (UTC) From: Eugen Hristev To: tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, linux-mediatek@lists.infradead.org Cc: eugen.hristev@collabora.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, kernel@collabora.com, Rob Herring Subject: [PATCH v3 4/6] dt-bindings: media: mtk-vcodec-encoder: add compatible for mt8186 Date: Thu, 28 Dec 2023 13:32:43 +0200 Message-Id: <20231228113245.174706-5-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231228113245.174706-1-eugen.hristev@collabora.com> References: <20231228113245.174706-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: 1786525682986483437 X-GMAIL-MSGID: 1786525682986483437 Add compatible for the mt8186 encoder which currently works in the same way as mt8183. Signed-off-by: Eugen Hristev Reviewed-by: Rob Herring Reviewed-by: AngeloGioacchino Del Regno --- Changes in v3: - collect R-b 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 849721c0571a..b45743d0a9ec 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 Thu Dec 28 11:32:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 183704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1937952dyb; Thu, 28 Dec 2023 03:41:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IHZEmY5Lmgr4kc7U7cYOzs02Rtpk1mgZp26xtjCGvGlXcca/R3cJJ3xCPMDS6dhxTYMnVm0 X-Received: by 2002:a50:aa94:0:b0:554:347a:4f58 with SMTP id q20-20020a50aa94000000b00554347a4f58mr6644566edc.66.1703763694524; Thu, 28 Dec 2023 03:41:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703763694; cv=none; d=google.com; s=arc-20160816; b=AIwD6xwmhY/N6dKEiPQxIx3ZyzwItEe3tWOGxYWnm8Fw+CglpIudfTldvjTOeucO6Q 7X6WxfAb4c2JRbeFEBrnR266bluXnDY+GHbAr8dXCktJZIVxJ32QjqgUkC9H9u/yzxXS 4No3eHsjagtL7SzfMu58VRoHqIC6RJDimx4sOkV9ybofpbb/4SzK7NaSjbDFQ9dJfuHi 9drwtAc49terjudPzBziCKkMSUb869Kxv/zT/mt169DntOv34olNYapBi7CZOLZcJf6z T+GmWhXhh7bthbYXE6yoR6BRwKdm43xZ2QaN+1QybJEb7TCMKykv1nM1qv4lQh4GJFB8 JGCw== 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=uBeiFM/g74J9FYOPMljB5gSkFxOWHAJj9RIBGuxI2S8=; fh=IuvxWylKxQEL53X9SQ+46bOfa5jRsbefefc79eZRGUs=; b=QwD15HCeLuL45PWRn8EvWr3kOXjiMY2lQy70/NeYb1EnmMCoODQ3bMXaCibuBc6j/w WFgnyF+HbbD8MvtUtjHbTbYYTi4l2tTTtCKkObAGI2mlrC7jbraQSWxbsaKwFYmwlrhe dSm3dcSeVV7aRx0JjT4LFtphPY1H2JDBsv+TINXN/sWC8uallTVmCTUv8P8puXxxsJ/Y elJtRYjKIyQR16tao+OBfc6hSGAbI+1S8Keai6CLefXynl5Q7GT9OvGFcwPCcXXdOXVm td0654Z6uCmvvSw836z99Hx5BmwmlIS3i9cJ81V7A/62/dfpb98Kbj6gEoEGZQ0mX5mL t/dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Fj/sUvMk"; spf=pass (google.com: domain of linux-kernel+bounces-12614-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12614-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 r8-20020a50aac8000000b0055542869575si1669586edc.551.2023.12.28.03.41.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 03:41:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12614-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="Fj/sUvMk"; spf=pass (google.com: domain of linux-kernel+bounces-12614-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12614-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 17B061F252E7 for ; Thu, 28 Dec 2023 11:34:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 573FCF9E9; Thu, 28 Dec 2023 11:33:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Fj/sUvMk" 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 6CE76C8C2; Thu, 28 Dec 2023 11:33:02 +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=1703763181; bh=3ZZY3CyyeCXrWyryOHnL40AqUpSsKrEdHmyGgsIpTAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fj/sUvMkC1z/STvO4qzjcvc2RKLueJW0WOOTFHMhm+jytveYzDNu10T4gaa6/C0iD NH/Qw6jQTdzOkmz2Mzue9DW6YH+phw97Lf59zRe3g1EOZ7FUh4MzfhhlNkpcT8GdaD DuwOuVmjI3ZVqeskO30JwejVtaQlsaRL8qw0xakZ6B2v2G1wiYHu0zMjwLp8XIES1C 9+i74YU7UNyWpp3pUlwvtG4wxk5ZXoGLGgq8LO2Bz+ccMACZPMvziszZgIa7RPT3Aj mM3tz9VPBAHw/oE9njgkLqBgPwbNj8c7T3K/qS7VyLTPI9kislKo7D4fcNyy8EJR1Q NdR/94LXXKRYQ== 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 264C237813CF; Thu, 28 Dec 2023 11:33:00 +0000 (UTC) From: Eugen Hristev To: tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, linux-mediatek@lists.infradead.org Cc: eugen.hristev@collabora.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, kernel@collabora.com Subject: [PATCH v3 5/6] arm64: dts: mediatek: mt8186: fix VENC power domain clocks Date: Thu, 28 Dec 2023 13:32:44 +0200 Message-Id: <20231228113245.174706-6-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231228113245.174706-1-eugen.hristev@collabora.com> References: <20231228113245.174706-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: 1786525719678873402 X-GMAIL-MSGID: 1786525719678873402 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 Reviewed-by: AngeloGioacchino Del Regno --- Changes in v2,v3: - 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 Thu Dec 28 11:32: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: 183705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1938042dyb; Thu, 28 Dec 2023 03:41:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsWJXwOL1+DYnJgdGEu5Zh0RvJDdP50Mk6wE8ZQEGT1m8MjFDSkGt+yhf/ShJ/Ny0gI1OD X-Received: by 2002:a50:d7dc:0:b0:554:1af:4771 with SMTP id m28-20020a50d7dc000000b0055401af4771mr6954210edj.63.1703763710779; Thu, 28 Dec 2023 03:41:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703763710; cv=none; d=google.com; s=arc-20160816; b=XmxhWikOnXbx7pox01t01fIo2hCNsUCiZrZ2kkagcGvXP23Vx4vuLE6c7hRPJeHkYt yYCjPhWpwnpishY1FmFek2TK6LWwktNhTbEFYO/InTYaFEOZpsjr+tisT59N4+8b1gL4 uOtyuodOLLJS1Qi8x0j5B7iY5xk/MmFJ8dS35t7HlF26pBJhbHOOzQED+W1dH8707mLD IJRNbw5ZhG83Rlg5H/QypJPdUQrrrVZ/Qo4RuDYD7juD4chQAWTt/YWq9203p+8OoB02 yzsMChiaNnc1ilrOLupYD1/rYsHqgMNUhSJWCTJj03P/5Oc8vFkqJAHY+bG3y4SpMoMD BCiA== 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=W653f3pVQL5Ic+1C+7POVMvYSp9qVH87u7uaN4LFloI=; fh=6ZnRimt1zq9d4rNc6aU+i30uueC+eTX8T4Did3qv2iY=; b=eWjEhmDiX7987g6+wusTHhxxedXvAkt1n6O3YHZ+hXeRlK0VMsCAzk/TELn8ghHS0a xmaqk1gRvk9iCi18x6yenrMgeNkXQvxuuCZ5Y6s0oCWP6ibasVO2/TdqBAat6Wb0l8Tg Pc0ELODzqr87Emp7PWb80Dv7eoFPxhY+I2Rke7vA4lsKgz3Boexp8PQSEiF7nL4CUwIK iI80vpOzNygPQk71HM5lNt9TRCKL4zXxZqru5x8ACnWeoUQGe6hFuT8Dm7SxwzNx2obQ SgU4XFzhrIRimZHTpRv9Q36Zd/d/4efIJyjYZbLA394MC4fPW2JByhHFlF4tYoYlE3rW V5Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=1z0cOoyT; spf=pass (google.com: domain of linux-kernel+bounces-12615-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12615-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 k11-20020a508acb000000b0055484293d64si5020193edk.372.2023.12.28.03.41.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 03:41:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12615-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=1z0cOoyT; spf=pass (google.com: domain of linux-kernel+bounces-12615-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12615-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 C23FF1F254F0 for ; Thu, 28 Dec 2023 11:35:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 70470101EF; Thu, 28 Dec 2023 11:33:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="1z0cOoyT" 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 C0065DDAF; Thu, 28 Dec 2023 11:33:03 +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=1703763182; bh=37Z5+7S5t846U9B0A0dcCmQr8H0ZxSimQ6IOeUd6EuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1z0cOoyTvc9pTmCrf9DWg7bgLlojEZ8Oh50GKVtLwZuJPKIPvGJnhCnFjkoBTPWJ/ sAaRJD+I20+ohk1nhbTuxSymui4d5QhB8R/Xv5BDlYdpAonk8aIjMvuPRPTksXC3Jr yG57VuVD/NzJ5VfImR7Qd3lACDL6vcOWiUXO54E0j2wxbjRm17qgGeymzzo1mfmDdR N86OtiqbS1YkOa8ZVvvbb1YFpQK/l5VT0/DnTnjCwXcl5XQkuV5kP5qYSXp+9FEb5z 3xqCTQQZm/61IZDE+kRmbnf5fNsRNwkdKaHK1Gbj51XyTRfDdry/MRAZUMS1bFBS9g yp5c0wW841dmg== 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 3556C3781419; Thu, 28 Dec 2023 11:33:01 +0000 (UTC) From: Eugen Hristev To: tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, linux-mediatek@lists.infradead.org Cc: eugen.hristev@collabora.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, kernel@collabora.com, Kyrie Wu , Allen-KH Cheng , Hsin-Yi Wang Subject: [PATCH v3 6/6] arm64: dts: mediatek: mt8186: Add venc node Date: Thu, 28 Dec 2023 13:32:45 +0200 Message-Id: <20231228113245.174706-7-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231228113245.174706-1-eugen.hristev@collabora.com> References: <20231228113245.174706-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: 1786525736468729047 X-GMAIL-MSGID: 1786525736468729047 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 Reviewed-by: AngeloGioacchino Del Regno --- Changes in v3: - remove dma ranges and cells. 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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8186.dtsi b/arch/arm64/boot/dts/mediatek/mt8186.dtsi index 66ead3f23336..bafb0845e986 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8186.dtsi @@ -1993,6 +1993,27 @@ 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>; + 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>; + 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>;