kernel: bump 5.4 to 5.4.69

[openwrt/staging/blogic.git] / target / linux / bcm27xx / patches-5.4 / 950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch b/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch
index ff9fa1a1580e9769ec7224043facc4a5b9770bf4..24e4229c0ead3b40d0ff9cbe0b92bf0e8f47c0ed 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch
@@ -23,7 +23,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        struct vc4_dpi *dpi;
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1199,7 +1199,6 @@ static int vc4_hdmi_bind(struct device *
+@@ -1200,7 +1200,6 @@ static int vc4_hdmi_bind(struct device *
  #endif
        struct platform_device *pdev = to_platform_device(dev);
        struct drm_device *drm = dev_get_drvdata(master);
@@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        struct vc4_hdmi *vc4_hdmi;
        struct drm_encoder *encoder;
        struct device_node *ddc_node;
-@@ -1287,8 +1286,6 @@ static int vc4_hdmi_bind(struct device *
+@@ -1288,8 +1287,6 @@ static int vc4_hdmi_bind(struct device *
                vc4_hdmi->hpd_active_low = hpd_gpio_flags & OF_GPIO_ACTIVE_LOW;
        }
  
@@ -40,7 +40,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        /* HDMI core must be enabled. */
        if (!(HD_READ(VC4_HD_M_CTL) & VC4_HD_M_ENABLE)) {
                HD_WRITE(VC4_HD_M_CTL, VC4_HD_M_SW_RST);
-@@ -1369,9 +1366,12 @@ err_put_i2c:
+@@ -1370,9 +1367,12 @@ err_put_i2c:
  static void vc4_hdmi_unbind(struct device *dev, struct device *master,
                            void *data)
  {
@@ -56,7 +56,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        cec_unregister_adapter(vc4_hdmi->cec_adap);
        vc4_hdmi_connector_destroy(&vc4_hdmi->connector.base);
-@@ -1381,8 +1381,6 @@ static void vc4_hdmi_unbind(struct devic
+@@ -1382,8 +1382,6 @@ static void vc4_hdmi_unbind(struct devic
        pm_runtime_disable(dev);
  
        put_device(&vc4_hdmi->ddc->dev);