fbd027c5da
Removed upstreamed: pending-5.10/841-USB-serial-option-add-ZTE-MF286D-modem.patch[1] bcm27xx/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch[2] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=7113440a36c741efd7c76e3d70b3634100120cdb 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=21c890ca8eaecea06cabb92be2a53a6f26f56383 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 8fb908fe3f80d6bbc0a7f5e7fe14ababe7f87f83 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 11 Jan 2021 15:23:06 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Don't register the CEC adapter if
|
|
there's no interrupts
|
|
|
|
We introduced the BCM2711 support to the vc4 HDMI controller with 5.10,
|
|
but this was lacking any of the interrupts of the CEC controller so we
|
|
have to deal with the backward compatibility.
|
|
|
|
Do so by simply ignoring the CEC setup if the DT doesn't have the
|
|
interrupts property.
|
|
|
|
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1787,9 +1787,15 @@ static int vc4_hdmi_cec_init(struct vc4_
|
|
{
|
|
struct cec_connector_info conn_info;
|
|
struct platform_device *pdev = vc4_hdmi->pdev;
|
|
+ struct device *dev = &pdev->dev;
|
|
u32 value;
|
|
int ret;
|
|
|
|
+ if (!of_find_property(dev->of_node, "interrupts", NULL)) {
|
|
+ dev_warn(dev, "'interrupts' DT property is missing, no CEC\n");
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
|
|
vc4_hdmi, "vc4",
|
|
CEC_CAP_DEFAULTS |
|