From patchwork Mon Dec 2 14:31:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 846756 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 D8C7420B80F for ; Mon, 2 Dec 2024 14:32:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149942; cv=none; b=aWLzybpAtXWxWUT17HSJgjusVvb3Ucri70rGWu5Qt28ZTccORWBbUN7IZ2SH7oc2/Wn4qKpvyzT0nJU4Es/ab1I5ZSSh9aOZwaQnhzFs16BmnohrubFA3hE2n3ZiUOU+1gSF0V0WLLL04FMjRGPdx8mh1RUNyPsCHL09gur3Csw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149942; c=relaxed/simple; bh=FQOZmUNicupuaj+h7+nIqZLEwfVhlNCxkDeqgMBEpIo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S9CDXaTAQj+QRcUiKIlFXjwLD4Nv3ohGzTNQw751Slx0Hi5SLih54Y+FkggLeRp0/MZjkzdSBoeK4W7pMcyEnaO6LDPGUiil9BQ3F2RK9cYb8AgffCr1Jum6qDx4dnNMI9yZkYDo3r7VsxX7v8fpjWxVYRScI9/06IXolrajVnM= 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=d3x+UxdZ; arc=none smtp.client-ip=209.85.221.54 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="d3x+UxdZ" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-385e27c75f4so1545242f8f.2 for ; Mon, 02 Dec 2024 06:32:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1733149937; x=1733754737; 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=7AFVILEGG6inA8zYmU/doFUBGD/IkzUATf3B1mIzQMQ=; b=d3x+UxdZbLevh/ZBKcrsuOUyjOFQULhVF14UVtAk757k+6YDMiVWbX5ICak/lR8ihr BsaH3S41avVqHG6VEgaVzL54U4Db7YaslfJ50wOcQzV5Q/PVa3dAf11jhz52X4IaQ7pu WCXsgVcGkIuk+n1bYZ/C8cC34jpfv/qjsg+0vw1CroP8ZVZ2UA+blKW8tqrGrlPnrF6c vm54BkjHlBzRfY/Mu5vmTCZ5/EQIzhwGzmxNHKUCJuh4rKdUP3LFPA+5Pm9+f7xXHPir iDzw36qMwgYc+9cFRhYP2WJt7956NL1VOO8Gk7kQ7rP6xRB5XFPl2Ig77eRpJ7oNHqAI sSMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733149937; x=1733754737; 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=7AFVILEGG6inA8zYmU/doFUBGD/IkzUATf3B1mIzQMQ=; b=t31E921A2qzYpl7xkCyT49u3uK5KY72bpElz9awETAr5dnpj+nCFX/Lj5DuDjxpMKN lhTY2PwCmplyztn+98foLtKw6gVFUc1nUDjKoHHfAwYOYRUv6oMpYqNkZhC87SQrB2b8 h11C6l7VzzFLH9EeRdY0+wrzzyR7GQYaiyb0RML7MlrOFufMuvbk2zT/cWgL32vaDGCD gYt/lifguA6eJJsQYWo0ZeqirOu/zr4uxgpo6Rbql3Vf8s7HtcOyQ4YfTH7yj7NDv4YE wYqEj6FTtHjLtKdYr6eQHZP/TI9ls4QYMqzvq2CVx3mmcdJm+5trxBhJx558pcLI2Bbb /mVw== X-Forwarded-Encrypted: i=1; AJvYcCVil5QHhhZDSV+EXEcwL8pbpJgV4KrQaY38o3kyH0knN7C3+cr31Ts8p6bo8kiVSQvOBTI3Q/NAuEQU@vger.kernel.org X-Gm-Message-State: AOJu0Yy/UhnFy7OzM8mEcxFMNwqlvcx5YqjABJVzNBvqUrMLstwNkBm+ 10LB5toyMFsxBtSeKP8wuNtmHd31dsGuJ2pJytIgo3SeLu8RAN8pg0PVqyWIwow= X-Gm-Gg: ASbGncv+rRJ5HR0sNw/eaFEZ+8LDhXwWxU/uvopiOEpNLeCXxbRlzleVqvRfAq137pl QcQA30aVakskjV5yazptxAhZ4SsbGg+NqzKtGdlTHfWOKw3AkX3oSFjnHEkhMqSBW6fmAi15ST+ jpFvIIk8S8JCrGSH1YokwsCBXIp00oEML8feLnOCHCj1OZzjVorsRtKW8Bxxcl+WrlwUetNrqA7 7jKkSeQ4xGD4stE2QmefZd0kJQFEVZXEAhcLFq5PA== X-Google-Smtp-Source: AGHT+IEh8wUvPPp6fmiu8qi70G2dLIyR2cy0B8DQH6XpxZjumKSN1WVLLU9bXrhtMfH6hCylA9amQQ== X-Received: by 2002:a05:6000:4024:b0:385:e4a7:df07 with SMTP id ffacd0b85a97d-385e4a7e08dmr6305010f8f.42.1733149937090; Mon, 02 Dec 2024 06:32:17 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-434aa74f1e6sm188429555e9.9.2024.12.02.06.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 06:32:16 -0800 (PST) From: Dave Stevenson Date: Mon, 02 Dec 2024 14:31:55 +0000 Subject: [PATCH 2/7] dtbindings: 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: <20241202-dt-bcm2712-fixes-v1-2-fac67cc2f98a@raspberrypi.com> References: <20241202-dt-bcm2712-fixes-v1-0-fac67cc2f98a@raspberrypi.com> In-Reply-To: <20241202-dt-bcm2712-fixes-v1-0-fac67cc2f98a@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 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 The previous patch adding the compatible string missed out that the number of interrupts and clocks changed with BCM2712 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 | 77 +++++++++++++++++----- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml index f91c9dce2a44..ab59edbcf32c 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml @@ -19,12 +19,13 @@ properties: reg: maxItems: 1 - interrupts: - maxItems: 1 + interrupts: true - clocks: - maxItems: 1 - description: Core Clock + interrupt-names: true + + clocks: true + + clock-names: true required: - compatible @@ -33,17 +34,61 @@ 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 + + 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: - |