From d1ebc2ca7d21782a963710b4ba60c2d014dbdf00 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Tue, 1 Oct 2024 12:25:04 +0800 Subject: [PATCH] kernel: bump 6.6 to 6.6.53 (#12509) --- include/kernel-6.6 | 4 ++-- ...f_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch | 2 +- ...boot-env-align-endianness-of-crc32-values.patch | 2 +- .../generic/pending-6.6/834-ledtrig-libata.patch | 2 +- ...altek-r8169-add-LED-configuration-from-OF.patch | 6 +++--- ...tek-RTL8211-add-LED-configuration-from-OF.patch | 4 ++-- ...hip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch | 2 +- ...chip-gic-v3-add-hackaround-for-rk3568-its.patch | 4 ++-- ...rk3328-add-i2c0-controller-for-nanopi-r2s.patch | 2 +- .../301-pinctrl-rockchip-add-rk3528-support.patch | 14 +++++++------- ...kchip-add-clock-controller-for-the-RK3528.patch | 2 +- ...port-setting-ddr-clock-via-SIP-Version-2-.patch | 2 +- ...dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch | 10 +++++----- ...-dts-orangepi-r1-plus-add-dmc-relate-node.patch | 4 ++-- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 094066fe7..d096bfabd 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .52 -LINUX_KERNEL_HASH-6.6.52 = 1591ab348399d4aa53121158525056a69c8cf0fe0e90935b0095e9a58e37b4b8 +LINUX_VERSION-6.6 = .53 +LINUX_KERNEL_HASH-6.6.53 = 285d181d1b252b0bf905f040d094215cf183ac98c31a17f9cce9f3537ef4d779 diff --git a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index 827ceff18..be7405c1a 100644 --- a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -8322,7 +8322,7 @@ static int nft_register_flowtable_net_ho +@@ -8327,7 +8327,7 @@ static int nft_register_flowtable_net_ho err = flowtable->data.type->setup(&flowtable->data, hook->ops.dev, FLOW_BLOCK_BIND); diff --git a/target/linux/generic/pending-6.6/802-nvmem-u-boot-env-align-endianness-of-crc32-values.patch b/target/linux/generic/pending-6.6/802-nvmem-u-boot-env-align-endianness-of-crc32-values.patch index d07447bcb..46acd47f6 100644 --- a/target/linux/generic/pending-6.6/802-nvmem-u-boot-env-align-endianness-of-crc32-values.patch +++ b/target/linux/generic/pending-6.6/802-nvmem-u-boot-env-align-endianness-of-crc32-values.patch @@ -36,7 +36,7 @@ Signed-off-by: Srinivas Kandagatla --- a/drivers/nvmem/u-boot-env.c +++ b/drivers/nvmem/u-boot-env.c -@@ -181,7 +181,7 @@ static int u_boot_env_parse(struct u_boo +@@ -188,7 +188,7 @@ static int u_boot_env_parse(struct u_boo crc32_data_len = dev_size - crc32_data_offset; data_len = dev_size - data_offset; diff --git a/target/linux/generic/pending-6.6/834-ledtrig-libata.patch b/target/linux/generic/pending-6.6/834-ledtrig-libata.patch index c2d281bfc..672d0d54c 100644 --- a/target/linux/generic/pending-6.6/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-6.6/834-ledtrig-libata.patch @@ -96,7 +96,7 @@ Signed-off-by: Daniel Golle kfree(ap); } EXPORT_SYMBOL_GPL(ata_port_free); -@@ -5927,7 +5950,23 @@ int ata_host_register(struct ata_host *h +@@ -5929,7 +5952,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } diff --git a/target/linux/rockchip/patches-6.6/101-net-realtek-r8169-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-6.6/101-net-realtek-r8169-add-LED-configuration-from-OF.patch index 902d71178..a85744701 100644 --- a/target/linux/rockchip/patches-6.6/101-net-realtek-r8169-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-6.6/101-net-realtek-r8169-add-LED-configuration-from-OF.patch @@ -17,7 +17,7 @@ Subject: [PATCH] r8169: add LED configuration from OF #include #include #include -@@ -177,6 +178,7 @@ enum rtl_registers { +@@ -173,6 +174,7 @@ enum rtl_registers { MAR0 = 8, /* Multicast filter. */ CounterAddrLow = 0x10, CounterAddrHigh = 0x14, @@ -25,7 +25,7 @@ Subject: [PATCH] r8169: add LED configuration from OF TxDescStartAddrLow = 0x20, TxDescStartAddrHigh = 0x24, TxHDescStartAddrLow = 0x28, -@@ -5403,6 +5405,22 @@ static bool rtl_aspm_is_safe(struct rtl8 +@@ -5325,6 +5327,22 @@ static bool rtl_aspm_is_safe(struct rtl8 return false; } @@ -48,7 +48,7 @@ Subject: [PATCH] r8169: add LED configuration from OF static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { struct rtl8169_private *tp; -@@ -5575,6 +5593,7 @@ static int rtl_init_one(struct pci_dev * +@@ -5493,6 +5511,7 @@ static int rtl_init_one(struct pci_dev * if (!tp->counters) return -ENOMEM; diff --git a/target/linux/rockchip/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch index d43dc28e9..4f9c6e4cf 100644 --- a/target/linux/rockchip/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-6.6/102-net-phy-realtek-RTL8211-add-LED-configuration-from-OF.patch @@ -18,7 +18,7 @@ Subject: [PATCH] net: phy: realtek: add LED configuration from OF for 8211f #define RTL8211F_PHYCR1 0x18 #define RTL8211F_PHYCR2 0x19 #define RTL8211F_INSR 0x1d -@@ -361,6 +363,7 @@ static int rtl8211f_config_init(struct p +@@ -380,6 +382,7 @@ static int rtl8211f_config_init(struct p struct rtl821x_priv *priv = phydev->priv; struct device *dev = &phydev->mdio.dev; u16 val_txdly, val_rxdly; @@ -26,7 +26,7 @@ Subject: [PATCH] net: phy: realtek: add LED configuration from OF for 8211f int ret; ret = phy_modify_paged_changed(phydev, 0xa43, RTL8211F_PHYCR1, -@@ -427,6 +430,15 @@ static int rtl8211f_config_init(struct p +@@ -446,6 +449,15 @@ static int rtl8211f_config_init(struct p val_rxdly ? "enabled" : "disabled"); } diff --git a/target/linux/rockchip/patches-6.6/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch b/target/linux/rockchip/patches-6.6/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch index 694ddefc4..eeef0df01 100644 --- a/target/linux/rockchip/patches-6.6/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch +++ b/target/linux/rockchip/patches-6.6/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch @@ -14,7 +14,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -397,6 +397,7 @@ +@@ -406,6 +406,7 @@ rtl8153: device@2 { compatible = "usbbda,8153"; reg = <2>; diff --git a/target/linux/rockchip/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch b/target/linux/rockchip/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch index a3734b7cc..ff73f99fc 100644 --- a/target/linux/rockchip/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch +++ b/target/linux/rockchip/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch @@ -1,6 +1,6 @@ --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -4732,11 +4732,13 @@ static bool __maybe_unused its_enable_qu +@@ -4730,11 +4730,13 @@ static bool __maybe_unused its_enable_qu return true; } @@ -16,7 +16,7 @@ !of_machine_is_compatible("rockchip,rk3588s")) return false; -@@ -4802,10 +4804,10 @@ static const struct gic_quirk its_quirks +@@ -4800,10 +4802,10 @@ static const struct gic_quirk its_quirks #endif #ifdef CONFIG_ROCKCHIP_ERRATUM_3588001 { diff --git a/target/linux/rockchip/patches-6.6/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch b/target/linux/rockchip/patches-6.6/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch index 856906550..5ea8341da 100644 --- a/target/linux/rockchip/patches-6.6/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch +++ b/target/linux/rockchip/patches-6.6/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch @@ -9,7 +9,7 @@ Subject: [PATCH] rockchip: rk3328: add i2c0 controller for nanopi r2s --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -166,6 +166,10 @@ +@@ -175,6 +175,10 @@ }; }; diff --git a/target/linux/rockchip/patches-6.6/301-pinctrl-rockchip-add-rk3528-support.patch b/target/linux/rockchip/patches-6.6/301-pinctrl-rockchip-add-rk3528-support.patch index a5411fe4b..27bfa756d 100644 --- a/target/linux/rockchip/patches-6.6/301-pinctrl-rockchip-add-rk3528-support.patch +++ b/target/linux/rockchip/patches-6.6/301-pinctrl-rockchip-add-rk3528-support.patch @@ -12,7 +12,7 @@ Change-Id: I2c1d32907168caf8a8afee6d1f742795b3d13536 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c -@@ -2018,6 +2018,150 @@ static int rk3568_calc_pull_reg_and_bit( +@@ -2005,6 +2005,150 @@ static int rk3568_calc_pull_reg_and_bit( return 0; } @@ -163,7 +163,7 @@ Change-Id: I2c1d32907168caf8a8afee6d1f742795b3d13536 #define RK3568_DRV_PMU_OFFSET 0x70 #define RK3568_DRV_GRF_OFFSET 0x200 #define RK3568_DRV_BITS_PER_PIN 8 -@@ -2341,6 +2485,10 @@ static int rockchip_set_drive_perpin(str +@@ -2328,6 +2472,10 @@ static int rockchip_set_drive_perpin(str rmask_bits = RK3588_DRV_BITS_PER_PIN; ret = strength; goto config; @@ -174,7 +174,7 @@ Change-Id: I2c1d32907168caf8a8afee6d1f742795b3d13536 } else if (ctrl->type == RK3568) { rmask_bits = RK3568_DRV_BITS_PER_PIN; ret = (1 << (strength + 1)) - 1; -@@ -2481,6 +2629,7 @@ static int rockchip_get_pull(struct rock +@@ -2468,6 +2616,7 @@ static int rockchip_get_pull(struct rock case RK3328: case RK3368: case RK3399: @@ -182,7 +182,7 @@ Change-Id: I2c1d32907168caf8a8afee6d1f742795b3d13536 case RK3568: case RK3588: pull_type = bank->pull_type[pin_num / 8]; -@@ -2540,6 +2689,7 @@ static int rockchip_set_pull(struct rock +@@ -2527,6 +2676,7 @@ static int rockchip_set_pull(struct rock case RK3328: case RK3368: case RK3399: @@ -190,7 +190,7 @@ Change-Id: I2c1d32907168caf8a8afee6d1f742795b3d13536 case RK3568: case RK3588: pull_type = bank->pull_type[pin_num / 8]; -@@ -2805,6 +2955,7 @@ static bool rockchip_pinconf_pull_valid( +@@ -2792,6 +2942,7 @@ static bool rockchip_pinconf_pull_valid( case RK3328: case RK3368: case RK3399: @@ -198,7 +198,7 @@ Change-Id: I2c1d32907168caf8a8afee6d1f742795b3d13536 case RK3568: case RK3588: return (pull != PIN_CONFIG_BIAS_PULL_PIN_DEFAULT); -@@ -3930,6 +4081,49 @@ static struct rockchip_pin_ctrl rk3399_p +@@ -3917,6 +4068,49 @@ static struct rockchip_pin_ctrl rk3399_p .drv_calc_reg = rk3399_calc_drv_reg_and_bit, }; @@ -248,7 +248,7 @@ Change-Id: I2c1d32907168caf8a8afee6d1f742795b3d13536 static struct rockchip_pin_bank rk3568_pin_banks[] = { PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_SOURCE_PMU | IOMUX_WIDTH_4BIT, IOMUX_SOURCE_PMU | IOMUX_WIDTH_4BIT, -@@ -4023,6 +4217,8 @@ static const struct of_device_id rockchi +@@ -4010,6 +4204,8 @@ static const struct of_device_id rockchi .data = &rk3368_pin_ctrl }, { .compatible = "rockchip,rk3399-pinctrl", .data = &rk3399_pin_ctrl }, diff --git a/target/linux/rockchip/patches-6.6/305-clk-rockchip-add-clock-controller-for-the-RK3528.patch b/target/linux/rockchip/patches-6.6/305-clk-rockchip-add-clock-controller-for-the-RK3528.patch index 23651d34b..bf031c543 100644 --- a/target/linux/rockchip/patches-6.6/305-clk-rockchip-add-clock-controller-for-the-RK3528.patch +++ b/target/linux/rockchip/patches-6.6/305-clk-rockchip-add-clock-controller-for-the-RK3528.patch @@ -88,7 +88,7 @@ Change-Id: I09745b6a31484d6a27f04e608268d9738c1fe224 obj-$(CONFIG_CLK_RK3588) += clk-rk3588.o rst-rk3588.o --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c -@@ -509,6 +509,14 @@ void rockchip_clk_register_branches(stru +@@ -526,6 +526,14 @@ void rockchip_clk_register_branches(stru ctx->reg_base + list->gate_offset, list->gate_shift, list->gate_flags, &ctx->lock); break; diff --git a/target/linux/rockchip/patches-6.6/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch b/target/linux/rockchip/patches-6.6/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch index 74b76af62..7f2d7175a 100644 --- a/target/linux/rockchip/patches-6.6/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch +++ b/target/linux/rockchip/patches-6.6/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch @@ -179,7 +179,7 @@ Signed-off-by: hmz007 GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED, --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h -@@ -486,7 +486,8 @@ struct clk *rockchip_clk_register_mmc(co +@@ -515,7 +515,8 @@ struct clk *rockchip_clk_register_mmc(co * DDRCLK flags, including method of setting the rate * ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate. */ diff --git a/target/linux/rockchip/patches-6.6/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch b/target/linux/rockchip/patches-6.6/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch index 29495ddc2..4f9fea302 100644 --- a/target/linux/rockchip/patches-6.6/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch +++ b/target/linux/rockchip/patches-6.6/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch @@ -16,7 +16,7 @@ Signed-off-by: hmz007 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -7,6 +7,7 @@ +@@ -8,6 +8,7 @@ #include #include #include @@ -24,7 +24,7 @@ Signed-off-by: hmz007 #include "rk3328.dtsi" / { -@@ -114,6 +115,72 @@ +@@ -123,6 +124,72 @@ regulator-boot-on; vin-supply = <&vdd_5v>; }; @@ -97,7 +97,7 @@ Signed-off-by: hmz007 }; &cpu0 { -@@ -132,6 +199,10 @@ +@@ -141,6 +208,10 @@ cpu-supply = <&vdd_arm>; }; @@ -108,7 +108,7 @@ Signed-off-by: hmz007 &display_subsystem { status = "disabled"; }; -@@ -199,6 +270,7 @@ +@@ -208,6 +279,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -116,7 +116,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -213,6 +285,7 @@ +@@ -222,6 +294,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; diff --git a/target/linux/rockchip/patches-6.6/808-arm64-dts-orangepi-r1-plus-add-dmc-relate-node.patch b/target/linux/rockchip/patches-6.6/808-arm64-dts-orangepi-r1-plus-add-dmc-relate-node.patch index 850e9dbdd..7f8f22dec 100644 --- a/target/linux/rockchip/patches-6.6/808-arm64-dts-orangepi-r1-plus-add-dmc-relate-node.patch +++ b/target/linux/rockchip/patches-6.6/808-arm64-dts-orangepi-r1-plus-add-dmc-relate-node.patch @@ -8,7 +8,7 @@ #include "rk3328.dtsi" / { -@@ -86,6 +87,71 @@ vdd_5v_lan: vdd-5v-lan-regulator { +@@ -89,6 +90,71 @@ regulator-boot-on; vin-supply = <&vcc_sys>; }; @@ -82,7 +82,7 @@ &cpu0 { --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -@@ -14,6 +14,13 @@ / { +@@ -14,6 +14,13 @@ compatible = "xunlong,orangepi-r1-plus-lts", "rockchip,rk3328"; };