kernel: bump 5.4 to 5.4.69

[openwrt/staging/hauke.git] / target / linux / bcm27xx / patches-5.4 / 950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch b/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch
index 533eb89e7a2c9940ef433bf06f2f9e5fd802308a..a3efadd2ad7bdf0771d7425271b91f7e2aca2629 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch
@@ -14,7 +14,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1178,6 +1178,67 @@ static const struct cec_adap_ops vc4_hdm
+@@ -1179,6 +1179,67 @@ static const struct cec_adap_ops vc4_hdm
        .adap_log_addr = vc4_hdmi_cec_adap_log_addr,
        .adap_transmit = vc4_hdmi_cec_adap_transmit,
  };
@@ -82,7 +82,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  #endif
  
  static int vc4_hdmi_build_regset(struct vc4_hdmi *vc4_hdmi,
-@@ -1255,9 +1316,6 @@ static int vc4_hdmi_init_resources(struc
+@@ -1256,9 +1317,6 @@ static int vc4_hdmi_init_resources(struc
  
  static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
  {
@@ -92,7 +92,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        struct platform_device *pdev = to_platform_device(dev);
        struct drm_device *drm = dev_get_drvdata(master);
        const struct vc4_hdmi_variant *variant;
-@@ -1345,43 +1403,13 @@ static int vc4_hdmi_bind(struct device *
+@@ -1346,43 +1404,13 @@ static int vc4_hdmi_bind(struct device *
        if (ret)
                goto err_destroy_encoder;
  
@@ -139,7 +139,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        vc4_debugfs_add_file(drm,
                             variant->id ? "hdmi1_regs" : "hdmi_regs",
-@@ -1390,12 +1418,10 @@ static int vc4_hdmi_bind(struct device *
+@@ -1391,12 +1419,10 @@ static int vc4_hdmi_bind(struct device *
  
        return 0;
  
@@ -154,7 +154,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  err_destroy_encoder:
        vc4_hdmi_encoder_destroy(encoder);
  err_unprepare_hsm:
-@@ -1420,7 +1446,7 @@ static void vc4_hdmi_unbind(struct devic
+@@ -1421,7 +1447,7 @@ static void vc4_hdmi_unbind(struct devic
        kfree(vc4_hdmi->hdmi_regset.regs);
        kfree(vc4_hdmi->hd_regset.regs);