From patchwork Mon Jan 30 03:33:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen-KH Cheng X-Patchwork-Id: 50109 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1992544wrn; Sun, 29 Jan 2023 19:45:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAD3vQtbQSlfnRdUv9MPBJFKd1poT9ZoA4hdlOJxGUPQbJtMExqLSfu5BklmnsPSwsUxVz X-Received: by 2002:a17:907:1c08:b0:86f:de0b:b066 with SMTP id nc8-20020a1709071c0800b0086fde0bb066mr57695364ejc.76.1675050320961; Sun, 29 Jan 2023 19:45:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675050320; cv=none; d=google.com; s=arc-20160816; b=kn32eFpxKSbzTRYYvALNXNg4kNrq0u6fUlBBYnZoKGe7Toz6ezpBWfgiE6GKmLlJKr iJOYxEGZN7YQajDlaFEHJb+DTcKSAh/ul0xnTSrzBlDiQ8ukWMBJ1pHjUCLJAyApj3cE rS/ZaurPGg0EHojWYRNcEin7oJ6ypGclt/bnz6oHlTn2Mp7qTcZa91YZWv/sNKWGqPEy ZkZF+8cc2aMQDZNuBLyYUA75m+HToJmaFSuUExq759ixgqqCX4cTBdIRerlaghHFAs7v JT6GuQ+km8lJUC9YAXM5OYou4M12BHUsxIT3j158Vs+MNFABEDgpLXmcN8TnN0VJXDbL lYuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3Ung9oFBm33rXOG7FFhNcYNioi3ccW9m3+5fbEJMqX0=; b=ZkxoAZ/xgzQjrWRGE8Cfx9NzSm3IuoANuc6AbjgdkUlQvGMmhcVbCuZldDrq30liAe OpA8GrJwZJ1Jk9wJP3JM3jFEyd/i649IzlfCfMLZqyx5NoXJfS2bhtCPvFpuI+qp84Tb 1qJwd52H4TnsqZaInL5nrn0HvxjiOfjgmv7lUez/0qyFZLqVCSbNEdL7Deajzg9L9QHR iSjK5R597phhKBExLt9GUvqm4vU+GXZgNQcFb9UbtALMv+XvmdIHbaF9pu2HmnVl8Ucy LiF9KTL9j+2TDDr530a41XQkGx1qNgFCS61DRM3yZaPHOvMd1E1BLt/scqEoXxrzwxSR kVpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b="oSZ6y/AD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 11-20020a170906024b00b0087877581bfesi11480075ejl.428.2023.01.29.19.44.58; Sun, 29 Jan 2023 19:45:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b="oSZ6y/AD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235627AbjA3Dd3 (ORCPT + 99 others); Sun, 29 Jan 2023 22:33:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235438AbjA3DdU (ORCPT ); Sun, 29 Jan 2023 22:33:20 -0500 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 044181C336; Sun, 29 Jan 2023 19:33:17 -0800 (PST) X-UUID: d291d010a04e11eda06fc9ecc4dadd91-20230130 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=3Ung9oFBm33rXOG7FFhNcYNioi3ccW9m3+5fbEJMqX0=; b=oSZ6y/ADErueq2lxe2wqgnOpoWh1kmTwu+1DvI+r0EydCZVSFzANq3vhRrlsK97qgRM6pZxFB2CYmI1KcDqRMszqHjvJ/cSpUpyfp2TsNV60eIK5JQ3+3sY6zpiqkahW6VqkQWm/pSvL/fHqDc1qPsa0fDKIebtQpmHdP6UgBgA=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.18,REQID:f7fdc806-bf8d-4786-a0bd-3064080b8b31,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:90 X-CID-INFO: VERSION:1.1.18,REQID:f7fdc806-bf8d-4786-a0bd-3064080b8b31,IP:0,URL :0,TC:0,Content:-5,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTIO N:quarantine,TS:90 X-CID-META: VersionHash:3ca2d6b,CLOUDID:a633b355-dd49-462e-a4be-2143a3ddc739,B ulkID:230130113313494307RR,BulkQuantity:0,Recheck:0,SF:38|29|28|17|19|48,T C:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 ,OSI:0,OSA:0 X-CID-BVR: 0 X-UUID: d291d010a04e11eda06fc9ecc4dadd91-20230130 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1179411382; Mon, 30 Jan 2023 11:33:11 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Mon, 30 Jan 2023 11:33:11 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Mon, 30 Jan 2023 11:33:10 +0800 From: Allen-KH Cheng To: Mauro Carvalho Chehab , Matthias Brugger , Rob Herring , Krzysztof Kozlowski CC: , , , , , , , Allen-KH Cheng Subject: [PATCH 4/6] media: dt-bindings: media: mediatek: vcodec: adapt to the 'clock-names' of different platforms Date: Mon, 30 Jan 2023 11:33:03 +0800 Message-ID: <20230130033305.31830-5-allen-kh.cheng@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230130033305.31830-1-allen-kh.cheng@mediatek.com> References: <20230130033305.31830-1-allen-kh.cheng@mediatek.com> MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756417565800802462?= X-GMAIL-MSGID: =?utf-8?q?1756417565800802462?= From: Yunfei Dong mt8195 and mt8192 have different clock numbers, separate 'clock-names' according to compatible name. Signed-off-by: Yunfei Dong Signed-off-by: Allen-KH Cheng Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Rob Herring --- .../media/mediatek,vcodec-subdev-decoder.yaml | 41 ++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml index 7efc70ae4406..51c0ff7baa52 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml @@ -110,15 +110,12 @@ patternProperties: Refer to bindings/iommu/mediatek,iommu.yaml. clocks: + minItems: 4 maxItems: 5 clock-names: - items: - - const: sel - - const: soc-vdec - - const: soc-lat - - const: vdec - - const: top + minItems: 4 + maxItems: 5 assigned-clocks: maxItems: 1 @@ -160,6 +157,38 @@ then: required: - interrupts +allOf: + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt8192-vcodec-dec + then: + properties: + clock-names: + items: + - const: sel + - const: soc-vdec + - const: soc-lat + - const: vdec + - const: top + + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt8195-vcodec-dec + then: + properties: + clock-names: + items: + - const: sel + - const: vdec + - const: lat + - const: top + additionalProperties: false examples: