diff options
| author | John Audia <graysky@archlinux.us> | 2020-10-01 09:22:00 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-10-02 22:02:26 +0200 |
| commit | d6a9a92e32177e8236812045d09deacc4e36be26 (patch) | |
| tree | b42a2c4eea5d7d8e126a4cfeb45e572578ea6522 /target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch | |
| parent | 2d72671b6e7469dbc5b2e79cb1be77c4e13a9c92 (diff) | |
| download | upstream-d6a9a92e32177e8236812045d09deacc4e36be26.tar.gz upstream-d6a9a92e32177e8236812045d09deacc4e36be26.tar.bz2 upstream-d6a9a92e32177e8236812045d09deacc4e36be26.zip | |
kernel: bump 5.4 to 5.4.69
Seemingly unneeded based on new upstream code so manually deleted:
layerscape:
820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch
Manually merged:
generic-hack:
251-sound_kconfig.patch
All other modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[add lantiq test report, minor commit message clarification]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 ff9fa1a158..24e4229c0e 100644 --- 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); |