kernel: bump 5.4 to 5.4.69

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch b/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch
index 71125e3e25d730bf0bc3bbbcccd06e4c6480dbc7..ebe64329135d34c8e4ab2d829694bc20570c5e37 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch
@@ -180,7 +180,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        return 0;
  }
-@@ -1230,7 +1229,7 @@ static int vc4_hdmi_bind(struct device *
+@@ -1231,7 +1230,7 @@ static int vc4_hdmi_bind(struct device *
        struct drm_device *drm = dev_get_drvdata(master);
        struct vc4_dev *vc4 = drm->dev_private;
        struct vc4_hdmi *hdmi;
@@ -189,7 +189,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        struct device_node *ddc_node;
        u32 value;
        int ret;
-@@ -1239,14 +1238,10 @@ static int vc4_hdmi_bind(struct device *
+@@ -1240,14 +1239,10 @@ static int vc4_hdmi_bind(struct device *
        if (!hdmi)
                return -ENOMEM;
  
@@ -207,7 +207,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        hdmi->hdmicore_regs = vc4_ioremap_regs(pdev, 0);
        if (IS_ERR(hdmi->hdmicore_regs))
                return PTR_ERR(hdmi->hdmicore_regs);
-@@ -1332,15 +1327,14 @@ static int vc4_hdmi_bind(struct device *
+@@ -1333,15 +1328,14 @@ static int vc4_hdmi_bind(struct device *
        }
        pm_runtime_enable(dev);
  
@@ -228,7 +228,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  #ifdef CONFIG_DRM_VC4_HDMI_CEC
        hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
                                              vc4, "vc4",
-@@ -1350,7 +1344,7 @@ static int vc4_hdmi_bind(struct device *
+@@ -1351,7 +1345,7 @@ static int vc4_hdmi_bind(struct device *
        if (ret < 0)
                goto err_destroy_conn;
  
@@ -237,7 +237,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        cec_s_conn_info(hdmi->cec_adap, &conn_info);
  
        HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff);
-@@ -1387,10 +1381,10 @@ static int vc4_hdmi_bind(struct device *
+@@ -1388,10 +1382,10 @@ static int vc4_hdmi_bind(struct device *
  err_delete_cec_adap:
        cec_delete_adapter(hdmi->cec_adap);
  err_destroy_conn:
@@ -250,7 +250,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  err_unprepare_hsm:
        clk_disable_unprepare(hdmi->hsm_clock);
        pm_runtime_disable(dev);
-@@ -1408,8 +1402,8 @@ static void vc4_hdmi_unbind(struct devic
+@@ -1409,8 +1403,8 @@ static void vc4_hdmi_unbind(struct devic
        struct vc4_hdmi *hdmi = vc4->hdmi;
  
        cec_unregister_adapter(hdmi->cec_adap);