From patchwork Thu Dec 12 18:36:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13905805 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 9983EE77182 for ; Thu, 12 Dec 2024 18:36:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 05EFB10EE73; Thu, 12 Dec 2024 18:36:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="t0BnGdzs"; dkim-atps=neutral Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C5E410E642 for ; Thu, 12 Dec 2024 18:36:44 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-385deda28b3so688846f8f.0 for ; Thu, 12 Dec 2024 10:36:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1734028603; x=1734633403; darn=lists.freedesktop.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=ZmY4nSeOHfUAeSRoOGUYAdGnJvM3BDuelhiAae/7ZWg=; b=t0BnGdzswhTviyAnnfYXBB21DP3/ApJD4v7oEAUmfGyw+P0uJrV6kCx+ijFJSBJ4mC P1RRKNV6cyhrjFobyQX0oZEnuA5+fvZrATzaPpWF0VAN1MSNd60Uo+oZ05/9LVk9WXB0 4Au7OIIsXu0zXUosOxM7m3joIMAC9cqzMRjm3vUCJQ1CYAV9SloBLnX2rmnSTkoson0R 9/X9fEZ41JruWCkB0IosO9Ga64HbLVoiajW3+pxY2ggikBVPv4QRGvvbZ1aPBfWVkdc4 tKhXa2/XmM3RBw6psh435Cc1x7OZO+/OL6eJYPjA0stmXBuefaZ9MzITrgplQpTk7iB2 WBAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734028603; x=1734633403; 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=ZmY4nSeOHfUAeSRoOGUYAdGnJvM3BDuelhiAae/7ZWg=; b=qxcilyNWjwIHFjAYk+7swN5opQ5X71KSO51ajLu/gq+/hP2yOhqMZdX6mY0T2q1JYC EkzT0DzMgvYthvBiX8OKrLq7wBm3fXqs+dkm96Q3uDNN0RPpr2sWcm+TVCYosxXi7+IQ wn6SIXuQubbtrWqV27RCcXzkCy8OogjeZHaL9YwKDxUDXbqzMZRUuveVQzmMtI9Dn/5V wJSgHnEL2RMff8ioDqPZvrHEzHbHzZyceMqeTJLD560UY8WlgSeAkUXHCckuIz3Oea/N PM3g2dvbeIShd0DqTDaB06cRQKTDhFNAqdzylZ9h0hSF8ahHG1772UQYqR2vXPOdmUap Is0A== X-Gm-Message-State: AOJu0YwyTfalsXz1w4L3Ev6AmTCI31C1uca2JijoHv3JfBu9zuVZ7amu QBMRxKnIkLlQ4o//IduHnzVGsMYfltLKhdMQqrLC0hmLy7IYEsLYnut03xwquj0= X-Gm-Gg: ASbGnctofw+6avyCjuhWyQugVlWvoJiPC+fddMvKnaxZsotaEoGjmnKMggJWWJaxsk6 RJIWt7uK5G6Ih21qjp33SAT/vchzYYuRZ5w3usMvGTVIGrrC9DgykhibwqKQDmPg8387IMGcCRk zqQRXGqU5ONMNWdzVtOFQMdXrJ3mz8KgIlbDWaHmoNNv0bXMon6xDWtvl5HLC5WH0xlcuiBSkJP 5oqYICgouc35TD0/J11gok0sOZZma7ATH0gHAEigqHdHJUr X-Google-Smtp-Source: AGHT+IFU9uMnmpDGMa3W5FkV+Zbg8mGPNRBLqmRp7s6rNpHHpbC4TqWxpZPj4otDLO2FaOF1TjZ6vQ== X-Received: by 2002:a05:6000:70e:b0:386:3864:5cf2 with SMTP id ffacd0b85a97d-38787691302mr4172021f8f.19.1734028602901; Thu, 12 Dec 2024 10:36:42 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-436257178e3sm24651995e9.41.2024.12.12.10.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2024 10:36:41 -0800 (PST) From: Dave Stevenson Date: Thu, 12 Dec 2024 18:36:29 +0000 Subject: [PATCH v3 2/7] dt-bindings: display: Fix BCM2835 HVS bindings for BCM2712 MIME-Version: 1.0 Message-Id: <20241212-dt-bcm2712-fixes-v3-2-44a7f3390331@raspberrypi.com> References: <20241212-dt-bcm2712-fixes-v3-0-44a7f3390331@raspberrypi.com> In-Reply-To: <20241212-dt-bcm2712-fixes-v3-0-44a7f3390331@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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. Update to validate clock and interrupts for the variants. Fixes: 6cfcbe548a3a ("dt-bindings: display: Add BCM2712 HVS bindings") Signed-off-by: Dave Stevenson --- .../bindings/display/brcm,bcm2835-hvs.yaml | 83 ++++++++++++++++++---- 1 file changed, 69 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..36bf8eec88a6 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,63 @@ 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 + + required: + - clocks + + - if: + properties: + compatible: + contains: + const: brcm,bcm2712-hvs + + then: + properties: + clocks: + 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 examples: - |