diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-08-22 14:02:36 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-08-23 10:37:04 +0200 |
| commit | ca5c695a4522091234026e22e8336f05d65602ba (patch) | |
| tree | 7ea3f3abfa9a15e8fee51408918a6a0671062409 /target/linux/ipq806x | |
| parent | d1163fd13f6498826d202f0b58cedf32d7891d52 (diff) | |
| download | upstream-ca5c695a4522091234026e22e8336f05d65602ba.tar.gz upstream-ca5c695a4522091234026e22e8336f05d65602ba.tar.bz2 upstream-ca5c695a4522091234026e22e8336f05d65602ba.zip | |
kernel: bump 5.15 to 5.15.62
Deleted following upstreamed patches:
bcm27xx: 950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch
bcm27xx: 950-0420-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch
bcm27xx: 950-0425-drm-vc4-A-present-but-empty-dmas-disables-audio.patch
bcm27xx: 950-0432-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch
bcm27xx: 950-0433-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch
bcm27xx: 950-0435-drm-vc4-Correct-pixel-order-for-DSI0.patch
bcm27xx: 950-0436-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch
bcm27xx: 950-0437-drm-vc4-Fix-dsi0-interrupt-support.patch
bcm27xx: 950-0438-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch
bcm27xx: 950-0443-drm-vc4-Fix-timings-for-interlaced-modes.patch
bcm27xx: 950-0445-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch
bcm27xx: 950-0475-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch
bcm27xx: 950-0476-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch
bcm27xx: 950-0477-drm-vc4-Correct-DSI-divider-calculations.patch
bcm27xx: 950-0664-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch
bcm53xx: 072-next-ARM_dts_BCM53015-add-mr26.patch
mediatek: 920-linux-next-dts-mt7622-bpi-r64-fix-wps-button.patch
Manually rebased following patches:
bcm27xx: 950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch
bcm27xx: 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch
bcm27xx: 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
bcm27xx: 950-0713-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch
bcm27xx: 950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch
bcm27xx: 950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch
bcm27xx: 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
Runtime tested on turris-omnia and glinet-b1300.
Tested-by: John Audia <therealgraysky@proton.me> [bcm2711/RPi4B, mt7622/RT3200]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/ipq806x')
4 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index 39ec7b8028..4758c25bbf 100644 --- a/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -178,7 +178,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> } --- a/init/main.c +++ b/init/main.c -@@ -113,6 +113,10 @@ +@@ -114,6 +114,10 @@ #include <kunit/test.h> @@ -189,7 +189,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> static int kernel_init(void *); extern void init_IRQ(void); -@@ -992,6 +996,18 @@ asmlinkage __visible void __init __no_sa +@@ -993,6 +997,18 @@ asmlinkage __visible void __init __no_sa pr_notice("Kernel command line: %s\n", saved_command_line); /* parameters may set static keys */ jump_label_init(); diff --git a/target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch index 05f39f6465..698df248fb 100644 --- a/target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch +++ b/target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org> --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -956,8 +956,30 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -957,8 +957,30 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-ipq4019-ap.dk04.1-c3.dtb \ qcom-ipq4019-ap.dk07.1-c1.dtb \ qcom-ipq4019-ap.dk07.1-c2.dtb \ diff --git a/target/linux/ipq806x/patches-5.15/097-3-clk-qcom-krait-add-missing-enable-disable.patch b/target/linux/ipq806x/patches-5.15/097-3-clk-qcom-krait-add-missing-enable-disable.patch index bf1c1a4a2f..78068f359c 100644 --- a/target/linux/ipq806x/patches-5.15/097-3-clk-qcom-krait-add-missing-enable-disable.patch +++ b/target/linux/ipq806x/patches-5.15/097-3-clk-qcom-krait-add-missing-enable-disable.patch @@ -13,7 +13,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- a/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c -@@ -68,7 +68,25 @@ static u8 krait_mux_get_parent(struct cl +@@ -73,7 +73,25 @@ static u8 krait_mux_get_parent(struct cl return clk_mux_val_to_index(hw, mux->parent_map, 0, sel); } @@ -39,7 +39,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> .set_parent = krait_mux_set_parent, .get_parent = krait_mux_get_parent, .determine_rate = __clk_mux_determine_rate_closest, -@@ -79,8 +97,13 @@ EXPORT_SYMBOL_GPL(krait_mux_clk_ops); +@@ -84,8 +102,13 @@ EXPORT_SYMBOL_GPL(krait_mux_clk_ops); static long krait_div2_round_rate(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate) { diff --git a/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch index ec9027ae47..d433cb49b8 100644 --- a/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch +++ b/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch @@ -12,7 +12,7 @@ Subject: SoC: add qualcomm syscon obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig -@@ -190,6 +190,13 @@ config QCOM_SOCINFO +@@ -191,6 +191,13 @@ config QCOM_SOCINFO Say yes here to support the Qualcomm socinfo driver, providing information about the SoC to user space. |