From patchwork Thu Dec 12 16:18:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 849857 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66096231A2F for ; Thu, 12 Dec 2024 16:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734020349; cv=none; b=AmmL4Dsmlky4zqL1MQfSZvMgiunxB+cItIz09MBa89d4xtKzFFFo4/ZLgr0H2DrmzBAe7DHz4IcIQK4RqrxdOpRku4KaRXpqsc4/YOGF+ZCaVNuC2orNrCGwuE7aVTXKYiSERnVEA1c19QDBUSGWbAwecL7/lNs5czHDS5XrQGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734020349; c=relaxed/simple; bh=rkPNOS/CThHiZ6WlZSF0eZPRzkaH0woMbTCR+SPr3t8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m5Znaf7duppZ7jKCjtDfdZcUJ4QckG4SkVf+0pSjxOBDPdbnw4t+mDuylMLhqewlVI0EnUlGyPQ6ViFOcDuXntlcfJG3LrdJqmPL0637r/bAWNGyRTExJ/hOqf+5JlBaxlVLCwV4wZdwzscPzH8IDdwpWbo+JB1AR4Yjc+8JPR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com; spf=pass smtp.mailfrom=raspberrypi.com; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b=pw0JJYUU; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="pw0JJYUU" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4361815b96cso5793045e9.1 for ; Thu, 12 Dec 2024 08:19:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1734020345; x=1734625145; darn=vger.kernel.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=pw0JJYUU8lSpKaYDG1xYEW30vvb8fR1NvawXdELQX9Y6mK70Y6/vu1rkkSu+eFdcaG YWF9nrKSZS5qbGTb8+/EJJD3HcedIwLxdHThtgVs/e45sJUT3Gh3Y31TNvv25NMvvZeY 0YpX++blG3D9AQZ7p60v+tGpeyEGS645Bbro3tkPXVBthgbRIH8//RM2WisK7C5WPuTh uTVy/eCa+BKpM/nK14RuJ7FbXBrQ8VL2p0q7yUbNk4r30gyIUSHpgVvnPOEqWUr8DOUA r2ZFpZU/U4AhvuwAgx1vo73cpfmJSZ7q5wtwh9KL31wLQWo7sx0Sivl5mFoL+pR5qG6v NyGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734020345; x=1734625145; 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=mnZTmTcBtst+nw9ZDGs6BCanDzQbZTgorKBOM4hZDA3o3IqKoOtpFN4qNFQyM8hUre MN7yITvNpQ6SOaOGulLBFuoHZNCRe21UCAWRNULn+uq396D7eq71VhgtVPC6sd/cZ1qP DJW7vZTaDU+YT+307haSE7ilOMvJi45QIfE2MabN71Y2jA88hhjVdaSECFJuQY0T+VHy 3ap/lOxUoH1858iN0UuovgEg8UHPEDtpOKib9ZXp/jIYnn2L9fhku4cUMrxBh2wnoTkP tRG+jej5Z+wZn9NgWp2mZyoWjuqD6zszB59tJkoy9AEMoBCwAlqw2go1Ea5QU6n8asCz VrDA== X-Forwarded-Encrypted: i=1; AJvYcCW+X0ub5sq9MGV0UVGR9fyWye0+3uPsZvGadXY1dRyqwSIkXfj1nEni4SLdT6cRlO5ME5k4GjH7Hc6E@vger.kernel.org X-Gm-Message-State: AOJu0YwpSyjzKMDlUGoesJUErfkXaFdN6QwAWLxjFp/YnlZzNjCZBmkW IzV7dltVnBFKAlGSYuDCQs2Y99GdkxPvDoLzvTDH77cn4ZcKkpJ5H6LXYCXLNGU= X-Gm-Gg: ASbGncs9xP2ugvaDsq9UaPIxQhY6oN+M++LhGCW+61Z7Iw9caD067fyKF4acBI0gTET T00utYzVSqsR4DzKhZe05PGYWKef6TeaV3dkZvyaNHZgsD3RcuVnJ54pxcfWVmiSro+v/o2Ncsc Cvg3/cHbXDI+ejraouK5MVlnVqlwe05nlkig9zvDIuG6oZDvqHP9geP7WZpGJqynayceRtOdPRj UYvBYvrhjlq0CCYt4+l/pnzMEcpLPv7VXf8bb8sEwTHwYog X-Google-Smtp-Source: AGHT+IGaFVqNcAbsh2wXwykvgIG8wIvYr5xOyoWGcWi8bclbVOgLkhFW5BR0LdTPsNVGk8Tlgv5MLQ== X-Received: by 2002:a05:600c:b86:b0:434:f2f4:4c07 with SMTP id 5b1f17b1804b1-4361c373f5fmr66829415e9.15.1734020345541; Thu, 12 Dec 2024 08:19:05 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4361e322328sm44336105e9.0.2024.12.12.08.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2024 08:19:04 -0800 (PST) From: Dave Stevenson Date: Thu, 12 Dec 2024 16:18:52 +0000 Subject: [PATCH v2 2/7] dt-bindings: display: Fix BCM2835 HVS bindings for BCM2712 Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241212-dt-bcm2712-fixes-v2-2-35986e04d0f4@raspberrypi.com> References: <20241212-dt-bcm2712-fixes-v2-0-35986e04d0f4@raspberrypi.com> In-Reply-To: <20241212-dt-bcm2712-fixes-v2-0-35986e04d0f4@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 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: - |