aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-02-06 11:51:17 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-02-11 23:17:40 +0100
commite9c1c83679891a02e3b95b954847a95621cbbc79 (patch)
treebdb58f19b89da010f5ec9f8949f740025bf74cd0 /target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
parent337e942290fa6a18e0289ae32420c5c402aead1a (diff)
downloadupstream-e9c1c83679891a02e3b95b954847a95621cbbc79.tar.gz
upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.tar.bz2
upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.zip
kernel: bump 5.10 to 5.10.98
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>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch b/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
index a5b127ded7..36f46a71ba 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
@@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
value |= clk_cnt << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT;
HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
}
-@@ -1875,6 +1875,7 @@ static int vc4_hdmi_init_resources(struc
+@@ -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;
@@ -35,7 +35,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return 0;
}
-@@ -1969,6 +1970,12 @@ static int vc5_hdmi_init_resources(struc
+@@ -1961,6 +1962,12 @@ static int vc5_hdmi_init_resources(struc
return PTR_ERR(vc4_hdmi->audio_clock);
}