diff --git a/include/kernel-5.19 b/include/kernel-5.19 index 832937156..33742ba7c 100644 --- a/include/kernel-5.19 +++ b/include/kernel-5.19 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.19 = .11 -LINUX_KERNEL_HASH-5.19.11 = 5554d2f90b806bb3454fcf3432882cf85077d660a89db5a4e8d7375271e3d973 +LINUX_VERSION-5.19 = .12 +LINUX_KERNEL_HASH-5.19.12 = c436a548c7312ce6fc5a3472cbead895eef8f52841fbe7c71fd8e48bdfe2b0ba diff --git a/target/linux/generic/backport-5.19/002-struct-net_device.patch b/target/linux/generic/backport-5.19/002-struct-net_device.patch index 8f4262c4b..869d14d91 100644 --- a/target/linux/generic/backport-5.19/002-struct-net_device.patch +++ b/target/linux/generic/backport-5.19/002-struct-net_device.patch @@ -62,7 +62,7 @@ wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size); --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c -@@ -307,11 +307,9 @@ static bool batadv_is_cfg80211_netdev(st +@@ -308,11 +308,9 @@ static bool batadv_is_cfg80211_netdev(st if (!net_device) return false; diff --git a/target/linux/generic/hack-5.19/221-module_exports.patch b/target/linux/generic/hack-5.19/221-module_exports.patch index d12dc8c3d..13c5b58d8 100644 --- a/target/linux/generic/hack-5.19/221-module_exports.patch +++ b/target/linux/generic/hack-5.19/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -1024,6 +1034,8 @@ +@@ -1023,6 +1033,8 @@ #define COMMON_DISCARDS \ SANITIZER_DISCARDS \ diff --git a/target/linux/generic/hack-5.19/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.19/780-usb-net-MeigLink_modem_support.patch index a30034f9f..e0be8619e 100644 --- a/target/linux/generic/hack-5.19/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-5.19/780-usb-net-MeigLink_modem_support.patch @@ -19,8 +19,8 @@ #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1140,6 +1142,11 @@ static const struct usb_device_id option - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, +@@ -1143,6 +1145,11 @@ static const struct usb_device_id option + .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, + /* Meiglink products using Qualcomm vendor ID */ diff --git a/target/linux/rockchip/patches-5.19/0001-arm64-dts-rockchip-add-Quartz64-A-fan-pinctrl.patch b/target/linux/rockchip/patches-5.19/0001-arm64-dts-rockchip-add-Quartz64-A-fan-pinctrl.patch index e430e6972..745b32033 100644 --- a/target/linux/rockchip/patches-5.19/0001-arm64-dts-rockchip-add-Quartz64-A-fan-pinctrl.patch +++ b/target/linux/rockchip/patches-5.19/0001-arm64-dts-rockchip-add-Quartz64-A-fan-pinctrl.patch @@ -24,7 +24,7 @@ Signed-off-by: Heiko Stuebner #cooling-cells = <2>; }; -@@ -524,6 +526,12 @@ +@@ -523,6 +525,12 @@ }; }; diff --git a/target/linux/rockchip/patches-5.19/0002-arm64-dts-rockchip-enable-sdr-104-for-sdmmc-on-Quart.patch b/target/linux/rockchip/patches-5.19/0002-arm64-dts-rockchip-enable-sdr-104-for-sdmmc-on-Quart.patch index 87e3c6866..880f77649 100644 --- a/target/linux/rockchip/patches-5.19/0002-arm64-dts-rockchip-enable-sdr-104-for-sdmmc-on-Quart.patch +++ b/target/linux/rockchip/patches-5.19/0002-arm64-dts-rockchip-enable-sdr-104-for-sdmmc-on-Quart.patch @@ -22,7 +22,7 @@ Signed-off-by: Heiko Stuebner --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts -@@ -596,6 +596,7 @@ +@@ -595,6 +595,7 @@ disable-wp; pinctrl-names = "default"; pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; diff --git a/target/linux/rockchip/patches-5.19/0003-arm64-dts-rockchip-enable-sfc-controller-on-Quartz64.patch b/target/linux/rockchip/patches-5.19/0003-arm64-dts-rockchip-enable-sfc-controller-on-Quartz64.patch index 48ee02187..3cd979168 100644 --- a/target/linux/rockchip/patches-5.19/0003-arm64-dts-rockchip-enable-sfc-controller-on-Quartz64.patch +++ b/target/linux/rockchip/patches-5.19/0003-arm64-dts-rockchip-enable-sfc-controller-on-Quartz64.patch @@ -16,7 +16,7 @@ Signed-off-by: Heiko Stuebner --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts -@@ -617,6 +617,22 @@ +@@ -616,6 +616,22 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-5.19/0005-arm64-dts-rockchip-Enable-PCIe-controller-on-quartz6.patch b/target/linux/rockchip/patches-5.19/0005-arm64-dts-rockchip-Enable-PCIe-controller-on-quartz6.patch index 0980512db..4247daf55 100644 --- a/target/linux/rockchip/patches-5.19/0005-arm64-dts-rockchip-Enable-PCIe-controller-on-quartz6.patch +++ b/target/linux/rockchip/patches-5.19/0005-arm64-dts-rockchip-Enable-PCIe-controller-on-quartz6.patch @@ -35,7 +35,7 @@ Signed-off-by: Heiko Stuebner vcc5v0_usb: vcc5v0_usb { compatible = "regulator-fixed"; regulator-name = "vcc5v0_usb"; -@@ -203,6 +215,10 @@ +@@ -202,6 +214,10 @@ status = "okay"; }; @@ -46,7 +46,7 @@ Signed-off-by: Heiko Stuebner &cpu0 { cpu-supply = <&vdd_cpu>; }; -@@ -511,6 +527,14 @@ +@@ -510,6 +526,14 @@ }; }; @@ -61,7 +61,7 @@ Signed-off-by: Heiko Stuebner &pinctrl { bt { bt_enable_h: bt-enable-h { -@@ -542,6 +566,16 @@ +@@ -541,6 +565,16 @@ }; }; diff --git a/target/linux/rockchip/patches-5.19/0010-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-quartz.patch b/target/linux/rockchip/patches-5.19/0010-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-quartz.patch index 3b4489aa9..926096d6e 100644 --- a/target/linux/rockchip/patches-5.19/0010-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-quartz.patch +++ b/target/linux/rockchip/patches-5.19/0010-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-quartz.patch @@ -43,7 +43,7 @@ Signed-off-by: Heiko Stuebner leds { compatible = "gpio-leds"; -@@ -280,6 +292,24 @@ +@@ -279,6 +291,24 @@ status = "okay"; }; @@ -68,7 +68,7 @@ Signed-off-by: Heiko Stuebner &i2c0 { status = "okay"; -@@ -782,3 +812,20 @@ +@@ -781,3 +811,20 @@ phy-supply = <&vcc5v0_usb20_host>; status = "okay"; }; diff --git a/target/linux/rockchip/patches-5.19/0015-arm64-dts-rockchip-Enable-HDMI-audio-on-Quartz64-A.patch b/target/linux/rockchip/patches-5.19/0015-arm64-dts-rockchip-Enable-HDMI-audio-on-Quartz64-A.patch index 09369e3d8..316674eea 100644 --- a/target/linux/rockchip/patches-5.19/0015-arm64-dts-rockchip-Enable-HDMI-audio-on-Quartz64-A.patch +++ b/target/linux/rockchip/patches-5.19/0015-arm64-dts-rockchip-Enable-HDMI-audio-on-Quartz64-A.patch @@ -16,7 +16,7 @@ Signed-off-by: Heiko Stuebner --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts -@@ -310,6 +310,10 @@ +@@ -309,6 +309,10 @@ }; }; @@ -27,7 +27,7 @@ Signed-off-by: Heiko Stuebner &i2c0 { status = "okay"; -@@ -540,6 +544,10 @@ +@@ -539,6 +543,10 @@ status = "okay"; };