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-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.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-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch b/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch index 82fae40246..c3a4a76bad 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch @@ -18,7 +18,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 -@@ -1189,38 +1189,23 @@ static const struct cec_adap_ops vc4_hdm +@@ -1190,38 +1190,23 @@ static const struct cec_adap_ops vc4_hdm }; #endif @@ -64,7 +64,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> vc4_hdmi->hd_regset.base = vc4_hdmi->hd_regs; vc4_hdmi->hd_regset.regs = hd_regs; vc4_hdmi->hd_regset.nregs = ARRAY_SIZE(hd_regs); -@@ -1230,12 +1215,44 @@ static int vc4_hdmi_bind(struct device * +@@ -1231,12 +1216,44 @@ static int vc4_hdmi_bind(struct device * DRM_ERROR("Failed to get pixel clock\n"); return PTR_ERR(vc4_hdmi->pixel_clock); } @@ -109,7 +109,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> ddc_node = of_parse_phandle(dev->of_node, "ddc", 0); if (!ddc_node) { DRM_ERROR("Failed to find ddc node in device tree\n"); -@@ -1396,8 +1413,12 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1397,8 +1414,12 @@ static int vc4_hdmi_dev_remove(struct pl return 0; } |