rockchip64-6.15: rewrite/rebase patches against 6.15-rc1

rpardini · rpardini · commit 3af06a575241 · 2025-04-10T23:17:50.000+02:00
diff --git a/patch/kernel/archive/rockchip64-6.15/board-nanopi-r3s-fix-leds.patch b/patch/kernel/archive/rockchip64-6.15/board-nanopi-r3s-fix-leds.patch
@@ -123,7 +123,7 @@ index 111111111111..222222222222 100644
  #include <linux/tcp.h>
  #include <linux/interrupt.h>
  #include <linux/dma-mapping.h>
-@@ -2436,6 +2437,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
+@@ -2438,6 +2439,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
  	}
  }
  
@@ -139,7 +139,7 @@ index 111111111111..222222222222 100644
  static void rtl8168_config_eee_mac(struct rtl8169_private *tp)
  {
  	/* Adjust EEE LED frequency */
-@@ -3421,6 +3431,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
+@@ -3449,6 +3459,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
  	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
  
  	rtl8168_config_eee_mac(tp);
@@ -151,7 +151,7 @@ diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/re
 index 111111111111..222222222222 100644
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -125,6 +125,15 @@ static int rtl821x_write_page(struct phy_device *phydev, int page)
+@@ -135,6 +135,15 @@ static int rtl821x_write_page(struct phy_device *phydev, int page)
  	return __phy_write(phydev, RTL821x_PAGE_SELECT, page);
  }
  
@@ -167,9 +167,9 @@ index 111111111111..222222222222 100644
  static int rtl821x_probe(struct phy_device *phydev)
  {
  	struct device *dev = &phydev->mdio.dev;
-@@ -444,6 +453,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
- 			val_rxdly ? "enabled" : "disabled");
- 	}
+@@ -460,6 +469,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
+ 	if (ret)
+ 		return ret;
  
 +	rtl821x_led_of_init(phydev);
 +
diff --git a/patch/kernel/archive/rockchip64-6.15/board-odroidm2-fix-for-ethernet.patch b/patch/kernel/archive/rockchip64-6.15/board-odroidm2-fix-for-ethernet.patch
@@ -46,7 +46,7 @@ index 111111111111..222222222222 100644
  		reset-assert-us = <20000>;
  		reset-deassert-us = <100000>;
  		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
-@@ -475,6 +479,12 @@ pcf8563_int: pcf8563-int {
+@@ -479,6 +483,12 @@ pcf8563_int: pcf8563-int {
  		};
  	};
  
