mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
e9c1c83679
Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From b4627f9f36d8af7cb7bf24d8c1daee8b48f12299 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 11 Jan 2021 15:23:02 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Introduce a CEC clock
|
|
|
|
While the BCM2835 had the CEC clock derived from the HSM clock, the
|
|
BCM2711 has a dedicated parent clock for it.
|
|
|
|
Let's introduce a separate clock for it so that we can handle both
|
|
cases.
|
|
|
|
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 9 ++++++++-
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 1 +
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -151,7 +151,7 @@ static void vc4_hdmi_cec_update_clk_div(
|
|
* Set the clock divider: the hsm_clock rate and this divider
|
|
* setting will give a 40 kHz CEC clock.
|
|
*/
|
|
- clk_cnt = clk_get_rate(vc4_hdmi->hsm_clock) / CEC_CLOCK_FREQ;
|
|
+ clk_cnt = clk_get_rate(vc4_hdmi->cec_clock) / CEC_CLOCK_FREQ;
|
|
value |= clk_cnt << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT;
|
|
HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
|
|
}
|
|
@@ -1867,6 +1867,7 @@ static int vc4_hdmi_init_resources(struc
|
|
return PTR_ERR(vc4_hdmi->hsm_clock);
|
|
}
|
|
vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock;
|
|
+ vc4_hdmi->cec_clock = vc4_hdmi->hsm_clock;
|
|
|
|
return 0;
|
|
}
|
|
@@ -1961,6 +1962,12 @@ static int vc5_hdmi_init_resources(struc
|
|
return PTR_ERR(vc4_hdmi->audio_clock);
|
|
}
|
|
|
|
+ vc4_hdmi->cec_clock = devm_clk_get(dev, "cec");
|
|
+ if (IS_ERR(vc4_hdmi->cec_clock)) {
|
|
+ DRM_ERROR("Failed to get CEC clock\n");
|
|
+ return PTR_ERR(vc4_hdmi->cec_clock);
|
|
+ }
|
|
+
|
|
vc4_hdmi->reset = devm_reset_control_get(dev, NULL);
|
|
if (IS_ERR(vc4_hdmi->reset)) {
|
|
DRM_ERROR("Failed to get HDMI reset line\n");
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -154,6 +154,7 @@ struct vc4_hdmi {
|
|
bool cec_tx_ok;
|
|
bool cec_irq_was_rx;
|
|
|
|
+ struct clk *cec_clock;
|
|
struct clk *pixel_clock;
|
|
struct clk *hsm_clock;
|
|
struct clk *audio_clock;
|