diff --git a/patch/kernel/archive/rockchip64-6.19/board-nanopi-m4v2-dts-add-sound-card.patch b/patch/kernel/archive/rockchip64-6.19/board-nanopi-m4v2-dts-add-sound-card.patch index d87dd14c02..f7b49c678e 100644 --- a/patch/kernel/archive/rockchip64-6.19/board-nanopi-m4v2-dts-add-sound-card.patch +++ b/patch/kernel/archive/rockchip64-6.19/board-nanopi-m4v2-dts-add-sound-card.patch @@ -75,8 +75,8 @@ Subject: [ARCHEOLOGY] Initial addition of NanoPi M4V2 > X-Git-Archeology: --- arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 51 ++++++++++ - sound/soc/codecs/Kconfig | 1 ++ - 2 files changed, 52 insertions(+) + sound/soc/codecs/Kconfig | 2 +- + 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi index 111111111111..222222222222 100644 @@ -169,7 +169,7 @@ diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 111111111111..222222222222 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig -@@ -1756,7 +1756,7 @@ config SND_SOC_RT5645 +@@ -1800,7 +1800,7 @@ config SND_SOC_RT5645 depends on I2C config SND_SOC_RT5651 @@ -180,3 +180,4 @@ index 111111111111..222222222222 100644 config SND_SOC_RT5659 -- Armbian + diff --git a/patch/kernel/archive/rockchip64-6.19/board-rockpis-dts-fixes.patch b/patch/kernel/archive/rockchip64-6.19/board-rockpis-dts-fixes.patch index c0912ac619..24409f7559 100644 --- a/patch/kernel/archive/rockchip64-6.19/board-rockpis-dts-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.19/board-rockpis-dts-fixes.patch @@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts -@@ -48,6 +48,30 @@ blue-led { +@@ -47,6 +47,30 @@ blue-led { }; }; @@ -42,7 +42,7 @@ index 111111111111..222222222222 100644 sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; pinctrl-0 = <&wifi_enable_h>; -@@ -128,6 +152,11 @@ vdd_log: regulator-vdd-log { +@@ -127,6 +151,11 @@ vdd_log: regulator-vdd-log { }; }; @@ -54,7 +54,7 @@ index 111111111111..222222222222 100644 &cpu0 { cpu-supply = <&vdd_core>; }; -@@ -242,6 +271,11 @@ &io_domains { +@@ -241,6 +270,11 @@ &io_domains { status = "okay"; }; @@ -66,7 +66,7 @@ index 111111111111..222222222222 100644 &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>; -@@ -333,10 +367,17 @@ &sdmmc { +@@ -332,10 +366,17 @@ &sdmmc { cap-mmc-highspeed; cap-sd-highspeed; disable-wp; diff --git a/patch/kernel/archive/rockchip64-6.19/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rockchip64-6.19/drv-spi-spidev-remove-warnings.patch index 32495a9e3f..d5a9eb30ad 100644 --- a/patch/kernel/archive/rockchip64-6.19/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/rockchip64-6.19/drv-spi-spidev-remove-warnings.patch @@ -18,16 +18,16 @@ index 111111111111..222222222222 100644 static const struct spi_device_id spidev_spi_ids[] = { + { .name = "spi-dev" }, { .name = /* abb */ "spi-sensor" }, + { .name = /* arduino */ "unoq-mcu" }, { .name = /* cisco */ "spi-petra" }, - { .name = /* dh */ "dhcom-board" }, -@@ -736,6 +737,7 @@ static int spidev_of_check(struct device *dev) +@@ -737,6 +738,7 @@ static int spidev_of_check(struct device *dev) } static const struct of_device_id spidev_dt_ids[] = { + { .compatible = "armbian,spi-dev", .data = &spidev_of_check }, { .compatible = "abb,spi-sensor", .data = &spidev_of_check }, + { .compatible = "arduino,unoq-mcu", .data = &spidev_of_check }, { .compatible = "cisco,spi-petra", .data = &spidev_of_check }, - { .compatible = "dh,dhcom-board", .data = &spidev_of_check }, -- Armbian diff --git a/patch/kernel/archive/rockchip64-6.19/general-add-hdmi-mks-ips50-resolutions.patch b/patch/kernel/archive/rockchip64-6.19/general-add-hdmi-mks-ips50-resolutions.patch index 3b0fa7fad3..08fa6f462a 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-add-hdmi-mks-ips50-resolutions.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-add-hdmi-mks-ips50-resolutions.patch @@ -15,7 +15,7 @@ diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c -@@ -1561,6 +1561,16 @@ static const struct drm_display_mode edid_cea_modes_193[] = { +@@ -1564,6 +1564,16 @@ static const struct drm_display_mode edid_cea_modes_193[] = { 4272, 4400, 0, 2160, 2168, 2178, 2250, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, }, @@ -32,7 +32,7 @@ index 111111111111..222222222222 100644 }; /* -@@ -4236,7 +4246,7 @@ static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid) +@@ -4239,7 +4249,7 @@ static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid) static __always_inline const struct drm_display_mode *cea_mode_for_vic(u8 vic) { BUILD_BUG_ON(1 + ARRAY_SIZE(edid_cea_modes_1) - 1 != 127); diff --git a/patch/kernel/archive/rockchip64-6.19/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip64-6.19/general-add-overlay-compilation-support.patch index 75b5b3dd70..bffc0b1a7b 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-add-overlay-compilation-support.patch @@ -36,7 +36,7 @@ diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs index 111111111111..222222222222 100644 --- a/scripts/Makefile.dtbs +++ b/scripts/Makefile.dtbs -@@ -123,17 +123,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) +@@ -132,17 +132,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@ cmd_dtc = \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ diff --git a/patch/kernel/archive/rockchip64-6.19/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-6.19/general-add-xtx-spi-nor-chips.patch index 4a0b9251b2..ee9e0962b0 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-add-xtx-spi-nor-chips.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-add-xtx-spi-nor-chips.patch @@ -42,7 +42,7 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -598,6 +598,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; +@@ -604,6 +604,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; extern const struct spi_nor_manufacturer spi_nor_sst; extern const struct spi_nor_manufacturer spi_nor_winbond; extern const struct spi_nor_manufacturer spi_nor_xmc; diff --git a/patch/kernel/archive/rockchip64-6.19/general-cryptov1-trng.patch b/patch/kernel/archive/rockchip64-6.19/general-cryptov1-trng.patch index ffffaddca8..1791e6a50b 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-cryptov1-trng.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-cryptov1-trng.patch @@ -183,7 +183,7 @@ diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/r index 111111111111..222222222222 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c -@@ -363,6 +363,7 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req) +@@ -362,6 +362,7 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req) } } err = 0; @@ -191,7 +191,7 @@ index 111111111111..222222222222 100644 rk_cipher_hw_init(rkc, areq); if (ivsize) { if (ivsize == DES_BLOCK_SIZE) -@@ -378,6 +379,7 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req) +@@ -377,6 +378,7 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req) crypto_dma_start(rkc, sgs, sgd, todo / 4); wait_for_completion_interruptible_timeout(&rkc->complete, msecs_to_jiffies(2000)); diff --git a/patch/kernel/archive/rockchip64-6.19/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.19/general-disable-mtu-validation.patch index 2d9301e7c4..73cd07b2fb 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-disable-mtu-validation.patch +++ b/patch/kernel/archive/rockchip64-6.19/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 -@@ -5846,27 +5846,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) +@@ -5984,27 +5984,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.19/general-drm-panel-add-yixian-yx0345-panel.patch b/patch/kernel/archive/rockchip64-6.19/general-drm-panel-add-yixian-yx0345-panel.patch index b53f507bb1..9e109f2666 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-drm-panel-add-yixian-yx0345-panel.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-drm-panel-add-yixian-yx0345-panel.patch @@ -13,7 +13,7 @@ diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig -@@ -1147,6 +1147,15 @@ config DRM_PANEL_WIDECHIPS_WS2401 +@@ -1201,6 +1201,15 @@ config DRM_PANEL_WIDECHIPS_WS2401 480x800 display controller used in panels such as Samsung LMS380KF01. This display is used in the Samsung Galaxy Ace 2 GT-I8160 (Codina). @@ -33,7 +33,7 @@ diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile -@@ -117,3 +117,4 @@ obj-$(CONFIG_DRM_PANEL_VISIONOX_VTDR6130) += panel-visionox-vtdr6130.o +@@ -120,3 +120,4 @@ obj-$(CONFIG_DRM_PANEL_VISIONOX_VTDR6130) += panel-visionox-vtdr6130.o obj-$(CONFIG_DRM_PANEL_VISIONOX_R66451) += panel-visionox-r66451.o obj-$(CONFIG_DRM_PANEL_WIDECHIPS_WS2401) += panel-widechips-ws2401.o obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o diff --git a/patch/kernel/archive/rockchip64-6.19/general-drm-rockchip-Set-dma-mask-to-64-bit.patch b/patch/kernel/archive/rockchip64-6.19/general-drm-rockchip-Set-dma-mask-to-64-bit.patch index 7ce7354e6e..e25b632b7a 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-drm-rockchip-Set-dma-mask-to-64-bit.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-drm-rockchip-Set-dma-mask-to-64-bit.patch @@ -23,7 +23,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockc index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -@@ -472,7 +472,9 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) +@@ -476,7 +476,9 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) return ret; } diff --git a/patch/kernel/archive/rockchip64-6.19/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.19/general-hdmi-clock-fixes.patch index 1d48b18642..b925496fdf 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-hdmi-clock-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-hdmi-clock-fixes.patch @@ -212,7 +212,7 @@ index 111111111111..222222222222 100644 .intr = &rk3368_vop_intr, .common = &rk3288_common, .modeset = &rk3288_modeset, -@@ -894,6 +896,7 @@ static const struct vop_intr rk3366_vop_intr = { +@@ -895,6 +897,7 @@ static const struct vop_intr rk3366_vop_intr = { static const struct vop_data rk3366_vop = { .version = VOP_VERSION(3, 4), @@ -220,7 +220,7 @@ index 111111111111..222222222222 100644 .intr = &rk3366_vop_intr, .common = &rk3288_common, .modeset = &rk3288_modeset, -@@ -1047,6 +1050,7 @@ static const struct vop_afbc rk3399_vop_afbc = { +@@ -1048,6 +1051,7 @@ static const struct vop_afbc rk3399_vop_afbc = { static const struct vop_data rk3399_vop_big = { .version = VOP_VERSION(3, 5), .feature = VOP_FEATURE_OUTPUT_RGB10, @@ -228,7 +228,7 @@ index 111111111111..222222222222 100644 .intr = &rk3366_vop_intr, .common = &rk3399_common, .modeset = &rk3288_modeset, -@@ -1075,6 +1079,7 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = { +@@ -1076,6 +1080,7 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = { static const struct vop_data rk3399_vop_lit = { .version = VOP_VERSION(3, 6), @@ -236,7 +236,7 @@ index 111111111111..222222222222 100644 .intr = &rk3366_vop_intr, .common = &rk3399_common, .modeset = &rk3288_modeset, -@@ -1097,6 +1102,7 @@ static const struct vop_win_data rk3228_vop_win_data[] = { +@@ -1098,6 +1103,7 @@ static const struct vop_win_data rk3228_vop_win_data[] = { static const struct vop_data rk3228_vop = { .version = VOP_VERSION(3, 7), .feature = VOP_FEATURE_OUTPUT_RGB10, @@ -244,7 +244,7 @@ index 111111111111..222222222222 100644 .intr = &rk3366_vop_intr, .common = &rk3288_common, .modeset = &rk3288_modeset, -@@ -1169,6 +1175,7 @@ static const struct vop_win_data rk3328_vop_win_data[] = { +@@ -1170,6 +1176,7 @@ static const struct vop_win_data rk3328_vop_win_data[] = { static const struct vop_data rk3328_vop = { .version = VOP_VERSION(3, 8), .feature = VOP_FEATURE_OUTPUT_RGB10, diff --git a/patch/kernel/archive/rockchip64-6.19/general-rt5651-add-mclk.patch b/patch/kernel/archive/rockchip64-6.19/general-rt5651-add-mclk.patch index 869426b3c2..051341cb00 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-rt5651-add-mclk.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-rt5651-add-mclk.patch @@ -80,13 +80,7 @@ index 111111111111..222222222222 100644 #include "rl6231.h" #include "rt5651.h" -diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c -index 60b872f4e8db..2215cc9b96ce 100644 ---- a/sound/soc/codecs/rt5651.c -+++ b/sound/soc/codecs/rt5651.c -@@ -1510,10 +1510,11 @@ static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, - } - +@@ -1511,6 +1512,7 @@ static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, static int rt5651_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { @@ -94,9 +88,7 @@ index 60b872f4e8db..2215cc9b96ce 100644 struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); switch (level) { - case SND_SOC_BIAS_PREPARE: - if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) { -@@ -1518,6 +1520,13 @@ static int rt5651_set_bias_level(struct snd_soc_component *component, +@@ -1520,6 +1522,13 @@ static int rt5651_set_bias_level(struct snd_soc_component *component, snd_soc_component_update_bits(component, RT5651_D_MISC, 0xc00, 0xc00); } @@ -109,10 +101,10 @@ index 60b872f4e8db..2215cc9b96ce 100644 + } break; case SND_SOC_BIAS_STANDBY: - if (SND_SOC_BIAS_OFF == snd_soc_component_get_bias_level(component)) { -@@ -2059,6 +2068,13 @@ static int rt5651_probe(struct snd_soc_component *component) - { + if (SND_SOC_BIAS_OFF == snd_soc_dapm_get_bias_level(dapm)) { +@@ -2062,6 +2071,13 @@ static int rt5651_probe(struct snd_soc_component *component) struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component); + struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component); + /* Check if MCLK provided */ + rt5651->mclk = devm_clk_get(component->dev, "mclk"); diff --git a/patch/kernel/archive/rockchip64-6.19/general-v4l2-iep-driver.patch b/patch/kernel/archive/rockchip64-6.19/general-v4l2-iep-driver.patch index 62f4a8752a..132fad1a08 100644 --- a/patch/kernel/archive/rockchip64-6.19/general-v4l2-iep-driver.patch +++ b/patch/kernel/archive/rockchip64-6.19/general-v4l2-iep-driver.patch @@ -1,31 +1,25 @@ -From a420482aa6eb1cfda0530e3cfeee8447b1255fec Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Fabian Wolter Date: Sat, 20 Dec 2025 13:05:56 +0100 -Subject: [PATCH] Rockchip IEP driver +Subject: Rockchip IEP driver --- - .../bindings/media/rockchip-iep.yaml | 73 ++ - arch/arm/boot/dts/rockchip/rk3288.dtsi | 13 +- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 22 + - arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 13 +- - drivers/media/platform/rockchip/Kconfig | 1 + - drivers/media/platform/rockchip/Makefile | 1 + - drivers/media/platform/rockchip/iep/Kconfig | 16 + - drivers/media/platform/rockchip/iep/Makefile | 5 + - .../media/platform/rockchip/iep/iep-regs.h | 291 +++++ - drivers/media/platform/rockchip/iep/iep.c | 1087 +++++++++++++++++ - drivers/media/platform/rockchip/iep/iep.h | 112 ++ + Documentation/devicetree/bindings/media/rockchip-iep.yaml | 73 + + arch/arm/boot/dts/rockchip/rk3288.dtsi | 13 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 22 + + arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 13 +- + drivers/media/platform/rockchip/Kconfig | 1 + + drivers/media/platform/rockchip/Makefile | 1 + + drivers/media/platform/rockchip/iep/Kconfig | 16 + + drivers/media/platform/rockchip/iep/Makefile | 5 + + drivers/media/platform/rockchip/iep/iep-regs.h | 291 +++ + drivers/media/platform/rockchip/iep/iep.c | 1087 ++++++++++ + drivers/media/platform/rockchip/iep/iep.h | 112 + 11 files changed, 1632 insertions(+), 2 deletions(-) - create mode 100644 Documentation/devicetree/bindings/media/rockchip-iep.yaml - create mode 100644 drivers/media/platform/rockchip/iep/Kconfig - create mode 100644 drivers/media/platform/rockchip/iep/Makefile - create mode 100644 drivers/media/platform/rockchip/iep/iep-regs.h - create mode 100644 drivers/media/platform/rockchip/iep/iep.c - create mode 100644 drivers/media/platform/rockchip/iep/iep.h diff --git a/Documentation/devicetree/bindings/media/rockchip-iep.yaml b/Documentation/devicetree/bindings/media/rockchip-iep.yaml new file mode 100644 -index 000000000..a9efcda13 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-iep.yaml @@ -0,0 +1,73 @@ @@ -103,10 +97,10 @@ index 000000000..a9efcda13 + power-domains = <&power RK3228_PD_VIO>; + }; diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 42d705b54..773376166 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -990,14 +990,25 @@ crypto: crypto@ff8a0000 { +@@ -983,14 +983,25 @@ crypto: crypto@ff8a0000 { reset-names = "crypto-rst"; }; @@ -134,7 +128,7 @@ index 42d705b54..773376166 100644 isp_mmu: iommu@ff914000 { diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 03b7c4313..d29e4843b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -784,6 +784,28 @@ vop_mmu: iommu@ff373f00 { @@ -167,7 +161,7 @@ index 03b7c4313..d29e4843b 100644 compatible = "rockchip,rk3328-dw-hdmi"; reg = <0x0 0xff3c0000 0x0 0x20000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi -index 4dcceb913..0d40ac352 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi @@ -1475,14 +1475,25 @@ vdec_mmu: iommu@ff660480 { @@ -198,7 +192,7 @@ index 4dcceb913..0d40ac352 100644 rga: rga@ff680000 { diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig -index 9bbeec499..6f8d6bee2 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -2,6 +2,7 @@ @@ -207,21 +201,21 @@ index 9bbeec499..6f8d6bee2 100644 +source "drivers/media/platform/rockchip/iep/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" + source "drivers/media/platform/rockchip/rkcif/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" - source "drivers/media/platform/rockchip/rkvdec/Kconfig" diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile -index 286dc5c53..fc9110004 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/Makefile +++ b/drivers/media/platform/rockchip/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += iep/ obj-y += rga/ + obj-y += rkcif/ obj-y += rkisp1/ - obj-y += rkvdec/ diff --git a/drivers/media/platform/rockchip/iep/Kconfig b/drivers/media/platform/rockchip/iep/Kconfig new file mode 100644 -index 000000000..d95155a95 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/Kconfig @@ -0,0 +1,16 @@ @@ -243,7 +237,7 @@ index 000000000..d95155a95 + will be called rockchip-iep diff --git a/drivers/media/platform/rockchip/iep/Makefile b/drivers/media/platform/rockchip/iep/Makefile new file mode 100644 -index 000000000..5c89b3277 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/Makefile @@ -0,0 +1,5 @@ @@ -254,7 +248,7 @@ index 000000000..5c89b3277 +obj-$(CONFIG_VIDEO_ROCKCHIP_IEP) += rockchip-iep.o diff --git a/drivers/media/platform/rockchip/iep/iep-regs.h b/drivers/media/platform/rockchip/iep/iep-regs.h new file mode 100644 -index 000000000..a68685ef3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/iep-regs.h @@ -0,0 +1,291 @@ @@ -551,7 +545,7 @@ index 000000000..a68685ef3 +#endif diff --git a/drivers/media/platform/rockchip/iep/iep.c b/drivers/media/platform/rockchip/iep/iep.c new file mode 100644 -index 000000000..165a61c9a +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/iep.c @@ -0,0 +1,1087 @@ @@ -1644,7 +1638,7 @@ index 000000000..165a61c9a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/iep/iep.h b/drivers/media/platform/rockchip/iep/iep.h new file mode 100644 -index 000000000..7d9fc6162 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/iep.h @@ -0,0 +1,112 @@ @@ -1761,5 +1755,5 @@ index 000000000..7d9fc6162 + +#endif -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.19/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch b/patch/kernel/archive/rockchip64-6.19/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch index aea4499f3c..ff1e390a02 100644 --- a/patch/kernel/archive/rockchip64-6.19/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch +++ b/patch/kernel/archive/rockchip64-6.19/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch @@ -14,15 +14,15 @@ diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/pla index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -@@ -186,7 +186,6 @@ static int rkvdec_s_ctrl(struct v4l2_ctrl *ctrl) +@@ -151,7 +151,6 @@ static int rkvdec_s_ctrl(struct v4l2_ctrl *ctrl) struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl); const struct rkvdec_coded_fmt_desc *desc = ctx->coded_fmt_desc; enum rkvdec_image_fmt image_fmt; - struct vb2_queue *vq; - /* Check if this change requires a capture format reset */ - if (!desc->ops->get_image_fmt) -@@ -194,11 +193,6 @@ static int rkvdec_s_ctrl(struct v4l2_ctrl *ctrl) + if (ctrl->id == V4L2_CID_STATELESS_HEVC_EXT_SPS_ST_RPS) { + ctx->has_sps_st_rps |= !!(ctrl->has_changed); +@@ -169,11 +168,6 @@ static int rkvdec_s_ctrl(struct v4l2_ctrl *ctrl) image_fmt = desc->ops->get_image_fmt(ctx, ctrl); if (rkvdec_image_fmt_changed(ctx, image_fmt)) { diff --git a/patch/kernel/archive/rockchip64-6.19/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.19/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch index 87924a5bba..cefe8b1708 100644 --- a/patch/kernel/archive/rockchip64-6.19/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch +++ b/patch/kernel/archive/rockchip64-6.19/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch @@ -5,16 +5,14 @@ Subject: net: ethernet: realtek: add r8169 LED configuration from OF Signed-off-by: retro98boy --- - drivers/net/ethernet/realtek/r8169_main.c | 11 ++++++++++ - 1 file changed, 11 insertions(+) + drivers/net/ethernet/realtek/r8169_main.c | 12 ++++++++++ + 1 file changed, 12 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index 405e91eb3141..0d415adac4e7 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -19,10 +19,11 @@ - #include - #include +@@ -21,6 +21,7 @@ #include #include #include @@ -22,11 +20,7 @@ index 405e91eb3141..0d415adac4e7 100644 #include #include #include - #include - #include -@@ -2386,10 +2387,19 @@ void r8169_apply_firmware(struct rtl8169_private *tp) - !(val & BMCR_RESET), - 50000, 600000, true); +@@ -2388,6 +2389,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp) } } @@ -42,11 +36,7 @@ index 405e91eb3141..0d415adac4e7 100644 static void rtl_rar_exgmac_set(struct rtl8169_private *tp, const u8 *addr) { rtl_eri_write(tp, 0xe0, ERIAR_MASK_1111, get_unaligned_le32(addr)); - rtl_eri_write(tp, 0xe4, ERIAR_MASK_1111, get_unaligned_le16(addr + 4)); - rtl_eri_write(tp, 0xf0, ERIAR_MASK_1111, get_unaligned_le16(addr) << 16); -@@ -3236,10 +3246,12 @@ static void rtl_hw_start_8168g(struct rtl8169_private *tp) - rtl_disable_rxdvgate(tp); - +@@ -3235,6 +3245,8 @@ static void rtl_hw_start_8168g(struct rtl8169_private *tp) rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000); rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000); @@ -55,8 +45,6 @@ index 405e91eb3141..0d415adac4e7 100644 rtl_w0w1_eri(tp, 0x2fc, 0x01, 0x06); rtl_eri_clear_bits(tp, 0x1b0, BIT(12)); - rtl_pcie_state_l2l3_disable(tp); - } -- Armbian diff --git a/patch/kernel/archive/rockchip64-6.19/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.19/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch index 324bae621f..d629a692bc 100644 --- a/patch/kernel/archive/rockchip64-6.19/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch +++ b/patch/kernel/archive/rockchip64-6.19/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch @@ -12,7 +12,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 -@@ -214,6 +214,15 @@ static int rtl821x_modify_ext_page(struct phy_device *phydev, u16 ext_page, +@@ -248,6 +248,15 @@ static int rtl821x_modify_ext_page(struct phy_device *phydev, u16 ext_page, return phy_restore_page(phydev, oldpage, ret); } @@ -28,7 +28,7 @@ index 111111111111..222222222222 100644 static int rtl821x_probe(struct phy_device *phydev) { struct device *dev = &phydev->mdio.dev; -@@ -263,6 +272,8 @@ static int rtl8211f_probe(struct phy_device *phydev) +@@ -281,6 +290,8 @@ static int rtl8211f_probe(struct phy_device *phydev) if (ret < 0) return ret; diff --git a/patch/kernel/archive/rockchip64-6.19/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.19/regulator-add-fan53200-driver.patch index a117ae9940..f67b23e75c 100644 --- a/patch/kernel/archive/rockchip64-6.19/regulator-add-fan53200-driver.patch +++ b/patch/kernel/archive/rockchip64-6.19/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 -@@ -810,6 +810,7 @@ CONFIG_REGULATOR_BD9571MWV=y +@@ -821,6 +821,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.19/rk3308-fix-uart-dma.patch b/patch/kernel/archive/rockchip64-6.19/rk3308-fix-uart-dma.patch index ad1546e36b..071d8c6da0 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3308-fix-uart-dma.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3308-fix-uart-dma.patch @@ -80,7 +80,7 @@ index 111111111111..222222222222 100644 #define RK3368_GRF_SOC_CON15 0x43c static const struct rockchip_grf_value rk3368_defaults[] __initconst = { -@@ -172,6 +183,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = { +@@ -184,6 +195,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = { }, { .compatible = "rockchip,rk3328-grf", .data = (void *)&rk3328_grf, diff --git a/patch/kernel/archive/rockchip64-6.19/rk3308-internal-rgb-lcdc.patch b/patch/kernel/archive/rockchip64-6.19/rk3308-internal-rgb-lcdc.patch index 41364597be..19480eb3bd 100755 --- a/patch/kernel/archive/rockchip64-6.19/rk3308-internal-rgb-lcdc.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3308-internal-rgb-lcdc.patch @@ -20,7 +20,7 @@ index 111111111111..222222222222 100644 #include #include -@@ -168,6 +169,8 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev, +@@ -169,6 +170,8 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev, goto err_free_connector; } diff --git a/patch/kernel/archive/rockchip64-6.19/rk3308-vop-output.patch b/patch/kernel/archive/rockchip64-6.19/rk3308-vop-output.patch index 3f172734c8..4864be1ddd 100755 --- a/patch/kernel/archive/rockchip64-6.19/rk3308-vop-output.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3308-vop-output.patch @@ -54,7 +54,7 @@ index 111111111111..222222222222 100644 i2s_8ch_0: i2s@ff300000 { compatible = "rockchip,rk3308-i2s-tdm"; reg = <0x0 0xff300000 0x0 0x1000>; -@@ -2121,5 +2147,89 @@ uart4_rts_pin: uart4-rts-pin { +@@ -2118,5 +2144,89 @@ uart4_rts_pin: uart4-rts-pin { <4 RK_PA7 0 &pcfg_pull_none>; }; }; @@ -148,7 +148,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockc index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -@@ -1186,6 +1186,106 @@ static const struct vop_data rk3328_vop = { +@@ -1187,6 +1187,106 @@ static const struct vop_data rk3328_vop = { .max_output = { 4096, 2160 }, }; @@ -255,7 +255,7 @@ index 111111111111..222222222222 100644 static const struct vop_common rv1126_common = { .standby = VOP_REG_SYNC(PX30_SYS_CTRL2, 0x1, 1), .out_mode = VOP_REG(PX30_DSP_CTRL2, 0xf, 16), -@@ -1254,6 +1354,8 @@ static const struct of_device_id vop_driver_dt_match[] = { +@@ -1255,6 +1355,8 @@ static const struct of_device_id vop_driver_dt_match[] = { .data = &rk3188_vop }, { .compatible = "rockchip,rk3288-vop", .data = &rk3288_vop }, diff --git a/patch/kernel/archive/rockchip64-6.19/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-6.19/rk3328-add-dmc-driver.patch index e675881452..22ffc1c913 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3328-add-dmc-driver.patch +++ b/patch/kernel/archive/rockchip64-6.19/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 -@@ -632,7 +632,8 @@ struct clk *rockchip_clk_register_mmc(const char *name, +@@ -722,7 +722,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. */ diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch index 557e203cd7..866cdffb87 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch +++ b/patch/kernel/archive/rockchip64-6.19/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 -@@ -5087,6 +5087,14 @@ +@@ -5205,6 +5205,14 @@ Kernel parameters nomsi Do not use MSI for native PCIe PME signaling (this makes all PCIe root ports use INTx for all services). diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-sd-drive-level-8ma.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-sd-drive-level-8ma.patch index b4a57ad16e..017e3b4835 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-sd-drive-level-8ma.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-sd-drive-level-8ma.patch @@ -112,7 +112,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi -@@ -2658,25 +2658,25 @@ sdio0_int: sdio0-int { +@@ -2656,25 +2656,25 @@ sdio0_int: sdio0-int { sdmmc { sdmmc_bus1: sdmmc-bus1 { rockchip,pins = @@ -145,7 +145,7 @@ index 111111111111..222222222222 100644 }; sdmmc_cd: sdmmc-cd { -@@ -2686,7 +2686,7 @@ sdmmc_cd: sdmmc-cd { +@@ -2684,7 +2684,7 @@ sdmmc_cd: sdmmc-cd { sdmmc_wp: sdmmc-wp { rockchip,pins = diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-sd-pwr-pinctrl.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-sd-pwr-pinctrl.patch index e8ee76d835..a2b229ca3d 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-sd-pwr-pinctrl.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-sd-pwr-pinctrl.patch @@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi -@@ -2653,6 +2653,11 @@ sdio0_int: sdio0-int { +@@ -2651,6 +2651,11 @@ sdio0_int: sdio0-int { rockchip,pins = <0 RK_PA4 1 &pcfg_pull_up>; }; diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch index c65c38a340..60a75364ae 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch @@ -13,7 +13,7 @@ diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 111111111111..222222222222 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c -@@ -3114,7 +3114,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port) +@@ -3127,7 +3127,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port) { struct usb_power_delivery_desc desc = { port->negotiated_rev }; struct usb_power_delivery_capabilities_desc caps = { }; @@ -22,7 +22,7 @@ index 111111111111..222222222222 100644 if (!port->partner_pd) port->partner_pd = usb_power_delivery_register(NULL, &desc); -@@ -3124,11 +3124,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port) +@@ -3137,11 +3137,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port) memcpy(caps.pdo, port->source_caps, sizeof(u32) * port->nr_source_caps); caps.role = TYPEC_SOURCE; diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch index 385bbb73b1..d0a5b5268a 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch @@ -16,7 +16,7 @@ diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 111111111111..222222222222 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -153,7 +153,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode, bool ignore_susphy) +@@ -154,7 +154,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode, bool ignore_susphy) } reg &= ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG)); @@ -25,7 +25,7 @@ index 111111111111..222222222222 100644 dwc3_writel(dwc->regs, DWC3_GCTL, reg); dwc->current_dr_role = mode; -@@ -193,6 +193,7 @@ static void __dwc3_set_mode(struct work_struct *work) +@@ -195,6 +195,7 @@ static void __dwc3_set_mode(struct work_struct *work) dwc3_host_exit(dwc); break; case DWC3_GCTL_PRTCAP_DEVICE: @@ -33,7 +33,7 @@ index 111111111111..222222222222 100644 dwc3_gadget_exit(dwc); dwc3_event_buffers_cleanup(dwc); break; -@@ -212,12 +213,43 @@ static void __dwc3_set_mode(struct work_struct *work) +@@ -214,12 +215,43 @@ static void __dwc3_set_mode(struct work_struct *work) * Only perform GCTL.CoreSoftReset when there's DRD role switching. */ if (dwc->current_dr_role && ((DWC3_IP_IS(DWC3) || @@ -78,7 +78,7 @@ index 111111111111..222222222222 100644 /* * Wait for internal clocks to synchronized. DWC_usb31 and * DWC_usb32 may need at least 50ms (less for DWC_usb3). To -@@ -259,6 +291,7 @@ static void __dwc3_set_mode(struct work_struct *work) +@@ -261,6 +293,7 @@ static void __dwc3_set_mode(struct work_struct *work) } break; case DWC3_GCTL_PRTCAP_DEVICE: @@ -86,7 +86,7 @@ index 111111111111..222222222222 100644 dwc3_core_soft_reset(dwc); dwc3_event_buffers_setup(dwc); -@@ -1846,6 +1879,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1852,6 +1885,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) dwc->dis_split_quirk = device_property_read_bool(dev, "snps,dis-split-quirk"); @@ -95,7 +95,7 @@ index 111111111111..222222222222 100644 dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; -@@ -2442,6 +2477,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) +@@ -2451,6 +2486,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -103,7 +103,7 @@ index 111111111111..222222222222 100644 if (pm_runtime_suspended(dwc->dev)) break; ret = dwc3_gadget_suspend(dwc); -@@ -2506,11 +2542,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) +@@ -2515,11 +2551,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -117,7 +117,7 @@ index 111111111111..222222222222 100644 dwc3_gadget_resume(dwc); break; case DWC3_GCTL_PRTCAP_HOST: -@@ -2574,6 +2611,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc) +@@ -2583,6 +2620,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc) { switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -125,7 +125,7 @@ index 111111111111..222222222222 100644 if (dwc->connected) return -EBUSY; break; -@@ -2612,6 +2650,7 @@ int dwc3_runtime_resume(struct dwc3 *dwc) +@@ -2621,6 +2659,7 @@ int dwc3_runtime_resume(struct dwc3 *dwc) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -133,7 +133,7 @@ index 111111111111..222222222222 100644 if (dwc->pending_events) { pm_runtime_put(dev); dwc->pending_events = false; -@@ -2636,6 +2675,7 @@ int dwc3_runtime_idle(struct dwc3 *dwc) +@@ -2645,6 +2684,7 @@ int dwc3_runtime_idle(struct dwc3 *dwc) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -229,7 +229,7 @@ index 111111111111..222222222222 100644 return NOTIFY_DONE; } -@@ -548,8 +559,7 @@ int dwc3_drd_init(struct dwc3 *dwc) +@@ -549,8 +560,7 @@ int dwc3_drd_init(struct dwc3 *dwc) if (dwc->edev) { dwc->edev_nb.notifier_call = dwc3_drd_notifier; diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch index d931e9fe5f..61a3b28d25 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch @@ -18,7 +18,7 @@ diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 111111111111..222222222222 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -933,6 +933,7 @@ static int dwc3_phy_power_on(struct dwc3 *dwc) +@@ -934,6 +934,7 @@ static int dwc3_phy_power_on(struct dwc3 *dwc) goto err_power_off_usb3_phy; } @@ -26,7 +26,7 @@ index 111111111111..222222222222 100644 return 0; err_power_off_usb3_phy: -@@ -953,8 +954,10 @@ static void dwc3_phy_power_off(struct dwc3 *dwc) +@@ -954,8 +955,10 @@ static void dwc3_phy_power_off(struct dwc3 *dwc) { int i; diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch index d22c84c4a6..b38fd0df39 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch @@ -18,7 +18,7 @@ diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 111111111111..222222222222 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c -@@ -3115,15 +3115,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port) +@@ -3128,15 +3128,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port) struct usb_power_delivery_desc desc = { port->negotiated_rev }; struct usb_power_delivery_capabilities_desc caps = { }; struct usb_power_delivery_capabilities *cap; @@ -45,7 +45,7 @@ index 111111111111..222222222222 100644 cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps); if (IS_ERR(cap)) return PTR_ERR(cap); -@@ -3138,15 +3145,22 @@ static int tcpm_register_sink_caps(struct tcpm_port *port) +@@ -3151,15 +3158,22 @@ static int tcpm_register_sink_caps(struct tcpm_port *port) struct usb_power_delivery_desc desc = { port->negotiated_rev }; struct usb_power_delivery_capabilities_desc caps = { }; struct usb_power_delivery_capabilities *cap; @@ -72,7 +72,7 @@ index 111111111111..222222222222 100644 cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps); if (IS_ERR(cap)) return PTR_ERR(cap); -@@ -7209,10 +7223,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port) +@@ -7222,10 +7236,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port) port->pds[i] = usb_power_delivery_register(port->dev, &desc); if (IS_ERR(port->pds[i])) { ret = PTR_ERR(port->pds[i]); diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch index 42b6d7ce33..42460d97a5 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch @@ -37,7 +37,7 @@ diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 111111111111..222222222222 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c -@@ -1863,6 +1863,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port) +@@ -1876,6 +1876,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port) return; for (i = 0; i < modep->altmodes; i++) { diff --git a/patch/kernel/archive/rockchip64-6.19/rk3528-net-dsa-realtek-fixes-for-radxa-e24c-switch-chip.patch b/patch/kernel/archive/rockchip64-6.19/rk3528-net-dsa-realtek-fixes-for-radxa-e24c-switch-chip.patch index 0e50772dcb..31a2459ed3 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3528-net-dsa-realtek-fixes-for-radxa-e24c-switch-chip.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3528-net-dsa-realtek-fixes-for-radxa-e24c-switch-chip.patch @@ -210,7 +210,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethern index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c -@@ -1544,23 +1544,23 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, +@@ -1573,23 +1573,23 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, ret = of_property_read_u32(dev->of_node, "tx_delay", &value); if (ret) { @@ -244,7 +244,7 @@ index 111111111111..222222222222 100644 bsp_priv->rx_delay = value; } -@@ -1639,21 +1639,14 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) +@@ -1668,21 +1668,14 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) /*rmii or rgmii*/ switch (bsp_priv->phy_iface) { case PHY_INTERFACE_MODE_RGMII: @@ -303,7 +303,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethern index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c -@@ -1531,17 +1531,22 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, +@@ -1560,17 +1560,22 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, ret = of_property_read_string(dev->of_node, "clock_in_out", &strings); if (ret) { @@ -329,7 +329,7 @@ index 111111111111..222222222222 100644 ret = of_property_read_u32(dev->of_node, "tx_delay", &value); if (ret) { if (plat->phy_interface == PHY_INTERFACE_MODE_RGMII_ID || -@@ -1649,7 +1654,9 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) +@@ -1678,7 +1683,9 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) bsp_priv->rx_delay); break; case PHY_INTERFACE_MODE_RMII: diff --git a/patch/kernel/archive/rockchip64-6.19/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.19/rk356x-add-rkvdec2-support.patch index d32a62fe85..b46f26fe7f 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk356x-add-rkvdec2-support.patch +++ b/patch/kernel/archive/rockchip64-6.19/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 -@@ -380,6 +380,19 @@ usb2phy1_grf: syscon@fdca8000 { +@@ -383,6 +383,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>; -@@ -565,7 +578,7 @@ gpu: gpu@fde60000 { +@@ -568,7 +581,7 @@ gpu: gpu@fde60000 { }; vpu: video-codec@fdea0400 { @@ -45,8 +45,8 @@ index 111111111111..222222222222 100644 reg = <0x0 0xfdea0000 0x0 0x800>; interrupts = ; interrupt-names = "vdpu"; -@@ -616,6 +629,26 @@ vepu_mmu: iommu@fdee0800 { - #iommu-cells = <0>; +@@ -663,6 +676,26 @@ vicap_mmu: iommu@fdfe0800 { + status = "disabled"; }; + vdec: video-codec@fdf80200 { diff --git a/patch/kernel/archive/rockchip64-6.19/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch b/patch/kernel/archive/rockchip64-6.19/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch index 507834b0d1..0c8229b122 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch @@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch/arm6 index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi -@@ -584,6 +584,7 @@ &sdhci { +@@ -590,6 +590,7 @@ &sdhci { no-sdio; no-sd; non-removable; diff --git a/patch/kernel/archive/rockchip64-6.19/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.19/rk35xx-montjoie-crypto-v2-rk35xx.patch index 84d4ca3645..1e680b0a4d 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk35xx-montjoie-crypto-v2-rk35xx.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk35xx-montjoie-crypto-v2-rk35xx.patch @@ -102,7 +102,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 -@@ -2256,6 +2256,18 @@ rng@fe378000 { +@@ -2257,6 +2257,18 @@ rng@fe378000 { resets = <&scmi_reset SCMI_SRST_H_TRNG_NS>; }; @@ -142,7 +142,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 -@@ -1090,6 +1090,18 @@ rng: rng@fe388000 { +@@ -1137,6 +1137,18 @@ rng: rng@fe388000 { status = "disabled"; }; @@ -345,7 +345,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 111111111111..222222222222 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -745,6 +745,35 @@ config CRYPTO_DEV_XILINX_TRNG +@@ -746,6 +746,35 @@ config CRYPTO_DEV_XILINX_TRNG To compile this driver as a module, choose M here: the module will be called xilinx-trng. diff --git a/patch/kernel/archive/rockchip64-6.19/temporary-workaround-dma-reset.patch b/patch/kernel/archive/rockchip64-6.19/temporary-workaround-dma-reset.patch index 24af5b543d..4c09ffe8aa 100644 --- a/patch/kernel/archive/rockchip64-6.19/temporary-workaround-dma-reset.patch +++ b/patch/kernel/archive/rockchip64-6.19/temporary-workaround-dma-reset.patch @@ -17,9 +17,9 @@ 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 -@@ -3057,8 +3057,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) +@@ -3206,8 +3206,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) - ret = stmmac_reset(priv, priv->ioaddr); + ret = stmmac_reset(priv); if (ret) { - netdev_err(priv->dev, "Failed to reset the dma\n"); - return ret;