diff --git a/patch/kernel/archive/rockchip64-6.15/board-rock3a-0002-usb3.patch b/patch/kernel/archive/rockchip64-6.15/board-rock3a-0002-usb3.patch
@@ -31,7 +31,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/d
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
-@@ -819,6 +819,7 @@ &usb_host0_ohci {
+@@ -805,6 +805,7 @@ &usb_host0_ohci {
  
  &usb_host0_xhci {
  	extcon = <&usb2phy0>;
diff --git a/patch/kernel/archive/rockchip64-6.15/board-rockpi3-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.15/board-rockpi3-enable-dmc.patch
@@ -29,7 +29,7 @@ index 111111111111..222222222222 100644
  
  / {
  	model = "Radxa ROCK Pi E";
-@@ -440,3 +441,9 @@ &usbdrd3 {
+@@ -448,3 +449,9 @@ &usbdrd3 {
  &usb_host0_ehci {
  	status = "okay";
  };
diff --git a/patch/kernel/archive/rockchip64-6.15/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rockchip64-6.15/drv-spi-spidev-remove-warnings.patch
@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
  	{ .name = /* cisco */ "spi-petra" },
  	{ .name = /* dh */ "dhcom-board" },
  	{ .name = /* elgin */ "jg10309-01" },
-@@ -734,6 +735,7 @@ static int spidev_of_check(struct device *dev)
+@@ -735,6 +736,7 @@ static int spidev_of_check(struct device *dev)
  }
  
  static const struct of_device_id spidev_dt_ids[] = {
diff --git a/patch/kernel/archive/rockchip64-6.15/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-6.15/general-add-xtx-spi-nor-chips.patch
@@ -30,7 +30,7 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
 index 111111111111..222222222222 100644
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -1981,6 +1981,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
+@@ -1954,6 +1954,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
  	&spi_nor_sst,
  	&spi_nor_winbond,
  	&spi_nor_xmc,
diff --git a/patch/kernel/archive/rockchip64-6.15/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.15/general-disable-mtu-validation.patch
@@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
 index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5878,27 +5878,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
+@@ -5921,27 +5921,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
  static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
  {
  	struct stmmac_priv *priv = netdev_priv(dev);
diff --git a/patch/kernel/archive/rockchip64-6.15/general-rockchip-overlays.patch b/patch/kernel/archive/rockchip64-6.15/general-rockchip-overlays.patch
@@ -13,7 +13,7 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 111111111111..222222222222 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -75,6 +75,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
+@@ -70,6 +70,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
  userprogs += $(userprogs-always-y) $(userprogs-always-m)
  always-y += $(userprogs-always-y) $(userprogs-always-m)
  
diff --git a/patch/kernel/archive/rockchip64-6.15/general-v4l2-rkvdec-00-fixes.patch b/patch/kernel/archive/rockchip64-6.15/general-v4l2-rkvdec-00-fixes.patch
@@ -173,7 +173,7 @@ diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2
 index 111111111111..222222222222 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1367,6 +1367,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1369,6 +1369,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
  	case V4L2_PIX_FMT_NV42:		descr = "Y/VU 4:4:4"; break;
  	case V4L2_PIX_FMT_P010:		descr = "10-bit Y/UV 4:2:0"; break;
  	case V4L2_PIX_FMT_P012:		descr = "12-bit Y/UV 4:2:0"; break;
diff --git a/patch/kernel/archive/rockchip64-6.15/general-v4l2-rkvdec-01-vp9.patch b/patch/kernel/archive/rockchip64-6.15/general-v4l2-rkvdec-01-vp9.patch
@@ -51,7 +51,7 @@ diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/
 index 111111111111..222222222222 100644
 --- a/drivers/pmdomain/rockchip/pm-domains.c
 +++ b/drivers/pmdomain/rockchip/pm-domains.c
-@@ -392,6 +392,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
+@@ -399,6 +399,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
  	return 0;
  }
  
diff --git a/patch/kernel/archive/rockchip64-6.15/media-0001-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip64-6.15/media-0001-Add-rkvdec2-Support-v3.patch
@@ -3679,7 +3679,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -2883,6 +2883,16 @@ system_sram2: sram@ff001000 {
+@@ -2973,6 +2973,16 @@ system_sram2: sram@ff001000 {
  		ranges = <0x0 0x0 0xff001000 0xef000>;
  		#address-cells = <1>;
  		#size-cells = <1>;
@@ -3696,7 +3696,7 @@ index 111111111111..222222222222 100644
  	};
  
  	pinctrl: pinctrl {
-@@ -2952,6 +2962,46 @@ gpio4: gpio@fec50000 {
+@@ -3042,6 +3052,46 @@ gpio4: gpio@fec50000 {
  			#interrupt-cells = <2>;
  		};
  	};
diff --git a/patch/kernel/archive/rockchip64-6.15/media-0003-rk3568-disable-hantro-h264.patch b/patch/kernel/archive/rockchip64-6.15/media-0003-rk3568-disable-hantro-h264.patch
@@ -20,7 +20,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1126,7 +1126,7 @@ power-domain@RK3588_PD_SDMMC {
+@@ -1137,7 +1137,7 @@ power-domain@RK3588_PD_SDMMC {
  	};
  
  	vpu121: video-codec@fdb50000 {
diff --git a/patch/kernel/archive/rockchip64-6.15/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.15/net-usb-r8152-add-LED-configuration-from-OF.patch
@@ -24,7 +24,7 @@ index 111111111111..222222222222 100644
  #include <linux/crc32.h>
  #include <linux/if_vlan.h>
  #include <linux/uaccess.h>
-@@ -7046,6 +7047,22 @@ static void rtl_tally_reset(struct r8152 *tp)
+@@ -7047,6 +7048,22 @@ static void rtl_tally_reset(struct r8152 *tp)
  	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
  }
  
@@ -47,7 +47,7 @@ index 111111111111..222222222222 100644
  static void r8152b_init(struct r8152 *tp)
  {
  	u32 ocp_data;
-@@ -7087,6 +7104,8 @@ static void r8152b_init(struct r8152 *tp)
+@@ -7088,6 +7105,8 @@ static void r8152b_init(struct r8152 *tp)
  	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
  	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
  	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -56,7 +56,7 @@ index 111111111111..222222222222 100644
  }
  
  static void r8153_init(struct r8152 *tp)
-@@ -7227,6 +7246,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -7228,6 +7247,8 @@ static void r8153_init(struct r8152 *tp)
  		tp->coalesce = COALESCE_SLOW;
  		break;
  	}
@@ -65,7 +65,7 @@ index 111111111111..222222222222 100644
  }
  
  static void r8153b_init(struct r8152 *tp)
-@@ -7309,6 +7330,8 @@ static void r8153b_init(struct r8152 *tp)
+@@ -7310,6 +7331,8 @@ static void r8153b_init(struct r8152 *tp)
  	rtl_tally_reset(tp);
  
  	tp->coalesce = 15000;	/* 15 us */
diff --git a/patch/kernel/archive/rockchip64-6.15/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.15/regulator-add-fan53200-driver.patch
@@ -24,7 +24,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
 index 111111111111..222222222222 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
-@@ -784,6 +784,7 @@ CONFIG_REGULATOR_BD9571MWV=y
+@@ -786,6 +786,7 @@ CONFIG_REGULATOR_BD9571MWV=y
  CONFIG_REGULATOR_CROS_EC=y
  CONFIG_REGULATOR_DA9211=m
  CONFIG_REGULATOR_FAN53555=y
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3308-0001-pinctrl-slew-mux.patch b/patch/kernel/archive/rockchip64-6.15/rk3308-0001-pinctrl-slew-mux.patch
@@ -96,7 +96,7 @@ diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockch
 index 111111111111..222222222222 100644
 --- a/drivers/pinctrl/pinctrl-rockchip.c
 +++ b/drivers/pinctrl/pinctrl-rockchip.c
-@@ -2888,6 +2888,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
+@@ -3000,6 +3000,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
  	return ret;
  }
  
@@ -123,7 +123,7 @@ index 111111111111..222222222222 100644
  #define RK3328_SCHMITT_BITS_PER_PIN		1
  #define RK3328_SCHMITT_PINS_PER_REG		16
  #define RK3328_SCHMITT_BANK_STRIDE		8
-@@ -3003,6 +3023,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank,
+@@ -3115,6 +3135,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank,
  	return regmap_update_bits(regmap, reg, rmask, data);
  }
  
@@ -175,7 +175,7 @@ index 111111111111..222222222222 100644
  /*
   * Pinmux_ops handling
   */
-@@ -3240,6 +3305,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
+@@ -3353,6 +3418,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
  			if (rc < 0)
  				return rc;
  			break;
@@ -191,7 +191,7 @@ index 111111111111..222222222222 100644
  		default:
  			return -ENOTSUPP;
  			break;
-@@ -3314,6 +3388,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
+@@ -3427,6 +3501,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
  		if (rc < 0)
  			return rc;
  
@@ -218,7 +218,7 @@ index 111111111111..222222222222 100644
  		arg = rc;
  		break;
  	default:
-@@ -4116,6 +4210,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
+@@ -4229,6 +4323,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
  		.pull_calc_reg		= rk3308_calc_pull_reg_and_bit,
  		.drv_calc_reg		= rk3308_calc_drv_reg_and_bit,
  		.schmitt_calc_reg	= rk3308_calc_schmitt_reg_and_bit,
@@ -230,7 +230,7 @@ diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockch
 index 111111111111..222222222222 100644
 --- a/drivers/pinctrl/pinctrl-rockchip.h
 +++ b/drivers/pinctrl/pinctrl-rockchip.h
-@@ -409,6 +409,9 @@ struct rockchip_pin_ctrl {
+@@ -410,6 +410,9 @@ struct rockchip_pin_ctrl {
  	int	(*schmitt_calc_reg)(struct rockchip_pin_bank *bank,
  				    int pin_num, struct regmap **regmap,
  				    int *reg, u8 *bit);
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3308-0003-pinctrl-io-voltage-domains.patch b/patch/kernel/archive/rockchip64-6.15/rk3308-0003-pinctrl-io-voltage-domains.patch
@@ -95,7 +95,7 @@ index 111111111111..222222222222 100644
  /*
   * Generate a bitmask for setting a value (v) with a write mask bit in hiword
   * register 31:16 area.
-@@ -3873,6 +3879,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
+@@ -3986,6 +3992,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
  	if (ret)
  		return ret;
  
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3308-add-tsadc-driver.patch b/patch/kernel/archive/rockchip64-6.15/rk3308-add-tsadc-driver.patch
@@ -26,7 +26,7 @@ diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_therm
 index 111111111111..222222222222 100644
 --- a/drivers/thermal/rockchip_thermal.c
 +++ b/drivers/thermal/rockchip_thermal.c
-@@ -1060,6 +1060,28 @@ static void rk_tsadcv3_tshut_mode(int chn, void __iomem *regs,
+@@ -1061,6 +1061,28 @@ static void rk_tsadcv3_tshut_mode(int chn, void __iomem *regs,
  	writel_relaxed(val_cru, regs + TSADCV3_HSHUT_CRU_INT_EN);
  }
  
@@ -55,7 +55,7 @@ index 111111111111..222222222222 100644
  static const struct rockchip_tsadc_chip px30_tsadc_data = {
  	/* cpu, gpu */
  	.chn_offset = 0,
-@@ -1321,6 +1343,10 @@ static const struct of_device_id of_rockchip_thermal_match[] = {
+@@ -1322,6 +1344,10 @@ static const struct of_device_id of_rockchip_thermal_match[] = {
  		.compatible = "rockchip,rk3288-tsadc",
  		.data = (void *)&rk3288_tsadc_data,
  	},
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-6.15/rk3328-add-dmc-driver.patch
@@ -588,7 +588,7 @@ diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
 index 111111111111..222222222222 100644
 --- a/drivers/clk/rockchip/clk.h
 +++ b/drivers/clk/rockchip/clk.h
-@@ -539,7 +539,8 @@ struct clk *rockchip_clk_register_mmc(const char *name,
+@@ -600,7 +600,8 @@ struct clk *rockchip_clk_register_mmc(const char *name,
   * DDRCLK flags, including method of setting the rate
   * ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate.
   */
@@ -654,7 +654,7 @@ index 111111111111..222222222222 100644
  	struct regmap *regmap_pmu;
  	struct clk *clk;
  	int usecount;
-@@ -669,6 +672,46 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi)
+@@ -668,6 +671,46 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi)
  }
  #endif
  
@@ -701,7 +701,7 @@ index 111111111111..222222222222 100644
  static int rk3399_dfi_init(struct rockchip_dfi *dfi)
  {
  	struct regmap *regmap_pmu = dfi->regmap_pmu;
-@@ -757,6 +800,8 @@ static int rk3588_dfi_init(struct rockchip_dfi *dfi)
+@@ -756,6 +799,8 @@ static int rk3588_dfi_init(struct rockchip_dfi *dfi)
  };
  
  static const struct of_device_id rockchip_dfi_id_match[] = {
@@ -710,7 +710,7 @@ index 111111111111..222222222222 100644
  	{ .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init },
  	{ .compatible = "rockchip,rk3568-dfi", .data = rk3568_dfi_init },
  	{ .compatible = "rockchip,rk3588-dfi", .data = rk3588_dfi_init },
-@@ -786,14 +831,30 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
+@@ -785,14 +830,30 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
  	if (IS_ERR(dfi->regs))
  		return PTR_ERR(dfi->regs);
  
@@ -748,7 +748,7 @@ index 111111111111..222222222222 100644
  
  	dfi->dev = dev;
  	mutex_init(&dfi->mutex);
-@@ -818,6 +879,8 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
+@@ -817,6 +878,8 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
  	if (ret)
  		return ret;
  
@@ -1877,7 +1877,7 @@ diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip
 index 111111111111..222222222222 100644
 --- a/include/soc/rockchip/rockchip_sip.h
 +++ b/include/soc/rockchip/rockchip_sip.h
-@@ -16,5 +16,16 @@
+@@ -19,5 +19,16 @@
  #define ROCKCHIP_SIP_CONFIG_DRAM_CLR_IRQ	0x06
  #define ROCKCHIP_SIP_CONFIG_DRAM_SET_PARAM	0x07
  #define ROCKCHIP_SIP_CONFIG_DRAM_SET_ODT_PD	0x08
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.15/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
@@ -20,7 +20,7 @@ diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/adm
 index 111111111111..222222222222 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4877,6 +4877,14 @@
+@@ -4909,6 +4909,14 @@
  		nomsi	Do not use MSI for native PCIe PME signaling (this makes
  			all PCIe root ports use INTx for all services).
  
@@ -110,7 +110,7 @@ diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pci
 index 111111111111..222222222222 100644
 --- a/drivers/pci/controller/pcie-rockchip.h
 +++ b/drivers/pci/controller/pcie-rockchip.h
-@@ -351,6 +351,8 @@ struct rockchip_pcie {
+@@ -350,6 +350,8 @@ struct rockchip_pcie {
  	phys_addr_t msg_bus_addr;
  	bool is_rc;
  	struct resource *mem_res;
diff --git a/patch/kernel/archive/rockchip64-6.15/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.15/rk356x-add-rkvdec2-support.patch
@@ -16,7 +16,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boot/dts
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
-@@ -369,6 +369,19 @@ usb2phy1_grf: syscon@fdca8000 {
+@@ -380,6 +380,19 @@ usb2phy1_grf: syscon@fdca8000 {
  		reg = <0x0 0xfdca8000 0x0 0x8000>;
  	};
  
@@ -36,7 +36,7 @@ index 111111111111..222222222222 100644
  	pmucru: clock-controller@fdd00000 {
  		compatible = "rockchip,rk3568-pmucru";
  		reg = <0x0 0xfdd00000 0x0 0x1000>;
-@@ -554,7 +567,7 @@ gpu: gpu@fde60000 {
+@@ -565,7 +578,7 @@ gpu: gpu@fde60000 {
  	};
  
  	vpu: video-codec@fdea0400 {
@@ -45,7 +45,7 @@ index 111111111111..222222222222 100644
  		reg = <0x0 0xfdea0000 0x0 0x800>;
  		interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
  		interrupt-names = "vdpu";
-@@ -605,6 +618,26 @@ vepu_mmu: iommu@fdee0800 {
+@@ -616,6 +629,26 @@ vepu_mmu: iommu@fdee0800 {
  		#iommu-cells = <0>;
  	};
  
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-0010-fix-clk-divisions.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-0010-fix-clk-divisions.patch
@@ -15,7 +15,7 @@ diff --git a/include/linux/math.h b/include/linux/math.h
 index 111111111111..222222222222 100644
 --- a/include/linux/math.h
 +++ b/include/linux/math.h
-@@ -36,6 +36,17 @@
+@@ -48,6 +48,17 @@
  
  #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP
  
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
@@ -11,15 +11,15 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/d
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
-@@ -440,6 +440,7 @@ &sdhci {
+@@ -510,6 +510,7 @@ &sdhci {
  	no-sdio;
  	no-sd;
  	non-removable;
 +	max-frequency = <150000000>;
  	mmc-hs400-1_8v;
  	mmc-hs400-enhanced-strobe;
  	status = "okay";
-@@ -495,6 +496,10 @@ flash@0 {
+@@ -565,6 +566,10 @@ flash@0 {
  	};
  };
  
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1040-board-khadas-edge2-add-nodes.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1040-board-khadas-edge2-add-nodes.patch
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1041-board-khadas-edge2-mcu.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1041-board-khadas-edge2-mcu.patch
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1053-board-nanopc-t6-hdmi1-and-audio-support.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1053-board-nanopc-t6-hdmi1-and-audio-support.patch
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch
diff --git a/patch/kernel/archive/rockchip64-6.15/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch b/patch/kernel/archive/rockchip64-6.15/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch
diff --git a/patch/kernel/archive/rockchip64-6.15/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.15/rk35xx-montjoie-crypto-v2-rk35xx.patch

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ index 111111111111..222222222222 100644`
`123`	`123`	`#include <linux/tcp.h>`
`124`	`124`	`#include <linux/interrupt.h>`
`125`	`125`	`#include <linux/dma-mapping.h>`
`126`		`-@@ -2436,6 +2437,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)`
	`126`	`+@@ -2438,6 +2439,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`@@ -139,7 +139,7 @@ index 111111111111..222222222222 100644`
`139`	`139`	`static void rtl8168_config_eee_mac(struct rtl8169_private *tp)`
`140`	`140`	`{`
`141`	`141`	`/* Adjust EEE LED frequency */`
`142`		`-@@ -3421,6 +3431,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)`
	`142`	`+@@ -3449,6 +3459,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)`
`143`	`143`	`rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);`
`144`	`144`
`145`	`145`	`rtl8168_config_eee_mac(tp);`
`@@ -151,7 +151,7 @@ diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/re`
`151`	`151`	`index 111111111111..222222222222 100644`
`152`	`152`	`--- a/drivers/net/phy/realtek/realtek_main.c`
`153`	`153`	`+++ b/drivers/net/phy/realtek/realtek_main.c`
`154`		`-@@ -125,6 +125,15 @@ static int rtl821x_write_page(struct phy_device *phydev, int page)`
	`154`	`+@@ -135,6 +135,15 @@ static int rtl821x_write_page(struct phy_device *phydev, int page)`
`155`	`155`	`return __phy_write(phydev, RTL821x_PAGE_SELECT, page);`
`156`	`156`	`}`
`157`	`157`
`@@ -167,9 +167,9 @@ index 111111111111..222222222222 100644`
`167`	`167`	`static int rtl821x_probe(struct phy_device *phydev)`
`168`	`168`	`{`
`169`	`169`	`struct device *dev = &phydev->mdio.dev;`
`170`		`-@@ -444,6 +453,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)`
`171`		`- val_rxdly ? "enabled" : "disabled");`
`172`		`- }`
	`170`	`+@@ -460,6 +469,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)`
	`171`	`+ if (ret)`
	`172`	`+ return ret;`
`173`	`173`
`174`	`174`	`+ rtl821x_led_of_init(phydev);`
`175`	`175`	`+`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644`
`20`	`20`	`{ .name = /* cisco */ "spi-petra" },`
`21`	`21`	`{ .name = /* dh */ "dhcom-board" },`
`22`	`22`	`{ .name = /* elgin */ "jg10309-01" },`
`23`		`-@@ -734,6 +735,7 @@ static int spidev_of_check(struct device *dev)`
	`23`	`+@@ -735,6 +736,7 @@ static int spidev_of_check(struct device *dev)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`static const struct of_device_id spidev_dt_ids[] = {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth`
`18`	`18`	`index 111111111111..222222222222 100644`
`19`	`19`	`--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c`
`20`	`20`	`+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c`
`21`		`-@@ -5878,27 +5878,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)`
	`21`	`+@@ -5921,27 +5921,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)`
`22`	`22`	`static int stmmac_change_mtu(struct net_device *dev, int new_mtu)`
`23`	`23`	`{`
`24`	`24`	`struct stmmac_priv *priv = netdev_priv(dev);`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/`
`51`	`51`	`index 111111111111..222222222222 100644`
`52`	`52`	`--- a/drivers/pmdomain/rockchip/pm-domains.c`
`53`	`53`	`+++ b/drivers/pmdomain/rockchip/pm-domains.c`
`54`		`-@@ -392,6 +392,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,`
	`54`	`+@@ -399,6 +399,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,`
`55`	`55`	`return 0;`
`56`	`56`	`}`
`57`	`57`