Merge pull request #10947 from chewitt/rockchip-upstream

Rockchip: update kernel/u-boot patches and noofbuffers config

Author: heitbaum

packages/linux/package.mk

@@ -30,8 +30,8 @@ case "${LINUX}" in
     PKG_PATCH_DIRS="raspberrypi"
     ;;
   rockchip)
-    PKG_VERSION="78d82960b939df64cf7d26ca5ed34eb87f44c9e5" # 6.18.2
-    PKG_SHA256="a11985db0126ba0e80e34a97d4a6e3b77cf13c89a3af76733a44b8c4f8d5b767"
+    PKG_VERSION="5dfbc5357c34bdf81c84aa78bc8e3d6d9ba10aad" # 6.18.7
+    PKG_SHA256="dcb5b08946f044cee1cb584397f981586c8b4565e01a95c668e679b1bcd2470a"
     PKG_URL="https://github.com/chewitt/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     PKG_PATCH_DIRS="default rockchip"

packages/linux/patches/rockchip/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch

@@ -1,7 +1,7 @@
-From 6528fb041b09573b393753c84666970a4076dbdf Mon Sep 17 00:00:00 2001
+From d7301156c2ad3e692a82c39c18c19126eafd10c5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 13 Apr 2019 05:45:18 +0000
-Subject: [PATCH 001/157] LOCAL: arm64: fix Kodi sysinfo CPU information
+Subject: [PATCH 001/148] LOCAL: arm64: fix Kodi sysinfo CPU information
 
 This allows the CPU information to show in the Kodi sysinfo screen, e.g.
 
@@ -29,5 +29,5 @@ index c44e6d94f5de..cfebc1435582 100644
  	seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
  		   loops_per_jiffy / (500000UL/HZ),
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch

@@ -1,7 +1,7 @@
-From f4c95af939d8c8a2df154e5d0fe651cbe9565903 Mon Sep 17 00:00:00 2001
+From 98d7f65436018e52baefd90def8cfdf01e00e10a Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 16 Jul 2025 11:03:09 +0000
-Subject: [PATCH 002/157] LOCAL: arm64: dts: rockchip: rock5b: disable sdio
+Subject: [PATCH 002/148] LOCAL: arm64: dts: rockchip: rock5b: disable sdio
  node
 
 Radxa ships an M2 compatible WiFi module with PCIe wired RTL8852BE
