From patchwork Wed Dec 18 14:48:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 851864 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.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 48CD31C5CBE for ; Wed, 18 Dec 2024 14:48:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734533330; cv=none; b=l7GhUYPaSDpvg+M+4B/ZaBgFFsFNSNtrVcdbC7ulY3X/wcvvxKPOJgcOH72KAxQzoXv7lh6v2r08ue6G3hDCXzLXWhr0Ut8r2Cj90X6sJO5oisCJ0KYuMyc7oxawYnoVCU0a2w7LCOLjzLsBygsZu6+0pd17hgGERBgKgrlSgEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734533330; c=relaxed/simple; bh=obHcyfNRXnhgSZAtJjJHu9uLZYv2OBdT8Zf1ANvMXhg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k4PYoIQnqXIWmse8ENg5WO6oA3EKz17IhXB2mTxfb268rBDGSvPFrRpuY0bTx4kiy8MSr2cDn5tYg6EFdXTiDP6VmB9uYuQMy/GYLnGctbT/WuWazc20Jsg0XVU5wAch+lj9qAZrRD3WMbJrzSgX3gLo1KWUOcbGiOTJK/qHiMo= 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=OliAWIQP; arc=none smtp.client-ip=209.85.128.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="OliAWIQP" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43626213fffso5470765e9.1 for ; Wed, 18 Dec 2024 06:48:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1734533326; x=1735138126; 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=0HhuvChnZxHEKbDR0wzjSlhppXuk6dBcqGjZkLEJAX4=; b=OliAWIQPkeVUjKIOl8HeS9G0/GgDn+Ovo/O8dnscdpsILH7C0nNFQfAMSpgBCbp5uP 8kWiybVby9IW8ya4ocWOW120kbjsyfKuqKKOtI2/3SUOxQ4aU2QurKUrOePjmxboEHAN YBdRR4pnc4WU+ryDNnBthtAIPRC6nBDMQMlooGd9H2asoZkEE9HNKzg3PtlaoTFhbZqh bLjQ+aIjQoqq147MDOlZEJA5Zc1aaxZHB48MLy7hBR/4SNSlx1+Lcshfln9JL+c9Hs37 RY/zAkbw8bLa5hLtOO9SRpLgElqgfZJzUnXNzRohfivGcrII9DBSnWBq8k388hjPb5fx vozA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734533326; x=1735138126; 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=0HhuvChnZxHEKbDR0wzjSlhppXuk6dBcqGjZkLEJAX4=; b=rNwyU7LkVzx1VrXcbfCwXZB6XajpdlJ3q5BMAVsS3JzekUhJtOmNx80BxABkW5qYTr KznO0y/v2KK1ndEvyLQwLnFXD6eM3hSDtdjUUSJM26bRWLpqeD0RNwDkfufVKpneWBdA 7X9p+HE2n7fNu8IYUwaVtcvJ/y5UP39NJQ4RS8OgrMmMyDCh3wsZtt9caZS/QsWveuJR Hx1jtZFrjqWXVDkZ1bpJ6CICtBmLSZBDn5ACmdvVqtCArYlQDThCEiLCOgR/lJYqaYuy 82P1K6418OZD0VOK5jUfp3UkjlzRo6iO+zWvj830PVFCa6Zehp3Kp9FWQWen8d0Ntdn0 K0JQ== X-Forwarded-Encrypted: i=1; AJvYcCV6GGcMi6sCvZfzSCVk9rnudX5cKhdvcjN37TLwTCks0XEPKlKcu6wd2pNIiZs0mmFXppbzDfQZyjrU@vger.kernel.org X-Gm-Message-State: AOJu0YyGNh68G7E9i0NNlFGtYAj5paZx9P2e/oCnNAuXfrGF/c2q1nxJ br/XsknKP7jzPACMhNjLZgq7ZqMmoK+y5FGjWOCOY+0QiTOOsdsEmS5Q7ySu/Lk= X-Gm-Gg: ASbGncuMfxgP6k0NhAb0kwyUGkO+tmBYQ3go6ZTg+xsFY0tpQPRCoLukG1O/zVIXiw3 bW/zwbLntHIq+Y0YNrGzo7PYuiB+0gNu0y9XeUsUOKrP2PUjn5P8tGI8Tml2ZtxgL/rQi/rdNJk UV66rlZBoioq168d7V0fN0VNSclo9cI4pFZdhvFFrsqXyOwFArRZq3M/X4vKVNeNp8xNKv8kjxn uZvWivCYQO90dY0VfYoaf8DT5W/4H9upNpecbawQ3m7ynlJ X-Google-Smtp-Source: AGHT+IHW10MOxS28loaYz58hcigl3Ail1h5qTPK70DcVM/fvNy/4Wh1EKi45+y5z3iUCnn9N7rshPw== X-Received: by 2002:a05:600c:35cb:b0:434:fa73:a906 with SMTP id 5b1f17b1804b1-436553052fbmr27423205e9.4.1734533326478; Wed, 18 Dec 2024 06:48:46 -0800 (PST) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-388c80613a9sm14165163f8f.101.2024.12.18.06.48.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 06:48:46 -0800 (PST) From: Dave Stevenson Date: Wed, 18 Dec 2024 14:48:32 +0000 Subject: [PATCH v4 1/3] dt-bindings: display: bcm2711-hdmi: Add interrupt details for BCM2712 Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241218-dt-bcm2712-fixes-v4-1-54cc88b6c229@raspberrypi.com> References: <20241218-dt-bcm2712-fixes-v4-0-54cc88b6c229@raspberrypi.com> In-Reply-To: <20241218-dt-bcm2712-fixes-v4-0-54cc88b6c229@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 62948c62abca ("dt-bindings: display: Add BCM2712 HDMI bindings") added the compatible strings for BCM2712, but missed out that the number of interrupts changed. Update the schema to include the interrupt requirements. Fixes: 62948c62abca ("dt-bindings: display: Add BCM2712 HDMI bindings") Signed-off-by: Dave Stevenson --- .../bindings/display/brcm,bcm2711-hdmi.yaml | 81 ++++++++++++++++++---- 1 file changed, 67 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..83c058728ef1 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,66 @@ 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 + + + required: + - interrupts + - interrupt-names + + - 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 +186,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>; };