From patchwork Fri Dec 20 18:11:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13917240 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EC28BE77188 for ; Fri, 20 Dec 2024 18:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VKnwwPFe/+dE7hLJc1Yz3pFEYPu928FDpcSUb/vByrQ=; b=B91ZWJ0VLR8x6uTScd9A5ts1Hn kYt/umwkQFayzOtRSSyXVNvmvdxk4fcaa7FULtiggZ6wGRWL5gBQnDrwedefTAMDK0c4jTaUQf2et RjAMqcl+565uYq6NCToHnr5vmJyn1vu3pbqkTFmdQCGhmfyMFZgJjxJJTyN+prC1rmac4eGC8OwsI jXhEeE0q/4yth18wEvHDhN9wU7Btwztsv0eOj/qalFij+s4UMlkiWZmtsJqlQBFzHmJBmSFDdk4fz hX77TK0Y6R9WCjpeeyQTDUpD0XREfi4BEOEvZdu2Efis5NjhQS2OmHKEUjWEEZLCg2kyMmx/VsTqW 9n5PG0lQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tOhVR-00000005lm8-2icf; Fri, 20 Dec 2024 18:13:45 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tOhTB-00000005lKV-1eJq for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2024 18:11:26 +0000 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43624b2d453so23890685e9.2 for ; Fri, 20 Dec 2024 10:11:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1734718284; x=1735323084; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VKnwwPFe/+dE7hLJc1Yz3pFEYPu928FDpcSUb/vByrQ=; b=Ldw+BWIzFoxopAVTlOm51IoC39H+1FiAPJwZgEw0gyddUiGQdnmD6mmET8nt/D7PYb MMUpT9zOzYiqWcz1zSgee71/saalWgG60BW8kU4i9W6tkFAyVSTf5noEw+syTrGDO2l2 9uSpbefHWt1sMf+hbpCd/KS/6GQw/6M0v46yMHITXY8Lo1jxjWqX58m9Bidk818BJI1z Swxl2ueggD14Q/ZSrCjEBB9wTuv8Zqr3tli+2IV/KvNOQBX5v+RRBdRnAeW4faNxEP6b nu8CxPt+sCb+ZVlqnvzfnbyMiRcdy6h7KeXVPJywXDLqWt+ExDvbBjlgeHnpgg7sh3+r YqsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734718284; x=1735323084; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VKnwwPFe/+dE7hLJc1Yz3pFEYPu928FDpcSUb/vByrQ=; b=vcjbJsEvcz9XJX1UPoQe7Lysaf8pyUHZntijKi08pOACh5w7UmtZluCmPaoKI1pH3a pneT16Bg8GA3UiK2L/rlzq5SKi/glKxsSbQ0OU4Zqu8UZXi+lyCYzgBZNcdtEJxFGI7a FKP5wsAoU32n5dp0i+3WxnWCole2wDC9qPsvm9py3KfBJ+POmtB1MiZlXiMU/fiynKG5 CnoWO+QwuQt3dCNYMbRJ4rdYH67fImgo8DzJ0U4w3rTPCPC3bu2UoGQYplZ/8NqpdlqR NaUfV9PYkysMzoxd/AG7kNKxQMtev2nefGr772cuAm0FksqShFBAZg2RPl+dlWw5vF7a dYrg== X-Forwarded-Encrypted: i=1; AJvYcCWj1omLIf+2ouiQxL8HnpFTIDeCjbANDOTZPM6QPz31HSwRZw3uv0qrc6sdAYL9jiGmE9enxTnqxurlE8+ah6A8@lists.infradead.org X-Gm-Message-State: AOJu0YzK0wsJMPc9CWI1BFGdZzhR35Inv+Lo/p5tifhhluoQ7DcTdVCp kx0sRzkr12vR9qVWYQ8FIy4RFrIGUwFtxFrJ+blu1zYDxqolGcdq12aNS+xYPL8= X-Gm-Gg: ASbGncu6DpXDHKtlUehh/lqKAcYaARHRMrRwvJRPbFi6n6ZtMOOwrYChd31GfVODEia QBPWUmrYWn+lwxbiZ44BazWx0PcEFsqU9ATuPhcbMpygNpz1HbB8rzDOLTgw2IbBCgnBxwAXOTH ETkKLFEdM0wvcAJB36NijqPnUFSeZW/yGh49iTa4QpEWPMOKzG5kaqDDeBXVir3dXD7oNXhXLb5 jx23sw0wCQEeWGQiE1GmpGiU9ubuKBI0p6Ki4+tZ3VLeb7E X-Google-Smtp-Source: AGHT+IEuWHn26jFE8mEN526e1pripavNV4jfCGcWV22FyYVXEe2zax7RoEXGtmhyz0wWSN2QoW0ULg== X-Received: by 2002:a05:600c:1388:b0:434:f131:1e71 with SMTP id 5b1f17b1804b1-4366854c07emr38472865e9.8.1734718283903; Fri, 20 Dec 2024 10:11:23 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4366127c488sm51460075e9.27.2024.12.20.10.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 10:11:22 -0800 (PST) From: Dave Stevenson Date: Fri, 20 Dec 2024 18:11:11 +0000 Subject: [PATCH v5 1/3] dt-bindings: display: bcm2711-hdmi: Add interrupt details for BCM2712 MIME-Version: 1.0 Message-Id: <20241220-dt-bcm2712-fixes-v5-1-cbbf13d2e97a@raspberrypi.com> References: <20241220-dt-bcm2712-fixes-v5-0-cbbf13d2e97a@raspberrypi.com> In-Reply-To: <20241220-dt-bcm2712-fixes-v5-0-cbbf13d2e97a@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Eric Anholt , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Ray Jui , Scott Branden , Doug Berger , Linus Walleij , Bartosz Golaszewski , Thomas Gleixner , Stefan Wahren Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Florian Fainelli , linux-gpio@vger.kernel.org, Dave Stevenson X-Mailer: b4 0.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241220_101125_446245_5145464E X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 62948c62abca ("dt-bindings: display: Add BCM2712 HDMI bindings") added the compatible strings for BCM2712, but missed out that the number of interrupts changed, and for BCM2712 the driver changes[1] required that the interrupts are named. Update the schema to correct the interrupt requirements for BCM2712. (Requirements for BCM2711 should be unchanged). [1] Commit 0b1dbe82e051 ("drm/vc4: hdmi: Add support for BCM2712 HDMI controllers") Fixes: 62948c62abca ("dt-bindings: display: Add BCM2712 HDMI bindings") Signed-off-by: Dave Stevenson --- .../bindings/display/brcm,bcm2711-hdmi.yaml | 76 ++++++++++++++++++---- 1 file changed, 62 insertions(+), 14 deletions(-) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml index 6d11f5955b51..c1cefd547391 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml @@ -56,22 +56,12 @@ properties: - const: cec interrupts: - items: - - description: CEC TX interrupt - - description: CEC RX interrupt - - description: CEC stuck at low interrupt - - description: Wake-up interrupt - - description: Hotplug connected interrupt - - description: Hotplug removed interrupt + minItems: 5 + maxItems: 6 interrupt-names: - items: - - const: cec-tx - - const: cec-rx - - const: cec-low - - const: wakeup - - const: hpd-connected - - const: hpd-removed + minItems: 5 + maxItems: 6 ddc: $ref: /schemas/types.yaml#/definitions/phandle @@ -112,6 +102,61 @@ required: additionalProperties: false +allOf: + - if: + properties: + compatible: + contains: + enum: + - brcm,bcm2711-hdmi0 + - brcm,bcm2711-hdmi1 + then: + properties: + interrupts: + items: + - description: CEC TX interrupt + - description: CEC RX interrupt + - description: CEC stuck at low interrupt + - description: Wake-up interrupt + - description: Hotplug connected interrupt + - description: Hotplug removed interrupt + interrupt-names: + items: + - const: cec-tx + - const: cec-rx + - const: cec-low + - const: wakeup + - const: hpd-connected + - const: hpd-removed + + - if: + properties: + compatible: + contains: + enum: + - brcm,bcm2712-hdmi0 + - brcm,bcm2712-hdmi1 + then: + properties: + interrupts: + items: + - description: CEC TX interrupt + - description: CEC RX interrupt + - description: CEC stuck at low interrupt + - description: Hotplug connected interrupt + - description: Hotplug removed interrupt + interrupts-names: + items: + - const: cec-tx + - const: cec-rx + - const: cec-low + - const: hpd-connected + - const: hpd-removed + + required: + - interrupts + - interrupt-names + examples: - | hdmi0: hdmi@7ef00700 { @@ -136,6 +181,9 @@ examples: "hd"; clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>; clock-names = "hdmi", "bvb", "audio", "cec"; + interrupts = <0>, <1>, <2>, <3>, <4>, <5>; + interrupt-names = "cec-tx", "cec-rx", "cec-low", "wakeup", + "hpd-connected", "hpd-removed"; resets = <&dvp 0>; ddc = <&ddc0>; }; From patchwork Fri Dec 20 18:11:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13917242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C83EE77188 for ; Fri, 20 Dec 2024 18:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9Sl5vZ6DuvY58dxwG3krkGImhGuVFYQY4MkC0DJ9Dic=; b=nn/+Pj95eHdVP5mbW6+ctRsPPf ppxenrPKXFduamrbQ6lYgMtN+pyYH5VGkh6PMhsyQOzvtUX6lL9o/e85pySZKEpPkdm5IurQWDAoe LpVLc3hxt1kOSermEXwa+/CpKinYqi82lkYvlnyAPx+6MfBgEO/0iy/IOGKtVn2V5ksst1u8XmFwM GYv17Ug6iCm0oFa4TI1BeLIxMTLObgObpPrBiVTiCVBgLA/lUADjp2zx2QNCB0hNnNDzEAoTKTe0T LI382jQ7ONE3keZhfV0uBTCnEFwipc+p3U9ARTiearNTBldfo0XFX21KYckyt72KIz2hpUaCJso/Y eLYF4uAg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tOhWg-00000005m1A-00K9; Fri, 20 Dec 2024 18:15:02 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tOhTC-00000005lKh-2zw5 for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2024 18:11:27 +0000 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4361815b96cso15469455e9.1 for ; Fri, 20 Dec 2024 10:11:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1734718285; x=1735323085; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9Sl5vZ6DuvY58dxwG3krkGImhGuVFYQY4MkC0DJ9Dic=; b=UVE9JlitkspCl14b0VzY35o5EDa94xnjwU7AtS9HVDawoXATTq5091x4kSWHyQtDEU wo3QEw13YwSEN7sPqX6Ht2gbvAmfGyAMYWrwx7VJ0k24snzJnjbiv1IytQCJ+zgSZyEh pjJxHyY9cJ6/FtrJCfUDkxNyOks0r0U6CsnZW0Ea1w+UjW5Dvd7gSeX/qGygKltB6nsW M6GivQedi0l2rEmH6ws43zEi7xEmt65ex6WtNI9eLYDCtYHCkKXFiNS6vQ5hCmBnzUha gHVW1XjpGt2A9hkX7aDgLGw3itJzLM7BAPkyt+a+CcwyPvHdqz/oeQ3u/UVW5SVNLAk0 8hKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734718285; x=1735323085; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Sl5vZ6DuvY58dxwG3krkGImhGuVFYQY4MkC0DJ9Dic=; b=pRfITkeC5QQsMN6Y8cbRDzGu17IoIABRLD13avn0sQkrmSuIHID3GukgibGB6J1hWJ ly0aj06979OFBa+/3tD+qvTztTIN1VXcGdA8C+U9A9l6UCrGQJQvbXGw3eNeRRfLz53Z r8CX9Kf9f6OfjJXXO8uilGYRuMsoHTBKwn1Obs2n3FDGAusR8jJg8gypCAlu0v1h5H1U 6HaWhbCFQDpPclxYHPK/Jy1lVM0z8n31xaAHm9zG/ybFMie8HIUE097zRLkMNPUPKcPS qyREG4VYrxyfayCxvaA2lWy1Y8dwZmT0K2m5hWWfnumahaF7HJ72aQlcVWfNqo6qKI1i g1pQ== X-Forwarded-Encrypted: i=1; AJvYcCXGEjeAvCyGJX4nBD/op+lNWqcCFQ9hIQ1qxhyge+lqNgYhnbRgUR7G0wrzHW1PGiK826VFKoLSPGZ3WdpA/Iig@lists.infradead.org X-Gm-Message-State: AOJu0Yyq87dVgYr6Foo9UooKzV9qnJT9l+/bpC8VhLbcIQlgIyqSTt5C 5UxcqAGw3Wsma+zyyE0xwoPKo8qvmC1A6X7SQ50OgYj9/xPBgWIoaXUvIIzrZlU= X-Gm-Gg: ASbGncvEiTNaz2BhBGojFyskmameGSVJ5Vu30koDv+DXfSXCoxrPchLpEdt4BWYlBJC 62gEyX+3PkRWOXgmGc4Hx4WEu+D97+eGMQSjrzg6t6W2N2R6Mh5cuWL9QKbC1KS5ZhBisnNF5lu ZIgHz4pI44zfagtFWMqXpeU4SjMzYFhfbuwX/5VTy8YpZAcs3bCS8TFD24GQh+maps97y8+a77a EUXAG50QwoWRgJg9AkPO4dsabM5l23/hF17VX4y+duVVm+l X-Google-Smtp-Source: AGHT+IEvTWbavoXhQ6+vfbkOhG8cbDKYZMOKpzg5ZpuFE1J+Gc33Tj3rIi7Es/smHvmbL2/NSCBTrA== X-Received: by 2002:a05:600c:1912:b0:434:a968:89a3 with SMTP id 5b1f17b1804b1-436686436f9mr40093445e9.9.1734718284772; Fri, 20 Dec 2024 10:11:24 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4366127c488sm51460075e9.27.2024.12.20.10.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 10:11:24 -0800 (PST) From: Dave Stevenson Date: Fri, 20 Dec 2024 18:11:12 +0000 Subject: [PATCH v5 2/3] dt-bindings: display: Fix brcm,bcm2835-hvs bindings for BCM2712 MIME-Version: 1.0 Message-Id: <20241220-dt-bcm2712-fixes-v5-2-cbbf13d2e97a@raspberrypi.com> References: <20241220-dt-bcm2712-fixes-v5-0-cbbf13d2e97a@raspberrypi.com> In-Reply-To: <20241220-dt-bcm2712-fixes-v5-0-cbbf13d2e97a@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Eric Anholt , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Ray Jui , Scott Branden , Doug Berger , Linus Walleij , Bartosz Golaszewski , Thomas Gleixner , Stefan Wahren Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Florian Fainelli , linux-gpio@vger.kernel.org, Dave Stevenson X-Mailer: b4 0.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241220_101126_775930_6C18C711 X-CRM114-Status: GOOD ( 10.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 6cfcbe548a3a ("dt-bindings: display: Add BCM2712 HVS bindings") added the compatible string for BCM2712, but missed out that the number of interrupts and clocks changed too. The driver commit adding support for BCM2712 [1] also requires that both interrupts and clocks are named, so the relevant -names properties are also added to "required" for BCM2712. Update to validate clock, interrupts, and their names for the BCM2712 variant. (There should be no change in the binding requirements for the other variants). [1] Commit 7687a12153d3 ("drm/vc4: hvs: Add support for BCM2712 HVS") Fixes: 6cfcbe548a3a ("dt-bindings: display: Add BCM2712 HVS bindings") Signed-off-by: Dave Stevenson --- .../bindings/display/brcm,bcm2835-hvs.yaml | 88 ++++++++++++++++++---- 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml index f91c9dce2a44..9aca38a58a16 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml @@ -20,11 +20,20 @@ properties: maxItems: 1 interrupts: - maxItems: 1 + minItems: 1 + maxItems: 3 + + interrupt-names: + minItems: 1 + maxItems: 3 clocks: - maxItems: 1 - description: Core Clock + minItems: 1 + maxItems: 2 + + clock-names: + minItems: 1 + maxItems: 2 required: - compatible @@ -33,17 +42,68 @@ required: additionalProperties: false -if: - properties: - compatible: - contains: - enum: - - brcm,bcm2711-hvs - - brcm,bcm2712-hvs - -then: - required: - - clocks +allOf: + - if: + properties: + compatible: + contains: + const: brcm,bcm2711-hvs + + then: + properties: + clocks: + items: + - description: Core Clock + interrupts: + maxItems: 1 + clock-names: false + interrupt-names: false + + required: + - clocks + + - if: + properties: + compatible: + contains: + const: brcm,bcm2712-hvs + + then: + properties: + clocks: + minItems: 2 + maxItems: 2 + clock-names: + items: + - const: core + - const: disp + interrupts: + items: + - description: Channel 0 End of frame + - description: Channel 1 End of frame + - description: Channel 2 End of frame + interrupt-names: + items: + - const: ch0-eof + - const: ch1-eof + - const: ch2-eof + required: + - clocks + - clock-names + - interrupt-names + + - if: + properties: + compatible: + contains: + const: brcm,bcm2835-hvs + + then: + properties: + interrupts: + maxItems: 1 + clock-names: false + interrupt-names: false examples: - | From patchwork Fri Dec 20 18:11:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13917243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7A362E7718B for ; Fri, 20 Dec 2024 18:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VdlpFNH3uxbIb6jb7BUkFAfn6xTxvwPpL6GXsJonkco=; b=dV3ivuBhdlTtBlde0yKVpmkJFA DCyhjQyL6cADvPFyGXUa1rlupVuonZeJ/pNSNN6Tu0LYIvbofSpPyxV3S0ToR+yCkpUuLgy78lLNl OLFQFpCnNh/q1aOkGaQoh7X7lQgAVkkqGv0rHtlZkZENoEuTr5jRcGGPakZWUEIclCjeKFkVi3NnT MEcnubzYo2w0MLUCZS94Insmxrkr9LO2r7njYSSbAw9exCTufFmYHIYNYd5q/j2h04R++cIMXXmgy dHuiyDNqZ8P8M4jZhC6YCoBAcVZ2A8i/FPEh4aIMMJC3nMY9xyiqPKbMUl+JDkaMkuXqe+iEBjpY7 adbQDP1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tOhXt-00000005mC8-0R4m; Fri, 20 Dec 2024 18:16:17 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tOhTE-00000005lM4-1J8K for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2024 18:11:29 +0000 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4361a50e337so15585975e9.0 for ; Fri, 20 Dec 2024 10:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1734718286; x=1735323086; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VdlpFNH3uxbIb6jb7BUkFAfn6xTxvwPpL6GXsJonkco=; b=CnpalBiLNtsx/F9uARM0sj5Ia+JUyzYmEDGHLRdPbIQw1CRUic4Dbvv9odxUM0XWbs rfdyx9Y3bHmYCtAhKlKMlL/R2SBBI1wbvTmQsHjRLd1le0YbyFNNSOUbuDtYZ6eOdfYu jyhfvgCxlinL6xEKpDoRF6ri2QmJuz6Q2uMa6YqsP50dtDeY6NoDbircjLBVPdAQpb2U KISiy+U7wR0Yj567nYay9SynPt46bnKLYCBj5BFrh+YYdmsgL5yWeKXFRLKiILlY5urs 4iiWfcOiPpHr5aamOkH9M8ZrmvNDij3Faof3WxkOq5ONZaLAc35TnbtHQxxKOHE8ZS5T wrfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734718286; x=1735323086; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VdlpFNH3uxbIb6jb7BUkFAfn6xTxvwPpL6GXsJonkco=; b=GayZ5xoQv4NGYrxTzxIpFM07M+ihIEP4R2F2V5BGTag1MwBXQ+AoS7ATUIegVw/6ay wZrjMMZheJi67PeCT3+8Lyt/X45nFH+Qt8pAjjc4+KY0fQXnE3xPQnbl2kZrChFuqOhL Z/u0pdakrIP7oiylFOW4TRyavnD/XvHcEpiRkGqRkJEJQ4Rkeqt6umVLVjwtikVQaQkF DzSsG/L4pMQSNyRlTw88pkpX1Lm3D6ju1pCuVevC5B86xF0HsSpJ3V0NAc1p4xE5aGee ViLI0YmQApplb5gf2ben26KUL/1AvyVZle28xmt4EqgriAGAoi1+sB0o4k4vq7EE8izR kTfQ== X-Forwarded-Encrypted: i=1; AJvYcCUGeyBYd9NvWL5JUdsfx6nDkUGJx/tPGs9b5SdpaeZTGMRuChtdFNE3juepxxcnbF04sPsiEvqnOoXFn+540/F7@lists.infradead.org X-Gm-Message-State: AOJu0YwNfpSAb9Jt6XQnEBS6d0nKzpAXkshMJ8IO5xN08KWbfjzZIb4G H847DMn7wqLwbptBiJFMHsH4Gr2hNXN6BhW63c1rp4xATsQexKlkymBq7fBjXWc= X-Gm-Gg: ASbGnctnJE5odS49+LOC6Svm5lF6nhPq1iOi34M06GMVYmc/MrKOICm+BGjZyMeR01A 44fQzYCiQcxSO9R2b6QE6RH8HXrTqRo0A9YUtr377DmtK88jAr42jyrigM2r+KDRYKt6zrOhheZ sYZAaDQk+7Av/9Tu1CnB8od14Vg8gbOFZ72RdlYdLWe6MUrojINGnd1sBnCl5ZFZjUjq/fiZcom pnsclQpXUQK99fXbosmFSkO50kSHF9KfVi9ipfMw0uEFSN7 X-Google-Smtp-Source: AGHT+IGkUJ6wiQ+PFzhrRg9QEs0JFLnzOAYHhAM3qA2cpb4nCgeQZdE914UHndE0hNBgPmIssevaTg== X-Received: by 2002:a05:600c:4586:b0:434:a902:97cd with SMTP id 5b1f17b1804b1-4366864364dmr37590895e9.12.1734718286362; Fri, 20 Dec 2024 10:11:26 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4366127c488sm51460075e9.27.2024.12.20.10.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 10:11:25 -0800 (PST) From: Dave Stevenson Date: Fri, 20 Dec 2024 18:11:13 +0000 Subject: [PATCH v5 3/3] dt-bindings: interrupt-controller: brcm,bcm2836-l1-intc: Drop interrupt-controller requirement MIME-Version: 1.0 Message-Id: <20241220-dt-bcm2712-fixes-v5-3-cbbf13d2e97a@raspberrypi.com> References: <20241220-dt-bcm2712-fixes-v5-0-cbbf13d2e97a@raspberrypi.com> In-Reply-To: <20241220-dt-bcm2712-fixes-v5-0-cbbf13d2e97a@raspberrypi.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Eric Anholt , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Ray Jui , Scott Branden , Doug Berger , Linus Walleij , Bartosz Golaszewski , Thomas Gleixner , Stefan Wahren Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Florian Fainelli , linux-gpio@vger.kernel.org, Dave Stevenson , Krzysztof Kozlowski X-Mailer: b4 0.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241220_101128_349093_64AD907E X-CRM114-Status: GOOD ( 11.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since commit 88bbe85dcd37 ("irqchip: bcm2836: Move SMP startup code to arch/arm (v2)") the bcm2836-l1-intc block on bcm2711 is only used as a base address for the smp_boot_secondary hook on 32 bit kernels. It is not used as an interrupt controller. Drop the binding requirement for interrupt-controller and interrupt-cells to satisfy validation on this platform. Signed-off-by: Dave Stevenson Acked-by: Krzysztof Kozlowski --- .../devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml index 5fda626c80ce..2ff390c1705b 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml +++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml @@ -34,8 +34,6 @@ properties: required: - compatible - reg - - interrupt-controller - - '#interrupt-cells' additionalProperties: false