@@ -39,5 +39,5 @@ index da13dafcbc82..7af53147bdd8 100644
 
  &uart6 {
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch

@@ -1,7 +1,7 @@
-From 6d592e47f89ec2f950e8489960af088f8cc582cd Mon Sep 17 00:00:00 2001
+From 6ee9e5b2d81eb20a18afa3f71b27903fd59a1eda Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 16 Jul 2025 05:09:07 +0000
-Subject: [PATCH 003/157] LOCAL: drm/rockchip: vop2: rk3588: change
+Subject: [PATCH 003/148] LOCAL: drm/rockchip: vop2: rk3588: change
  Esmart/Cluster ordering
 
 Order Esmart planes before Cluster planes so Kodi (which currently
@@ -15,7 +15,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 68 insertions(+), 68 deletions(-)
 
 diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
-index 38c49030c7ab..577cd23f9b64 100644
+index f3950e8476a7..2bae8b18dd6c 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
 @@ -1120,6 +1120,74 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = {
@@ -169,5 +169,5 @@ index 38c49030c7ab..577cd23f9b64 100644
  };
 
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0004-LOCAL-drm-rockchip-vop2-rk3568-change-Esmart-Cluster.patch

@@ -1,7 +1,7 @@
-From d0bb4ca6a1a86865836ae07f62dd0fc457867160 Mon Sep 17 00:00:00 2001
+From 9d60f3bc26e0adf913cab8f662398adde31e5035 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 17 Sep 2025 11:17:20 +0000
-Subject: [PATCH 004/157] LOCAL: drm/rockchip: vop2: rk3568: change
+Subject: [PATCH 004/148] LOCAL: drm/rockchip: vop2: rk3568: change
  Esmart/Cluster/Smart ordering
 
 Order Esmart planes before Cluster planes and Smart planes so Kodi
@@ -15,7 +15,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 29 insertions(+), 29 deletions(-)
 
 diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
-index 577cd23f9b64..e880b66e772e 100644
+index 2bae8b18dd6c..dfad992a53b2 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
 @@ -595,35 +595,6 @@ static const struct vop2_video_port_data rk3568_vop_video_ports[] = {
@@ -91,5 +91,5 @@ index 577cd23f9b64..e880b66e772e 100644
  };
 
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0005-FROMGIT-6.19-ASoC-rockchip-i2s-tdm-Omit-a-variable-r.patch

@@ -1,7 +1,7 @@
-From 03855596396a8b16f25f92cb1808f7a56431c29a Mon Sep 17 00:00:00 2001
+From 4e56a75fda5f5fa7d34223ef939a6f6b75851e8f Mon Sep 17 00:00:00 2001
 From: Markus Elfring <elfring@users.sourceforge.net>
 Date: Mon, 20 Oct 2025 18:11:58 +0200
-Subject: [PATCH 005/157] FROMGIT(6.19): ASoC: rockchip: i2s-tdm: Omit a
+Subject: [PATCH 005/148] FROMGIT(6.19): ASoC: rockchip: i2s-tdm: Omit a
  variable reassignment in rockchip_i2s_tdm_probe()
 
 An error code was assigned to a variable and checked accordingly.
@@ -31,5 +31,5 @@ index d9a1fab7f403..770b9bfbb384 100644
  	}
 
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0006-FROMGIT-6.19-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch

@@ -1,7 +1,7 @@
-From 3195006f461539d5222019454acaf22d2a799182 Mon Sep 17 00:00:00 2001
+From a3c9836604e2b7090337f38ff23e68074731b979 Mon Sep 17 00:00:00 2001
 From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
 Date: Wed, 3 Sep 2025 21:50:59 +0300
-Subject: [PATCH 006/157] FROMGIT(6.19): drm/bridge: dw-hdmi-qp: Add CEC
+Subject: [PATCH 006/148] FROMGIT(6.19): drm/bridge: dw-hdmi-qp: Add CEC
  support
 
 Add support for the CEC interface of the Synopsys DesignWare HDMI QP TX
@@ -46,7 +46,7 @@ index 2c5e532410de..a46df7583bcf 100644
  	tristate
  	select DRM_KMS_HELPER
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
-index 39332c57f2c5..fc98953672b6 100644
+index c85eb340e5a3..0d9d651cee28 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
 @@ -18,6 +18,7 @@
@@ -95,7 +95,7 @@ index 39332c57f2c5..fc98953672b6 100644
  	struct {
  		const struct dw_hdmi_qp_phy_ops *ops;
  		void *data;
-@@ -965,6 +984,179 @@ static int dw_hdmi_qp_bridge_write_infoframe(struct drm_bridge *bridge,
+@@ -966,6 +985,179 @@ static int dw_hdmi_qp_bridge_write_infoframe(struct drm_bridge *bridge,
  	}
  }
 
@@ -275,7 +275,7 @@ index 39332c57f2c5..fc98953672b6 100644
  static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs = {
  	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
  	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
-@@ -979,6 +1171,10 @@ static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs = {
+@@ -980,6 +1172,10 @@ static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs = {
  	.hdmi_audio_startup = dw_hdmi_qp_audio_enable,
  	.hdmi_audio_shutdown = dw_hdmi_qp_audio_disable,
  	.hdmi_audio_prepare = dw_hdmi_qp_audio_prepare,
@@ -286,7 +286,7 @@ index 39332c57f2c5..fc98953672b6 100644
  };
 
  static irqreturn_t dw_hdmi_qp_main_hardirq(int irq, void *dev_id)
-@@ -1093,6 +1289,22 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
+@@ -1095,6 +1291,22 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
  	hdmi->bridge.hdmi_audio_dev = dev;
  	hdmi->bridge.hdmi_audio_dai_port = 1;
 
@@ -338,7 +338,7 @@ index 72987e6c4689..91a15f82e32a 100644
  #define CEC_TX_DATA3_0					0x1024
  #define CEC_TX_DATA7_4					0x1028
 diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h
-index e9be6d507ad9..b4a9b739734e 100644
+index 8955450663e5..1bdac35b32d7 100644
 --- a/include/drm/bridge/dw_hdmi_qp.h
 +++ b/include/drm/bridge/dw_hdmi_qp.h
 @@ -23,6 +23,7 @@ struct dw_hdmi_qp_plat_data {
@@ -350,5 +350,5 @@ index e9be6d507ad9..b4a9b739734e 100644
 
  struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0007-FROMGIT-6.19-drm-bridge-dw-hdmi-qp-Fixup-timer-base-.patch

@@ -1,7 +1,7 @@
-From 2fbb44077037451b1bc39d46fb3836671f0c13fb Mon Sep 17 00:00:00 2001
+From 62f73e7b8d97e4d322c61308f38d082a3660a78f Mon Sep 17 00:00:00 2001
 From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
 Date: Wed, 3 Sep 2025 21:51:00 +0300
-Subject: [PATCH 007/157] FROMGIT(6.19): drm/bridge: dw-hdmi-qp: Fixup timer
+Subject: [PATCH 007/148] FROMGIT(6.19): drm/bridge: dw-hdmi-qp: Fixup timer
  base setup
 
 Currently the TIMER_BASE_CONFIG0 register gets initialized to a fixed
@@ -26,7 +26,7 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
  2 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
-index fc98953672b6..4ba7b339eff6 100644
+index 0d9d651cee28..2c0fbeeaeefe 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
 @@ -161,6 +161,7 @@ struct dw_hdmi_qp {
@@ -35,9 +35,9 @@ index fc98953672b6..4ba7b339eff6 100644
 
 +	unsigned long ref_clk_rate;
  	struct regmap *regm;
+ 	int main_irq;
 
- 	unsigned long tmds_char_rate;
-@@ -1210,13 +1211,11 @@ static void dw_hdmi_qp_init_hw(struct dw_hdmi_qp *hdmi)
+@@ -1211,13 +1212,11 @@ static void dw_hdmi_qp_init_hw(struct dw_hdmi_qp *hdmi)
  {
  	dw_hdmi_qp_write(hdmi, 0, MAINUNIT_0_INT_MASK_N);
  	dw_hdmi_qp_write(hdmi, 0, MAINUNIT_1_INT_MASK_N);
@@ -52,7 +52,7 @@ index fc98953672b6..4ba7b339eff6 100644
  	dw_hdmi_qp_mod(hdmi, 0, I2CM_FM_EN, I2CM_INTERFACE_CONTROL0);
 
  	/* Clear DONE and ERROR interrupts */
-@@ -1262,6 +1261,13 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
+@@ -1263,6 +1262,13 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
  	hdmi->phy.ops = plat_data->phy_ops;
  	hdmi->phy.data = plat_data->phy_data;
 
@@ -65,9 +65,9 @@ index fc98953672b6..4ba7b339eff6 100644
 +
  	dw_hdmi_qp_init_hw(hdmi);
 
- 	ret = devm_request_threaded_irq(dev, plat_data->main_irq,
+ 	hdmi->main_irq = plat_data->main_irq;
 diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h
-index b4a9b739734e..76ecf3130199 100644
+index 1bdac35b32d7..71ad6280c691 100644
 --- a/include/drm/bridge/dw_hdmi_qp.h
 +++ b/include/drm/bridge/dw_hdmi_qp.h
 @@ -24,6 +24,7 @@ struct dw_hdmi_qp_plat_data {
@@ -79,5 +79,5 @@ index b4a9b739734e..76ecf3130199 100644
 
  struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0008-FROMGIT-6.19-drm-rockchip-dw_hdmi_qp-Improve-error-h.patch

@@ -1,7 +1,7 @@
-From 469c97ec38a3edce060a7954df09fbd79bf35d44 Mon Sep 17 00:00:00 2001
+From e054f4f9a5084230a38c4b482eb7283e78d2a66f Mon Sep 17 00:00:00 2001
 From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
 Date: Wed, 3 Sep 2025 21:51:01 +0300
-Subject: [PATCH 008/157] FROMGIT(6.19): drm/rockchip: dw_hdmi_qp: Improve
+Subject: [PATCH 008/148] FROMGIT(6.19): drm/rockchip: dw_hdmi_qp: Improve
  error handling with dev_err_probe()
 
 The error handling in dw_hdmi_qp_rockchip_bind() is quite inconsistent,
@@ -18,7 +18,7 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
  1 file changed, 24 insertions(+), 38 deletions(-)
 
 diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
-index ed6e8f036f4b..a775d89f20fc 100644
+index 9ac45e7bc987..9d20df85d485 100644
 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
 +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
 @@ -455,10 +455,8 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master,
@@ -126,5 +126,5 @@ index ed6e8f036f4b..a775d89f20fc 100644
  	return drm_connector_attach_encoder(connector, encoder);
  }
 -- 
-2.34.1
+2.43.0
 

packages/linux/patches/rockchip/rockchip-0009-FROMGIT-6.19-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ.patch

@@ -1,7 +1,7 @@
-From 12880b27bac310becf994dabe41fbbf6a65df353 Mon Sep 17 00:00:00 2001
+From b32b89e6e17459e7fa672f422ccd656e10b397a1 Mon Sep 17 00:00:00 2001
 From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
 Date: Wed, 3 Sep 2025 21:51:02 +0300
-Subject: [PATCH 009/157] FROMGIT(6.19): drm/rockchip: dw_hdmi_qp: Provide CEC
+Subject: [PATCH 009/148] FROMGIT(6.19): drm/rockchip: dw_hdmi_qp: Provide CEC
  IRQ in dw_hdmi_qp_plat_data
 
 In order to support the CEC interface of the DesignWare HDMI QP IP
@@ -14,7 +14,7 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
-index a775d89f20fc..9191a74a568f 100644
+index 9d20df85d485..96dedd571338 100644
 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
 +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
 @@ -525,6 +525,10 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master,
@@ -29,5 +29,5 @@ index a775d89f20fc..9191a74a568f 100644
  	if (irq < 0)
  		return irq;
 -- 
-2.34.1
+2.43.0