diff --git a/patch/kernel/archive/rockchip-6.17/0001-temp-workaround-dma-reset.patch b/patch/kernel/archive/rockchip-6.17/0001-temp-workaround-dma-reset.patch index 5a7958751603..3155ed399aca 100644 --- a/patch/kernel/archive/rockchip-6.17/0001-temp-workaround-dma-reset.patch +++ b/patch/kernel/archive/rockchip-6.17/0001-temp-workaround-dma-reset.patch @@ -1,14 +1,28 @@ -Temporary patch to workaround a DMA reset issue with rockchip -devices experienced at least on rk3288 and rk3328 with a message -like this: +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Wed, 20 Aug 2025 21:40:48 +0200 +Subject: [ARCHEOLOGY] workaround for rockchip gigabit ethernet not able to + init dma -rk_gmac-dwmac ff290000.ethernet end0: Failed to reset the dma +> X-Git-Archeology: - Revision ae11ad5db511f41448066fd29c1c9f5e661b023c: https://github.com/armbian/build/commit/ae11ad5db511f41448066fd29c1c9f5e661b023c +> X-Git-Archeology: Date: Wed, 20 Aug 2025 21:40:48 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: workaround for rockchip gigabit ethernet not able to init dma +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index e0fb06af1f94..156a5d25d1fd 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -3133,8 +3133,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) +@@ -3134,8 +3134,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) ret = stmmac_reset(priv, priv->ioaddr); if (ret) { @@ -19,3 +33,6 @@ index e0fb06af1f94..156a5d25d1fd 100644 } /* DMA Configuration */ +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip-6.17/kernel-6.8-tools-cgroup-makefile.patch index 068fe83689d6..bbb8b1fbd491 100644 --- a/patch/kernel/archive/rockchip-6.17/kernel-6.8-tools-cgroup-makefile.patch +++ b/patch/kernel/archive/rockchip-6.17/kernel-6.8-tools-cgroup-makefile.patch @@ -1,6 +1,65 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Mon, 25 Mar 2024 19:38:38 +0100 +Subject: [ARCHEOLOGY] rockchip: bump edge kernel to 6.8 + +> X-Git-Archeology: - Revision 47d2e8287e34fed3e47f37ab076d0f34ed0ac399: https://github.com/armbian/build/commit/47d2e8287e34fed3e47f37ab076d0f34ed0ac399 +> X-Git-Archeology: Date: Mon, 25 Mar 2024 19:38:38 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.8 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 724573bf7a21e61b0b626f835031a4c3206bb8ba: https://github.com/armbian/build/commit/724573bf7a21e61b0b626f835031a4c3206bb8ba +> X-Git-Archeology: Date: Wed, 05 Jun 2024 22:18:51 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip family edge kernel to 6.9 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7da7bbf61cb776a054219e35926d391dad9a67a7: https://github.com/armbian/build/commit/7da7bbf61cb776a054219e35926d391dad9a67a7 +> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:18:14 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.10 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 94ec783de0dad381b3e2e71d646d8428af4d5051: https://github.com/armbian/build/commit/94ec783de0dad381b3e2e71d646d8428af4d5051 +> X-Git-Archeology: Date: Wed, 18 Sep 2024 14:03:19 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.11 +> X-Git-Archeology: +> X-Git-Archeology: - Revision c90a0f7890bddc8e755847fc8227e15828950251: https://github.com/armbian/build/commit/c90a0f7890bddc8e755847fc8227e15828950251 +> X-Git-Archeology: Date: Sat, 30 Nov 2024 13:07:31 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.12 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + tools/cgroup/Makefile | 11 ++++++++++ + 1 file changed, 11 insertions(+) + diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile new file mode 100644 -index 000000000000..ffca068e4a76 +index 000000000000..111111111111 --- /dev/null +++ b/tools/cgroup/Makefile @@ -0,0 +1,11 @@ @@ -15,3 +74,6 @@ index 000000000000..ffca068e4a76 + +clean: + $(RM) cgroup_event_listener +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-ds1307.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-ds1307.dtbo deleted file mode 100644 index 937c261aecb8..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-ds1307.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c1.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c1.dtbo deleted file mode 100644 index fd1b3d988f6d..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c1.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c4.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c4.dtbo deleted file mode 100644 index aa2836e20269..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c4.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi0.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi0.dtbo deleted file mode 100644 index 060d23bcebaf..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi0.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi2.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi2.dtbo deleted file mode 100644 index 7bedbcbee869..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi2.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev0.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev0.dtbo deleted file mode 100644 index 2423a6ca4de1..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev0.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev2.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev2.dtbo deleted file mode 100644 index 65f6860c6d78..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev2.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart1.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart1.dtbo deleted file mode 100644 index 0b820aa447ec..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart1.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart2.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart2.dtbo deleted file mode 100644 index 3e57168c2ed4..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart2.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart3.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart3.dtbo deleted file mode 100644 index d171ece89929..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart3.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart4.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart4.dtbo deleted file mode 100644 index 795fdebae94b..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart4.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-w1-gpio.dtbo b/patch/kernel/archive/rockchip-6.17/overlay/rockchip-w1-gpio.dtbo deleted file mode 100644 index 6bbc114521d8..000000000000 Binary files a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-w1-gpio.dtbo and /dev/null differ diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/bt-broadcom-serdev-workaround.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/bt-broadcom-serdev-workaround.patch index a876f697344d..3b37fa347596 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/bt-broadcom-serdev-workaround.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/bt-broadcom-serdev-workaround.patch @@ -9,12 +9,10 @@ Subject: Workaround to make several broadcom bluetooth serdev devices work 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c -index 3a3a56ddbb06..de66fe473595 100644 +index 111111111111..222222222222 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c -@@ -133,11 +133,11 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) - !bacmp(&bda->bdaddr, BDADDR_BCM43341B)) { - /* Try falling back to BDADDR EFI variable */ +@@ -135,7 +135,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) if (btbcm_set_bdaddr_from_efi(hdev) != 0) { bt_dev_info(hdev, "BCM: Using default device address (%pMR)", &bda->bdaddr); @@ -23,8 +21,6 @@ index 3a3a56ddbb06..de66fe473595 100644 } } - kfree_skb(skb); - --- +-- Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rk322x-composite-mmc-clk.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rk322x-composite-mmc-clk.patch index 1c889e35852b..4d8ca1bdf13f 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rk322x-composite-mmc-clk.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rk322x-composite-mmc-clk.patch @@ -1,17 +1,17 @@ -From 9e105544fcb63f8f79b199d1b194a36a354519b3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 2 Apr 2023 10:53:07 +0000 -Subject: [PATCH 2/2] rk322x: better handle mmc/sdio clocks +Subject: rk322x: better handle mmc/sdio clocks --- drivers/clk/rockchip/clk-rk3228.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c -index 996f8bfee..0f690dd84 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c -@@ -371,17 +371,15 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -383,17 +383,15 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKSEL_CON(11), 8, 2, MFLAGS, 0, 8, DFLAGS, RK2928_CLKGATE_CON(2), 11, GFLAGS), @@ -34,5 +34,5 @@ index 996f8bfee..0f690dd84 100644 /* * Clock-Architecture Diagram 2 -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk322x-audio-codec.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk322x-audio-codec.patch index a4492b9d3cc9..8c41f35046fb 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk322x-audio-codec.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk322x-audio-codec.patch @@ -1,25 +1,22 @@ -From 50a8db983c682918cd2efe02ede48db93892d52a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 20 Jul 2024 13:51:55 +0200 -Subject: [PATCH] rk3228: add analog audio codec +Subject: rk3228: add analog audio codec --- - .../bindings/sound/rockchip,rk3228-codec.txt | 22 + - arch/arm/boot/dts/rockchip/rk322x.dtsi | 9 + - drivers/clk/rockchip/clk-rk3228.c | 2 +- - include/dt-bindings/clock/rk3228-cru.h | 1 + - sound/soc/codecs/Kconfig | 6 + - sound/soc/codecs/Makefile | 2 + - sound/soc/codecs/rk3228_codec.c | 545 ++++++++++++++++++ - sound/soc/codecs/rk3228_codec.h | 218 +++++++ + Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt | 22 + + arch/arm/boot/dts/rockchip/rk322x.dtsi | 9 + + drivers/clk/rockchip/clk-rk3228.c | 2 +- + include/dt-bindings/clock/rk3228-cru.h | 1 + + sound/soc/codecs/Kconfig | 6 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/rk3228_codec.c | 545 ++++++++++ + sound/soc/codecs/rk3228_codec.h | 218 ++++ 8 files changed, 804 insertions(+), 1 deletion(-) - create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt - create mode 100644 sound/soc/codecs/rk3228_codec.c - create mode 100644 sound/soc/codecs/rk3228_codec.h diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt new file mode 100644 -index 000000000000..9191a8593380 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt @@ -0,0 +1,22 @@ @@ -46,10 +43,10 @@ index 000000000000..9191a8593380 + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index cc5a5e609f04..d13dc979a67e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi -@@ -249,6 +249,15 @@ i2s1: i2s1@100b0000 { +@@ -148,6 +148,15 @@ i2s1: i2s1@100b0000 { status = "disabled"; }; @@ -66,10 +63,10 @@ index cc5a5e609f04..d13dc979a67e 100644 compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s"; reg = <0x100c0000 0x4000>; diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c -index 0db8a97007f2..0f690dd84650 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c -@@ -603,7 +603,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -618,7 +618,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { GATE(0, "pclk_sim", "pclk_cpu", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS), GATE(0, "pclk_ddrphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS), @@ -79,10 +76,10 @@ index 0db8a97007f2..0f690dd84650 100644 GATE(0, "pclk_vdacphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 8, GFLAGS), GATE(0, "pclk_phy_noc", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 9, GFLAGS), diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h -index 911824731866..9162f9132657 100644 +index 111111111111..222222222222 100644 --- a/include/dt-bindings/clock/rk3228-cru.h +++ b/include/dt-bindings/clock/rk3228-cru.h -@@ -116,6 +116,7 @@ +@@ -115,6 +115,7 @@ #define PCLK_HDMI_CTRL 364 #define PCLK_HDMI_PHY 365 #define PCLK_GMAC 367 @@ -91,10 +88,10 @@ index 911824731866..9162f9132657 100644 /* hclk gates */ #define HCLK_I2S0_8CH 442 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 4afc43d3f71f..183a69249160 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig -@@ -182,6 +182,7 @@ config SND_SOC_ALL_CODECS +@@ -193,6 +193,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_PCM6240 imply SND_SOC_PEB2466 imply SND_SOC_RK3308 @@ -102,7 +99,7 @@ index 4afc43d3f71f..183a69249160 100644 imply SND_SOC_RK3328 imply SND_SOC_RK817 imply SND_SOC_RT274 -@@ -1457,6 +1458,11 @@ config SND_SOC_RK3308 +@@ -1554,6 +1555,11 @@ config SND_SOC_RK3308 It has 8 24-bit ADCs and 2 24-bit DACs. The maximum supported sampling rate is 192 kHz. @@ -115,10 +112,10 @@ index 4afc43d3f71f..183a69249160 100644 tristate "Rockchip RK3328 audio CODEC" depends on ARCH_ROCKCHIP || COMPILE_TEST diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index b4df22186e25..454179eb7b73 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile -@@ -207,6 +207,7 @@ snd-soc-pcm512x-spi-y := pcm512x-spi.o +@@ -223,6 +223,7 @@ snd-soc-pcm512x-spi-y := pcm512x-spi.o snd-soc-pcm6240-y := pcm6240.o snd-soc-peb2466-y := peb2466.o snd-soc-rk3308-y := rk3308_codec.o @@ -126,7 +123,7 @@ index b4df22186e25..454179eb7b73 100644 snd-soc-rk3328-y := rk3328_codec.o snd-soc-rk817-y := rk817_codec.o snd-soc-rl6231-y := rl6231.o -@@ -599,6 +600,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o +@@ -643,6 +644,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o obj-$(CONFIG_SND_SOC_PCM6240) += snd-soc-pcm6240.o obj-$(CONFIG_SND_SOC_PEB2466) += snd-soc-peb2466.o obj-$(CONFIG_SND_SOC_RK3308) += snd-soc-rk3308.o @@ -136,7 +133,7 @@ index b4df22186e25..454179eb7b73 100644 obj-$(CONFIG_SND_SOC_RL6231) += snd-soc-rl6231.o diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c new file mode 100644 -index 000000000000..197e7e2e0d8b +index 000000000000..111111111111 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.c @@ -0,0 +1,545 @@ @@ -687,7 +684,7 @@ index 000000000000..197e7e2e0d8b +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3228_codec.h b/sound/soc/codecs/rk3228_codec.h new file mode 100644 -index 000000000000..7283d0ba86e8 +index 000000000000..111111111111 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.h @@ -0,0 +1,218 @@ @@ -910,5 +907,5 @@ index 000000000000..7283d0ba86e8 + +#endif -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk3288-gpiomem.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk3288-gpiomem.patch index e2f887bdd42f..8fe777043b64 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk3288-gpiomem.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk3288-gpiomem.patch @@ -1,8 +1,153 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Thu, 24 May 2018 15:44:15 +0200 +Subject: [ARCHEOLOGY] Merging Rockchip family + +> X-Git-Archeology: - Revision 7d2f3af08f23049c91c88eec5062613bbfbc85d4: https://github.com/armbian/build/commit/7d2f3af08f23049c91c88eec5062613bbfbc85d4 +> X-Git-Archeology: Date: Thu, 24 May 2018 15:44:15 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Merging Rockchip family +> X-Git-Archeology: +> X-Git-Archeology: - Revision fafd26db7e055a87e775fdc18de8e64f95e53d41: https://github.com/armbian/build/commit/fafd26db7e055a87e775fdc18de8e64f95e53d41 +> X-Git-Archeology: Date: Thu, 28 Jun 2018 22:11:59 -0400 +> X-Git-Archeology: From: Tony +> X-Git-Archeology: Subject: Rockchip default merge (#1026) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96e78c102f8c9a3719b9cb4a9eb6becb063891ce: https://github.com/armbian/build/commit/96e78c102f8c9a3719b9cb4a9eb6becb063891ce +> X-Git-Archeology: Date: Sun, 08 Jul 2018 13:19:07 -0700 +> X-Git-Archeology: From: Rabit +> X-Git-Archeology: Subject: ASUS Tinkerboard: Restore justice - author of the gpiomem port +> X-Git-Archeology: +> X-Git-Archeology: - Revision 106685906579e4c5528fcd22abf79c6719d633fb: https://github.com/armbian/build/commit/106685906579e4c5528fcd22abf79c6719d633fb +> X-Git-Archeology: Date: Sun, 08 Jul 2018 14:12:15 -0700 +> X-Git-Archeology: From: Rabit +> X-Git-Archeology: Subject: ASUS Tinkerboard: Added gpio & i2c groups with udev rules to devices +> X-Git-Archeology: +> X-Git-Archeology: - Revision de41d3dbce3ed5e467019c0f74ac93dbeb866ded: https://github.com/armbian/build/commit/de41d3dbce3ed5e467019c0f74ac93dbeb866ded +> X-Git-Archeology: Date: Fri, 10 Aug 2018 10:33:42 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Rockchip default cleanup. (Temporally) moving back to Rockchip upstream. This source builds but doesn't boot ... +> X-Git-Archeology: +> X-Git-Archeology: - Revision fc1715450015ae62374a13d77f19b0ab53bb1d4c: https://github.com/armbian/build/commit/fc1715450015ae62374a13d77f19b0ab53bb1d4c +> X-Git-Archeology: Date: Sat, 13 Jul 2019 15:14:54 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: rockchip-dev: bump to 5.2, adjust pathes, add gpio_mem driver +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: https://github.com/armbian/build/commit/744ea89a589d62cb6f409baab60fc6664520bc39 +> X-Git-Archeology: Date: Wed, 08 Sep 2021 17:51:34 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Bumping EDGE kernel to 5.14.y (#3125) +> X-Git-Archeology: +> X-Git-Archeology: - Revision a1d044de8e0bb6ca504386bc31f5615a9d169067: https://github.com/armbian/build/commit/a1d044de8e0bb6ca504386bc31f5615a9d169067 +> X-Git-Archeology: Date: Tue, 12 Oct 2021 15:59:01 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: update support for edge kernel 5.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 4c3dcbf4fcd3616999cb91a1dddfa74668eb6de9: https://github.com/armbian/build/commit/4c3dcbf4fcd3616999cb91a1dddfa74668eb6de9 +> X-Git-Archeology: Date: Tue, 09 Nov 2021 21:58:35 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: Rockchip 5.15 (#3242) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 3f704692a7933a67b5e8cc6ff690d92ef3a5e735: https://github.com/armbian/build/commit/3f704692a7933a67b5e8cc6ff690d92ef3a5e735 +> X-Git-Archeology: Date: Fri, 24 Mar 2023 23:12:56 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.2 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 4605bcab83d3d0c0360da7dd0f9ee90e884b58e4: https://github.com/armbian/build/commit/4605bcab83d3d0c0360da7dd0f9ee90e884b58e4 +> X-Git-Archeology: Date: Sun, 09 Jul 2023 11:24:10 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge kernel to 6.4 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 06d5054cce5d269b3fe8a0e23918c0c31a91140c: https://github.com/armbian/build/commit/06d5054cce5d269b3fe8a0e23918c0c31a91140c +> X-Git-Archeology: Date: Sun, 24 Sep 2023 19:22:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 47d2e8287e34fed3e47f37ab076d0f34ed0ac399: https://github.com/armbian/build/commit/47d2e8287e34fed3e47f37ab076d0f34ed0ac399 +> X-Git-Archeology: Date: Mon, 25 Mar 2024 19:38:38 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.8 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 724573bf7a21e61b0b626f835031a4c3206bb8ba: https://github.com/armbian/build/commit/724573bf7a21e61b0b626f835031a4c3206bb8ba +> X-Git-Archeology: Date: Wed, 05 Jun 2024 22:18:51 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip family edge kernel to 6.9 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7da7bbf61cb776a054219e35926d391dad9a67a7: https://github.com/armbian/build/commit/7da7bbf61cb776a054219e35926d391dad9a67a7 +> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:18:14 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.10 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 94ec783de0dad381b3e2e71d646d8428af4d5051: https://github.com/armbian/build/commit/94ec783de0dad381b3e2e71d646d8428af4d5051 +> X-Git-Archeology: Date: Wed, 18 Sep 2024 14:03:19 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.11 +> X-Git-Archeology: +> X-Git-Archeology: - Revision c90a0f7890bddc8e755847fc8227e15828950251: https://github.com/armbian/build/commit/c90a0f7890bddc8e755847fc8227e15828950251 +> X-Git-Archeology: Date: Sat, 30 Nov 2024 13:07:31 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.12 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 3 + + arch/arm/boot/dts/rockchip/rk3288.dtsi | 6 + + drivers/char/Kconfig | 1 + + drivers/char/Makefile | 2 + + drivers/char/rockchip/Kconfig | 16 + + drivers/char/rockchip/Makefile | 1 + + drivers/char/rockchip/rk3288-gpiomem.c | 303 ++++++++++ + 7 files changed, 332 insertions(+) + diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index e5b7ef1a5..f88c913ff 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -@@ -544,3 +544,6 @@ +@@ -544,3 +544,6 @@ &vopl_mmu { &wdt { status = "okay"; }; @@ -10,13 +155,13 @@ index e5b7ef1a5..f88c913ff 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index f3ca55496..14bbcb192 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -1418,6 +1418,12 @@ +@@ -1468,6 +1468,12 @@ gic: interrupt-controller@ffc01000 { interrupts = ; }; - + + gpiomem: rk3288-gpiomem@ff750000 { + compatible = "rockchip,rk3288-gpiomem"; + reg = <0x0 0xff750000 0x0 0x1000>; @@ -26,27 +171,26 @@ index f3ca55496..14bbcb192 100644 pinctrl: pinctrl { compatible = "rockchip,rk3288-pinctrl"; rockchip,grf = <&grf>; - diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index 3143db5..9c18b74 100644 +index 111111111111..222222222222 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -5,6 +5,7 @@ +@@ -6,6 +6,7 @@ menu "Character devices" - + source "drivers/tty/Kconfig" +source "drivers/char/rockchip/Kconfig" - - config DEVMEM - bool "/dev/mem virtual device support" + + config TTY_PRINTK + tristate "TTY driver to output user messages via printk" diff --git a/drivers/char/Makefile b/drivers/char/Makefile -index 264eb398f..9fd5f240b 100644 +index 111111111111..222222222222 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -43,6 +43,8 @@ obj-$(CONFIG_TCG_TPM) += tpm/ - +@@ -40,6 +40,8 @@ obj-$(CONFIG_TCG_TPM) += tpm/ + obj-$(CONFIG_PS3_FLASH) += ps3flash.o - + +obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ + obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/ @@ -54,7 +198,7 @@ index 264eb398f..9fd5f240b 100644 obj-$(CONFIG_ADI) += adi.o diff --git a/drivers/char/rockchip/Kconfig b/drivers/char/rockchip/Kconfig new file mode 100644 -index 0000000..6e97486 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/char/rockchip/Kconfig @@ -0,0 +1,16 @@ @@ -77,7 +221,7 @@ index 0000000..6e97486 \ No newline at end of file diff --git a/drivers/char/rockchip/Makefile b/drivers/char/rockchip/Makefile new file mode 100644 -index 0000000..2287ec2 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/char/rockchip/Makefile @@ -0,0 +1 @@ @@ -85,7 +229,7 @@ index 0000000..2287ec2 \ No newline at end of file diff --git a/drivers/char/rockchip/rk3288-gpiomem.c b/drivers/char/rockchip/rk3288-gpiomem.c new file mode 100644 -index 0000000..984471c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/char/rockchip/rk3288-gpiomem.c @@ -0,0 +1,303 @@ @@ -393,3 +537,6 @@ index 0000000..984471c +MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace"); +MODULE_AUTHOR("Luke Wren "); \ No newline at end of file +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-tinkerboard-alc4040-codec.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-tinkerboard-alc4040-codec.patch index f85f24fb7adc..37f81439417d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-tinkerboard-alc4040-codec.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-tinkerboard-alc4040-codec.patch @@ -1,8 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony +Date: Sun, 15 Apr 2018 14:40:58 -0400 +Subject: [ARCHEOLOGY] Rockchip next sync master and development + +> X-Git-Archeology: > recovered message: > includes kernel panic fix on veth interfaces and audio device patch to enable Tinkerboard audio +> X-Git-Archeology: - Revision b1a21a44cde3d976b9b8ebce4f265e5aa79b2d8a: https://github.com/armbian/build/commit/b1a21a44cde3d976b9b8ebce4f265e5aa79b2d8a +> X-Git-Archeology: Date: Sun, 15 Apr 2018 14:40:58 -0400 +> X-Git-Archeology: From: Tony +> X-Git-Archeology: Subject: Rockchip next sync master and development +> X-Git-Archeology: +> X-Git-Archeology: - Revision b6f1503dfdb215429cc6dee6c2b94ca9ddc96fbc: https://github.com/armbian/build/commit/b6f1503dfdb215429cc6dee6c2b94ca9ddc96fbc +> X-Git-Archeology: Date: Mon, 26 Nov 2018 01:38:25 -0500 +> X-Git-Archeology: From: Thomas McKahan +> X-Git-Archeology: Subject: [ tinkerboard ] dev kernel add audio support +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + sound/usb/card.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + diff --git a/sound/usb/card.c b/sound/usb/card.c -index 2bfe4e80a..cea93aaf5 100644 +index 111111111111..222222222222 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c -@@ -382,6 +382,14 @@ static void usb_audio_make_shortname(struct usb_device *dev, +@@ -623,6 +623,14 @@ static void usb_audio_make_shortname(struct usb_device *dev, } strim(card->shortname); @@ -17,3 +82,6 @@ index 2bfe4e80a..cea93aaf5 100644 } static void usb_audio_make_longname(struct usb_device *dev, +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-plane-overlay.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-plane-overlay.patch index 15319a894f38..e5ad3e427e3b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-plane-overlay.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-plane-overlay.patch @@ -1,9 +1,72 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: paolo +Date: Sat, 19 Sep 2020 15:20:16 +0000 +Subject: [ARCHEOLOGY] Many changes for rk322x target: + +> X-Git-Archeology: > recovered message: > - Chanaged default x.org configuration to disable glamor +> X-Git-Archeology: > recovered message: > - Reintroduce patch to use DRM cursor plane as overlay in rk322x-current and -dev +> X-Git-Archeology: > recovered message: > - Updated wifi patches for kernel 5.8.10 +> X-Git-Archeology: > recovered message: > - Bumped rk322x to u-boot v2020.07, removed reserved zones from device trees +> X-Git-Archeology: > recovered message: > - Updated OPTEE to v3.10, using ddrbin v1.10 +> X-Git-Archeology: > recovered message: > - Bumped rk322x-current to kernel 5.8.y +> X-Git-Archeology: > recovered message: > - Imported new patches from knaerzche's LibreELEC fork for rk322x-dev (kernel 5.8.y) +> X-Git-Archeology: > recovered message: > - Adjusted existing patches to match changes, updated rk322x-dev kernel config file +> X-Git-Archeology: > recovered message: > - Add default modprobe conf file for esp8089 to force the crystal frequency to 40Mhz for rk322x targets +> X-Git-Archeology: > recovered message: > - Removed ssv6051 firmware packages to move to armbian-firmware repository +> X-Git-Archeology: > recovered message: > - Switching ssv6051-wifi.cfg to /lib/firmware for rk322x-legacy +> X-Git-Archeology: > recovered message: > - Removed P2P interface for esp8089 driver for rk322x-legacy +> X-Git-Archeology: > recovered message: > - Optimized ssv6051 performance: kernel module gains -Os flag, disabled p2p interface, enabled HW crypto for CCMP cipher +> X-Git-Archeology: > recovered message: > - Enabled remote control interface, IR GPIO kernel module and HDMI CEC modules +> X-Git-Archeology: - Revision bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076: https://github.com/armbian/build/commit/bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076 +> X-Git-Archeology: Date: Sat, 19 Sep 2020 15:20:16 +0000 +> X-Git-Archeology: From: paolo +> X-Git-Archeology: Subject: Many changes for rk322x target: +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 44 +++++++++- + 1 file changed, 41 insertions(+), 3 deletions(-) + diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 73d24c6bbf05..d4ac6e161ef2 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -@@ -614,6 +614,44 @@ static const struct vop_common rk3288_common = { - .dsp_background = VOP_REG(RK3288_DSP_BG, 0xffffffff, 0), +@@ -729,6 +729,44 @@ static const struct vop_common rk3288_common = { + .cfg_done = VOP_REG_SYNC(RK3288_REG_CFG_DONE, 0x1, 0), }; +static const struct vop_win_phy rk3228_win0_data = { @@ -47,7 +110,7 @@ index 73d24c6bbf05..d4ac6e161ef2 100644 /* * Note: rk3288 has a dedicated 'cursor' window, however, that window requires * special support to get alpha blending working. For now, just use overlay -@@ -864,10 +902,10 @@ static const struct vop_data rk3399_vop_lit = { +@@ -1088,10 +1126,10 @@ static const struct vop_data rk3399_vop_lit = { }; static const struct vop_win_data rk3228_vop_win_data[] = { @@ -62,5 +125,5 @@ index 73d24c6bbf05..d4ac6e161ef2 100644 static const struct vop_data rk3228_vop = { -- -2.17.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-yuv-10bit-modes.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-yuv-10bit-modes.patch index acd738f00d04..9e01747e0f66 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-yuv-10bit-modes.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-yuv-10bit-modes.patch @@ -1,17 +1,17 @@ -From 2d42546642fa4299d88fa4ae414fa1ab205dad70 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 11 Sep 2021 17:38:48 +0000 -Subject: [PATCH] rk322x: enable YUV modes for win1, 10-bit for win0/win1 +Subject: rk322x: enable YUV modes for win1, 10-bit for win0/win1 --- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 70930b410..3fd00b323 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -@@ -719,10 +719,11 @@ static const struct vop_common rk3288_common = { +@@ -731,10 +731,11 @@ static const struct vop_common rk3288_common = { static const struct vop_win_phy rk3228_win0_data = { .scl = &rk3288_win_full_scl, @@ -25,7 +25,7 @@ index 70930b410..3fd00b323 100644 .rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12), .act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0), .dsp_info = VOP_REG(RK3288_WIN0_DSP_INFO, 0x0fff0fff, 0), -@@ -738,10 +739,11 @@ static const struct vop_win_phy rk3228_win0_data = { +@@ -750,10 +751,11 @@ static const struct vop_win_phy rk3228_win0_data = { static const struct vop_win_phy rk3228_win1_data = { .scl = &rk3288_win_full_scl, @@ -40,5 +40,5 @@ index 70930b410..3fd00b323 100644 .act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0), .dsp_info = VOP_REG(RK3288_WIN0_DSP_INFO, 0x0fff0fff, 0), -- -2.25.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rockchip-hardware-cursor.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rockchip-hardware-cursor.patch index bd5993ce0574..4b5922bbeb92 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rockchip-hardware-cursor.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rockchip-hardware-cursor.patch @@ -1,16 +1,16 @@ -From e5bb429dc58c8b4fc7a52dcb2fb134a838a4a952 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Tue, 16 Sep 2025 14:08:52 +0200 -Subject: [PATCH] drm rockchip hardware cursor +Subject: drm rockchip hardware cursor --- - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 208 +++++++++++++++++++- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 208 +++++++++- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 3 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 21 +- 3 files changed, 229 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index ba6b0528d1e5..b488df65cfea 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1144,6 +1144,197 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane, @@ -250,7 +250,7 @@ index ba6b0528d1e5..b488df65cfea 100644 if (plane->type == DRM_PLANE_TYPE_PRIMARY) primary = plane; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h -index f04c9731ae7b..3de7e79a2a80 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -206,6 +206,8 @@ struct vop_win_phy { @@ -271,7 +271,7 @@ index f04c9731ae7b..3de7e79a2a80 100644 }; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 95a0a44ba457..2c9f523c9250 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -696,6 +696,19 @@ static const struct vop_win_phy rk3288_win23_data = { @@ -328,5 +328,5 @@ index 95a0a44ba457..2c9f523c9250 100644 .common = &rk3288_common, .modeset = &rk3288_modeset, -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-fan.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-fan.patch index b4b05a4abee1..3c12f55f8c28 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-fan.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-fan.patch @@ -1,7 +1,7 @@ -From c27e445527e949f3ef46d5326066196969c17d23 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Myy Date: Sun, 12 Mar 2017 19:43:15 +0000 -Subject: [PATCH 06/28] ARM: dts: rockchip: add the MiQi board's fan definition +Subject: ARM: dts: rockchip: add the MiQi board's fan definition The MiQi board is sold with an enclosure in which a fan is connected to the second LED output, and configured by default in "heartbeat" @@ -24,10 +24,10 @@ Signed-off-by: Myy 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -index a1c3cdaa..0e383595 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -@@ -67,6 +67,13 @@ +@@ -30,6 +30,13 @@ ext_gmac: external-gmac-clock { leds { compatible = "gpio-leds"; @@ -42,4 +42,5 @@ index a1c3cdaa..0e383595 100644 gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>; label = "miqi:green:user"; -- -2.11.0 +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-hevc-rga.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-hevc-rga.patch index f1d54b97c3c3..b4f17f38ab87 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-hevc-rga.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-hevc-rga.patch @@ -1,17 +1,17 @@ -From 2fdd826a704ef70df42d92b38ad88ef869c3729b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 18 Sep 2021 12:32:05 +0000 -Subject: [PATCH 2/2] rockchip: enable hevc, hevc_mmu and rga nodes for miqi +Subject: rockchip: enable hevc, hevc_mmu and rga nodes for miqi --- - arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 12 ++++++++++++ + arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 12 ++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -index 94bc76099..68eb766f0 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -@@ -162,6 +162,14 @@ &hdmi { +@@ -157,6 +157,14 @@ &hdmi { status = "okay"; }; @@ -26,7 +26,7 @@ index 94bc76099..68eb766f0 100644 &i2c0 { clock-frequency = <400000>; status = "okay"; -@@ -405,6 +413,10 @@ host_vbus_drv: host-vbus-drv { +@@ -399,6 +407,10 @@ host_vbus_drv: host-vbus-drv { }; }; @@ -38,5 +38,5 @@ index 94bc76099..68eb766f0 100644 vref-supply = <&vcc_18>; status = "okay"; -- -2.30.2 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-mali-gpu.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-mali-gpu.patch index 6a07886e7326..a4a8d73beb49 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-mali-gpu.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-mali-gpu.patch @@ -1,7 +1,7 @@ -From 604ea7fc311af2b3a41e7fe3b4fbde0ee03dfb9c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Thu, 19 Oct 2017 21:09:50 +0200 -Subject: [PATCH 04/28] dts: rk3288: miqi: Enabling the Mali GPU node +Subject: dts: rk3288: miqi: Enabling the Mali GPU node Why is the MiQi the only one left without a working mali GPU node ? @@ -15,11 +15,11 @@ Signed-off-by: Myy Miouyouyou 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -index 4d923aa6..3cd60674 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -@@ -149,6 +149,11 @@ - status = "ok"; +@@ -150,6 +150,11 @@ &gpu { + status = "okay"; }; +&gpu { @@ -29,7 +29,7 @@ index 4d923aa6..3cd60674 100644 + &hdmi { ddc-i2c-bus = <&i2c5>; - status = "okay"; + pinctrl-names = "default"; -- -2.11.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-regulator-fix.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-regulator-fix.patch index 01c66a95fa32..0d715fb96a60 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-regulator-fix.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-regulator-fix.patch @@ -1,8 +1,7 @@ -From 89e5763110ca77d68a4be00cd97a638adc2401d5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 2 Aug 2016 08:31:00 +0200 -Subject: [PATCH 05/28] ARM: dts: rockchip: fix the regulator's voltage range - on MiQi board +Subject: ARM: dts: rockchip: fix the regulator's voltage range on MiQi board The board declared too narrow a voltage range for the CPU and GPU regulators, preventing it from using the full CPU frequency range. @@ -15,10 +14,10 @@ Signed-off-by: Willy Tarreau 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -index 3cd60674..a1c3cdaa 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -@@ -168,8 +168,8 @@ +@@ -179,8 +179,8 @@ vdd_cpu: syr827@40 { fcs,suspend-voltage-selector = <1>; reg = <0x40>; regulator-name = "vdd_cpu"; @@ -29,7 +28,7 @@ index 3cd60674..a1c3cdaa 100644 regulator-always-on; regulator-boot-on; regulator-enable-ramp-delay = <300>; -@@ -182,8 +182,8 @@ +@@ -193,8 +193,8 @@ vdd_gpu: syr828@41 { fcs,suspend-voltage-selector = <1>; reg = <0x41>; regulator-name = "vdd_gpu"; @@ -41,5 +40,5 @@ index 3cd60674..a1c3cdaa 100644 vin-supply = <&vcc_sys>; }; -- -2.11.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-iep-node.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-iep-node.patch index 994f01e8ea29..0bc155d77508 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-iep-node.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-iep-node.patch @@ -1,17 +1,17 @@ -From adecdd57a0155e0d96af2c84cc4fa52309fbb535 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 9 Sep 2021 19:14:08 +0000 -Subject: [PATCH] add iep node for rk322x +Subject: add iep node for rk322x --- - arch/arm/boot/dts/rockchip/rk322x.dtsi | 11 +++++++++++ + arch/arm/boot/dts/rockchip/rk322x.dtsi | 11 ++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index 0ae753c1d..271e7835f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi -@@ -834,6 +834,17 @@ rga: rga@20060000 { +@@ -714,6 +714,17 @@ rga: rga@20060000 { reset-names = "core", "axi", "ahb"; }; @@ -30,5 +30,5 @@ index 0ae753c1d..271e7835f 100644 compatible = "rockchip,iommu"; reg = <0x20070800 0x100>; -- -2.25.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-pinctrl-nand.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-pinctrl-nand.patch index 6c6ab33ff04e..f13c6b52a714 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-pinctrl-nand.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-pinctrl-nand.patch @@ -1,8 +1,88 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo +Date: Fri, 19 Jun 2020 17:27:27 +0200 +Subject: [ARCHEOLOGY] Introducing Rockchip RK322X SoC support (#2032) + +> X-Git-Archeology: > recovered message: > * Introducing Rockchip rk322x SoC support +> X-Git-Archeology: > recovered message: > Main features: +> X-Git-Archeology: > recovered message: > - Legacy kernel flavour based upon stable v2.x rk3288 Rockchip branch (https://github.com/rockchip-linux/kernel/tree/stable-4.4-rk3288-linux-v2.x) +> X-Git-Archeology: > recovered message: > - Current kernel flavour based on mainline 5.6.y kernel +> X-Git-Archeology: > recovered message: > - Mainline u-boot (v2020.04) +> X-Git-Archeology: > recovered message: > - Single generic tv box target (rk322x-box) which boots on all the known tv boxes +> X-Git-Archeology: > recovered message: > - Hardware devices (eMMC/NAND, led wiring configuration, SoC variant selection) modulation done by user at runtime via device tree overlays - a script (rk322x-config) is provided for autodetection and simple configuration by inexperienced users; +> X-Git-Archeology: > recovered message: > - Bits added to armbian-hardware-optimization to set affinity for irq handlers +> X-Git-Archeology: > recovered message: > - rk322x-box targets already added to targets.conf for automatic image creation +> X-Git-Archeology: > recovered message: > * Removed disabled patches +> X-Git-Archeology: > recovered message: > * Restored mysteriously removed comment character +> X-Git-Archeology: - Revision 23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7: https://github.com/armbian/build/commit/23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7 +> X-Git-Archeology: Date: Fri, 19 Jun 2020 17:27:27 +0200 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: Introducing Rockchip RK322X SoC support (#2032) +> X-Git-Archeology: +> X-Git-Archeology: - Revision bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076: https://github.com/armbian/build/commit/bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076 +> X-Git-Archeology: Date: Sat, 19 Sep 2020 15:20:16 +0000 +> X-Git-Archeology: From: paolo +> X-Git-Archeology: Subject: Many changes for rk322x target: +> X-Git-Archeology: +> X-Git-Archeology: - Revision 95425c27b9d3bbb96e7936cc531638c9150538f9: https://github.com/armbian/build/commit/95425c27b9d3bbb96e7936cc531638c9150538f9 +> X-Git-Archeology: Date: Fri, 12 Mar 2021 20:20:12 +0000 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: Changes and fixes to rk322x uboot and kernel config +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 4c3dcbf4fcd3616999cb91a1dddfa74668eb6de9: https://github.com/armbian/build/commit/4c3dcbf4fcd3616999cb91a1dddfa74668eb6de9 +> X-Git-Archeology: Date: Tue, 09 Nov 2021 21:58:35 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: Rockchip 5.15 (#3242) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0a2892aeba4dec4633a86f8ad573bf62f09cdb38: https://github.com/armbian/build/commit/0a2892aeba4dec4633a86f8ad573bf62f09cdb38 +> X-Git-Archeology: Date: Sun, 24 Sep 2023 19:47:01 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rk322x: bump edge kernel to 6.5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + arch/arm/boot/dts/rockchip/rk322x.dtsi | 75 ++++++++++ + 1 file changed, 75 insertions(+) + diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index 48e6e8d44..1dfd27f9f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi -@@ -712,6 +712,22 @@ emmc: mmc@30020000 { +@@ -817,6 +817,22 @@ emmc: mmc@30020000 { status = "disabled"; }; @@ -25,7 +105,7 @@ index 48e6e8d44..1dfd27f9f 100644 usb_otg: usb@30040000 { compatible = "rockchip,rk3228-usb", "rockchip,rk3066-usb", "snps,dwc2"; -@@ -950,6 +966,65 @@ emmc_bus8: emmc-bus8 { +@@ -1100,6 +1116,65 @@ emmc_bus8: emmc-bus8 { }; }; @@ -91,3 +171,6 @@ index 48e6e8d44..1dfd27f9f 100644 gmac { rgmii_pins: rgmii-pins { rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>, +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-disable-serial-dma.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-disable-serial-dma.patch index b54cf9d59060..7a4203364f8e 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-disable-serial-dma.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-disable-serial-dma.patch @@ -1,8 +1,86 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo +Date: Sun, 14 Jun 2020 22:59:24 +0200 +Subject: [ARCHEOLOGY] [RK3288] Bump rockchip-dev to kernel 5.7 (#2018) + +> X-Git-Archeology: > recovered message: > * Moved rockchip-dev to kernel 5.7, removed already upstreamed patch (1016), adjusted conflicting patch (1015) +> X-Git-Archeology: > recovered message: > Most kernel configuration answer left at default, notables: +> X-Git-Archeology: > recovered message: > - Wireguard (as module) +> X-Git-Archeology: > recovered message: > - Zswap default compression set to LZO +> X-Git-Archeology: > recovered message: > - RK3288 GPIOMEM (as module) +> X-Git-Archeology: > recovered message: > - Enabled some new DMABUF bits (heaps, cmas) +> X-Git-Archeology: > recovered message: > - Hantro driver +> X-Git-Archeology: > recovered message: > - F2FS compression +> X-Git-Archeology: > recovered message: > * Disabled rx/tx dma for uarts, on my board causes system freeze during bluetooth initialization. Don't know if they ever worked, tried to enable them ages ago and they were already not working +> X-Git-Archeology: - Revision 8f9f12065eab021a57bc782916da77348998074f: https://github.com/armbian/build/commit/8f9f12065eab021a57bc782916da77348998074f +> X-Git-Archeology: Date: Sun, 14 Jun 2020 22:59:24 +0200 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: [RK3288] Bump rockchip-dev to kernel 5.7 (#2018) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 812245def37a695bce9e7ece148b2920d82c8b37: https://github.com/armbian/build/commit/812245def37a695bce9e7ece148b2920d82c8b37 +> X-Git-Archeology: Date: Sat, 18 Jul 2020 23:07:01 +0200 +> X-Git-Archeology: From: Werner +> X-Git-Archeology: Subject: Move rockchip/64 current to 5.7.y (#2099) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54bc65b3bbd244820d950366523149f1c437223f: https://github.com/armbian/build/commit/54bc65b3bbd244820d950366523149f1c437223f +> X-Git-Archeology: Date: Wed, 17 Feb 2021 01:36:25 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Bump DEV kernels to 5.11.y (#2636) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 06d5054cce5d269b3fe8a0e23918c0c31a91140c: https://github.com/armbian/build/commit/06d5054cce5d269b3fe8a0e23918c0c31a91140c +> X-Git-Archeology: Date: Sun, 24 Sep 2023 19:22:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + arch/arm/boot/dts/rockchip/rk3288.dtsi | 8 -------- + 1 file changed, 8 deletions(-) + diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 0cd88774d..07681f1f0 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -420,8 +420,6 @@ +@@ -384,8 +384,6 @@ uart0: serial@ff180000 { reg-io-width = <4>; clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>; clock-names = "baudclk", "apb_pclk"; @@ -11,7 +89,7 @@ index 0cd88774d..07681f1f0 100644 pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer>; status = "disabled"; -@@ -435,8 +433,6 @@ +@@ -399,8 +397,6 @@ uart1: serial@ff190000 { reg-io-width = <4>; clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>; clock-names = "baudclk", "apb_pclk"; @@ -20,7 +98,7 @@ index 0cd88774d..07681f1f0 100644 pinctrl-names = "default"; pinctrl-0 = <&uart1_xfer>; status = "disabled"; -@@ -463,8 +459,6 @@ +@@ -427,8 +423,6 @@ uart3: serial@ff1b0000 { reg-io-width = <4>; clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>; clock-names = "baudclk", "apb_pclk"; @@ -29,7 +107,7 @@ index 0cd88774d..07681f1f0 100644 pinctrl-names = "default"; pinctrl-0 = <&uart3_xfer>; status = "disabled"; -@@ -478,8 +472,6 @@ +@@ -442,8 +436,6 @@ uart4: serial@ff1c0000 { reg-io-width = <4>; clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>; clock-names = "baudclk", "apb_pclk"; @@ -38,3 +116,6 @@ index 0cd88774d..07681f1f0 100644 pinctrl-names = "default"; pinctrl-0 = <&uart4_xfer>; status = "disabled"; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-fix-mmc-aliases.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-fix-mmc-aliases.patch index dede52866679..98e4376900fa 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-fix-mmc-aliases.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-fix-mmc-aliases.patch @@ -1,8 +1,56 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Tue, 26 Dec 2023 16:45:30 +0100 +Subject: [ARCHEOLOGY] consolidate rk322x and rockchip 32 bit families + +> X-Git-Archeology: > recovered message: > * merge patches from rockchip and rk322x families for current and edge +> X-Git-Archeology: > recovered message: > kernels +> X-Git-Archeology: > recovered message: > * adjust patches for tinkerboard to remove some cruft and overclocking +> X-Git-Archeology: > recovered message: > * rework kernel configs +> X-Git-Archeology: > recovered message: > * fix rk322x dmc to avoid lockup on rk3288 +> X-Git-Archeology: > recovered message: > * migrate rockchip-6.6 into patch series, rename all patches with +> X-Git-Archeology: > recovered message: > more understandable names +> X-Git-Archeology: > recovered message: > * add gen-series.sh script in tools directory (it is a naive tool to +> X-Git-Archeology: > recovered message: > create patch series when you don't want to rebase everything) +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + arch/arm/boot/dts/rockchip/rk3288.dtsi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 511ca864c1b2..d7ecb6b4de40 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -25,10 +25,10 @@ aliases { +@@ -34,10 +34,10 @@ aliases { i2c3 = &i2c3; i2c4 = &i2c4; i2c5 = &i2c5; @@ -17,4 +65,6 @@ index 511ca864c1b2..d7ecb6b4de40 100644 serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; +-- +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch index 6a91d9226c56..205e9f1dc3d7 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch @@ -1,7 +1,7 @@ -From 73258d32daf3a661281bb5c77c5e2e06c7ff714e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Fri, 3 Jul 2020 02:02:18 +0200 -Subject: [PATCH] arm: dtsi: rk3288: add GPU 500 Mhz OPP again +Subject: arm: dtsi: rk3288: add GPU 500 Mhz OPP again Undoing the very bizarre mainline kernel patch, 75481833c6dbab4c29d15452f6b4337c16f5407b @@ -23,10 +23,10 @@ Signed-off-by: Miouyouyou (Myy) 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index a66412547..ef7457f79 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -1312,6 +1312,10 @@ opp-400000000 { +@@ -1343,6 +1343,10 @@ opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <1100000>; }; @@ -38,5 +38,5 @@ index a66412547..ef7457f79 100644 opp-hz = /bits/ 64 <600000000>; opp-microvolt = <1250000>; -- -2.27.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-pinctrl-spi2.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-pinctrl-spi2.patch index f34e8fa8e417..cd6488675ded 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-pinctrl-spi2.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-pinctrl-spi2.patch @@ -1,7 +1,7 @@ -From 062488e4b8fd552c01e1104b3bc91a6f7ffe6c41 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Thu, 19 Oct 2017 21:24:47 +0200 -Subject: [PATCH 10/28] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl +Subject: RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl The spi2_cs1 pin reference is missing in the spi2 first pin control definition. @@ -14,10 +14,10 @@ Signed-off-by: Myy Miouyouyou 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 5b789528..9ed532cc 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -334,7 +334,7 @@ +@@ -317,7 +317,7 @@ spi2: spi@ff130000 { dma-names = "tx", "rx"; interrupts = ; pinctrl-names = "default"; @@ -27,5 +27,5 @@ index 5b789528..9ed532cc 100644 #address-cells = <1>; #size-cells = <0>; -- -2.11.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch index c9ae49db37cf..f9d63e97e95a 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch @@ -1,8 +1,102 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tonymac32 +Date: Mon, 18 Sep 2017 15:04:14 +0000 +Subject: [ARCHEOLOGY] Add files via upload + +> X-Git-Archeology: - Revision 3d96c26b0f4d6f94f1be3b42c1599f74a0f93465: https://github.com/armbian/build/commit/3d96c26b0f4d6f94f1be3b42c1599f74a0f93465 +> X-Git-Archeology: Date: Mon, 18 Sep 2017 15:04:14 +0000 +> X-Git-Archeology: From: Tonymac32 +> X-Git-Archeology: Subject: Add files via upload +> X-Git-Archeology: +> X-Git-Archeology: - Revision 97d06e86c19d3d7d73c0a978fbad7d022b915922: https://github.com/armbian/build/commit/97d06e86c19d3d7d73c0a978fbad7d022b915922 +> X-Git-Archeology: Date: Mon, 18 Sep 2017 15:05:37 +0000 +> X-Git-Archeology: From: Tonymac32 +> X-Git-Archeology: Subject: RK3288 get cpu to thermal_zone0 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7ee8ff8e3bd040e4cc02596327b01c5f89dc1027: https://github.com/armbian/build/commit/7ee8ff8e3bd040e4cc02596327b01c5f89dc1027 +> X-Git-Archeology: Date: Mon, 18 Sep 2017 18:09:24 +0000 +> X-Git-Archeology: From: Tonymac32 +> X-Git-Archeology: Subject: rk3288 dtsi thermal zone adjustment +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0d2da12129218170ac244cc8d6fc1b94e6f49089: https://github.com/armbian/build/commit/0d2da12129218170ac244cc8d6fc1b94e6f49089 +> X-Git-Archeology: Date: Sun, 17 Dec 2017 20:33:45 -0500 +> X-Git-Archeology: From: tonymac32 +> X-Git-Archeology: Subject: Re-fix RK3288 Next Thermal Zones +> X-Git-Archeology: +> X-Git-Archeology: - Revision f831a2a014d9305e272fc7541fa7d85f32c7dbab: https://github.com/armbian/build/commit/f831a2a014d9305e272fc7541fa7d85f32c7dbab +> X-Git-Archeology: Date: Mon, 19 Feb 2018 00:30:58 -0500 +> X-Git-Archeology: From: tonymac32 +> X-Git-Archeology: Subject: Rockchip Dev fixup. Boots. +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 3b3d85e25c2ecde30df7b5274fc6f1b9c0299ea2: https://github.com/armbian/build/commit/3b3d85e25c2ecde30df7b5274fc6f1b9c0299ea2 +> X-Git-Archeology: Date: Sat, 22 May 2021 17:08:44 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Upgrade EDGE to 5.12.y (#2825) +> X-Git-Archeology: +> X-Git-Archeology: - Revision e7377248b3cae186e24e2be781cd3365b43246f0: https://github.com/armbian/build/commit/e7377248b3cae186e24e2be781cd3365b43246f0 +> X-Git-Archeology: Date: Thu, 22 Jul 2021 00:15:54 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Second part of EDGE bumping to 5.13.y (#3045) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 06d5054cce5d269b3fe8a0e23918c0c31a91140c: https://github.com/armbian/build/commit/06d5054cce5d269b3fe8a0e23918c0c31a91140c +> X-Git-Archeology: Date: Sun, 24 Sep 2023 19:22:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + arch/arm/boot/dts/rockchip/rk3288.dtsi | 14 +++++----- + 1 file changed, 7 insertions(+), 7 deletions(-) + diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index bc3601a..37ae378 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -467,13 +467,6 @@ +@@ -454,13 +454,6 @@ dmac_peri: dma-controller@ff250000 { }; thermal-zones { @@ -16,7 +110,7 @@ index bc3601a..37ae378 100644 cpu_thermal: cpu-thermal { polling-delay-passive = <100>; /* milliseconds */ polling-delay = <5000>; /* milliseconds */ -@@ -539,6 +532,13 @@ +@@ -532,6 +525,13 @@ map0 { }; }; }; @@ -30,3 +124,6 @@ index bc3601a..37ae378 100644 }; tsadc: tsadc@ff280000 { +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch index e56921406c2d..8dc221cff77c 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch @@ -1,17 +1,17 @@ -From 87313f95f809fc34f499c1ceff1b95cd4efa0f3f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Tue, 22 Mar 2022 22:02:46 +0000 -Subject: [PATCH] rockchip: add tinkerboard bluetooth +Subject: rockchip: add tinkerboard bluetooth --- - arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 11 +++++++++++ + arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 11 ++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index ff2c6de3216..23acfdecee7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -@@ -510,6 +510,17 @@ &tsadc { +@@ -491,6 +491,17 @@ &tsadc { &uart0 { status = "okay"; @@ -30,5 +30,5 @@ index ff2c6de3216..23acfdecee7 100644 &uart1 { -- -2.30.2 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-uart-pins.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-uart-pins.patch index 50da0ecae05d..99e9fe27490c 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-uart-pins.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-uart-pins.patch @@ -1,7 +1,7 @@ -From 2c2e60256f2cbb2fce50a6317f85b1500efd1a6c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Mon, 5 Nov 2018 22:03:26 +0100 -Subject: [PATCH] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins +Subject: ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins The most essential being the RTS pin, which is clearly needed to upload the initial configuration into the Realtek Bluetooth @@ -44,12 +44,12 @@ Signed-off-by: Miouyouyou (Myy) 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dts b/arch/arm/boot/dts/rockchip/rk3288-tinker.dts -index d4df13bed..b92e59c1e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dts -@@ -73,3 +73,9 @@ - status = "okay"; - supports-sdio; +@@ -11,3 +11,9 @@ / { + model = "Rockchip RK3288 Asus Tinker Board"; + compatible = "asus,rk3288-tinker", "rockchip,rk3288"; }; + +&uart0 { @@ -58,5 +58,5 @@ index d4df13bed..b92e59c1e 100644 +}; + -- -2.16.4 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-hevc-rga.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-hevc-rga.patch index a5175c9e5b61..1c18b53b6122 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-hevc-rga.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-hevc-rga.patch @@ -1,18 +1,17 @@ -From 0bcc81848ec1fb34fee9d3c7eb1550495cc8efc9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 18 Sep 2021 12:31:19 +0000 -Subject: [PATCH 1/2] rockchip: enable hevc, hevc_mmu and rga nodes for - tinkerboard (both) +Subject: rockchip: enable hevc, hevc_mmu and rga nodes for tinkerboard (both) --- - arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 12 ++++++++++++ + arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 12 ++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index aa36aedf9..ff2c6de32 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -@@ -150,6 +150,14 @@ &hdmi { +@@ -148,6 +148,14 @@ &hdmi { status = "okay"; }; @@ -27,7 +26,7 @@ index aa36aedf9..ff2c6de32 100644 &i2c0 { clock-frequency = <400000>; status = "okay"; -@@ -449,6 +457,10 @@ &pwm0 { +@@ -447,6 +455,10 @@ &pwm0 { status = "okay"; }; @@ -39,5 +38,5 @@ index aa36aedf9..ff2c6de32 100644 vref-supply = <&vcc18_ldo1>; status = "okay"; -- -2.30.2 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdio-wifi.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdio-wifi.patch index 85974972be0a..c8e2314fa7b9 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdio-wifi.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdio-wifi.patch @@ -1,7 +1,7 @@ -From d5d5c53173c484a13cda62a537cbf75a5df4b0e4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Mon, 5 Nov 2018 21:58:56 +0100 -Subject: [PATCH] ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi +Subject: ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi Adding the appropriate nodes in order to exploit the WiFi capabilities of the board. @@ -15,14 +15,14 @@ Split if necessary. Signed-off-by: Miouyouyou (Myy) --- - arch/arm/boot/dts/rockchip/rk3288-tinker.dts | 62 +++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/rockchip/rk3288-tinker.dts | 62 ++++++++++ 1 file changed, 62 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dts b/arch/arm/boot/dts/rockchip/rk3288-tinker.dts -index 1e43527aa..d4df13bed 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dts -@@ -6,8 +6,70 @@ +@@ -6,10 +6,72 @@ /dts-v1/; #include "rk3288-tinker.dtsi" @@ -93,6 +93,8 @@ index 1e43527aa..d4df13bed 100644 + status = "okay"; + supports-sdio; }; + + &uart0 { -- -2.16.4 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdmmc-properties.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdmmc-properties.patch index 5486d60188c1..c551532987c8 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdmmc-properties.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdmmc-properties.patch @@ -1,7 +1,7 @@ -From 487db7cefc9861fdaf30579c378a98f0360690ae Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Mon, 5 Nov 2018 20:27:14 +0100 -Subject: [PATCH] ARM: DTSI: rk3288-tinker: Defining SDMMC properties +Subject: ARM: DTSI: rk3288-tinker: Defining SDMMC properties I never knew if these properties were required to fix the dreaded reboot issue... @@ -12,10 +12,10 @@ Signed-off-by: Miouyouyou (Myy) 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index dd1090728..8edd6f681 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -@@ -436,7 +436,12 @@ +@@ -472,7 +472,12 @@ &sdmmc { disable-wp; /* wp not hooked up */ pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; @@ -29,5 +29,5 @@ index dd1090728..8edd6f681 100644 vqmmc-supply = <&vccio_sd>; }; -- -2.16.4 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-spi-interface.patch index db2b09b1595c..4592a28dbd8e 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-spi-interface.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-spi-interface.patch @@ -1,7 +1,7 @@ -From b24b8f83e150811ad54ee2a4843e44cd1421fafa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Mon, 5 Nov 2018 22:15:14 +0100 -Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface +Subject: ARM: DTS: rk3288-tinker: Defining the SPI interface Taken from, and tested by @TonyMac32 . @@ -12,14 +12,14 @@ Therefore that *might* break, along with a few other patches. Signed-off-by: Miouyouyou (Myy) --- - arch/arm/boot/dts/rockchip/rk3288-tinker.dts | 19 +++++++++++++++++++ + arch/arm/boot/dts/rockchip/rk3288-tinker.dts | 19 ++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dts b/arch/arm/boot/dts/rockchip/rk3288-tinker.dts -index 96d05fc6b..17bfea298 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dts -@@ -99,6 +99,25 @@ +@@ -74,6 +74,25 @@ &sdio0 { supports-sdio; }; @@ -46,5 +46,5 @@ index 96d05fc6b..17bfea298 100644 pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>; -- -2.16.4 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-veyron-flag-cache-flush.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-veyron-flag-cache-flush.patch index 89cb36c0a24c..ae50fbc2af8b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-veyron-flag-cache-flush.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-veyron-flag-cache-flush.patch @@ -1,8 +1,7 @@ -From 9177b30ab083dbda2bede3b3d61ef71ad4b1ffe0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Thu, 1 Nov 2018 21:31:26 +0100 -Subject: [PATCH 2/2] arm: dts: veyron: Added a flag to disable cache flush - during reset +Subject: arm: dts: veyron: Added a flag to disable cache flush during reset Flushing the MMC cache of ASUS Chromebooks during initialization or "recovery" generates 10 minutes hangup, according to @SolidHal. @@ -16,10 +15,10 @@ Signed-off-by: Miouyouyou (Myy) 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi -index 2075120cf..fa4951fd7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi -@@ -123,6 +123,7 @@ +@@ -157,6 +157,7 @@ &emmc { mmc-hs200-1_8v; mmc-pwrseq = <&emmc_pwrseq>; non-removable; @@ -28,5 +27,5 @@ index 2075120cf..fa4951fd7 100644 pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; }; -- -2.16.4 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-configfs.patch index 0aa88542fc4a..b52ecf180298 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-configfs.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-configfs.patch @@ -1,3 +1,148 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martin Ayotte +Date: Wed, 20 Jul 2016 10:56:30 -0400 +Subject: [ARCHEOLOGY] Add ConfigFS for overlays support in v4.6.x + +> X-Git-Archeology: - Revision 7eb8428bb65aedbd9ef506d942a0a7420c8becd6: https://github.com/armbian/build/commit/7eb8428bb65aedbd9ef506d942a0a7420c8becd6 +> X-Git-Archeology: Date: Wed, 20 Jul 2016 10:56:30 -0400 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: Add ConfigFS for overlays support in v4.6.x +> X-Git-Archeology: +> X-Git-Archeology: - Revision 12c0a8a81224224d3fd9b487bf2e178fcb0cb9bd: https://github.com/armbian/build/commit/12c0a8a81224224d3fd9b487bf2e178fcb0cb9bd +> X-Git-Archeology: Date: Wed, 20 Jul 2016 11:19:44 -0400 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: move the add_configfs_overlay_for_v4.6.x.patch into sun8i-dev +> X-Git-Archeology: +> X-Git-Archeology: - Revision 536c9d795d9d5fe491795b4fff6bd1676b229688: https://github.com/armbian/build/commit/536c9d795d9d5fe491795b4fff6bd1676b229688 +> X-Git-Archeology: Date: Fri, 22 Jul 2016 17:24:12 -0400 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: fix Makefile in add_configfs_overlay_for_v4.6.x.patch +> X-Git-Archeology: +> X-Git-Archeology: - Revision 023b2e10a58d5090d6c1a6e1e34fdf2348900e0a: https://github.com/armbian/build/commit/023b2e10a58d5090d6c1a6e1e34fdf2348900e0a +> X-Git-Archeology: Date: Sun, 24 Jul 2016 16:50:16 -0400 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: remove debugging message +> X-Git-Archeology: +> X-Git-Archeology: - Revision a659f1769e5a08e780db9cb7a8aa35a49e90c917: https://github.com/armbian/build/commit/a659f1769e5a08e780db9cb7a8aa35a49e90c917 +> X-Git-Archeology: Date: Fri, 12 Aug 2016 15:13:23 -0400 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: add modified ConfigFS patches for kernel 4.8.x in sunxi-dev +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2def4ca6d90a8bba0df71a395ea08d9811169c24: https://github.com/armbian/build/commit/2def4ca6d90a8bba0df71a395ea08d9811169c24 +> X-Git-Archeology: Date: Mon, 09 Jan 2017 10:54:22 -0500 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: remove useless part of the patch for 4.10.x +> X-Git-Archeology: +> X-Git-Archeology: - Revision 43f9fe3debf8061be55dc51d0069973a61c707d4: https://github.com/armbian/build/commit/43f9fe3debf8061be55dc51d0069973a61c707d4 +> X-Git-Archeology: Date: Mon, 09 Jan 2017 10:55:14 -0500 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: rename patch for 4.10.x +> X-Git-Archeology: +> X-Git-Archeology: - Revision b0fcb64aaca589359338a500e7bc07eb7ca1cb71: https://github.com/armbian/build/commit/b0fcb64aaca589359338a500e7bc07eb7ca1cb71 +> X-Git-Archeology: Date: Thu, 07 Dec 2017 07:09:10 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Temporally disabling broken patches on sunxi DEV branch +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2c08ec8f5a210de35f9482f482ac01ea15381792: https://github.com/armbian/build/commit/2c08ec8f5a210de35f9482f482ac01ea15381792 +> X-Git-Archeology: Date: Thu, 24 May 2018 13:32:29 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Merge sunxi family into stable +> X-Git-Archeology: +> X-Git-Archeology: - Revision 8bc9d032a372ebd1b8f8126e439658a9879789d4: https://github.com/armbian/build/commit/8bc9d032a372ebd1b8f8126e439658a9879789d4 +> X-Git-Archeology: Date: Wed, 27 Jun 2018 11:24:34 -0400 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: fix pantoniou configfs using pelwell patch for new OF API +> X-Git-Archeology: +> X-Git-Archeology: - Revision 1a12994e79b6ef173dc58efe4df8919cb6cc7781: https://github.com/armbian/build/commit/1a12994e79b6ef173dc58efe4df8919cb6cc7781 +> X-Git-Archeology: Date: Tue, 17 Jul 2018 15:53:30 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Moving sunxi-next to 4.17.y (#1049) +> X-Git-Archeology: +> X-Git-Archeology: - Revision a57ce78b37f8dd2eb94a3836f4a7f6969f2ffd72: https://github.com/armbian/build/commit/a57ce78b37f8dd2eb94a3836f4a7f6969f2ffd72 +> X-Git-Archeology: Date: Tue, 21 Aug 2018 10:41:10 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Reverting sunxi/sunxi64 NEXT to 4.14. (#1087) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0aec4b058834e16d12ddff68c90ecbed946b19a3: https://github.com/armbian/build/commit/0aec4b058834e16d12ddff68c90ecbed946b19a3 +> X-Git-Archeology: Date: Tue, 04 Dec 2018 15:10:36 -0500 +> X-Git-Archeology: From: Martin Ayotte +> X-Git-Archeology: Subject: add configfs for overlay on meson64-dev +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2c439b921988b4f5210866ed484304d804cca60f: https://github.com/armbian/build/commit/2c439b921988b4f5210866ed484304d804cca60f +> X-Git-Archeology: Date: Mon, 30 Dec 2019 21:25:03 +0100 +> X-Git-Archeology: From: Piotr Szczepanik +> X-Git-Archeology: Subject: Overlay configfs support for rockchip64-current (#1699) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 20d17a7c9556b6eb39c2557b4a17fa0181f763fc: https://github.com/armbian/build/commit/20d17a7c9556b6eb39c2557b4a17fa0181f763fc +> X-Git-Archeology: Date: Fri, 19 Jun 2020 09:47:44 +0200 +> X-Git-Archeology: From: m][sko +> X-Git-Archeology: Subject: Switch meson to linux 5.7 (#2024) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7: https://github.com/armbian/build/commit/23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7 +> X-Git-Archeology: Date: Fri, 19 Jun 2020 17:27:27 +0200 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: Introducing Rockchip RK322X SoC support (#2032) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 1e37959e5381a0a1d1eaf0629cdc19658f30df9a: https://github.com/armbian/build/commit/1e37959e5381a0a1d1eaf0629cdc19658f30df9a +> X-Git-Archeology: Date: Thu, 10 Feb 2022 20:32:58 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Bumping sunxi/64, xu4, rockchip and mvebu64 to 5.16.y (#3453) +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + Documentation/devicetree/configfs-overlays.txt | 31 + + drivers/of/Kconfig | 7 + + drivers/of/Makefile | 1 + + drivers/of/configfs.c | 290 ++++++++++ + 4 files changed, 329 insertions(+) + +diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt +new file mode 100644 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/configfs-overlays.txt @@ -0,0 +1,31 @@ @@ -33,10 +178,10 @@ +intended to be used by hardware managers in the kernel, while the copy interface +make sense for developers (since it avoids problems with namespaces). diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig -index 37c2ccbefecdc..d3fc81a40c0e7 100644 +index 111111111111..222222222222 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig -@@ -103,4 +103,11 @@ config OF_OVERLAY +@@ -126,4 +126,11 @@ config OF_OVERLAY_KUNIT_TEST config OF_NUMA bool @@ -49,20 +194,20 @@ index 37c2ccbefecdc..d3fc81a40c0e7 100644 + endif # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile -index 663a4af0cccd5..b00a95adf5199 100644 +index 111111111111..222222222222 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 - obj-y = base.o device.o platform.o property.o + obj-y = base.o cpu.o device.o module.o platform.o property.o obj-$(CONFIG_OF_KOBJ) += kobj.o +obj-$(CONFIG_OF_CONFIGFS) += configfs.o obj-$(CONFIG_OF_DYNAMIC) += dynamic.o - obj-$(CONFIG_OF_FLATTREE) += fdt.o + obj-$(CONFIG_OF_FLATTREE) += fdt.o empty_root.dtb.o obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c new file mode 100644 -index 000000000..5dd509e8f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/of/configfs.c @@ -0,0 +1,290 @@ @@ -356,3 +501,6 @@ index 000000000..5dd509e8f + return ret; +} +late_initcall(of_cfs_init); +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-restart-handler-for-act8846.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-restart-handler-for-act8846.patch index 13bace124299..d8c8cc7d3791 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-restart-handler-for-act8846.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-restart-handler-for-act8846.patch @@ -1,14 +1,14 @@ -From 7f2d6a02498ce3fa7771893072e81b31f9bd64b2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Fri, 24 Mar 2023 17:15:16 +0000 -Subject: [PATCH] register act8846 restart handler for SIPC function +Subject: register act8846 restart handler for SIPC function --- - drivers/regulator/act8865-regulator.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) + drivers/regulator/act8865-regulator.c | 38 ++++++++++ + 1 file changed, 38 insertions(+) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c -index b2a6ddc6f56d..1a88cfb1ba07 100644 +index 111111111111..222222222222 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -20,6 +20,7 @@ @@ -78,5 +78,5 @@ index b2a6ddc6f56d..1a88cfb1ba07 100644 /* Finally register devices */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch index bc3a6f29630b..e906cfb770ec 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch @@ -1,14 +1,14 @@ -From c046bcccf1ca331cff3b89f09eed080a5407aa5a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Wed, 4 Dec 2024 14:32:40 +0100 -Subject: [PATCH] rockchip: fix rk3288 reset-on-wake quirk +Subject: rockchip: fix rk3288 reset-on-wake quirk --- drivers/usb/dwc2/params.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c -index 4d73fae80b12..0109055a9a8e 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -130,7 +130,6 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg) @@ -20,5 +20,5 @@ index 4d73fae80b12..0109055a9a8e 100644 static void dwc2_set_ltq_danube_params(struct dwc2_hsotg *hsotg) -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-peripheral.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-peripheral.patch index 9a5c933fdf8e..38eb32d68089 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-peripheral.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-peripheral.patch @@ -1,17 +1,17 @@ -From e477f1546f2739e9ea053d677f421e01a9babff4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 2 Mar 2024 21:56:44 +0100 -Subject: [PATCH] dwc2: add fixes for rk322x peripheral mode +Subject: dwc2: add fixes for rk322x peripheral mode --- - drivers/usb/dwc2/core.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) + drivers/usb/dwc2/core.c | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c -index 5635e4d7ec88..0a3d387a497a 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/core.c +++ b/drivers/usb/dwc2/core.c -@@ -532,6 +532,9 @@ void dwc2_force_mode(struct dwc2_hsotg *hsotg, bool host) +@@ -538,6 +538,9 @@ void dwc2_force_mode(struct dwc2_hsotg *hsotg, bool host) gusbcfg |= set; dwc2_writel(hsotg, gusbcfg, GUSBCFG); @@ -22,5 +22,5 @@ index 5635e4d7ec88..0a3d387a497a 100644 return; } -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-time.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-time.patch index f8517ac54733..9c8232bf5579 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-time.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-time.patch @@ -1,7 +1,7 @@ -From ee7c3ab6b5a4d284a04f110792508a7f8decd7f7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Wu Date: Tue, 6 Dec 2022 14:45:54 +0800 -Subject: [PATCH] usb: dwc2: fix waiting time for host only mode +Subject: usb: dwc2: fix waiting time for host only mode The current code uses 50ms sleep to wait for host only mode, the delay time is not enough for some Rockchip @@ -20,14 +20,14 @@ mode and increases the maximum waiting time to 200ms. Signed-off-by: William Wu Change-Id: Ie28299934aba09907ea08f5fd3b34bf2fb35822e --- - drivers/usb/dwc2/core.c | 14 ++++++++++++-- + drivers/usb/dwc2/core.c | 14 ++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c -index 15911ac7582b4..cbd5f1142f35e 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/core.c +++ b/drivers/usb/dwc2/core.c -@@ -656,14 +656,24 @@ static void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg) +@@ -579,14 +579,24 @@ static void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg) */ void dwc2_force_dr_mode(struct dwc2_hsotg *hsotg) { @@ -54,3 +54,6 @@ index 15911ac7582b4..cbd5f1142f35e 100644 break; case USB_DR_MODE_PERIPHERAL: +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-nak-gadget.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-nak-gadget.patch index 1162a96d9301..fa57b5c67bde 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-nak-gadget.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-nak-gadget.patch @@ -1,8 +1,7 @@ -From 15b317ff84dc09faa47995b1d973d96a6172fa4c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Wu Date: Thu, 15 Dec 2022 14:19:28 +0800 -Subject: [PATCH] usb: dwc2: gadget: Disable nak interrupt when get first isoc - in token +Subject: usb: dwc2: gadget: Disable nak interrupt when get first isoc in token The dwc2 driver use the nak interrupt for the starting point of isoc-in transfer. The first nak interrupt for isoc-in means @@ -21,14 +20,14 @@ the nak interrupt when get first isoc in token if the feature Signed-off-by: William Wu Change-Id: I99c71a5e0d7903346fd8f71619b6736c3181c0ec --- - drivers/usb/dwc2/gadget.c | 37 +++++++++++++++++++++++++++++++++++-- + drivers/usb/dwc2/gadget.c | 37 +++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -index e1dc4735a99c..0e185ef474ac 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c -@@ -1402,6 +1402,8 @@ static int dwc2_gadget_set_ep0_desc_chain(struct dwc2_hsotg *hsotg, +@@ -1399,6 +1399,8 @@ static int dwc2_gadget_set_ep0_desc_chain(struct dwc2_hsotg *hsotg, return 0; } @@ -37,7 +36,7 @@ index e1dc4735a99c..0e185ef474ac 100644 static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, gfp_t gfp_flags) { -@@ -1518,6 +1520,20 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, +@@ -1519,6 +1521,20 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, if (hs_ep->target_frame != TARGET_FRAME_INITIAL) dwc2_hsotg_start_req(hs, hs_ep, hs_req, false); @@ -58,7 +57,7 @@ index e1dc4735a99c..0e185ef474ac 100644 } return 0; } -@@ -2989,8 +3005,25 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep) +@@ -2991,8 +3007,25 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep) hs_ep->target_frame = hsotg->frame_number; if (hs_ep->interval > 1) { @@ -86,3 +85,6 @@ index e1dc4735a99c..0e185ef474ac 100644 if (hs_ep->target_frame & 0x1) ctrl |= DXEPCTL_SETODDFR; else +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-reboot-from-kwiboo.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-reboot-from-kwiboo.patch index 088b7ebe8b06..d246888423a7 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-reboot-from-kwiboo.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-reboot-from-kwiboo.patch @@ -1,10 +1,71 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas McKahan +Date: Sun, 17 Feb 2019 23:28:02 -0500 +Subject: [ARCHEOLOGY] [ rockchip-dev ] Add simpler reboot code + +> X-Git-Archeology: > recovered message: > As seen here: https://patchwork.kernel.org/patch/10817217/ +> X-Git-Archeology: > recovered message: > for testing in Dev. @paolosabatino please check TV box. +> X-Git-Archeology: - Revision 2c8ee5a69d023d22c9e3ac99e9fc45ab30751f22: https://github.com/armbian/build/commit/2c8ee5a69d023d22c9e3ac99e9fc45ab30751f22 +> X-Git-Archeology: Date: Sun, 17 Feb 2019 23:28:02 -0500 +> X-Git-Archeology: From: Thomas McKahan +> X-Git-Archeology: Subject: [ rockchip-dev ] Add simpler reboot code +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + drivers/mmc/core/core.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 5bd58b95d..48ebe081f 100644 +index 111111111111..222222222222 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -1684,6 +1684,14 @@ void mmc_power_off(struct mmc_host *host) - if (host->ios.power_mode == MMC_POWER_OFF) - return; +@@ -1381,6 +1381,14 @@ void mmc_power_off(struct mmc_host *host) + */ + mmc_delay(host->ios.power_delay_ms); + mmc_set_initial_signal_voltage(host); + @@ -17,3 +78,6 @@ index 5bd58b95d..48ebe081f 100644 mmc_pwrseq_power_off(host); host->ios.clock = 0; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-vdpu38x-32bit-archs.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-vdpu38x-32bit-archs.patch index 53004d4659e7..f917a3958265 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-vdpu38x-32bit-archs.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-vdpu38x-32bit-archs.patch @@ -1,7 +1,7 @@ -From 37b944b341c637749f1318366941f6e0e718a1cf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Tue, 16 Sep 2025 14:21:22 +0200 -Subject: [PATCH] fix vdpu381/383 compilation on 32 bit archs +Subject: fix vdpu381/383 compilation on 32 bit archs --- drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c | 2 +- @@ -10,7 +10,7 @@ Subject: [PATCH] fix vdpu381/383 compilation on 32 bit archs 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c -index e65a56bc9c63..95e6a785eac2 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c @@ -439,7 +439,7 @@ static int rkvdec_h264_run(struct rkvdec_ctx *ctx) @@ -23,7 +23,7 @@ index e65a56bc9c63..95e6a785eac2 100644 watchdog_time = 2000; schedule_delayed_work(&rkvdec->watchdog_work, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c -index bb2c62d9c3d4..ffa0b35db8c0 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c @@ -550,7 +550,7 @@ static int rkvdec_h264_run(struct rkvdec_ctx *ctx) @@ -36,7 +36,7 @@ index bb2c62d9c3d4..ffa0b35db8c0 100644 watchdog_time = 2000; schedule_delayed_work(&rkvdec->watchdog_work, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c -index 7d53c28e954e..0297ff89fe5b 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c @@ -656,7 +656,7 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx) @@ -49,5 +49,5 @@ index 7d53c28e954e..0297ff89fe5b 100644 watchdog_time = 2000; schedule_delayed_work(&rkvdec->watchdog_work, -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-increase-spdif-dma-burst.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-increase-spdif-dma-burst.patch index 9d3a91b4dd94..eb32f431f45a 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-increase-spdif-dma-burst.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-increase-spdif-dma-burst.patch @@ -1,14 +1,14 @@ -From 379651eb82cf5966a40a5b931afc2fa91c6a311d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 12 Jan 2025 12:39:03 +0100 -Subject: [PATCH 2/2] rockchip: increase SPDIF max burst value to maximum +Subject: rockchip: increase SPDIF max burst value to maximum --- sound/soc/rockchip/rockchip_spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c -index d87c0e4f6f91..7a2cfecf6a94 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -329,7 +329,7 @@ static int rk_spdif_probe(struct platform_device *pdev) @@ -21,5 +21,5 @@ index d87c0e4f6f91..7a2cfecf6a94 100644 spdif->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, spdif); -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-linux-export-mm-trace-rss-stats.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-linux-export-mm-trace-rss-stats.patch index 45c975a46cc8..ea4c37f7579b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-linux-export-mm-trace-rss-stats.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-linux-export-mm-trace-rss-stats.patch @@ -1,24 +1,24 @@ -From 6408e6688b18e5c712c711110d196a4e95f3f870 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 9 Sep 2021 16:37:28 +0000 -Subject: [PATCH 2/4] 01-linux-1000-export-mm_trace_rss_stat +Subject: 01-linux-1000-export-mm_trace_rss_stat --- mm/memory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/memory.c b/mm/memory.c -index 25fc46e87..7ef0adaa5 100644 +index 111111111111..222222222222 100644 --- a/mm/memory.c +++ b/mm/memory.c -@@ -171,6 +171,7 @@ void mm_trace_rss_stat(struct mm_struct *mm, int member, long count) +@@ -180,6 +180,7 @@ void mm_trace_rss_stat(struct mm_struct *mm, int member) { - trace_rss_stat(mm, member, count); + trace_rss_stat(mm, member); } +EXPORT_SYMBOL(mm_trace_rss_stat); - #if defined(SPLIT_RSS_COUNTING) - + /* + * Note: this doesn't free the actual pages themselves. That -- -2.25.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-01-fix-periodic-transfers.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-01-fix-periodic-transfers.patch index 844286d43db2..3d6828ac67e4 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-01-fix-periodic-transfers.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-01-fix-periodic-transfers.patch @@ -1,14 +1,14 @@ -From fc0d09bf651fcab0998da4d187a91f64df419188 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 12 Jan 2025 12:36:50 +0100 -Subject: [PATCH 1/2] pl330: fix dma engine periodic transfers +Subject: pl330: fix dma engine periodic transfers --- - drivers/dma/pl330.c | 277 +++++++++++++++++++++++++++++--------------- + drivers/dma/pl330.c | 277 +++++++--- 1 file changed, 186 insertions(+), 91 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index 82a9fe88ad54..ef197c4cfed4 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -239,6 +239,7 @@ enum pl330_byteswap { @@ -417,5 +417,5 @@ index 82a9fe88ad54..ef197c4cfed4 100644 return &desc->txd; } -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch index 54f0dd9134f2..4b9f8f78b9a3 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch @@ -1,16 +1,16 @@ -From e691c5c3feede95b4e159344aaea070fc428c847 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 23 Jan 2025 20:23:50 +0100 -Subject: [PATCH 1/2] rockchip/64: pl330 - add support for interleaved - transfers +Subject: rockchip/64: pl330 - add support for interleaved transfers original source: https://patchwork.kernel.org/project/linux-rockchip/cover/1712150304-60832-1-git-send-email-sugar.zhang@rock-chips.com/ --- - drivers/dma/pl330.c | 168 ++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 162 insertions(+), 6 deletions(-) + drivers/dma/pl330.c | 168 +++++++++- + include/linux/dmaengine.h | 1 + + 2 files changed, 163 insertions(+), 6 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index ef197c4cfed4..b49a3a6c4686 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -543,6 +543,8 @@ struct dma_pl330_desc { @@ -245,7 +245,7 @@ index ef197c4cfed4..b49a3a6c4686 100644 pd->device_prep_slave_sg = pl330_prep_slave_sg; pd->device_config = pl330_config; diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h -index b137fdb56093..63624c5836cf 100644 +index 111111111111..222222222222 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -156,6 +156,7 @@ struct dma_interleaved_template { @@ -257,5 +257,5 @@ index b137fdb56093..63624c5836cf 100644 struct data_chunk sgl[]; }; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch index 15b348888936..070fc2fb9c2d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch @@ -1,7 +1,7 @@ -From f695d6bfdd099ec6f59a73aa792b97df80c72d54 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 26 Jan 2025 14:49:18 +0100 -Subject: [PATCH] increase pl330 microcode buffer size +Subject: increase pl330 microcode buffer size suggestion comes from the scatter/gather functionality as proposed here: https://github.com/radxa/kernel/commit/ec0b65dbc59793426b6dc7af06ab6675f4a24940 @@ -10,10 +10,10 @@ proposed here: https://github.com/radxa/kernel/commit/ec0b65dbc59793426b6dc7af06 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index 82a9fe88ad54..eb322c7ae5de 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c -@@ -246,7 +246,7 @@ enum pl330_byteswap { +@@ -247,7 +247,7 @@ enum pl330_byteswap { * For typical scenario, at 1word/burst, 10MB and 20MB xfers per req * should be enough for P<->M and M<->M respectively. */ @@ -23,5 +23,5 @@ index 82a9fe88ad54..eb322c7ae5de 100644 /* Use this _only_ to wait on transient states */ #define UNTIL(t, s) while (!(_state(t) & (s))) cpu_relax(); -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch index c9a44f75f520..2b79e7bcaa69 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch @@ -1,7 +1,7 @@ -From 05cc2b4fba887e3da543952311b009bacc87cee8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Sat, 26 Mar 2022 18:01:21 +0800 -Subject: [PATCH] dmaengine: pl330: Fix unbalanced runtime PM +Subject: dmaengine: pl330: Fix unbalanced runtime PM This driver use runtime PM autosuspend mechanism to manager clk. @@ -64,10 +64,10 @@ Signed-off-by: Sugar Zhang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index 6dca548f4dab1..f87729ace4f5b 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c -@@ -2086,7 +2086,7 @@ static void pl330_tasklet(struct tasklet_struct *t) +@@ -2274,7 +2274,7 @@ static void pl330_tasklet(struct tasklet_struct *t) spin_lock(&pch->thread->dmac->lock); _stop(pch->thread); spin_unlock(&pch->thread->dmac->lock); @@ -76,3 +76,6 @@ index 6dca548f4dab1..f87729ace4f5b 100644 pch->active = false; } else { /* Make sure the PL330 Channel thread is active */ +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-06-fix-buffer-underruns.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-06-fix-buffer-underruns.patch index 1215a00c9c62..3755bf0a73d5 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-06-fix-buffer-underruns.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-06-fix-buffer-underruns.patch @@ -1,7 +1,7 @@ -From 4acf270a6310f5e2dbadac1d5f21d8e7477fade6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 16 Feb 2025 11:15:55 +0100 -Subject: [PATCH] pl330: fix buffer underrun with cyclic dma +Subject: pl330: fix buffer underrun with cyclic dma userspace applications (notably, pulseaudio) were suffering frequent buffer underruns when cyclic DMA @@ -10,11 +10,11 @@ the buffer underruns avoiding to juggle with the descriptor state, keeping it in BUSY state as long as it is actual transfer is progressing. --- - drivers/dma/pl330.c | 24 ++++++++++++------------ + drivers/dma/pl330.c | 24 +++++----- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index 208e2a089a4d..6dac00995765 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -1737,11 +1737,11 @@ static void dma_pl330_rqcb(struct dma_pl330_desc *desc, enum pl330_op_err err) @@ -34,7 +34,7 @@ index 208e2a089a4d..6dac00995765 100644 tasklet_schedule(&pch->task); } -@@ -2256,23 +2256,23 @@ static void pl330_tasklet(struct tasklet_struct *t) +@@ -2248,23 +2248,23 @@ static void pl330_tasklet(struct tasklet_struct *t) /* Pick up ripe tomatoes */ list_for_each_entry_safe(desc, _dt, &pch->work_list, node) { @@ -66,5 +66,5 @@ index 208e2a089a4d..6dac00995765 100644 /* Try to submit a req imm. next to the last completed cookie */ -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rk322x-gpio-ir-driver.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rk322x-gpio-ir-driver.patch index 46fafb06c1b9..0e6c181c9ac7 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rk322x-gpio-ir-driver.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rk322x-gpio-ir-driver.patch @@ -1,20 +1,19 @@ -From 13498feb91614d59ebece61d0c278e31529bb8c8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Tue, 10 Oct 2023 21:54:51 +0200 -Subject: [PATCH] rockchip gpio IR driver +Subject: rockchip gpio IR driver --- - drivers/media/rc/Kconfig | 11 + + drivers/media/rc/Kconfig | 10 + drivers/media/rc/Makefile | 1 + - drivers/media/rc/rockchip-ir.c | 723 +++++++++++++++++++++++++++++++++ - 3 files changed, 735 insertions(+) - create mode 100644 drivers/media/rc/rockchip-ir.c + drivers/media/rc/rockchip-ir.c | 733 ++++++++++ + 3 files changed, 744 insertions(+) diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig -index 2afe67ffa285..0fd671f5873c 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig -@@ -338,6 +338,16 @@ config IR_REDRAT3 +@@ -340,6 +340,16 @@ config IR_REDRAT3 To compile this driver as a module, choose M here: the module will be called redrat3. @@ -32,7 +31,7 @@ index 2afe67ffa285..0fd671f5873c 100644 tristate "Homebrew Serial Port Receiver" depends on HAS_IOPORT diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile -index 2bca6f7f07bc..2ec037f8b939 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/rc/Makefile +++ b/drivers/media/rc/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_IR_MTK) += mtk-cir.o @@ -45,7 +44,7 @@ index 2bca6f7f07bc..2ec037f8b939 100644 obj-$(CONFIG_IR_STREAMZAP) += streamzap.o diff --git a/drivers/media/rc/rockchip-ir.c b/drivers/media/rc/rockchip-ir.c new file mode 100644 -index 000000000000..43ade8c4adce +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/rc/rockchip-ir.c @@ -0,0 +1,733 @@ @@ -782,5 +781,6 @@ index 000000000000..43ade8c4adce + +MODULE_DESCRIPTION("Rockchip IR Receiver driver"); +MODULE_LICENSE("GPL v2"); - +-- +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rockchip-various-fixes.patch index 4eaa12cec3a7..745bcb69f68c 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rockchip-various-fixes.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rockchip-various-fixes.patch @@ -1,21 +1,20 @@ -From 92a42b2df843c0f6c2937dc6bdbfe72332c9e557 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 9 Sep 2021 16:46:33 +0000 -Subject: [PATCH 3/4] 01-linux-1000-rockchip-wip +Subject: 01-linux-1000-rockchip-wip --- - arch/arm/boot/dts/rockchip/rk322x.dtsi | 101 +++++++++++++++++- - arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 2 + - drivers/clk/rockchip/clk-rk3228.c | 61 ++++------- - drivers/net/ethernet/arc/emac.h | 14 +++ - drivers/net/ethernet/arc/emac_main.c | 81 ++++++++++++-- - drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 38 ++++++- - drivers/pmdomain/rockchip/pm-domains.c | 23 ++++ - drivers/usb/dwc2/core.c | 2 +- - 8 files changed, 266 insertions(+), 56 deletions(-) + arch/arm/boot/dts/rockchip/rk322x.dtsi | 85 +++++++++- + arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 2 + + drivers/clk/rockchip/clk-rk3228.c | 61 +++---- + drivers/net/ethernet/arc/emac.h | 14 ++ + drivers/net/ethernet/arc/emac_main.c | 61 +++++++ + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 38 ++++- + drivers/pmdomain/rockchip/pm-domains.c | 23 +++ + 7 files changed, 239 insertions(+), 45 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index 831561fc1814..24e963b01d87 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi @@ -19,6 +19,7 @@ aliases { @@ -26,7 +25,7 @@ index 831561fc1814..24e963b01d87 100644 serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; -@@ -132,6 +149,17 @@ display_subsystem: display-subsystem { +@@ -135,6 +136,17 @@ display_subsystem: display-subsystem { ports = <&vop_out>; }; @@ -44,7 +43,7 @@ index 831561fc1814..24e963b01d87 100644 i2s1: i2s1@100b0000 { compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s"; reg = <0x100b0000 0x4000>; -@@ -142,6 +170,7 @@ i2s1: i2s1@100b0000 { +@@ -145,6 +157,7 @@ i2s1: i2s1@100b0000 { dma-names = "tx", "rx"; pinctrl-names = "default"; pinctrl-0 = <&i2s1_bus>; @@ -52,7 +51,7 @@ index 831561fc1814..24e963b01d87 100644 status = "disabled"; }; -@@ -153,6 +182,7 @@ i2s0: i2s0@100c0000 { +@@ -165,6 +178,7 @@ i2s0: i2s0@100c0000 { clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0_8CH>; dmas = <&pdma 11>, <&pdma 12>; dma-names = "tx", "rx"; @@ -60,7 +59,7 @@ index 831561fc1814..24e963b01d87 100644 status = "disabled"; }; -@@ -166,6 +196,7 @@ spdif: spdif@100d0000 { +@@ -178,6 +192,7 @@ spdif: spdif@100d0000 { dma-names = "tx"; pinctrl-names = "default"; pinctrl-0 = <&spdif_tx>; @@ -68,7 +67,7 @@ index 831561fc1814..24e963b01d87 100644 status = "disabled"; }; -@@ -337,7 +368,7 @@ uart2: serial@11030000 { +@@ -349,7 +364,7 @@ uart2: serial@11030000 { clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>; clock-names = "baudclk", "apb_pclk"; pinctrl-names = "default"; @@ -77,7 +76,7 @@ index 831561fc1814..24e963b01d87 100644 reg-shift = <2>; reg-io-width = <4>; status = "disabled"; -@@ -358,6 +389,10 @@ efuse_id: id@7 { +@@ -370,6 +385,10 @@ efuse_id: id@7 { cpu_leakage: cpu_leakage@17 { reg = <0x17 0x1>; }; @@ -88,7 +87,7 @@ index 831561fc1814..24e963b01d87 100644 }; i2c0: i2c@11050000 { -@@ -554,6 +589,11 @@ map1 { +@@ -568,6 +587,11 @@ map1 { <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; }; @@ -100,7 +99,7 @@ index 831561fc1814..24e963b01d87 100644 }; }; }; -@@ -584,6 +624,8 @@ hdmi_phy: hdmi-phy@12030000 { +@@ -598,6 +622,8 @@ hdmi_phy: hdmi-phy@12030000 { clock-names = "sysclk", "refoclk", "refpclk"; #clock-cells = <0>; clock-output-names = "hdmiphy_phy"; @@ -109,7 +108,7 @@ index 831561fc1814..24e963b01d87 100644 #phy-cells = <0>; status = "disabled"; }; -@@ -607,7 +649,27 @@ gpu: gpu@20000000 { +@@ -621,7 +647,27 @@ gpu: gpu@20000000 { clock-names = "bus", "core"; power-domains = <&power RK3228_PD_GPU>; resets = <&cru SRST_GPU_A>; @@ -138,7 +137,7 @@ index 831561fc1814..24e963b01d87 100644 }; vpu: video-codec@20020000 { -@@ -727,6 +789,7 @@ hdmi: hdmi@200a0000 { +@@ -752,6 +798,7 @@ hdmi: hdmi@200a0000 { phys = <&hdmi_phy>; phy-names = "hdmi"; rockchip,grf = <&grf>; @@ -146,7 +145,7 @@ index 831561fc1814..24e963b01d87 100644 status = "disabled"; ports { -@@ -748,9 +811,13 @@ sdmmc: mmc@30000000 { +@@ -779,9 +826,13 @@ sdmmc: mmc@30000000 { clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>, <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; @@ -161,7 +160,7 @@ index 831561fc1814..24e963b01d87 100644 status = "disabled"; }; -@@ -760,10 +827,14 @@ sdio: mmc@30010000 { +@@ -791,10 +842,14 @@ sdio: mmc@30010000 { interrupts = ; clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>, <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; @@ -176,7 +175,7 @@ index 831561fc1814..24e963b01d87 100644 status = "disabled"; }; -@@ -771,14 +842,13 @@ emmc: mmc@30020000 { +@@ -802,14 +857,13 @@ emmc: mmc@30020000 { compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x30020000 0x4000>; interrupts = ; @@ -192,7 +191,7 @@ index 831561fc1814..24e963b01d87 100644 pinctrl-names = "default"; pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; resets = <&cru SRST_EMMC>; -@@ -1029,6 +1099,10 @@ sdmmc_bus4: sdmmc-bus4 { +@@ -1076,6 +1130,10 @@ sdmmc_bus4: sdmmc-bus4 { <1 RK_PC4 1 &pcfg_pull_none_drv_12ma>, <1 RK_PC5 1 &pcfg_pull_none_drv_12ma>; }; @@ -203,7 +202,7 @@ index 831561fc1814..24e963b01d87 100644 }; sdio { -@@ -1261,13 +1335,30 @@ uart1_xfer: uart1-xfer { +@@ -1367,13 +1425,30 @@ uart1_xfer: uart1-xfer { <1 RK_PB2 1 &pcfg_pull_none>; }; @@ -235,10 +234,10 @@ index 831561fc1814..24e963b01d87 100644 uart2 { diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi -index 616a828e0..f233b7a77 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi -@@ -64,6 +64,8 @@ L2: cache-controller@10138000 { +@@ -68,6 +68,8 @@ L2: cache-controller@10138000 { reg = <0x10138000 0x1000>; cache-unified; cache-level = <2>; @@ -248,10 +247,10 @@ index 616a828e0..f233b7a77 100644 scu@1013c000 { diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c -index aca1a483a..7250adc64 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c -@@ -135,24 +135,22 @@ static const struct rockchip_cpuclk_reg_data rk3228_cpuclk_data = { +@@ -131,24 +131,22 @@ static const struct rockchip_cpuclk_reg_data rk3228_cpuclk_data = { PNAME(mux_pll_p) = { "clk_24m", "xin24m" }; @@ -278,7 +277,7 @@ index aca1a483a..7250adc64 100644 PNAME(mux_dclk_vop_p) = { "hdmiphy", "sclk_vop_pre" }; PNAME(mux_i2s0_p) = { "i2s0_src", "i2s0_frac", "ext_i2s", "xin12m" }; -@@ -221,27 +219,23 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -217,27 +215,23 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKSEL_CON(4), 8, 5, DFLAGS), /* PD_DDR */ @@ -313,7 +312,7 @@ index aca1a483a..7250adc64 100644 COMPOSITE_NOMUX(0, "pclk_dbg", "armclk", CLK_IGNORE_UNUSED, RK2928_CLKSEL_CON(1), 0, 4, DFLAGS | CLK_DIVIDER_READ_ONLY, RK2928_CLKGATE_CON(4), 1, GFLAGS), -@@ -258,14 +252,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -254,14 +248,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_MISC_CON, 15, 1, MFLAGS), /* PD_BUS */ @@ -330,7 +329,7 @@ index aca1a483a..7250adc64 100644 GATE(ACLK_CPU, "aclk_cpu", "aclk_cpu_src", 0, RK2928_CLKGATE_CON(6), 0, GFLAGS), COMPOSITE_NOMUX(HCLK_CPU, "hclk_cpu", "aclk_cpu_src", 0, -@@ -338,14 +327,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -334,14 +323,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKGATE_CON(3), 8, GFLAGS), /* PD_PERI */ @@ -347,7 +346,7 @@ index aca1a483a..7250adc64 100644 COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_src", 0, RK2928_CLKSEL_CON(10), 12, 3, DFLAGS, RK2928_CLKGATE_CON(5), 2, GFLAGS), -@@ -380,7 +364,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -376,7 +360,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKGATE_CON(10), 12, GFLAGS), COMPOSITE(SCLK_WIFI, "sclk_wifi", mux_pll_src_cpll_gpll_usb480m_p, 0, @@ -356,7 +355,7 @@ index aca1a483a..7250adc64 100644 RK2928_CLKGATE_CON(2), 15, GFLAGS), COMPOSITE(SCLK_SDMMC, "sclk_sdmmc", mux_mmc_src_p, 0, -@@ -403,12 +387,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -397,12 +381,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { * Clock-Architecture Diagram 2 */ @@ -371,7 +370,7 @@ index aca1a483a..7250adc64 100644 DIV(DCLK_HDMI_PHY, "dclk_hdmiphy", "sclk_vop_src", 0, RK2928_CLKSEL_CON(29), 0, 3, DFLAGS), DIV(0, "sclk_vop_pre", "sclk_vop_src", 0, -@@ -640,13 +621,13 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -634,13 +615,13 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { /* PD_MMC */ MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "sclk_sdmmc", RK3228_SDMMC_CON0, 1), @@ -388,7 +387,7 @@ index aca1a483a..7250adc64 100644 }; static const char *const rk3228_critical_clocks[] __initconst = { -@@ -661,6 +642,7 @@ static const char *const rk3228_critical_clocks[] __initconst = { +@@ -655,6 +636,7 @@ static const char *const rk3228_critical_clocks[] __initconst = { "aclk_vop_noc", "aclk_hdcp_noc", "hclk_vio_ahb_arbi", @@ -396,7 +395,7 @@ index aca1a483a..7250adc64 100644 "hclk_vio_noc", "hclk_vop_noc", "hclk_host0_arb", -@@ -678,10 +660,13 @@ static const char *const rk3228_critical_clocks[] __initconst = { +@@ -672,10 +654,13 @@ static const char *const rk3228_critical_clocks[] __initconst = { "pclk_ddrphy", "pclk_acodecphy", "pclk_phy_noc", @@ -411,7 +410,7 @@ index aca1a483a..7250adc64 100644 static void __init rk3228_clk_init(struct device_node *np) diff --git a/drivers/net/ethernet/arc/emac.h b/drivers/net/ethernet/arc/emac.h -index d820ae03a..0ac87288b 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/arc/emac.h +++ b/drivers/net/ethernet/arc/emac.h @@ -91,6 +91,20 @@ struct arc_emac_bd { @@ -436,10 +435,10 @@ index d820ae03a..0ac87288b 100644 * struct buffer_state - Stores Rx/Tx buffer state. * @sk_buff: Pointer to socket buffer. diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c -index 67b8113a2..40332a976 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c -@@ -850,6 +850,62 @@ static const struct net_device_ops arc_emac_netdev_ops = { +@@ -855,6 +855,62 @@ static const struct net_device_ops arc_emac_netdev_ops = { #endif }; @@ -502,7 +501,7 @@ index 67b8113a2..40332a976 100644 int arc_emac_probe(struct net_device *ndev, int interface) { struct device *dev = ndev->dev.parent; -@@ -970,6 +1026,11 @@ int arc_emac_probe(struct net_device *ndev, int interface) +@@ -975,6 +1031,11 @@ int arc_emac_probe(struct net_device *ndev, int interface) goto out_clken; } @@ -515,10 +514,10 @@ index 67b8113a2..40332a976 100644 interface); if (!phydev) { diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c -index 1889e78e1..6209f51b3 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c -@@ -237,6 +237,9 @@ struct inno_hdmi_phy { +@@ -236,6 +236,9 @@ struct inno_hdmi_phy { struct clk *refoclk; struct clk *refpclk; @@ -528,7 +527,7 @@ index 1889e78e1..6209f51b3 100644 /* platform data */ const struct inno_hdmi_phy_drv_data *plat_data; int chip_version; -@@ -471,6 +474,7 @@ static const struct pre_pll_config pre_pll_cfg_table[] = { +@@ -470,6 +473,7 @@ static const struct pre_pll_config pre_pll_cfg_table[] = { static const struct post_pll_config post_pll_cfg_table[] = { {33750000, 1, 40, 8, 1}, {33750000, 1, 80, 8, 2}, @@ -536,7 +535,7 @@ index 1889e78e1..6209f51b3 100644 {74250000, 1, 40, 8, 1}, {74250000, 18, 80, 8, 2}, {148500000, 2, 40, 4, 3}, -@@ -621,8 +625,11 @@ static int inno_hdmi_phy_power_on(struct phy *phy) +@@ -620,8 +624,11 @@ static int inno_hdmi_phy_power_on(struct phy *phy) return -EINVAL; for (; cfg->tmdsclock != 0; cfg++) @@ -550,7 +549,7 @@ index 1889e78e1..6209f51b3 100644 break; for (; phy_cfg->tmdsclock != 0; phy_cfg++) -@@ -1033,6 +1040,10 @@ static int inno_hdmi_phy_clk_register(struct inno_hdmi_phy *inno) +@@ -1032,6 +1039,10 @@ static int inno_hdmi_phy_clk_register(struct inno_hdmi_phy *inno) static int inno_hdmi_phy_rk3228_init(struct inno_hdmi_phy *inno) { @@ -561,7 +560,7 @@ index 1889e78e1..6209f51b3 100644 /* * Use phy internal register control * rxsense/poweron/pllpd/pdataen signal. -@@ -1047,7 +1058,28 @@ static int inno_hdmi_phy_rk3228_init(struct inno_hdmi_phy *inno) +@@ -1046,7 +1057,28 @@ static int inno_hdmi_phy_rk3228_init(struct inno_hdmi_phy *inno) inno_update_bits(inno, 0xaa, RK3228_POST_PLL_CTRL_MANUAL, RK3228_POST_PLL_CTRL_MANUAL); @@ -590,7 +589,7 @@ index 1889e78e1..6209f51b3 100644 return 0; } -@@ -1147,6 +1179,8 @@ static int inno_hdmi_phy_rk3328_init(struct inno_hdmi_phy *inno) +@@ -1146,6 +1178,8 @@ static int inno_hdmi_phy_rk3328_init(struct inno_hdmi_phy *inno) /* try to read the chip-version */ inno->chip_version = 1; @@ -599,12 +598,11 @@ index 1889e78e1..6209f51b3 100644 cell = nvmem_cell_get(inno->dev, "cpu-version"); if (IS_ERR(cell)) { if (PTR_ERR(cell) == -EPROBE_DEFER) - diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c -index 03bcf79a461f..200047473d59 100644 +index 111111111111..222222222222 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c -@@ -95,6 +95,7 @@ struct rockchip_pm_domain { +@@ -97,6 +97,7 @@ struct rockchip_pm_domain { struct regmap **qos_regmap; u32 *qos_save_regs[MAX_QOS_REGS_NUM]; int num_clks; @@ -612,7 +610,7 @@ index 03bcf79a461f..200047473d59 100644 struct clk_bulk_data *clks; struct device_node *node; struct regulator *supply; -@@ -664,6 +665,9 @@ static int rockchip_pd_power_on(struct generic_pm_domain *domain) +@@ -686,6 +687,9 @@ static int rockchip_pd_power_on(struct generic_pm_domain *domain) struct rockchip_pm_domain *pd = to_rockchip_pd(domain); int ret; @@ -622,7 +620,7 @@ index 03bcf79a461f..200047473d59 100644 ret = rockchip_pd_regulator_enable(pd); if (ret) { dev_err(pd->pmu->dev, "Failed to enable supply: %d\n", ret); -@@ -682,6 +686,9 @@ static int rockchip_pd_power_off(struct generic_pm_domain *domain) +@@ -704,6 +708,9 @@ static int rockchip_pd_power_off(struct generic_pm_domain *domain) struct rockchip_pm_domain *pd = to_rockchip_pd(domain); int ret; @@ -632,7 +630,7 @@ index 03bcf79a461f..200047473d59 100644 ret = rockchip_pd_power(pd, false); if (ret) return ret; -@@ -770,6 +777,9 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, +@@ -792,6 +799,9 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, pd->pmu = pmu; pd->node = node; @@ -642,7 +640,7 @@ index 03bcf79a461f..200047473d59 100644 pd->num_clks = of_clk_get_parent_count(node); if (pd->num_clks > 0) { pd->clks = devm_kcalloc(pmu->dev, pd->num_clks, -@@ -915,6 +925,7 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, +@@ -937,6 +947,7 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, struct device_node *parent) { struct generic_pm_domain *child_domain, *parent_domain; @@ -650,7 +648,7 @@ index 03bcf79a461f..200047473d59 100644 int error; for_each_child_of_node_scoped(parent, np) { -@@ -955,6 +966,18 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, +@@ -977,6 +988,18 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, parent_domain->name, child_domain->name); } @@ -668,7 +666,7 @@ index 03bcf79a461f..200047473d59 100644 + rockchip_pm_add_subdomain(pmu, np); } - + -- -2.25.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-rk322x-box.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-rk322x-box.patch index c451a36481fe..198f93ee132d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-rk322x-box.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-rk322x-box.patch @@ -1,17 +1,16 @@ -From f14539f8d08328ae5aad165a4deea25c7d6b09bf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Mon, 25 Apr 2022 13:25:09 +0000 -Subject: [PATCH] add generic rk322x tv box remote controller keymap +Subject: add generic rk322x tv box remote controller keymap --- drivers/media/rc/keymaps/Makefile | 1 + - drivers/media/rc/keymaps/rc-rk322x-tvbox.c | 74 ++++++++++++++++++++++ + drivers/media/rc/keymaps/rc-rk322x-tvbox.c | 74 ++++++++++ include/media/rc-map.h | 1 + - 3 files changed, 77 insertions(+) - create mode 100644 drivers/media/rc/keymaps/rc-rk322x-tvbox.c + 3 files changed, 76 insertions(+) diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile -index d04572627cdd..a543bb3ef864 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/rc/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile @@ -106,6 +106,7 @@ obj-$(CONFIG_RC_MAP) += \ @@ -24,7 +23,7 @@ index d04572627cdd..a543bb3ef864 100644 rc-streamzap.o \ diff --git a/drivers/media/rc/keymaps/rc-rk322x-tvbox.c b/drivers/media/rc/keymaps/rc-rk322x-tvbox.c new file mode 100644 -index 00000000000..91e24ee52ee +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/rc/keymaps/rc-rk322x-tvbox.c @@ -0,0 +1,74 @@ @@ -103,7 +102,7 @@ index 00000000000..91e24ee52ee +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Paolo Sabatino"); diff --git a/include/media/rc-map.h b/include/media/rc-map.h -index d90e4611b066..14d6a50defed 100644 +index 111111111111..222222222222 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h @@ -313,6 +313,7 @@ struct rc_map *rc_map_get(const char *name); @@ -115,5 +114,5 @@ index d90e4611b066..14d6a50defed 100644 #define RC_MAP_SNAPSTREAM_FIREFLY "rc-snapstream-firefly" #define RC_MAP_STREAMZAP "rc-streamzap" -- -2.30.2 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-xt-q8l-v10.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-xt-q8l-v10.patch index eb4faa632591..b0cda766868b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-xt-q8l-v10.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-xt-q8l-v10.patch @@ -10,10 +10,10 @@ Subject: add xt-q8l-v10 keymap and makefile 3 files changed, 78 insertions(+) diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile -index f513ff5caf4e..198ef8bc2614 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/rc/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile -@@ -136,4 +136,5 @@ obj-$(CONFIG_RC_MAP) += \ +@@ -141,4 +141,5 @@ obj-$(CONFIG_RC_MAP) += \ rc-x96max.o \ rc-xbox-360.o \ rc-xbox-dvd.o \ @@ -21,7 +21,7 @@ index f513ff5caf4e..198ef8bc2614 100644 rc-zx-irdec.o diff --git a/drivers/media/rc/keymaps/rc-xt-q8l-v10.c b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c new file mode 100644 -index 000000000000..19c7d9ec8325 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c @@ -0,0 +1,76 @@ @@ -102,10 +102,10 @@ index 000000000000..19c7d9ec8325 +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Paolo Sabatino"); diff --git a/include/media/rc-map.h b/include/media/rc-map.h -index 793b54342dff..ef7f3710eafe 100644 +index 111111111111..222222222222 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h -@@ -343,6 +343,7 @@ struct rc_map *rc_map_get(const char *name); +@@ -348,6 +348,7 @@ struct rc_map *rc_map_get(const char *name); #define RC_MAP_X96MAX "rc-x96max" #define RC_MAP_XBOX_360 "rc-xbox-360" #define RC_MAP_XBOX_DVD "rc-xbox-dvd" diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/misc-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/misc-tinkerboard-spi-interface.patch index 27b54fe96c43..0ad2f3d0b662 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/misc-tinkerboard-spi-interface.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/misc-tinkerboard-spi-interface.patch @@ -1,8 +1,57 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Thu, 27 Apr 2023 21:31:27 +0200 +Subject: [ARCHEOLOGY] rockchip: bump edge kernel to 6.3 + +> X-Git-Archeology: - Revision da0ab48b7939235608c8fc042c61ae997681e865: https://github.com/armbian/build/commit/da0ab48b7939235608c8fc042c61ae997681e865 +> X-Git-Archeology: Date: Thu, 27 Apr 2023 21:31:27 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.3 +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + drivers/spi/spidev.c | 2 ++ + 1 file changed, 2 insertions(+) + diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 58ae4304fdab..52cb8872ffa4 100644 +index 111111111111..222222222222 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -716,6 +716,7 @@ static const struct spi_device_id spidev_spi_ids[] = { +@@ -718,6 +718,7 @@ static const struct spi_device_id spidev_spi_ids[] = { { .name = /* semtech */ "sx1301" }, { .name = /* silabs */ "em3581" }, { .name = /* silabs */ "si3210" }, @@ -10,7 +59,7 @@ index 58ae4304fdab..52cb8872ffa4 100644 {}, }; MODULE_DEVICE_TABLE(spi, spidev_spi_ids); -@@ -747,6 +748,7 @@ static const struct of_device_id spidev_dt_ids[] = { +@@ -751,6 +752,7 @@ static const struct of_device_id spidev_dt_ids[] = { { .compatible = "semtech,sx1301", .data = &spidev_of_check }, { .compatible = "silabs,em3581", .data = &spidev_of_check }, { .compatible = "silabs,si3210", .data = &spidev_of_check }, @@ -18,3 +67,6 @@ index 58ae4304fdab..52cb8872ffa4 100644 {}, }; MODULE_DEVICE_TABLE(of, spidev_dt_ids); +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch index 77385b14be1e..1283047c3469 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch @@ -1,7 +1,7 @@ -From 302cd9b8a9f1f8a7735fabea3b9a7645dc40f9cc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Sun, 7 Jan 2018 01:52:44 +0100 -Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot +Subject: drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot On ASUS Tinkerboard systems, if the SDMMC hardware is shutdown before rebooting, the system will be dead, as the SDMMC is the only way to @@ -17,14 +17,14 @@ similar effects with eMMC hardware. Signed-off-by: Myy Miouyouyou --- - drivers/mmc/host/dw_mmc-rockchip.c | 66 ++++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/dw_mmc-rockchip.c | 66 ++++++++++ 1 file changed, 66 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c -index a3f1c2b30..7eac1f221 100644 +index 111111111111..222222222222 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c -@@ -16,6 +16,11 @@ +@@ -12,6 +12,11 @@ #include #include @@ -36,7 +36,7 @@ index a3f1c2b30..7eac1f221 100644 #include "dw_mmc.h" #include "dw_mmc-pltfm.h" -@@ -334,6 +339,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = { +@@ -527,6 +532,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = { }; MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match); @@ -103,7 +103,7 @@ index a3f1c2b30..7eac1f221 100644 static int dw_mci_rockchip_probe(struct platform_device *pdev) { const struct dw_mci_drv_data *drv_data; -@@ -361,6 +426,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) +@@ -554,6 +619,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) } pm_runtime_put_autosuspend(&pdev->dev); @@ -112,5 +112,5 @@ index a3f1c2b30..7eac1f221 100644 return 0; } -- -2.14.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch index ed7158039f5c..679bb73f50df 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch @@ -1,17 +1,17 @@ -From e039790fb29227f646e91e6d7ec7c3e89c584243 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Tue, 6 Jul 2021 14:21:52 +0000 -Subject: [PATCH 1/5] rk3228/rk3328: fix ddr clock gate, add SIP v2 calls +Subject: rk3228/rk3328: fix ddr clock gate, add SIP v2 calls --- - drivers/clk/rockchip/clk-ddr.c | 130 ++++++++++++++++++++++++++++++ - drivers/clk/rockchip/clk-rk3228.c | 14 ++-- + drivers/clk/rockchip/clk-ddr.c | 130 ++++++++++ + drivers/clk/rockchip/clk-rk3228.c | 14 +- drivers/clk/rockchip/clk-rk3328.c | 7 +- drivers/clk/rockchip/clk.h | 3 +- 4 files changed, 143 insertions(+), 11 deletions(-) diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e..b16b3795f 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -87,6 +87,133 @@ static const struct clk_ops rockchip_ddrclk_sip_ops = { @@ -159,10 +159,10 @@ index 86718c54e..b16b3795f 100644 pr_err("%s: unsupported ddrclk type %d\n", __func__, ddr_flag); kfree(ddrclk); diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c -index 1f9176a5c..96393aa16 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c -@@ -218,9 +218,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -215,9 +215,9 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKSEL_CON(4), 8, 5, DFLAGS), /* PD_DDR */ @@ -175,7 +175,7 @@ index 1f9176a5c..96393aa16 100644 GATE(0, "ddrphy4x", "clk_ddrphy_src", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(7), 1, GFLAGS), FACTOR_GATE(0, "ddrc", "clk_ddrphy_src", CLK_IGNORE_UNUSED, 1, 4, -@@ -576,8 +576,8 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -571,8 +571,8 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { GATE(HCLK_M_CRYPTO, "hclk_crypto_mst", "hclk_cpu", 0, RK2928_CLKGATE_CON(8), 11, GFLAGS), GATE(HCLK_S_CRYPTO, "hclk_crypto_slv", "hclk_cpu", 0, RK2928_CLKGATE_CON(8), 12, GFLAGS), @@ -186,7 +186,7 @@ index 1f9176a5c..96393aa16 100644 GATE(0, "pclk_msch_noc", "pclk_ddr_pre", 0, RK2928_CLKGATE_CON(10), 2, GFLAGS), GATE(PCLK_EFUSE_1024, "pclk_efuse_1024", "pclk_cpu", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS), -@@ -652,8 +652,8 @@ static const char *const rk3228_critical_clocks[] __initconst = { +@@ -647,8 +647,8 @@ static const char *const rk3228_critical_clocks[] __initconst = { "sclk_initmem_mbist", "aclk_initmem", "hclk_rom", @@ -198,10 +198,10 @@ index 1f9176a5c..96393aa16 100644 "pclk_stimer", "pclk_ddrphy", diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c -index cc18dbc18..5fdd611bb 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c -@@ -317,9 +317,10 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -315,9 +315,10 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { RK3328_CLKGATE_CON(14), 1, GFLAGS), /* PD_DDR */ @@ -216,10 +216,10 @@ index cc18dbc18..5fdd611bb 100644 RK3328_CLKGATE_CON(18), 6, GFLAGS), GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED, diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index ae059b774..fdaa81ebb 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h -@@ -363,7 +363,8 @@ struct clk *rockchip_clk_register_mmc(const char *name, +@@ -632,7 +632,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. */ @@ -230,5 +230,5 @@ index ae059b774..fdaa81ebb 100644 struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, const char *const *parent_names, -- -2.25.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch index efeaace36252..00619741e1a8 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch @@ -1,16 +1,15 @@ -From 95358ea4a4434ad4af5545b3f762508e4f015fc3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Tue, 6 Jul 2021 14:23:36 +0000 -Subject: [PATCH 2/5] rk3228/rk3328: add ddr clock and SIP related constants - and defines +Subject: rk3228/rk3328: add ddr clock and SIP related constants and defines --- include/dt-bindings/clock/rk3228-cru.h | 1 + - include/soc/rockchip/rockchip_sip.h | 24 ++++++++++++++++++++++++ + include/soc/rockchip/rockchip_sip.h | 24 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h -index de550ea56..911824731 100644 +index 111111111111..222222222222 100644 --- a/include/dt-bindings/clock/rk3228-cru.h +++ b/include/dt-bindings/clock/rk3228-cru.h @@ -15,6 +15,7 @@ @@ -22,18 +21,18 @@ index de550ea56..911824731 100644 #define SCLK_NANDC 67 #define SCLK_SDMMC 68 diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a..34e653751 100644 +index 111111111111..222222222222 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h -@@ -6,6 +6,7 @@ - #ifndef __SOC_ROCKCHIP_SIP_H - #define __SOC_ROCKCHIP_SIP_H +@@ -9,6 +9,7 @@ + #define ROCKCHIP_SIP_SUSPEND_MODE 0x82000003 + #define ROCKCHIP_SLEEP_PD_CONFIG 0xff +#define ROCKCHIP_SIP_ATF_VERSION 0x82000001 #define ROCKCHIP_SIP_DRAM_FREQ 0x82000008 #define ROCKCHIP_SIP_CONFIG_DRAM_INIT 0x00 #define ROCKCHIP_SIP_CONFIG_DRAM_SET_RATE 0x01 -@@ -16,5 +17,28 @@ +@@ -19,5 +20,28 @@ #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 @@ -63,5 +62,5 @@ index c46a9ae2a..34e653751 100644 #endif -- -2.25.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch index b1b3aa8a5b14..9a92530a21d3 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch @@ -1,22 +1,20 @@ -From de9678fab28f23bdc3969cdea397f4057d42ba5a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 11 Jan 2024 20:42:48 +0100 -Subject: [PATCH] add rk3228/rk3328 to rockchip dfi driver +Subject: add rk3228/rk3328 to rockchip dfi driver --- - arch/arm/boot/dts/rockchip/rk322x.dtsi | 7 +++ - drivers/devfreq/event/rockchip-dfi.c | 77 +++++++++++++++++++++++--- - include/soc/rockchip/rk3228_grf.h | 14 +++++ - include/soc/rockchip/rk3328_grf.h | 14 +++++ + arch/arm/boot/dts/rockchip/rk322x.dtsi | 7 + + drivers/devfreq/event/rockchip-dfi.c | 77 +++++++++- + include/soc/rockchip/rk3228_grf.h | 14 ++ + include/soc/rockchip/rk3328_grf.h | 14 ++ 4 files changed, 105 insertions(+), 7 deletions(-) - create mode 100644 include/soc/rockchip/rk3228_grf.h - create mode 100644 include/soc/rockchip/rk3328_grf.h diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index 571626d879f8..e87096b97610 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi -@@ -208,6 +208,13 @@ xin24m: oscillator { +@@ -131,6 +131,13 @@ xin24m: oscillator { #clock-cells = <0>; }; @@ -31,7 +29,7 @@ index 571626d879f8..e87096b97610 100644 compatible = "rockchip,display-subsystem"; ports = <&vop_out>; diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c -index e2a1e4463b6f..fba3a958b352 100644 +index 111111111111..222222222222 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -24,6 +24,8 @@ @@ -51,7 +49,7 @@ index e2a1e4463b6f..fba3a958b352 100644 struct regmap *regmap_pmu; struct clk *clk; int usecount; -@@ -669,6 +672,46 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi) +@@ -672,6 +675,46 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi) } #endif @@ -98,7 +96,7 @@ index e2a1e4463b6f..fba3a958b352 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) +@@ -761,6 +804,8 @@ static int rk3588_dfi_init(struct rockchip_dfi *dfi) }; static const struct of_device_id rockchip_dfi_id_match[] = { @@ -107,7 +105,7 @@ index e2a1e4463b6f..fba3a958b352 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) +@@ -790,14 +835,30 @@ static int rockchip_dfi_probe(struct platform_device *pdev) if (IS_ERR(dfi->regs)) return PTR_ERR(dfi->regs); @@ -145,7 +143,7 @@ index e2a1e4463b6f..fba3a958b352 100644 dfi->dev = dev; mutex_init(&dfi->mutex); -@@ -818,6 +879,8 @@ static int rockchip_dfi_probe(struct platform_device *pdev) +@@ -822,6 +883,8 @@ static int rockchip_dfi_probe(struct platform_device *pdev) if (ret) return ret; @@ -156,7 +154,7 @@ index e2a1e4463b6f..fba3a958b352 100644 return 0; diff --git a/include/soc/rockchip/rk3228_grf.h b/include/soc/rockchip/rk3228_grf.h new file mode 100644 -index 000000000000..e37406814fad +index 000000000000..111111111111 --- /dev/null +++ b/include/soc/rockchip/rk3228_grf.h @@ -0,0 +1,14 @@ @@ -176,7 +174,7 @@ index 000000000000..e37406814fad +#endif diff --git a/include/soc/rockchip/rk3328_grf.h b/include/soc/rockchip/rk3328_grf.h new file mode 100644 -index 000000000000..bf6d209be7e6 +index 000000000000..111111111111 --- /dev/null +++ b/include/soc/rockchip/rk3328_grf.h @@ -0,0 +1,14 @@ @@ -195,5 +193,5 @@ index 000000000000..bf6d209be7e6 + +#endif -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-04-driver.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-04-driver.patch index 3039f9291272..7074ef023a2a 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-04-driver.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-04-driver.patch @@ -1,22 +1,19 @@ -From 8529e1141bf84ff4e0120eeb42e45a59c8e666c7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Wed, 27 Dec 2023 15:29:29 +0100 -Subject: [PATCH] rockchip: add rk3228 dmc driver +Subject: rockchip: add rk3228 dmc driver --- arch/arm/boot/dts/rockchip/rk322x.dtsi | 70 +- drivers/devfreq/Kconfig | 12 + drivers/devfreq/Makefile | 1 + - drivers/devfreq/rk3228_dmc.c | 696 +++++++++++++++++++ - include/dt-bindings/clock/rockchip-ddr.h | 63 ++ - include/dt-bindings/memory/rockchip,rk322x.h | 90 +++ - 6 files changed, 929 insertions(+), 3 deletions(-) - create mode 100644 drivers/devfreq/rk3228_dmc.c - create mode 100644 include/dt-bindings/clock/rockchip-ddr.h - create mode 100644 include/dt-bindings/memory/rockchip,rk322x.h + drivers/devfreq/rk3228_dmc.c | 827 ++++++++++ + include/dt-bindings/clock/rockchip-ddr.h | 63 + + include/dt-bindings/memory/rockchip,rk322x.h | 90 + + 6 files changed, 1060 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index 41374aff62c8..c9d71a776587 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi @@ -7,6 +7,8 @@ @@ -28,8 +25,8 @@ index 41374aff62c8..c9d71a776587 100644 / { #address-cells = <1>; -@@ -104,6 +106,68 @@ dfi: dfi@11210000 { - status = "okay"; +@@ -100,6 +102,68 @@ opp-1200000000 { + }; }; + dmc: dmc@11200000 { @@ -97,7 +94,7 @@ index 41374aff62c8..c9d71a776587 100644 arm-pmu { compatible = "arm,cortex-a7-pmu"; interrupts = , -@@ -676,17 +740,17 @@ gpu_opp_table: opp-table2 { +@@ -663,17 +727,17 @@ gpu_opp_table: opp-table2 { opp-200000000 { opp-hz = /bits/ 64 <200000000>; @@ -119,10 +116,10 @@ index 41374aff62c8..c9d71a776587 100644 }; diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 3c4862a752b5..066be239a16a 100644 +index 111111111111..222222222222 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig -@@ -129,6 +129,18 @@ config ARM_MEDIATEK_CCI_DEVFREQ +@@ -140,6 +140,18 @@ config ARM_MEDIATEK_CCI_DEVFREQ buck voltages and update a proper CCI frequency. Use the notification to get the regulator status. @@ -142,10 +139,10 @@ index 3c4862a752b5..066be239a16a 100644 tristate "ARM RK3399 DMC DEVFREQ Driver" depends on (ARCH_ROCKCHIP && HAVE_ARM_SMCCC) || \ diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index bf40d04928d0..059712bfe5f5 100644 +index 111111111111..222222222222 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile -@@ -13,6 +13,7 @@ obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx-bus.o +@@ -14,6 +14,7 @@ obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx-bus.o obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) += imx8m-ddrc.o obj-$(CONFIG_ARM_MEDIATEK_CCI_DEVFREQ) += mtk-cci-devfreq.o obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ) += rk3399_dmc.o @@ -153,174 +150,9 @@ index bf40d04928d0..059712bfe5f5 100644 obj-$(CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ) += sun8i-a33-mbus.o obj-$(CONFIG_ARM_TEGRA_DEVFREQ) += tegra30-devfreq.o -diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h -new file mode 100644 -index 000000000000..b065432e7793 ---- /dev/null -+++ b/include/dt-bindings/clock/rockchip-ddr.h -@@ -0,0 +1,63 @@ -+/* -+ * -+ * Copyright (C) 2017 ROCKCHIP, Inc. -+ * -+ * This software is licensed under the terms of the GNU General Public -+ * License version 2, as published by the Free Software Foundation, and -+ * may be copied, distributed, and modified under those terms. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#ifndef _DT_BINDINGS_CLOCK_ROCKCHIP_DDR_H -+#define _DT_BINDINGS_CLOCK_ROCKCHIP_DDR_H -+ -+#define DDR2_DEFAULT (0) -+ -+#define DDR3_800D (0) /* 5-5-5 */ -+#define DDR3_800E (1) /* 6-6-6 */ -+#define DDR3_1066E (2) /* 6-6-6 */ -+#define DDR3_1066F (3) /* 7-7-7 */ -+#define DDR3_1066G (4) /* 8-8-8 */ -+#define DDR3_1333F (5) /* 7-7-7 */ -+#define DDR3_1333G (6) /* 8-8-8 */ -+#define DDR3_1333H (7) /* 9-9-9 */ -+#define DDR3_1333J (8) /* 10-10-10 */ -+#define DDR3_1600G (9) /* 8-8-8 */ -+#define DDR3_1600H (10) /* 9-9-9 */ -+#define DDR3_1600J (11) /* 10-10-10 */ -+#define DDR3_1600K (12) /* 11-11-11 */ -+#define DDR3_1866J (13) /* 10-10-10 */ -+#define DDR3_1866K (14) /* 11-11-11 */ -+#define DDR3_1866L (15) /* 12-12-12 */ -+#define DDR3_1866M (16) /* 13-13-13 */ -+#define DDR3_2133K (17) /* 11-11-11 */ -+#define DDR3_2133L (18) /* 12-12-12 */ -+#define DDR3_2133M (19) /* 13-13-13 */ -+#define DDR3_2133N (20) /* 14-14-14 */ -+#define DDR3_DEFAULT (21) -+#define DDR_DDR2 (22) -+#define DDR_LPDDR (23) -+#define DDR_LPDDR2 (24) -+ -+#define DDR4_1600J (0) /* 10-10-10 */ -+#define DDR4_1600K (1) /* 11-11-11 */ -+#define DDR4_1600L (2) /* 12-12-12 */ -+#define DDR4_1866L (3) /* 12-12-12 */ -+#define DDR4_1866M (4) /* 13-13-13 */ -+#define DDR4_1866N (5) /* 14-14-14 */ -+#define DDR4_2133N (6) /* 14-14-14 */ -+#define DDR4_2133P (7) /* 15-15-15 */ -+#define DDR4_2133R (8) /* 16-16-16 */ -+#define DDR4_2400P (9) /* 15-15-15 */ -+#define DDR4_2400R (10) /* 16-16-16 */ -+#define DDR4_2400U (11) /* 18-18-18 */ -+#define DDR4_DEFAULT (12) -+ -+#define PAUSE_CPU_STACK_SIZE 16 -+ -+#endif -diff --git a/include/dt-bindings/memory/rockchip,rk322x.h b/include/dt-bindings/memory/rockchip,rk322x.h -new file mode 100644 -index 000000000000..1ab3317d700e ---- /dev/null -+++ b/include/dt-bindings/memory/rockchip,rk322x.h -@@ -0,0 +1,90 @@ -+/* -+ * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd -+ * -+ * SPDX-License-Identifier: GPL-2.0+ -+ */ -+ -+#ifndef _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H -+#define _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H -+ -+#define DDR3_DS_34ohm (1 << 1) -+#define DDR3_DS_40ohm (0x0) -+ -+#define LP2_DS_34ohm (0x1) -+#define LP2_DS_40ohm (0x2) -+#define LP2_DS_48ohm (0x3) -+#define LP2_DS_60ohm (0x4) -+#define LP2_DS_68_6ohm (0x5)/* optional */ -+#define LP2_DS_80ohm (0x6) -+#define LP2_DS_120ohm (0x7)/* optional */ -+ -+#define LP3_DS_34ohm (0x1) -+#define LP3_DS_40ohm (0x2) -+#define LP3_DS_48ohm (0x3) -+#define LP3_DS_60ohm (0x4) -+#define LP3_DS_80ohm (0x6) -+#define LP3_DS_34D_40U (0x9) -+#define LP3_DS_40D_48U (0xa) -+#define LP3_DS_34D_48U (0xb) -+ -+#define DDR3_ODT_DIS (0) -+#define DDR3_ODT_40ohm ((1 << 2) | (1 << 6)) -+#define DDR3_ODT_60ohm (1 << 2) -+#define DDR3_ODT_120ohm (1 << 6) -+ -+#define LP3_ODT_DIS (0) -+#define LP3_ODT_60ohm (1) -+#define LP3_ODT_120ohm (2) -+#define LP3_ODT_240ohm (3) -+ -+#define PHY_DDR3_RON_RTT_DISABLE (0) -+#define PHY_DDR3_RON_RTT_451ohm (1) -+#define PHY_DDR3_RON_RTT_225ohm (2) -+#define PHY_DDR3_RON_RTT_150ohm (3) -+#define PHY_DDR3_RON_RTT_112ohm (4) -+#define PHY_DDR3_RON_RTT_90ohm (5) -+#define PHY_DDR3_RON_RTT_75ohm (6) -+#define PHY_DDR3_RON_RTT_64ohm (7) -+#define PHY_DDR3_RON_RTT_56ohm (16) -+#define PHY_DDR3_RON_RTT_50ohm (17) -+#define PHY_DDR3_RON_RTT_45ohm (18) -+#define PHY_DDR3_RON_RTT_41ohm (19) -+#define PHY_DDR3_RON_RTT_37ohm (20) -+#define PHY_DDR3_RON_RTT_34ohm (21) -+#define PHY_DDR3_RON_RTT_33ohm (22) -+#define PHY_DDR3_RON_RTT_30ohm (23) -+#define PHY_DDR3_RON_RTT_28ohm (24) -+#define PHY_DDR3_RON_RTT_26ohm (25) -+#define PHY_DDR3_RON_RTT_25ohm (26) -+#define PHY_DDR3_RON_RTT_23ohm (27) -+#define PHY_DDR3_RON_RTT_22ohm (28) -+#define PHY_DDR3_RON_RTT_21ohm (29) -+#define PHY_DDR3_RON_RTT_20ohm (30) -+#define PHY_DDR3_RON_RTT_19ohm (31) -+ -+#define PHY_LP23_RON_RTT_DISABLE (0) -+#define PHY_LP23_RON_RTT_480ohm (1) -+#define PHY_LP23_RON_RTT_240ohm (2) -+#define PHY_LP23_RON_RTT_160ohm (3) -+#define PHY_LP23_RON_RTT_120ohm (4) -+#define PHY_LP23_RON_RTT_96ohm (5) -+#define PHY_LP23_RON_RTT_80ohm (6) -+#define PHY_LP23_RON_RTT_68ohm (7) -+#define PHY_LP23_RON_RTT_60ohm (16) -+#define PHY_LP23_RON_RTT_53ohm (17) -+#define PHY_LP23_RON_RTT_48ohm (18) -+#define PHY_LP23_RON_RTT_43ohm (19) -+#define PHY_LP23_RON_RTT_40ohm (20) -+#define PHY_LP23_RON_RTT_37ohm (21) -+#define PHY_LP23_RON_RTT_34ohm (22) -+#define PHY_LP23_RON_RTT_32ohm (23) -+#define PHY_LP23_RON_RTT_30ohm (24) -+#define PHY_LP23_RON_RTT_28ohm (25) -+#define PHY_LP23_RON_RTT_26ohm (26) -+#define PHY_LP23_RON_RTT_25ohm (27) -+#define PHY_LP23_RON_RTT_24ohm (28) -+#define PHY_LP23_RON_RTT_22ohm (29) -+#define PHY_LP23_RON_RTT_21ohm (30) -+#define PHY_LP23_RON_RTT_20ohm (31) -+ -+#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ diff --git a/drivers/devfreq/rk3228_dmc.c b/drivers/devfreq/rk3228_dmc.c new file mode 100644 -index 000000000000..1dbf53043f69 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/devfreq/rk3228_dmc.c @@ -0,0 +1,827 @@ @@ -1151,5 +983,171 @@ index 000000000000..1dbf53043f69 +MODULE_AUTHOR("Lin Huang "); +MODULE_AUTHOR("Paolo Sabatino "); +MODULE_DESCRIPTION("RK3228 dmcfreq driver with devfreq framework"); +diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h +new file mode 100644 +index 000000000000..111111111111 +--- /dev/null ++++ b/include/dt-bindings/clock/rockchip-ddr.h +@@ -0,0 +1,63 @@ ++/* ++ * ++ * Copyright (C) 2017 ROCKCHIP, Inc. ++ * ++ * This software is licensed under the terms of the GNU General Public ++ * License version 2, as published by the Free Software Foundation, and ++ * may be copied, distributed, and modified under those terms. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++ ++#ifndef _DT_BINDINGS_CLOCK_ROCKCHIP_DDR_H ++#define _DT_BINDINGS_CLOCK_ROCKCHIP_DDR_H ++ ++#define DDR2_DEFAULT (0) ++ ++#define DDR3_800D (0) /* 5-5-5 */ ++#define DDR3_800E (1) /* 6-6-6 */ ++#define DDR3_1066E (2) /* 6-6-6 */ ++#define DDR3_1066F (3) /* 7-7-7 */ ++#define DDR3_1066G (4) /* 8-8-8 */ ++#define DDR3_1333F (5) /* 7-7-7 */ ++#define DDR3_1333G (6) /* 8-8-8 */ ++#define DDR3_1333H (7) /* 9-9-9 */ ++#define DDR3_1333J (8) /* 10-10-10 */ ++#define DDR3_1600G (9) /* 8-8-8 */ ++#define DDR3_1600H (10) /* 9-9-9 */ ++#define DDR3_1600J (11) /* 10-10-10 */ ++#define DDR3_1600K (12) /* 11-11-11 */ ++#define DDR3_1866J (13) /* 10-10-10 */ ++#define DDR3_1866K (14) /* 11-11-11 */ ++#define DDR3_1866L (15) /* 12-12-12 */ ++#define DDR3_1866M (16) /* 13-13-13 */ ++#define DDR3_2133K (17) /* 11-11-11 */ ++#define DDR3_2133L (18) /* 12-12-12 */ ++#define DDR3_2133M (19) /* 13-13-13 */ ++#define DDR3_2133N (20) /* 14-14-14 */ ++#define DDR3_DEFAULT (21) ++#define DDR_DDR2 (22) ++#define DDR_LPDDR (23) ++#define DDR_LPDDR2 (24) ++ ++#define DDR4_1600J (0) /* 10-10-10 */ ++#define DDR4_1600K (1) /* 11-11-11 */ ++#define DDR4_1600L (2) /* 12-12-12 */ ++#define DDR4_1866L (3) /* 12-12-12 */ ++#define DDR4_1866M (4) /* 13-13-13 */ ++#define DDR4_1866N (5) /* 14-14-14 */ ++#define DDR4_2133N (6) /* 14-14-14 */ ++#define DDR4_2133P (7) /* 15-15-15 */ ++#define DDR4_2133R (8) /* 16-16-16 */ ++#define DDR4_2400P (9) /* 15-15-15 */ ++#define DDR4_2400R (10) /* 16-16-16 */ ++#define DDR4_2400U (11) /* 18-18-18 */ ++#define DDR4_DEFAULT (12) ++ ++#define PAUSE_CPU_STACK_SIZE 16 ++ ++#endif +diff --git a/include/dt-bindings/memory/rockchip,rk322x.h b/include/dt-bindings/memory/rockchip,rk322x.h +new file mode 100644 +index 000000000000..111111111111 +--- /dev/null ++++ b/include/dt-bindings/memory/rockchip,rk322x.h +@@ -0,0 +1,90 @@ ++/* ++ * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#ifndef _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H ++#define _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H ++ ++#define DDR3_DS_34ohm (1 << 1) ++#define DDR3_DS_40ohm (0x0) ++ ++#define LP2_DS_34ohm (0x1) ++#define LP2_DS_40ohm (0x2) ++#define LP2_DS_48ohm (0x3) ++#define LP2_DS_60ohm (0x4) ++#define LP2_DS_68_6ohm (0x5)/* optional */ ++#define LP2_DS_80ohm (0x6) ++#define LP2_DS_120ohm (0x7)/* optional */ ++ ++#define LP3_DS_34ohm (0x1) ++#define LP3_DS_40ohm (0x2) ++#define LP3_DS_48ohm (0x3) ++#define LP3_DS_60ohm (0x4) ++#define LP3_DS_80ohm (0x6) ++#define LP3_DS_34D_40U (0x9) ++#define LP3_DS_40D_48U (0xa) ++#define LP3_DS_34D_48U (0xb) ++ ++#define DDR3_ODT_DIS (0) ++#define DDR3_ODT_40ohm ((1 << 2) | (1 << 6)) ++#define DDR3_ODT_60ohm (1 << 2) ++#define DDR3_ODT_120ohm (1 << 6) ++ ++#define LP3_ODT_DIS (0) ++#define LP3_ODT_60ohm (1) ++#define LP3_ODT_120ohm (2) ++#define LP3_ODT_240ohm (3) ++ ++#define PHY_DDR3_RON_RTT_DISABLE (0) ++#define PHY_DDR3_RON_RTT_451ohm (1) ++#define PHY_DDR3_RON_RTT_225ohm (2) ++#define PHY_DDR3_RON_RTT_150ohm (3) ++#define PHY_DDR3_RON_RTT_112ohm (4) ++#define PHY_DDR3_RON_RTT_90ohm (5) ++#define PHY_DDR3_RON_RTT_75ohm (6) ++#define PHY_DDR3_RON_RTT_64ohm (7) ++#define PHY_DDR3_RON_RTT_56ohm (16) ++#define PHY_DDR3_RON_RTT_50ohm (17) ++#define PHY_DDR3_RON_RTT_45ohm (18) ++#define PHY_DDR3_RON_RTT_41ohm (19) ++#define PHY_DDR3_RON_RTT_37ohm (20) ++#define PHY_DDR3_RON_RTT_34ohm (21) ++#define PHY_DDR3_RON_RTT_33ohm (22) ++#define PHY_DDR3_RON_RTT_30ohm (23) ++#define PHY_DDR3_RON_RTT_28ohm (24) ++#define PHY_DDR3_RON_RTT_26ohm (25) ++#define PHY_DDR3_RON_RTT_25ohm (26) ++#define PHY_DDR3_RON_RTT_23ohm (27) ++#define PHY_DDR3_RON_RTT_22ohm (28) ++#define PHY_DDR3_RON_RTT_21ohm (29) ++#define PHY_DDR3_RON_RTT_20ohm (30) ++#define PHY_DDR3_RON_RTT_19ohm (31) ++ ++#define PHY_LP23_RON_RTT_DISABLE (0) ++#define PHY_LP23_RON_RTT_480ohm (1) ++#define PHY_LP23_RON_RTT_240ohm (2) ++#define PHY_LP23_RON_RTT_160ohm (3) ++#define PHY_LP23_RON_RTT_120ohm (4) ++#define PHY_LP23_RON_RTT_96ohm (5) ++#define PHY_LP23_RON_RTT_80ohm (6) ++#define PHY_LP23_RON_RTT_68ohm (7) ++#define PHY_LP23_RON_RTT_60ohm (16) ++#define PHY_LP23_RON_RTT_53ohm (17) ++#define PHY_LP23_RON_RTT_48ohm (18) ++#define PHY_LP23_RON_RTT_43ohm (19) ++#define PHY_LP23_RON_RTT_40ohm (20) ++#define PHY_LP23_RON_RTT_37ohm (21) ++#define PHY_LP23_RON_RTT_34ohm (22) ++#define PHY_LP23_RON_RTT_32ohm (23) ++#define PHY_LP23_RON_RTT_30ohm (24) ++#define PHY_LP23_RON_RTT_28ohm (25) ++#define PHY_LP23_RON_RTT_26ohm (26) ++#define PHY_LP23_RON_RTT_25ohm (27) ++#define PHY_LP23_RON_RTT_24ohm (28) ++#define PHY_LP23_RON_RTT_22ohm (29) ++#define PHY_LP23_RON_RTT_21ohm (30) ++#define PHY_LP23_RON_RTT_20ohm (31) ++ ++#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ -- -2.34.1 +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dwc2-no-clock-gating.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dwc2-no-clock-gating.patch index c5c290d43c52..a736c788711b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dwc2-no-clock-gating.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dwc2-no-clock-gating.patch @@ -1,9 +1,78 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Tue, 5 Mar 2024 20:08:38 +0100 +Subject: [ARCHEOLOGY] rockchip: add patches to fix peripheral mode + +> X-Git-Archeology: > recovered message: > rk322x has peripheral mode that is not working +> X-Git-Archeology: > recovered message: > really well, add various non-upstream patches +> X-Git-Archeology: > recovered message: > and timing adjustments that makes things a bit +> X-Git-Archeology: > recovered message: > more usable (mass storage and ethernet works, +> X-Git-Archeology: > recovered message: > uac isn't) +> X-Git-Archeology: - Revision 55836c60740bbf6f602216360f5ea785675153d2: https://github.com/armbian/build/commit/55836c60740bbf6f602216360f5ea785675153d2 +> X-Git-Archeology: Date: Tue, 05 Mar 2024 20:08:38 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: add patches to fix peripheral mode +> X-Git-Archeology: +> X-Git-Archeology: - Revision 47d2e8287e34fed3e47f37ab076d0f34ed0ac399: https://github.com/armbian/build/commit/47d2e8287e34fed3e47f37ab076d0f34ed0ac399 +> X-Git-Archeology: Date: Mon, 25 Mar 2024 19:38:38 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.8 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 724573bf7a21e61b0b626f835031a4c3206bb8ba: https://github.com/armbian/build/commit/724573bf7a21e61b0b626f835031a4c3206bb8ba +> X-Git-Archeology: Date: Wed, 05 Jun 2024 22:18:51 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip family edge kernel to 6.9 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7da7bbf61cb776a054219e35926d391dad9a67a7: https://github.com/armbian/build/commit/7da7bbf61cb776a054219e35926d391dad9a67a7 +> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:18:14 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.10 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 94ec783de0dad381b3e2e71d646d8428af4d5051: https://github.com/armbian/build/commit/94ec783de0dad381b3e2e71d646d8428af4d5051 +> X-Git-Archeology: Date: Wed, 18 Sep 2024 14:03:19 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.11 +> X-Git-Archeology: +> X-Git-Archeology: - Revision c90a0f7890bddc8e755847fc8227e15828950251: https://github.com/armbian/build/commit/c90a0f7890bddc8e755847fc8227e15828950251 +> X-Git-Archeology: Date: Sat, 30 Nov 2024 13:07:31 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.12 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + drivers/usb/dwc2/params.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c -index a937eadbc9b3..f1f6f6afe7fe 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c -@@ -133,6 +133,14 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg) - p->no_clock_gating = true; +@@ -132,6 +132,14 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg) + p->hird_threshold_en = false; } +static void dwc2_set_rk3228_params(struct dwc2_hsotg *hsotg) @@ -17,7 +86,7 @@ index a937eadbc9b3..f1f6f6afe7fe 100644 static void dwc2_set_ltq_danube_params(struct dwc2_hsotg *hsotg) { struct dwc2_core_params *p = &hsotg->params; -@@ -314,6 +322,7 @@ const struct of_device_id dwc2_of_match_table[] = { +@@ -313,6 +321,7 @@ const struct of_device_id dwc2_of_match_table[] = { { .compatible = "ingenic,x1830-otg", .data = dwc2_set_x1600_params }, { .compatible = "ingenic,x2000-otg", .data = dwc2_set_x2000_params }, { .compatible = "rockchip,rk3066-usb", .data = dwc2_set_rk_params }, @@ -25,3 +94,6 @@ index a937eadbc9b3..f1f6f6afe7fe 100644 { .compatible = "lantiq,danube-usb", .data = &dwc2_set_ltq_danube_params }, { .compatible = "lantiq,ase-usb", .data = &dwc2_set_ltq_ase_params }, { .compatible = "lantiq,arx100-usb", .data = &dwc2_set_ltq_ase_params }, +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-usb-reset-props.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-usb-reset-props.patch index 81deaa758e18..1cacf0427239 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-usb-reset-props.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-usb-reset-props.patch @@ -1,7 +1,7 @@ -From 6668d12fd4a628299ffbf89794b6f7f67416e3fa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 4 May 2024 15:12:43 +0200 -Subject: [PATCH] add reset props to usb otg/ehci ports +Subject: add reset props to usb otg/ehci ports usb resets are needed in case u-boot does its own reset of the devices, otherwise ports are left in a @@ -18,10 +18,10 @@ always detected also in case of timeout) 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index 03d9baddcbab..17c5f0a8fcf3 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi -@@ -807,6 +807,8 @@ usb_otg: usb@30040000 { +@@ -971,6 +971,8 @@ usb_otg: usb@30040000 { g-tx-fifo-size = <256 128 128 64 32 16>; phys = <&u2phy0_otg>; phy-names = "usb2-phy"; @@ -30,7 +30,7 @@ index 03d9baddcbab..17c5f0a8fcf3 100644 status = "disabled"; }; -@@ -817,6 +819,8 @@ usb_host0_ehci: usb@30080000 { +@@ -981,6 +983,8 @@ usb_host0_ehci: usb@30080000 { clocks = <&cru HCLK_HOST0>, <&u2phy0>; phys = <&u2phy0_host>; phy-names = "usb"; @@ -39,7 +39,7 @@ index 03d9baddcbab..17c5f0a8fcf3 100644 status = "disabled"; }; -@@ -837,6 +841,8 @@ usb_host1_ehci: usb@300c0000 { +@@ -1001,6 +1005,8 @@ usb_host1_ehci: usb@300c0000 { clocks = <&cru HCLK_HOST1>, <&u2phy1>; phys = <&u2phy1_otg>; phy-names = "usb"; @@ -48,7 +48,7 @@ index 03d9baddcbab..17c5f0a8fcf3 100644 status = "disabled"; }; -@@ -857,6 +863,8 @@ usb_host2_ehci: usb@30100000 { +@@ -1021,6 +1027,8 @@ usb_host2_ehci: usb@30100000 { clocks = <&cru HCLK_HOST2>, <&u2phy1>; phys = <&u2phy1_host>; phy-names = "usb"; @@ -58,10 +58,10 @@ index 03d9baddcbab..17c5f0a8fcf3 100644 }; diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c -index 5635e4d7ec88..1e20aabc2033 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/core.c +++ b/drivers/usb/dwc2/core.c -@@ -413,7 +413,7 @@ int dwc2_core_reset(struct dwc2_hsotg *hsotg, bool skip_wait) +@@ -419,7 +419,7 @@ int dwc2_core_reset(struct dwc2_hsotg *hsotg, bool skip_wait) if (!(gotgctl & GOTGCTL_CONID_B) || (gusbcfg & GUSBCFG_FORCEHOSTMODE)) { @@ -71,5 +71,5 @@ index 5635e4d7ec88..1e20aabc2033 100644 } -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch index 17b44a5f331f..ba5becfd43b0 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch @@ -1,21 +1,93 @@ -FROM: Solidhal - -This patch reverses commit 2b721118b7821107757eb1d37af4b60e877b27e7, as can bee seen here: -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2b721118b7821107757eb1d37af4b60e877b27e7 - -This commit caused issues on veyron speedy with ath9k and dwc2 drivers. Any ath9k device (ar9271) -would intermittently work, most of the time ending in errors as can bee seen here: -https://github.com/SolidHal/PrawnOS/issues/38 -This commit fixes that issue. -This is only a temporary work around while a permenant fix is found, as this commit seems to only cause issues -with dwc2 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas McKahan +Date: Fri, 25 Jan 2019 00:21:49 -0500 +Subject: [ARCHEOLOGY] [ rockchip-dev ] update patchset, target 5.0 RC +> X-Git-Archeology: > recovered message: > Includes experimental video decoder driver. Thanks as always to @miouyouyou for the base patches +> X-Git-Archeology: - Revision 5a0d83a316e19a3df6a6fd1f8bb536a88ca8e924: https://github.com/armbian/build/commit/5a0d83a316e19a3df6a6fd1f8bb536a88ca8e924 +> X-Git-Archeology: Date: Fri, 25 Jan 2019 00:21:49 -0500 +> X-Git-Archeology: From: Thomas McKahan +> X-Git-Archeology: Subject: [ rockchip-dev ] update patchset, target 5.0 RC +> X-Git-Archeology: +> X-Git-Archeology: - Revision 9afdc70340c4492ad0c1db9ace45e094d0c56df5: https://github.com/armbian/build/commit/9afdc70340c4492ad0c1db9ace45e094d0c56df5 +> X-Git-Archeology: Date: Wed, 08 May 2019 09:42:55 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: [ rockchip dev ] move to 5.1.y and adjust patches false permissions, add new patch to remove broken boards +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 9020803f1d17314db0931c50ef25d2bd15542817: https://github.com/armbian/build/commit/9020803f1d17314db0931c50ef25d2bd15542817 +> X-Git-Archeology: Date: Sun, 28 Jun 2020 17:13:32 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Update kernel configs due to logo support, adjust patches +> X-Git-Archeology: +> X-Git-Archeology: - Revision f86c6b313828b356a41afa6f5ef92dbcace0bb5c: https://github.com/armbian/build/commit/f86c6b313828b356a41afa6f5ef92dbcace0bb5c +> X-Git-Archeology: Date: Thu, 03 Sep 2020 21:37:23 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Moving Rockchip 32bit to 5.8.y (#2183) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision c0001d566b3770dae722c47180dcb942bed7006a: https://github.com/armbian/build/commit/c0001d566b3770dae722c47180dcb942bed7006a +> X-Git-Archeology: Date: Wed, 14 Dec 2022 01:43:31 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Bump bcm, imx, mvebu64 and xu4 EDGE to 6.1.y (#4560) +> X-Git-Archeology: +> X-Git-Archeology: - Revision cb3226dfa320e6359a1c11c3744e67ec50a6e69f: https://github.com/armbian/build/commit/cb3226dfa320e6359a1c11c3744e67ec50a6e69f +> X-Git-Archeology: Date: Tue, 24 Jan 2023 20:56:00 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit to kernel 6.1 +> X-Git-Archeology: +> X-Git-Archeology: - Revision f08dcd48677d2a34f349bf571c979cd422bffcc3: https://github.com/armbian/build/commit/f08dcd48677d2a34f349bf571c979cd422bffcc3 +> X-Git-Archeology: Date: Tue, 31 Oct 2023 08:13:23 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: rockchip,rk322x: bump edge kernel to 6.6 (#5875) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + drivers/net/wireless/ath/ath9k/hif_usb.c | 38 +++++++--- + 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c -index 3f563e02d..903851481 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -118,10 +118,10 @@ static int hif_usb_send_regout(struct hif_device_usb *hif_dev, +@@ -116,10 +116,10 @@ static int hif_usb_send_regout(struct hif_device_usb *hif_dev, cmd->skb = skb; cmd->hif_dev = hif_dev; @@ -29,7 +101,7 @@ index 3f563e02d..903851481 100644 usb_anchor_urb(urb, &hif_dev->regout_submitted); ret = usb_submit_urb(urb, GFP_KERNEL); -@@ -735,11 +735,11 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) +@@ -778,11 +778,11 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) rx_buf->skb = skb; @@ -44,7 +116,7 @@ index 3f563e02d..903851481 100644 } resubmit: -@@ -944,11 +944,11 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev) +@@ -995,11 +995,11 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev) rx_buf->hif_dev = hif_dev; rx_buf->skb = skb; @@ -59,7 +131,7 @@ index 3f563e02d..903851481 100644 /* Anchor URB */ usb_anchor_urb(urb, &hif_dev->reg_in_submitted); -@@ -1069,7 +1069,9 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) +@@ -1120,7 +1120,9 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev) { @@ -70,7 +142,7 @@ index 3f563e02d..903851481 100644 ret = ath9k_hif_usb_download_fw(hif_dev); if (ret) { -@@ -1079,6 +1081,20 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev) +@@ -1130,6 +1132,20 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev) return ret; } @@ -91,7 +163,7 @@ index 3f563e02d..903851481 100644 /* Alloc URBs */ ret = ath9k_hif_usb_alloc_urbs(hif_dev); if (ret) { -@@ -1353,7 +1369,7 @@ static void ath9k_hif_usb_reboot(struct usb_device *udev) +@@ -1418,7 +1434,7 @@ static void ath9k_hif_usb_reboot(struct usb_device *udev) if (!buf) return; @@ -100,3 +172,6 @@ index 3f563e02d..903851481 100644 buf, 4, NULL, USB_MSG_TIMEOUT); if (ret) dev_err(&udev->dev, "ath9k_htc: USB reboot failed\n"); +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-add-bcm43342.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-add-bcm43342.patch index e0307dc9c54b..9b91b3f144ac 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-add-bcm43342.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-add-bcm43342.patch @@ -9,7 +9,7 @@ Subject: add broadcom bcm43342 chip id 2 files changed, 3 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index 6b38d9de71af..6a603d045103 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -609,6 +609,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); @@ -29,7 +29,7 @@ index 6b38d9de71af..6a603d045103 100644 BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362), BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h -index 44684bf1b9ac..bcf48de78d53 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h @@ -27,6 +27,7 @@ diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch index affb86e4e7e6..b7709576830d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch @@ -1,10 +1,173 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo +Date: Thu, 22 Nov 2018 07:04:19 +0100 +Subject: [ARCHEOLOGY] Add rk3288 xt-q8l-v10 CSC board (#1158) + +> X-Git-Archeology: > recovered message: > This merge request contains various files which add support for xt-q8l-v10 boards (TVBox) equipped with Rockchip RK3288 SoC, AP6330 WiSoC (BCM4330 WiFi + Bluetooth), 2 GB DRAM (LPDDR2 or DDR3), 8 Gb eMMC, Gigabit Ethernet, 3 USB (1 OTG), 1 microSD slot, SPDIF optical output, 1 HDMI. +> X-Git-Archeology: > recovered message: > Kernel patches: +> X-Git-Archeology: > recovered message: > This thouches all three linux-rockchip-* kernelconfigs, just adds brcmfmac and brcmutil modules and remote controller support. default flavor activates rockchip own remote controller driver, next and dev use the mainline GPIO CIR driver (dev has lirc userland support activated too). +> X-Git-Archeology: > recovered message: > About the remote controller, an additional kernel module is added to the existing keymaps which is activated via device tree. +> X-Git-Archeology: > recovered message: > About possibly clashing patches assert-phy-reset-when-waking-up-in-rk3288-platform.patch should be checked against other rk3288 boards because it addresses an errata in rk3288 which causes the USB Host ports to stop responding when exiting from autosleep. On my device if I connect the first USB device when the system is already running, the USB Host gets stuck without this patch. Probably to work correctly on other platforms the device tree should include the proper reset lines of the USB PHYs (for reference, check patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch starting from line 869). +> X-Git-Archeology: > recovered message: > Patch 1-2-regulator-act8865-add-restart-handler-for-act8846.patch adds a restart handler which allows reboot using SIPC bit on act8846 power regulator. Possibly MiQi board is affected (is reboot working there?), others (tinkerboard) should not care. +> X-Git-Archeology: > recovered message: > Patch brcmfmac-add-ap6330-firmware.patch adds firmware file names for ap6330 , should be harmless in other cases. +> X-Git-Archeology: > recovered message: > Patch 0010-GPU-Mali-Midgard-remove-rcu_read_lock-references.patch is from Miouyouyou. It should be harmless, it was suggested by him to do some tests with devfreq +> X-Git-Archeology: > recovered message: > Other patches just add the proper device trees, Kconfig and bits for supporting the board as a regular kernel supported board and should not interfere with anything else +> X-Git-Archeology: > recovered message: > U-Boot patches: +> X-Git-Archeology: > recovered message: > All the patches for u-boot are per-board, so nothing is added which may interfere with other existing boards here. They include the device tree and u-boot config and also a couple of patches to support the silergy power regulators driving current to CPU and GPU +> X-Git-Archeology: > recovered message: > * Initial commit to provide kernel and u-boot configuration and device trees for xt-q8-v10 as patches +> X-Git-Archeology: > recovered message: > Modification to rockchip config to add initialization bits for xt-q8-v10 +> X-Git-Archeology: > recovered message: > * Committing correct path for rk3288_ddr_400Mhz... rockchip blob, moved assembling into another section to produce +> X-Git-Archeology: > recovered message: > immediately an u-boot working binary +> X-Git-Archeology: > recovered message: > * Enabled broadcom fmac driver in rockchip-next config +> X-Git-Archeology: > recovered message: > * Changed name definition of rk3288-xt-q8-v10 board to "TVBox" +> X-Git-Archeology: > recovered message: > Added bits to include support AP6330 and binary firmwares into the final image +> X-Git-Archeology: > recovered message: > * Fixed device tree file name in related patch, added patching of Makefile to produce the device tree binary accordingly +> X-Git-Archeology: > recovered message: > * Fixed xt-q8-v10 device tree patch +> X-Git-Archeology: > recovered message: > Added brcmfmac driver to rockchip dev and default kernel configs +> X-Git-Archeology: > recovered message: > * Syncing with upstream +> X-Git-Archeology: > recovered message: > * Splitted add-xt-q8... kernel patches into two separate patches +> X-Git-Archeology: > recovered message: > * Fixed bad extension while adding dtb in makefile for rockchip-default configuration +> X-Git-Archeology: > recovered message: > Updated device tree patches for all rockchip confs +> X-Git-Archeology: > recovered message: > * Enable mmc0 and usb in u-boot config +> X-Git-Archeology: > recovered message: > Fixed again makefile patch for kernel next +> X-Git-Archeology: > recovered message: > * Adding patches to reset the USB phy when kernel requires a reset, fixes autosuspend issue +> X-Git-Archeology: > recovered message: > * Changed xt-q8-v10 to proper xt-q8l-v10 in every string and every filename +> X-Git-Archeology: > recovered message: > Added power hold to u-boot, so now the device will boot and stay turned on without the need for the OTG cable anymore +> X-Git-Archeology: > recovered message: > * Changed names from 'Q8' to proper 'XT-Q8L-V10' in device tree patch files +> X-Git-Archeology: > recovered message: > * Legacy kernel device tree: +> X-Git-Archeology: > recovered message: > Fixed bluetooth gpio pin clashing +> X-Git-Archeology: > recovered message: > Fixed HDMI gpio pin clashing +> X-Git-Archeology: > recovered message: > Added support for PWM-based IR-Receiver, added driver in kernel default config too +> X-Git-Archeology: > recovered message: > Various other fixes to avoid some complaints from the kernel +> X-Git-Archeology: > recovered message: > * Added booting bluetooth systemd service for AP6330 (xt-q8l-v10) that loads patchram and invokes hciattach +> X-Git-Archeology: > recovered message: > Minor fixes to -next and -dev device trees for xt-q8l-v10 +> X-Git-Archeology: > recovered message: > * Disabled OTG USB port in u-boot due to long timeout during initialization +> X-Git-Archeology: > recovered message: > Fixed warning during u-boot dts compilation +> X-Git-Archeology: > recovered message: > Added emmc as second boot device in dts +> X-Git-Archeology: > recovered message: > * Adding myself to licensing +> X-Git-Archeology: > recovered message: > * Committing modifications to device trees +> X-Git-Archeology: > recovered message: > * Fixed dmac_bus_s explicitly set to unused dmac, restored right dmac in xt-q8l-v10 dts only +> X-Git-Archeology: > recovered message: > Change PLL_CPLL frequency in device tree to 408 Mhz to avoid fractional divisor warnings +> X-Git-Archeology: > recovered message: > * Added proper xt-q8l-v10_rk3288 configuration to u-boot, now appearing in config menu and +> X-Git-Archeology: > recovered message: > correctly selectable as a real target +> X-Git-Archeology: > recovered message: > Fixed typo in device tree from rockchip +> X-Git-Archeology: > recovered message: > * Fixed missing semicolon in device tree for default configuration +> X-Git-Archeology: > recovered message: > Fixed patch files for u-boot appending themselves to files on each compilation +> X-Git-Archeology: > recovered message: > * Added bits to enable power to USB ports in u-boot, thus enabling booting from USB devices (only USB host port for now) +> X-Git-Archeology: > recovered message: > * Changed u-boot binary creation using the rockchip SPL properly +> X-Git-Archeology: > recovered message: > * Added boot order for xt-q8l-v10: sdcard, usb0, eMMC, network +> X-Git-Archeology: > recovered message: > * Added bionic:next in beta config for xt-q8l-v10 board +> X-Git-Archeology: > recovered message: > * Changed some minor bits in xt-q8l-v10 device tree files, added missing bits to dev flavour +> X-Git-Archeology: > recovered message: > Added patches to introduce fairchild fan53555/silergy82x regulators to u-boot and enabled in xt-q8l-v10 device tree +> X-Git-Archeology: > recovered message: > * Updated u-boot to version v2018.03 for xt-q8l-v10. Other rk3288 boards will gain v2018.05 from main armbian fork +> X-Git-Archeology: > recovered message: > Removed pre-reloc labels in u-boot device tree because they are not necessary since we don't use u-boot SPL for xt-q8l-v10 +> X-Git-Archeology: > recovered message: > Removed vmmc-supply and vqmmc-supply in u-boot device tree to avoid hang on boot +> X-Git-Archeology: > recovered message: > * Tidied up a bit device trees, in particular some modifications are made to power regulator properties comparing them against the original q8l device tree +> X-Git-Archeology: > recovered message: > Removed unnecessary dummy regulator, removed unnecessary capacities to embedded eMMC +> X-Git-Archeology: > recovered message: > Disabled unused USB host +> X-Git-Archeology: > recovered message: > Removed vmmc-supply and vqmmc-supply from emmc section because it causes hang in u-boot v2018.03 and newer +> X-Git-Archeology: > recovered message: > * Restored previous regulator in u-boot dts +> X-Git-Archeology: > recovered message: > removed assert phy reset USB patch from rockchip-dev because of some upstream incompatible changes +> X-Git-Archeology: > recovered message: > * Added patch to enable IRQ for Midgard drivers which caused massive slowdown on dev kernel +> X-Git-Archeology: > recovered message: > Changed u-boot if-code for xt-q8l-v10 in rockchip.conf +> X-Git-Archeology: > recovered message: > Removed references to rk3288-linux.dtsi in xt-q8l-v10 device tree for default kernel +> X-Git-Archeology: > recovered message: > * Committing effective removal of USB reset assert for dev kernel +> X-Git-Archeology: > recovered message: > Committing changes to u-boot device tree +> X-Git-Archeology: > recovered message: > * Added patch to disable USB power down for rockchip devices broken on latest kernel +> X-Git-Archeology: > recovered message: > * Removed usb dwc2 patch to reinject it from specific branch +> X-Git-Archeology: > recovered message: > * Reverting some voltage changes for xt-q8l-v10 device in rockchip-dev +> X-Git-Archeology: > recovered message: > * Reverting some voltage changes for xt-q8l-v10 in u-boot section +> X-Git-Archeology: > recovered message: > * Added patch to make USB ports working again on rockchip devices with mainline +> X-Git-Archeology: > recovered message: > kernel >= 4.18 +> X-Git-Archeology: > recovered message: > * Changed the 0 into false +> X-Git-Archeology: > recovered message: > * Moved xt-q8l-v10 u-boot patches into board_xt-q8l-v10 directory +> X-Git-Archeology: > recovered message: > * Changed some minor things in rockchip-dev dts for xt-q8l-v10, added mali midgard driver to dev kernel config +> X-Git-Archeology: > recovered message: > * Added devfreq support for Mali in rockchip-next flavour +> X-Git-Archeology: > recovered message: > * Remove manually applied patch (0007-drivers-drm...) because it has been +> X-Git-Archeology: > recovered message: > added to armbian main repo +> X-Git-Archeology: > recovered message: > * Removed duplicate patch which has added to main armbian repository +> X-Git-Archeology: > recovered message: > * Tidied up regulators for default/next/dev rockchip flavours for xt-q8l-v10, disabling those regulators which are not tied to anything +> X-Git-Archeology: > recovered message: > Enabled voltage regulator to make SPDIF connector work (thus not tested because I have no DAC) +> X-Git-Archeology: > recovered message: > Changed rockchip-dev and rockchip-next config files to enable gpio-ir-receiver module to enable bundled remote IR controller, including kernel patch for keymap +> X-Git-Archeology: > recovered message: > * Enabled back regulator REG7 to allow propert bluetooth functionaly +> X-Git-Archeology: > recovered message: > * Minor changes to u-boot device tree for xt-q8l-v10 +> X-Git-Archeology: > recovered message: > Added patch to set act8846 SIPC to correctly reboot the device (thus require some power-hold at reboot to make reboot fully working) +> X-Git-Archeology: > recovered message: > * Fixed u-boot device tree +> X-Git-Archeology: > recovered message: > * Added configuration bits to support TPL in u-boot for xt-q8l-v10 (TPL is thrown away though) to allow faster reboot times and achieve a working reset feature activating power hold gpio pin as soon as possible. gpio pin is hardwired into spl_board_init() u-boot code because it is not possible to let it work via device tree +> X-Git-Archeology: > recovered message: > Fixed OTG USB port in u-boot, allowing devices detection and booting +> X-Git-Archeology: > recovered message: > Added proper vbus-supply properties for USB controllers in u-boot dts, so u-boot activates USB vbus itself +> X-Git-Archeology: > recovered message: > * Fixed dts makefile patching for next and dev rockchip kernel +> X-Git-Archeology: > recovered message: > * Fixed fdt_file renamed to fdtfile in armbianEnv.txt +> X-Git-Archeology: > recovered message: > * Changed xt-q8l-v10 board config as per recomendations +> X-Git-Archeology: > recovered message: > * Moved xt-q8l-v10 configuration to CSC +> X-Git-Archeology: > recovered message: > Restored linux-rockchip-* configurations, enabled brcmfmac driver, GPIO remote controller driver and lirc kernel compatibility interface +> X-Git-Archeology: > recovered message: > Polished a bit rockchip.conf +> X-Git-Archeology: > recovered message: > * Add patch to brcmfmac driver to search for ap6330 firmware +> X-Git-Archeology: > recovered message: > Removed copy-work from rockchip.conf about ap6330 firmware for xt-q8l-v10 and tidied up +> X-Git-Archeology: > recovered message: > Avoid using brcm_patchram_plus in ap6330-bluetooth-service putting proper firmware file in /etc/firmware for hciattach do firmware uploading itself +> X-Git-Archeology: > recovered message: > * Fixed bcm4330 bluetooth firmware linking for hciattach used by ap6330-bluetooth.service +> X-Git-Archeology: > recovered message: > * Removed foreign test patches from xt-q8l-v10 u-boot directory +> X-Git-Archeology: - Revision 60b4166a8a9efe74c76bf75246cd297ccf4cf7ca: https://github.com/armbian/build/commit/60b4166a8a9efe74c76bf75246cd297ccf4cf7ca +> X-Git-Archeology: Date: Thu, 22 Nov 2018 07:04:19 +0100 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: Add rk3288 xt-q8l-v10 CSC board (#1158) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision c0001d566b3770dae722c47180dcb942bed7006a: https://github.com/armbian/build/commit/c0001d566b3770dae722c47180dcb942bed7006a +> X-Git-Archeology: Date: Wed, 14 Dec 2022 01:43:31 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Bump bcm, imx, mvebu64 and xu4 EDGE to 6.1.y (#4560) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969 +> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families +> X-Git-Archeology: +> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0 +> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495 +> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14 +> X-Git-Archeology: +> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967 +> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096 +> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31 +> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17 +> X-Git-Archeology: +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index a907d7b06..ec71996c7 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -619,13 +619,17 @@ BRCMF_FW_DEF(4354, "brcmfmac4354-sdio"); - BRCMF_FW_DEF(4356, "brcmfmac4356-sdio"); - BRCMF_FW_DEF(4373, "brcmfmac4373-sdio"); +@@ -633,13 +633,17 @@ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt"); + /* per-board firmware binaries */ + MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin"); +/* AMPAK */ +BRCMF_FW_DEF(AP6330, "brcmfmac-ap6330-sdio"); @@ -21,3 +184,6 @@ index a907d7b06..ec71996c7 100644 BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334), BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340), BRCMF_FW_ENTRY(BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, 43340), +-- +Armbian + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-esp8089.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-esp8089.patch index 27e25f514a38..910fc5622304 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-esp8089.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-esp8089.patch @@ -1,106 +1,73 @@ -From 2d6165af6e9d5ed5026cdf250536c0a00d84fd75 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 1 Oct 2022 12:43:53 +0000 -Subject: [PATCH] add esp8089 kernel driver +Subject: add esp8089 kernel driver --- - drivers/net/wireless/Kconfig | 1 + - drivers/net/wireless/Makefile | 1 + - drivers/net/wireless/esp8089/.gitignore | 7 + - drivers/net/wireless/esp8089/Kconfig | 13 + - drivers/net/wireless/esp8089/LICENSE | 340 +++ - drivers/net/wireless/esp8089/Makefile | 7 + - drivers/net/wireless/esp8089/Makefile.old | 99 + - drivers/net/wireless/esp8089/README.md | 31 + - drivers/net/wireless/esp8089/esp_ctrl.c | 801 ++++++ - drivers/net/wireless/esp8089/esp_ctrl.h | 58 + - drivers/net/wireless/esp8089/esp_debug.c | 297 ++ - drivers/net/wireless/esp8089/esp_debug.h | 101 + - drivers/net/wireless/esp8089/esp_ext.c | 542 ++++ - drivers/net/wireless/esp8089/esp_ext.h | 100 + - drivers/net/wireless/esp8089/esp_file.c | 258 ++ - drivers/net/wireless/esp8089/esp_file.h | 43 + - drivers/net/wireless/esp8089/esp_init_data.h | 7 + - drivers/net/wireless/esp8089/esp_io.c | 639 +++++ - drivers/net/wireless/esp8089/esp_mac80211.c | 1727 ++++++++++++ - drivers/net/wireless/esp8089/esp_mac80211.h | 38 + - drivers/net/wireless/esp8089/esp_main.c | 263 ++ - drivers/net/wireless/esp8089/esp_path.h | 6 + - drivers/net/wireless/esp8089/esp_pub.h | 222 ++ - drivers/net/wireless/esp8089/esp_sif.h | 207 ++ - drivers/net/wireless/esp8089/esp_sip.c | 2418 +++++++++++++++++ - drivers/net/wireless/esp8089/esp_sip.h | 171 ++ - drivers/net/wireless/esp8089/esp_utils.c | 262 ++ - drivers/net/wireless/esp8089/esp_utils.h | 41 + - drivers/net/wireless/esp8089/esp_version.h | 1 + - drivers/net/wireless/esp8089/esp_wl.h | 63 + - drivers/net/wireless/esp8089/esp_wmac.h | 92 + - .../wireless/esp8089/firmware/LICENSE-2.0.txt | 203 ++ - drivers/net/wireless/esp8089/sdio_sif_esp.c | 811 ++++++ - drivers/net/wireless/esp8089/sip2_common.h | 475 ++++ - .../net/wireless/esp8089/slc_host_register.h | 271 ++ - 35 files changed, 10616 insertions(+) - create mode 100644 drivers/net/wireless/esp8089/.gitignore - create mode 100644 drivers/net/wireless/esp8089/Kconfig - create mode 100644 drivers/net/wireless/esp8089/LICENSE - create mode 100644 drivers/net/wireless/esp8089/Makefile - create mode 100644 drivers/net/wireless/esp8089/Makefile.old - create mode 100644 drivers/net/wireless/esp8089/README.md - create mode 100644 drivers/net/wireless/esp8089/esp_ctrl.c - create mode 100644 drivers/net/wireless/esp8089/esp_ctrl.h - create mode 100644 drivers/net/wireless/esp8089/esp_debug.c - create mode 100644 drivers/net/wireless/esp8089/esp_debug.h - create mode 100644 drivers/net/wireless/esp8089/esp_ext.c - create mode 100644 drivers/net/wireless/esp8089/esp_ext.h - create mode 100644 drivers/net/wireless/esp8089/esp_file.c - create mode 100644 drivers/net/wireless/esp8089/esp_file.h - create mode 100644 drivers/net/wireless/esp8089/esp_init_data.h - create mode 100644 drivers/net/wireless/esp8089/esp_io.c - create mode 100644 drivers/net/wireless/esp8089/esp_mac80211.c - create mode 100644 drivers/net/wireless/esp8089/esp_mac80211.h - create mode 100644 drivers/net/wireless/esp8089/esp_main.c - create mode 100644 drivers/net/wireless/esp8089/esp_path.h - create mode 100644 drivers/net/wireless/esp8089/esp_pub.h - create mode 100644 drivers/net/wireless/esp8089/esp_sif.h - create mode 100644 drivers/net/wireless/esp8089/esp_sip.c - create mode 100644 drivers/net/wireless/esp8089/esp_sip.h - create mode 100644 drivers/net/wireless/esp8089/esp_utils.c - create mode 100644 drivers/net/wireless/esp8089/esp_utils.h - create mode 100644 drivers/net/wireless/esp8089/esp_version.h - create mode 100644 drivers/net/wireless/esp8089/esp_wl.h - create mode 100644 drivers/net/wireless/esp8089/esp_wmac.h - create mode 100644 drivers/net/wireless/esp8089/firmware/LICENSE-2.0.txt - create mode 100644 drivers/net/wireless/esp8089/sdio_sif_esp.c - create mode 100644 drivers/net/wireless/esp8089/sip2_common.h - create mode 100644 drivers/net/wireless/esp8089/slc_host_register.h + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 1 + + drivers/net/wireless/esp8089/.gitignore | 7 + + drivers/net/wireless/esp8089/Kconfig | 13 + + drivers/net/wireless/esp8089/LICENSE | 340 ++ + drivers/net/wireless/esp8089/Makefile | 7 + + drivers/net/wireless/esp8089/Makefile.old | 99 + + drivers/net/wireless/esp8089/README.md | 31 + + drivers/net/wireless/esp8089/esp_ctrl.c | 801 +++ + drivers/net/wireless/esp8089/esp_ctrl.h | 58 + + drivers/net/wireless/esp8089/esp_debug.c | 297 ++ + drivers/net/wireless/esp8089/esp_debug.h | 101 + + drivers/net/wireless/esp8089/esp_ext.c | 542 +++ + drivers/net/wireless/esp8089/esp_ext.h | 100 + + drivers/net/wireless/esp8089/esp_file.c | 258 + + drivers/net/wireless/esp8089/esp_file.h | 43 + + drivers/net/wireless/esp8089/esp_init_data.h | 7 + + drivers/net/wireless/esp8089/esp_io.c | 639 +++ + drivers/net/wireless/esp8089/esp_mac80211.c | 1731 +++++++ + drivers/net/wireless/esp8089/esp_mac80211.h | 38 + + drivers/net/wireless/esp8089/esp_main.c | 263 + + drivers/net/wireless/esp8089/esp_path.h | 6 + + drivers/net/wireless/esp8089/esp_pub.h | 222 + + drivers/net/wireless/esp8089/esp_sif.h | 207 + + drivers/net/wireless/esp8089/esp_sip.c | 2420 ++++++++++ + drivers/net/wireless/esp8089/esp_sip.h | 171 + + drivers/net/wireless/esp8089/esp_utils.c | 262 + + drivers/net/wireless/esp8089/esp_utils.h | 41 + + drivers/net/wireless/esp8089/esp_version.h | 1 + + drivers/net/wireless/esp8089/esp_wl.h | 63 + + drivers/net/wireless/esp8089/esp_wmac.h | 92 + + drivers/net/wireless/esp8089/firmware/LICENSE-2.0.txt | 203 + + drivers/net/wireless/esp8089/sdio_sif_esp.c | 824 ++++ + drivers/net/wireless/esp8089/sip2_common.h | 475 ++ + drivers/net/wireless/esp8089/slc_host_register.h | 271 ++ + 35 files changed, 10635 insertions(+) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index cb1c15012dd0..de5e37846397 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig -@@ -37,6 +37,7 @@ source "drivers/net/wireless/st/Kconfig" - source "drivers/net/wireless/ti/Kconfig" +@@ -40,6 +40,7 @@ source "drivers/net/wireless/rtl8189fs/Kconfig" + source "drivers/net/wireless/rtl8189es/Kconfig" source "drivers/net/wireless/zydas/Kconfig" source "drivers/net/wireless/quantenna/Kconfig" +source "drivers/net/wireless/esp8089/Kconfig" - config PCMCIA_RAYCS - tristate "Aviator/Raytheon 2.4GHz wireless support" + source "drivers/net/wireless/virtual/Kconfig" + diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index a61cf6c90343..92ffd2cef51c 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile -@@ -22,6 +22,7 @@ obj-$(CONFIG_WLAN_VENDOR_SILABS) += silabs/ +@@ -21,6 +21,7 @@ obj-$(CONFIG_WLAN_VENDOR_SILABS) += silabs/ obj-$(CONFIG_WLAN_VENDOR_ST) += st/ obj-$(CONFIG_WLAN_VENDOR_TI) += ti/ obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/ +obj-$(CONFIG_ESP8089) += esp8089/ - # 16-bit wireless PCMCIA client drivers - obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o + obj-$(CONFIG_WLAN) += virtual/ + obj-$(CONFIG_RTL8189ES) += rtl8189es/ diff --git a/drivers/net/wireless/esp8089/.gitignore b/drivers/net/wireless/esp8089/.gitignore new file mode 100644 -index 000000000000..eae6529085d0 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/.gitignore @@ -0,0 +1,7 @@ @@ -113,7 +80,7 @@ index 000000000000..eae6529085d0 +*.mod.c diff --git a/drivers/net/wireless/esp8089/Kconfig b/drivers/net/wireless/esp8089/Kconfig new file mode 100644 -index 000000000000..8db1fc54712d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/Kconfig @@ -0,0 +1,13 @@ @@ -132,7 +99,7 @@ index 000000000000..8db1fc54712d + DebugFS support for ESP8089 diff --git a/drivers/net/wireless/esp8089/LICENSE b/drivers/net/wireless/esp8089/LICENSE new file mode 100644 -index 000000000000..d6a93266f748 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/LICENSE @@ -0,0 +1,340 @@ @@ -478,7 +445,7 @@ index 000000000000..d6a93266f748 + diff --git a/drivers/net/wireless/esp8089/Makefile b/drivers/net/wireless/esp8089/Makefile new file mode 100644 -index 000000000000..36decfd20ecd +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/Makefile @@ -0,0 +1,7 @@ @@ -491,7 +458,7 @@ index 000000000000..36decfd20ecd +obj-$(CONFIG_ESP8089) := esp8089.o diff --git a/drivers/net/wireless/esp8089/Makefile.old b/drivers/net/wireless/esp8089/Makefile.old new file mode 100644 -index 000000000000..b7b1a47b159c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/Makefile.old @@ -0,0 +1,99 @@ @@ -596,7 +563,7 @@ index 000000000000..b7b1a47b159c +.PHONY: all modules clean install config_check diff --git a/drivers/net/wireless/esp8089/README.md b/drivers/net/wireless/esp8089/README.md new file mode 100644 -index 000000000000..56b40db272f3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/README.md @@ -0,0 +1,31 @@ @@ -633,7 +600,7 @@ index 000000000000..56b40db272f3 +To load the module. diff --git a/drivers/net/wireless/esp8089/esp_ctrl.c b/drivers/net/wireless/esp8089/esp_ctrl.c new file mode 100644 -index 000000000000..a19d2437dd82 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_ctrl.c @@ -0,0 +1,801 @@ @@ -1440,7 +1407,7 @@ index 000000000000..a19d2437dd82 +} diff --git a/drivers/net/wireless/esp8089/esp_ctrl.h b/drivers/net/wireless/esp8089/esp_ctrl.h new file mode 100644 -index 000000000000..29c18caa9ede +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_ctrl.h @@ -0,0 +1,58 @@ @@ -1504,7 +1471,7 @@ index 000000000000..29c18caa9ede +#endif /* _ESP_CTRL_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_debug.c b/drivers/net/wireless/esp8089/esp_debug.c new file mode 100644 -index 000000000000..5ce8fd2ebd6b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_debug.c @@ -0,0 +1,297 @@ @@ -1807,7 +1774,7 @@ index 000000000000..5ce8fd2ebd6b +#endif /* HOST_RC */ diff --git a/drivers/net/wireless/esp8089/esp_debug.h b/drivers/net/wireless/esp8089/esp_debug.h new file mode 100644 -index 000000000000..bab695d34bfb +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_debug.h @@ -0,0 +1,101 @@ @@ -1914,7 +1881,7 @@ index 000000000000..bab695d34bfb +#endif /* _DEBUG_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_ext.c b/drivers/net/wireless/esp8089/esp_ext.c new file mode 100644 -index 000000000000..541f27a6853f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_ext.c @@ -0,0 +1,542 @@ @@ -2462,7 +2429,7 @@ index 000000000000..541f27a6853f +#endif /* USE_EXT_GPIO */ diff --git a/drivers/net/wireless/esp8089/esp_ext.h b/drivers/net/wireless/esp8089/esp_ext.h new file mode 100644 -index 000000000000..0eeba4d22111 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_ext.h @@ -0,0 +1,100 @@ @@ -2568,7 +2535,7 @@ index 000000000000..0eeba4d22111 +#endif /* USE_EXT_GPIO */ diff --git a/drivers/net/wireless/esp8089/esp_file.c b/drivers/net/wireless/esp8089/esp_file.c new file mode 100644 -index 000000000000..ea702f010eec +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_file.c @@ -0,0 +1,258 @@ @@ -2832,7 +2799,7 @@ index 000000000000..ea702f010eec +} diff --git a/drivers/net/wireless/esp8089/esp_file.h b/drivers/net/wireless/esp8089/esp_file.h new file mode 100644 -index 000000000000..5ba39c626baa +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_file.h @@ -0,0 +1,43 @@ @@ -2881,7 +2848,7 @@ index 000000000000..5ba39c626baa +#endif /* _ESP_FILE_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_init_data.h b/drivers/net/wireless/esp8089/esp_init_data.h new file mode 100644 -index 000000000000..16f451affd1e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_init_data.h @@ -0,0 +1,7 @@ @@ -2894,7 +2861,7 @@ index 000000000000..16f451affd1e +0 }; diff --git a/drivers/net/wireless/esp8089/esp_io.c b/drivers/net/wireless/esp8089/esp_io.c new file mode 100644 -index 000000000000..6c5c01aad4e5 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_io.c @@ -0,0 +1,639 @@ @@ -3539,7 +3506,7 @@ index 000000000000..6c5c01aad4e5 +} diff --git a/drivers/net/wireless/esp8089/esp_mac80211.c b/drivers/net/wireless/esp8089/esp_mac80211.c new file mode 100644 -index 000000000000..14186365fdd4 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_mac80211.c @@ -0,0 +1,1731 @@ @@ -5276,7 +5243,7 @@ index 000000000000..14186365fdd4 +} diff --git a/drivers/net/wireless/esp8089/esp_mac80211.h b/drivers/net/wireless/esp8089/esp_mac80211.h new file mode 100644 -index 000000000000..699b27dcadd1 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_mac80211.h @@ -0,0 +1,38 @@ @@ -5320,7 +5287,7 @@ index 000000000000..699b27dcadd1 +#endif /* _ESP_MAC80211_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_main.c b/drivers/net/wireless/esp8089/esp_main.c new file mode 100644 -index 000000000000..404e0d7a6f54 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_main.c @@ -0,0 +1,263 @@ @@ -5589,7 +5556,7 @@ index 000000000000..404e0d7a6f54 +#endif /* !FPGA_DEBUG */ diff --git a/drivers/net/wireless/esp8089/esp_path.h b/drivers/net/wireless/esp8089/esp_path.h new file mode 100644 -index 000000000000..1ceb14bc3b15 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_path.h @@ -0,0 +1,6 @@ @@ -5601,7 +5568,7 @@ index 000000000000..1ceb14bc3b15 +#endif /* _ESP_PATH_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_pub.h b/drivers/net/wireless/esp8089/esp_pub.h new file mode 100644 -index 000000000000..0d3ad3655cf4 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_pub.h @@ -0,0 +1,222 @@ @@ -5829,7 +5796,7 @@ index 000000000000..0d3ad3655cf4 +#endif /* _ESP_PUB_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_sif.h b/drivers/net/wireless/esp8089/esp_sif.h new file mode 100644 -index 000000000000..2d49f2bc8035 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_sif.h @@ -0,0 +1,207 @@ @@ -6042,7 +6009,7 @@ index 000000000000..2d49f2bc8035 +#endif /* _ESP_SIF_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_sip.c b/drivers/net/wireless/esp8089/esp_sip.c new file mode 100644 -index 000000000000..6602a1e22ab1 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_sip.c @@ -0,0 +1,2420 @@ @@ -8468,7 +8435,7 @@ index 000000000000..6602a1e22ab1 +#endif /* FPGA_TXDATA */ diff --git a/drivers/net/wireless/esp8089/esp_sip.h b/drivers/net/wireless/esp8089/esp_sip.h new file mode 100644 -index 000000000000..95cc42989b2c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_sip.h @@ -0,0 +1,171 @@ @@ -8645,7 +8612,7 @@ index 000000000000..95cc42989b2c +#endif diff --git a/drivers/net/wireless/esp8089/esp_utils.c b/drivers/net/wireless/esp8089/esp_utils.c new file mode 100644 -index 000000000000..8b188de79b2c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_utils.c @@ -0,0 +1,262 @@ @@ -8913,7 +8880,7 @@ index 000000000000..8b188de79b2c +} diff --git a/drivers/net/wireless/esp8089/esp_utils.h b/drivers/net/wireless/esp8089/esp_utils.h new file mode 100644 -index 000000000000..ed16d9ca0a65 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_utils.h @@ -0,0 +1,41 @@ @@ -8960,14 +8927,14 @@ index 000000000000..ed16d9ca0a65 +#endif diff --git a/drivers/net/wireless/esp8089/esp_version.h b/drivers/net/wireless/esp8089/esp_version.h new file mode 100644 -index 000000000000..481d98841fc2 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_version.h @@ -0,0 +1 @@ +#define DRIVER_VER 0xbdf5087c3debll diff --git a/drivers/net/wireless/esp8089/esp_wl.h b/drivers/net/wireless/esp8089/esp_wl.h new file mode 100644 -index 000000000000..e3e62a83d505 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_wl.h @@ -0,0 +1,63 @@ @@ -9036,7 +9003,7 @@ index 000000000000..e3e62a83d505 +#endif /* _ESP_WL_H_ */ diff --git a/drivers/net/wireless/esp8089/esp_wmac.h b/drivers/net/wireless/esp8089/esp_wmac.h new file mode 100644 -index 000000000000..72d13cbfc0e5 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/esp_wmac.h @@ -0,0 +1,92 @@ @@ -9134,7 +9101,7 @@ index 000000000000..72d13cbfc0e5 +#endif /* _ESP_WMAC_H_ */ diff --git a/drivers/net/wireless/esp8089/firmware/LICENSE-2.0.txt b/drivers/net/wireless/esp8089/firmware/LICENSE-2.0.txt new file mode 100644 -index 000000000000..0dd35c82a001 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/firmware/LICENSE-2.0.txt @@ -0,0 +1,203 @@ @@ -9343,7 +9310,7 @@ index 000000000000..0dd35c82a001 + limitations under the License. diff --git a/drivers/net/wireless/esp8089/sdio_sif_esp.c b/drivers/net/wireless/esp8089/sdio_sif_esp.c new file mode 100644 -index 000000000000..2bd2c63f5388 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/sdio_sif_esp.c @@ -0,0 +1,824 @@ @@ -10173,7 +10140,7 @@ index 000000000000..2bd2c63f5388 +module_exit(esp_sdio_exit); diff --git a/drivers/net/wireless/esp8089/sip2_common.h b/drivers/net/wireless/esp8089/sip2_common.h new file mode 100644 -index 000000000000..d46e87589b0b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/sip2_common.h @@ -0,0 +1,475 @@ @@ -10654,7 +10621,7 @@ index 000000000000..d46e87589b0b +#endif /* _SIP_COMMON_H_ */ diff --git a/drivers/net/wireless/esp8089/slc_host_register.h b/drivers/net/wireless/esp8089/slc_host_register.h new file mode 100644 -index 000000000000..2cdb2c856d15 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/esp8089/slc_host_register.h @@ -0,0 +1,271 @@ @@ -10930,5 +10897,5 @@ index 000000000000..2cdb2c856d15 + +#endif // SLC_HOST_REGISTER_H_INCLUDED -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-ssv6051.patch b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-ssv6051.patch index 954791d521fa..ae25f24657ae 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-ssv6051.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-ssv6051.patch @@ -32,7 +32,7 @@ Subject: add ssv6xxx wifi driver drivers/net/wireless/ssv6051/smac/ampdu.h | 215 + drivers/net/wireless/ssv6051/smac/ap.c | 598 + drivers/net/wireless/ssv6051/smac/ap.h | 41 + - drivers/net/wireless/ssv6051/smac/dev.c | 3881 ++ + drivers/net/wireless/ssv6051/smac/dev.c | 3884 ++ drivers/net/wireless/ssv6051/smac/dev.h | 445 + drivers/net/wireless/ssv6051/smac/dev_tbl.h | 141 + drivers/net/wireless/ssv6051/smac/drv_comm.h | 61 + @@ -64,7 +64,7 @@ Subject: add ssv6xxx wifi driver drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c | 1765 + drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h | 50 + drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c | 256 + - 60 files changed, 48982 insertions(+) + 60 files changed, 48985 insertions(+) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 111111111111..222222222222 100644 diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch index ab15318084c9..e5c39348becc 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch @@ -1,7 +1,7 @@ -From 1efb0ab46aeddce29687b942b118a5338d249c61 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 001/108] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: LOCAL: arm64: fix Kodi sysinfo CPU information This allows the CPU information to show in the Kodi sysinfo screen, e.g. @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index ba834909a28b..4384c894bb0f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -223,9 +223,8 @@ static int c_show(struct seq_file *m, void *v) @@ -29,5 +29,5 @@ index ba834909a28b..4384c894bb0f 100644 seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", loops_per_jiffy / (500000UL/HZ), -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch index 1331f7a37635..29126c1fd553 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch @@ -1,8 +1,7 @@ -From 9f9d1e1535f8004247aca088d83f964c66a81155 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 16 Jul 2025 11:03:09 +0000 -Subject: [PATCH 002/108] LOCAL: arm64: dts: rockchip: rock5b: disable sdio - node +Subject: LOCAL: arm64: dts: rockchip: rock5b: disable sdio node Radxa ships an M2 compatible WiFi module with PCIe wired RTL8852BE chip, so leave the SDIO node described in device-tree, but disable @@ -26,7 +25,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -index 9407a7c9910a..ba82c89201ea 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -27,7 +27,7 @@ &sdio { @@ -39,5 +38,5 @@ index 9407a7c9910a..ba82c89201ea 100644 &uart6 { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch index 4730e8690cd4..005868a66660 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch @@ -1,8 +1,7 @@ -From 5f3225643ae70aa456d1cc3ea4b42a2a1556ad0d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 16 Jul 2025 05:09:07 +0000 -Subject: [PATCH 003/108] LOCAL: drm/rockchip: vop2: rk3588: change - Esmart/Cluster ordering +Subject: LOCAL: drm/rockchip: vop2: rk3588: change Esmart/Cluster ordering Order Esmart planes before Cluster planes so Kodi (which currently lacks the ability to dymanically order planes using zpos) can show @@ -11,11 +10,11 @@ the OSD on-top of Video rather then behind. Suggested-by: Jonas Karlman Signed-off-by: Christian Hewitt --- - drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 136 +++++++++---------- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 136 +++++----- 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 45c5e3987813..42a4833a90a3 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -1119,6 +1119,74 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = { @@ -169,5 +168,5 @@ index 45c5e3987813..42a4833a90a3 100644 }; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch index 7bf38408115f..929adddca809 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch @@ -1,7 +1,7 @@ -From ba2f7791641e70ab3a6ad8605622a46a99f4b667 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Thu, 24 Jul 2025 14:10:18 -0400 -Subject: [PATCH 004/108] FROMGIT(6.18): media: uapi: HEVC: Add +Subject: FROMGIT(6.18): media: uapi: HEVC: Add v4l2_ctrl_hevc_ext_sps_[ls]t_rps controls Some hardware (e.g.: Rockchip's rk3588 hevc decoder) need the @@ -11,13 +11,13 @@ Add controls to provide it as the raw data form the stream. Signed-off-by: Detlev Casanova --- - .../media/v4l/ext-ctrls-codec-stateless.rst | 114 ++++++++++++++++++ - .../media/v4l/vidioc-queryctrl.rst | 12 ++ - .../media/videodev2.h.rst.exceptions | 2 + + Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst | 114 ++++++++++ + Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst | 12 + + Documentation/userspace-api/media/videodev2.h.rst.exceptions | 2 + 3 files changed, 128 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst -index 0da635691fdc..bb6772cf3cee 100644 +index 111111111111..222222222222 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst @@ -2958,6 +2958,120 @@ This structure contains all loop filter related parameters. See sections @@ -142,7 +142,7 @@ index 0da635691fdc..bb6772cf3cee 100644 ``V4L2_CID_STATELESS_AV1_SEQUENCE (struct)`` diff --git a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst b/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst -index 3549417c7feb..128c044d2e3c 100644 +index 111111111111..222222222222 100644 --- a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst +++ b/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst @@ -523,6 +523,18 @@ See also the examples in :ref:`control`. @@ -165,7 +165,7 @@ index 3549417c7feb..128c044d2e3c 100644 - n/a - n/a diff --git a/Documentation/userspace-api/media/videodev2.h.rst.exceptions b/Documentation/userspace-api/media/videodev2.h.rst.exceptions -index 35d3456cc812..1663fdf8444c 100644 +index 111111111111..222222222222 100644 --- a/Documentation/userspace-api/media/videodev2.h.rst.exceptions +++ b/Documentation/userspace-api/media/videodev2.h.rst.exceptions @@ -149,6 +149,8 @@ replace symbol V4L2_CTRL_TYPE_H264_DECODE_PARAMS :c:type:`v4l2_ctrl_type` @@ -178,5 +178,5 @@ index 35d3456cc812..1663fdf8444c 100644 replace symbol V4L2_CTRL_TYPE_RECT :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_FWHT_PARAMS :c:type:`v4l2_ctrl_type` -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch index 4f62ed9f593a..d6ce83b9f11b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch @@ -1,8 +1,7 @@ -From 09f7bf034d1a5608cd1992db1e582c1352a10dbf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Thu, 24 Jul 2025 14:10:19 -0400 -Subject: [PATCH 005/108] FROMGIT(6.18): media: v4l2-ctrls: Add - hevc_ext_sps_[ls]t_rps controls +Subject: FROMGIT(6.18): media: v4l2-ctrls: Add hevc_ext_sps_[ls]t_rps controls The vdpu381 decoder found on newer Rockchip SoC need the information from the long term and short term ref pic sets from the SPS. @@ -18,14 +17,14 @@ It is the role of the drivers to calculate the reference sets values. Signed-off-by: Detlev Casanova --- - drivers/media/v4l2-core/v4l2-ctrls-core.c | 18 +++++++ - drivers/media/v4l2-core/v4l2-ctrls-defs.c | 10 ++++ - include/uapi/linux/v4l2-controls.h | 61 +++++++++++++++++++++++ + drivers/media/v4l2-core/v4l2-ctrls-core.c | 18 +++ + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 10 ++ + include/uapi/linux/v4l2-controls.h | 61 ++++++++++ include/uapi/linux/videodev2.h | 2 + 4 files changed, 91 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c -index 98b960775e87..142e26134ef0 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -418,6 +418,12 @@ void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl) @@ -68,7 +67,7 @@ index 98b960775e87..142e26134ef0 100644 elem_size = sizeof(struct v4l2_ctrl_hevc_scaling_matrix); break; diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c -index 1ea52011247a..86c7ee224b66 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -1233,6 +1233,8 @@ const char *v4l2_ctrl_get_name(u32 id) @@ -96,7 +95,7 @@ index 1ea52011247a..86c7ee224b66 100644 *type = V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR; break; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index f836512e9deb..08f869124474 100644 +index 111111111111..222222222222 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -2094,6 +2094,8 @@ struct v4l2_ctrl_mpeg2_quantisation { @@ -175,7 +174,7 @@ index f836512e9deb..08f869124474 100644 #define V4L2_CID_COLORIMETRY_CLASS (V4L2_CTRL_CLASS_COLORIMETRY | 1) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 3dd9fa45dde1..a3aa1f8c3894 100644 +index 111111111111..222222222222 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1981,6 +1981,8 @@ enum v4l2_ctrl_type { @@ -188,5 +187,5 @@ index 3dd9fa45dde1..a3aa1f8c3894 100644 V4L2_CTRL_TYPE_AV1_SEQUENCE = 0x280, V4L2_CTRL_TYPE_AV1_TILE_GROUP_ENTRY = 0x281, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch index 506e0ada6119..d0d87c200595 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch @@ -1,8 +1,8 @@ -From fab7fe918af46b99bdd05a9a32c16d488ac8050b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Mon, 23 Jun 2025 12:07:17 -0400 -Subject: [PATCH 006/108] FROMGIT(6.18): arm64: dts: rockchip: Add the vdpu381 - Video Decoders on RK3588 +Subject: FROMGIT(6.18): arm64: dts: rockchip: Add the vdpu381 Video Decoders + on RK3588 Add the vdpu381 Video Decoders to the rk3588-base devicetree. @@ -11,11 +11,11 @@ This also adds the dedicated IOMMU controllers. Signed-off-by: Detlev Casanova --- - arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 74 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 74 ++++++++++ 1 file changed, 74 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -index 70f03e68ba55..c1eaff86d5b7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -1252,6 +1252,70 @@ vepu121_3_mmu: iommu@fdbac800 { @@ -107,5 +107,5 @@ index 70f03e68ba55..c1eaff86d5b7 100644 pinctrl: pinctrl { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch index 1a7620a2647d..76a8f041f3ce 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch @@ -1,8 +1,8 @@ -From f2641077e6f20acb152e9cdb439a0475662538fa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Mon, 23 Jun 2025 12:07:18 -0400 -Subject: [PATCH 007/108] FROMGIT(6.18): arm64: dts: rockchip: Add the vdpu383 - Video Decoder on rk3576 +Subject: FROMGIT(6.18): arm64: dts: rockchip: Add the vdpu383 Video Decoder on + rk3576 Add the vdpu383 Video Decoder variant to the RK3576 device tree. @@ -10,11 +10,11 @@ Also allow using the dedicated SRAM as a pool. Signed-off-by: Detlev Casanova --- - arch/arm64/boot/dts/rockchip/rk3576.dtsi | 36 ++++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 36 ++++++++++ 1 file changed, 36 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rockchip/rk3576.dtsi -index c3cdae8a5494..b99f4bd4c9d9 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi @@ -1139,6 +1139,41 @@ gpu: gpu@27800000 { @@ -68,5 +68,5 @@ index c3cdae8a5494..b99f4bd4c9d9 100644 }; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch index 46d049ae0c2a..e633dda76533 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch @@ -1,8 +1,8 @@ -From ea91dcbaa188e57990e25d381aa855d59ff9f1e9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Anton Kirilov Date: Thu, 7 Aug 2025 18:00:11 +0100 -Subject: [PATCH 008/108] FROMGIT(6.18): arm64: dts: rockchip: Enable HDMI - audio output for NanoPi R6C/R6S +Subject: FROMGIT(6.18): arm64: dts: rockchip: Enable HDMI audio output for + NanoPi R6C/R6S Enable HDMI audio output for FriendlyElec NanoPi R6C/R6S boards. @@ -12,7 +12,7 @@ Signed-off-by: Anton Kirilov 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi -index fbf062ec3bf1..2e9d5143476d 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -251,6 +251,10 @@ hdmi0_out_con: endpoint { @@ -38,5 +38,5 @@ index fbf062ec3bf1..2e9d5143476d 100644 rgmii_phy1: ethernet-phy@1 { compatible = "ethernet-phy-id001c.c916"; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch index 7ba18a949a95..61e2c0e86e4a 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch @@ -1,18 +1,17 @@ -From 4105b87fae397b898acc67b05019c7e8801bc582 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Anton Kirilov Date: Wed, 27 Aug 2025 15:22:10 +0100 -Subject: [PATCH 009/108] FROMGIT(6.18): arm64: dts: rockchip: Enable the NPU - on NanoPi R6C/R6S +Subject: FROMGIT(6.18): arm64: dts: rockchip: Enable the NPU on NanoPi R6C/R6S Enable the NPU on FriendlyElec NanoPi R6C/R6S boards. Signed-off-by: Anton Kirilov --- - .../boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 34 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 34 ++++++++++ 1 file changed, 34 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi -index 2e9d5143476d..1b6a59f7cabc 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -371,6 +371,10 @@ &pd_gpu { @@ -64,5 +63,5 @@ index 2e9d5143476d..1b6a59f7cabc 100644 vref-supply = <&avcc_1v8_s0>; status = "okay"; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch index f734350a3310..223365c87156 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch @@ -1,7 +1,7 @@ -From 2be686c1eaab81a13aa66752adbc2cc939d4ebb0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:28 +0200 -Subject: [PATCH 010/108] FROMGIT(6.18): accel/rocket: Add registers header +Subject: FROMGIT(6.18): accel/rocket: Add registers header A XML file was generated with the data from the TRM, and then this header was generated from it. @@ -13,13 +13,12 @@ Tested-by: Heiko Stuebner Reviewed-by: Jeff Hugo Signed-off-by: Tomeu Vizoso --- - drivers/accel/rocket/rocket_registers.h | 4404 +++++++++++++++++++++++ + drivers/accel/rocket/rocket_registers.h | 4404 ++++++++++ 1 file changed, 4404 insertions(+) - create mode 100644 drivers/accel/rocket/rocket_registers.h diff --git a/drivers/accel/rocket/rocket_registers.h b/drivers/accel/rocket/rocket_registers.h new file mode 100644 -index 000000000000..9aef614c3470 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_registers.h @@ -0,0 +1,4404 @@ @@ -4428,5 +4427,5 @@ index 000000000000..9aef614c3470 + +#endif /* __ROCKET_REGISTERS_XML__ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch index 8b8813028cda..7fcf48414750 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch @@ -1,8 +1,7 @@ -From c588f2f877ff0081119607f5fbfca3b130d6af66 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:29 +0200 -Subject: [PATCH 011/108] FROMGIT(6.18): accel/rocket: Add a new driver for - Rockchip's NPU +Subject: FROMGIT(6.18): accel/rocket: Add a new driver for Rockchip's NPU This initial version supports the NPU as shipped in the RK3588 SoC and described in the first part of its TRM, in Chapter 36. @@ -18,31 +17,21 @@ Reviewed-by: Jeff Hugo Signed-off-by: Tomeu Vizoso --- Documentation/accel/index.rst | 1 + - Documentation/accel/rocket/index.rst | 19 ++ - MAINTAINERS | 10 + + Documentation/accel/rocket/index.rst | 19 + drivers/accel/Kconfig | 1 + drivers/accel/Makefile | 1 + - drivers/accel/rocket/Kconfig | 24 +++ + drivers/accel/rocket/Kconfig | 24 + drivers/accel/rocket/Makefile | 8 + - drivers/accel/rocket/rocket_core.c | 100 ++++++++++ - drivers/accel/rocket/rocket_core.h | 49 +++++ - drivers/accel/rocket/rocket_device.c | 56 ++++++ - drivers/accel/rocket/rocket_device.h | 28 +++ - drivers/accel/rocket/rocket_drv.c | 261 +++++++++++++++++++++++++++ - drivers/accel/rocket/rocket_drv.h | 23 +++ - 13 files changed, 581 insertions(+) - create mode 100644 Documentation/accel/rocket/index.rst - create mode 100644 drivers/accel/rocket/Kconfig - create mode 100644 drivers/accel/rocket/Makefile - create mode 100644 drivers/accel/rocket/rocket_core.c - create mode 100644 drivers/accel/rocket/rocket_core.h - create mode 100644 drivers/accel/rocket/rocket_device.c - create mode 100644 drivers/accel/rocket/rocket_device.h - create mode 100644 drivers/accel/rocket/rocket_drv.c - create mode 100644 drivers/accel/rocket/rocket_drv.h + drivers/accel/rocket/rocket_core.c | 100 ++++ + drivers/accel/rocket/rocket_core.h | 49 ++ + drivers/accel/rocket/rocket_device.c | 56 ++ + drivers/accel/rocket/rocket_device.h | 28 + + drivers/accel/rocket/rocket_drv.c | 261 ++++++++++ + drivers/accel/rocket/rocket_drv.h | 23 + + 12 files changed, 571 insertions(+) diff --git a/Documentation/accel/index.rst b/Documentation/accel/index.rst -index bc85f26533d8..d8fa332d60a8 100644 +index 111111111111..222222222222 100644 --- a/Documentation/accel/index.rst +++ b/Documentation/accel/index.rst @@ -10,6 +10,7 @@ Compute Accelerators @@ -55,7 +44,7 @@ index bc85f26533d8..d8fa332d60a8 100644 diff --git a/Documentation/accel/rocket/index.rst b/Documentation/accel/rocket/index.rst new file mode 100644 -index 000000000000..70f97bccf100 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/accel/rocket/index.rst @@ -0,0 +1,19 @@ @@ -78,29 +67,8 @@ index 000000000000..70f97bccf100 +Hardware currently supported: + +* RK3588 -diff --git a/MAINTAINERS b/MAINTAINERS -index cd7ff55b5d32..a19231134b01 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -7499,6 +7499,16 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git - F: drivers/accel/ivpu/ - F: include/uapi/drm/ivpu_accel.h - -+DRM ACCEL DRIVER FOR ROCKCHIP NPU -+M: Tomeu Vizoso -+L: dri-devel@lists.freedesktop.org -+S: Supported -+T: git https://gitlab.freedesktop.org/drm/misc/kernel.git -+F: Documentation/accel/rocket/ -+F: Documentation/devicetree/bindings/npu/rockchip,rknn-core.yaml -+F: drivers/accel/rocket/ -+F: include/uapi/drm/rocket_accel.h -+ - DRM COMPUTE ACCELERATORS DRIVERS AND FRAMEWORK - M: Oded Gabbay - L: dri-devel@lists.freedesktop.org diff --git a/drivers/accel/Kconfig b/drivers/accel/Kconfig -index 5b9490367a39..bb01cebc42bf 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/Kconfig +++ b/drivers/accel/Kconfig @@ -28,5 +28,6 @@ source "drivers/accel/amdxdna/Kconfig" @@ -111,7 +79,7 @@ index 5b9490367a39..bb01cebc42bf 100644 endif diff --git a/drivers/accel/Makefile b/drivers/accel/Makefile -index a301fb6089d4..ffc3fa588666 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/Makefile +++ b/drivers/accel/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_DRM_ACCEL_AMDXDNA) += amdxdna/ @@ -122,7 +90,7 @@ index a301fb6089d4..ffc3fa588666 100644 \ No newline at end of file diff --git a/drivers/accel/rocket/Kconfig b/drivers/accel/rocket/Kconfig new file mode 100644 -index 000000000000..43d6cd98ec8e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/Kconfig @@ -0,0 +1,24 @@ @@ -152,7 +120,7 @@ index 000000000000..43d6cd98ec8e + module will be called rocket. diff --git a/drivers/accel/rocket/Makefile b/drivers/accel/rocket/Makefile new file mode 100644 -index 000000000000..abdd75f2492e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/Makefile @@ -0,0 +1,8 @@ @@ -166,7 +134,7 @@ index 000000000000..abdd75f2492e + rocket_drv.o diff --git a/drivers/accel/rocket/rocket_core.c b/drivers/accel/rocket/rocket_core.c new file mode 100644 -index 000000000000..9be964b5fbae +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_core.c @@ -0,0 +1,100 @@ @@ -272,7 +240,7 @@ index 000000000000..9be964b5fbae +} diff --git a/drivers/accel/rocket/rocket_core.h b/drivers/accel/rocket/rocket_core.h new file mode 100644 -index 000000000000..660de2d70f7d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_core.h @@ -0,0 +1,49 @@ @@ -327,7 +295,7 @@ index 000000000000..660de2d70f7d +#endif diff --git a/drivers/accel/rocket/rocket_device.c b/drivers/accel/rocket/rocket_device.c new file mode 100644 -index 000000000000..b05a0df91d48 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_device.c @@ -0,0 +1,56 @@ @@ -389,7 +357,7 @@ index 000000000000..b05a0df91d48 +} diff --git a/drivers/accel/rocket/rocket_device.h b/drivers/accel/rocket/rocket_device.h new file mode 100644 -index 000000000000..a5a5857bb199 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_device.h @@ -0,0 +1,28 @@ @@ -423,7 +391,7 @@ index 000000000000..a5a5857bb199 +#endif /* __ROCKET_DEVICE_H__ */ diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c new file mode 100644 -index 000000000000..a5df94f6b125 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_drv.c @@ -0,0 +1,261 @@ @@ -690,7 +658,7 @@ index 000000000000..a5df94f6b125 +MODULE_AUTHOR("Tomeu Vizoso"); diff --git a/drivers/accel/rocket/rocket_drv.h b/drivers/accel/rocket/rocket_drv.h new file mode 100644 -index 000000000000..36b1291b0ead +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_drv.h @@ -0,0 +1,23 @@ @@ -718,5 +686,5 @@ index 000000000000..36b1291b0ead + +#endif -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch index 43563709e4d0..a99f51652e6d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch @@ -1,8 +1,7 @@ -From 020bd1d28e4774d8beccc90bbfdad391d535cedc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:30 +0200 -Subject: [PATCH 012/108] FROMGIT(6.18): accel/rocket: Add IOCTL for BO - creation +Subject: FROMGIT(6.18): accel/rocket: Add IOCTL for BO creation This uses the SHMEM DRM helpers and we map right away to the CPU and NPU sides, as all buffers are expected to be accessed from both. @@ -12,18 +11,15 @@ Tested-by: Heiko Stuebner Signed-off-by: Tomeu Vizoso --- drivers/accel/rocket/Makefile | 3 +- - drivers/accel/rocket/rocket_drv.c | 15 +++- + drivers/accel/rocket/rocket_drv.c | 15 +- drivers/accel/rocket/rocket_drv.h | 4 + - drivers/accel/rocket/rocket_gem.c | 125 ++++++++++++++++++++++++++++++ - drivers/accel/rocket/rocket_gem.h | 30 +++++++ - include/uapi/drm/rocket_accel.h | 44 +++++++++++ + drivers/accel/rocket/rocket_gem.c | 125 ++++++++++ + drivers/accel/rocket/rocket_gem.h | 30 +++ + include/uapi/drm/rocket_accel.h | 44 ++++ 6 files changed, 219 insertions(+), 2 deletions(-) - create mode 100644 drivers/accel/rocket/rocket_gem.c - create mode 100644 drivers/accel/rocket/rocket_gem.h - create mode 100644 include/uapi/drm/rocket_accel.h diff --git a/drivers/accel/rocket/Makefile b/drivers/accel/rocket/Makefile -index abdd75f2492e..4deef267f9e1 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/Makefile +++ b/drivers/accel/rocket/Makefile @@ -5,4 +5,5 @@ obj-$(CONFIG_DRM_ACCEL_ROCKET) := rocket.o @@ -34,7 +30,7 @@ index abdd75f2492e..4deef267f9e1 100644 + rocket_drv.o \ + rocket_gem.o diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c -index a5df94f6b125..8b7fbe9226f4 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_drv.c +++ b/drivers/accel/rocket/rocket_drv.c @@ -5,6 +5,7 @@ @@ -104,7 +100,7 @@ index a5df94f6b125..8b7fbe9226f4 100644 .num_ioctls = ARRAY_SIZE(rocket_drm_driver_ioctls), .fops = &rocket_accel_driver_fops, diff --git a/drivers/accel/rocket/rocket_drv.h b/drivers/accel/rocket/rocket_drv.h -index 36b1291b0ead..2944e0136ab9 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_drv.h +++ b/drivers/accel/rocket/rocket_drv.h @@ -4,6 +4,8 @@ @@ -127,7 +123,7 @@ index 36b1291b0ead..2944e0136ab9 100644 struct rocket_iommu_domain *rocket_iommu_domain_get(struct rocket_file_priv *rocket_priv); diff --git a/drivers/accel/rocket/rocket_gem.c b/drivers/accel/rocket/rocket_gem.c new file mode 100644 -index 000000000000..05cf46040865 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_gem.c @@ -0,0 +1,125 @@ @@ -258,7 +254,7 @@ index 000000000000..05cf46040865 +} diff --git a/drivers/accel/rocket/rocket_gem.h b/drivers/accel/rocket/rocket_gem.h new file mode 100644 -index 000000000000..91a1fc09c56c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_gem.h @@ -0,0 +1,30 @@ @@ -294,7 +290,7 @@ index 000000000000..91a1fc09c56c +#endif diff --git a/include/uapi/drm/rocket_accel.h b/include/uapi/drm/rocket_accel.h new file mode 100644 -index 000000000000..95720702b7c4 +index 000000000000..111111111111 --- /dev/null +++ b/include/uapi/drm/rocket_accel.h @@ -0,0 +1,44 @@ @@ -343,5 +339,5 @@ index 000000000000..95720702b7c4 + +#endif /* __DRM_UAPI_ROCKET_ACCEL_H__ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch index 89cc887ba2a0..d16f2d0ff64e 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch @@ -1,7 +1,7 @@ -From 2bf294ce12cd8982a7d47137c5fa699cd0c7436c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:31 +0200 -Subject: [PATCH 013/108] FROMGIT(6.18): accel/rocket: Add job submission IOCTL +Subject: FROMGIT(6.18): accel/rocket: Add job submission IOCTL Using the DRM GPU scheduler infrastructure, with a scheduler for each core. @@ -22,15 +22,13 @@ Signed-off-by: Tomeu Vizoso drivers/accel/rocket/rocket_device.h | 2 + drivers/accel/rocket/rocket_drv.c | 14 + drivers/accel/rocket/rocket_drv.h | 3 + - drivers/accel/rocket/rocket_job.c | 636 +++++++++++++++++++++++++++ - drivers/accel/rocket/rocket_job.h | 52 +++ - include/uapi/drm/rocket_accel.h | 64 +++ + drivers/accel/rocket/rocket_job.c | 636 ++++++++++ + drivers/accel/rocket/rocket_job.h | 52 + + include/uapi/drm/rocket_accel.h | 64 + 10 files changed, 802 insertions(+), 1 deletion(-) - create mode 100644 drivers/accel/rocket/rocket_job.c - create mode 100644 drivers/accel/rocket/rocket_job.h diff --git a/drivers/accel/rocket/Makefile b/drivers/accel/rocket/Makefile -index 4deef267f9e1..3713dfe223d6 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/Makefile +++ b/drivers/accel/rocket/Makefile @@ -6,4 +6,5 @@ rocket-y := \ @@ -41,7 +39,7 @@ index 4deef267f9e1..3713dfe223d6 100644 + rocket_gem.o \ + rocket_job.o diff --git a/drivers/accel/rocket/rocket_core.c b/drivers/accel/rocket/rocket_core.c -index 9be964b5fbae..72fb5e5798fa 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_core.c +++ b/drivers/accel/rocket/rocket_core.c @@ -12,6 +12,7 @@ @@ -83,7 +81,7 @@ index 9be964b5fbae..72fb5e5798fa 100644 void rocket_core_reset(struct rocket_core *core) diff --git a/drivers/accel/rocket/rocket_core.h b/drivers/accel/rocket/rocket_core.h -index 660de2d70f7d..f6d7382854ca 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_core.h +++ b/drivers/accel/rocket/rocket_core.h @@ -40,6 +40,21 @@ struct rocket_core { @@ -109,7 +107,7 @@ index 660de2d70f7d..f6d7382854ca 100644 int rocket_core_init(struct rocket_core *core); diff --git a/drivers/accel/rocket/rocket_device.c b/drivers/accel/rocket/rocket_device.c -index b05a0df91d48..46e6ee1e72c5 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_device.c +++ b/drivers/accel/rocket/rocket_device.c @@ -41,6 +41,10 @@ struct rocket_device *rocket_device_init(struct platform_device *pdev, @@ -124,7 +122,7 @@ index b05a0df91d48..46e6ee1e72c5 100644 if (err) return ERR_PTR(err); diff --git a/drivers/accel/rocket/rocket_device.h b/drivers/accel/rocket/rocket_device.h -index a5a5857bb199..ce662abc01d3 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_device.h +++ b/drivers/accel/rocket/rocket_device.h @@ -15,6 +15,8 @@ @@ -137,7 +135,7 @@ index a5a5857bb199..ce662abc01d3 100644 unsigned int num_cores; }; diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c -index 8b7fbe9226f4..a21aa9aa189b 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_drv.c +++ b/drivers/accel/rocket/rocket_drv.c @@ -15,6 +15,7 @@ @@ -192,7 +190,7 @@ index 8b7fbe9226f4..a21aa9aa189b 100644 return 0; diff --git a/drivers/accel/rocket/rocket_drv.h b/drivers/accel/rocket/rocket_drv.h -index 2944e0136ab9..f50634935b60 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_drv.h +++ b/drivers/accel/rocket/rocket_drv.h @@ -5,6 +5,7 @@ @@ -214,7 +212,7 @@ index 2944e0136ab9..f50634935b60 100644 struct rocket_iommu_domain *rocket_iommu_domain_get(struct rocket_file_priv *rocket_priv); diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c new file mode 100644 -index 000000000000..e731da15ebff +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_job.c @@ -0,0 +1,636 @@ @@ -856,7 +854,7 @@ index 000000000000..e731da15ebff +} diff --git a/drivers/accel/rocket/rocket_job.h b/drivers/accel/rocket/rocket_job.h new file mode 100644 -index 000000000000..4ae00feec3b9 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/accel/rocket/rocket_job.h @@ -0,0 +1,52 @@ @@ -913,7 +911,7 @@ index 000000000000..4ae00feec3b9 + +#endif diff --git a/include/uapi/drm/rocket_accel.h b/include/uapi/drm/rocket_accel.h -index 95720702b7c4..374f8370ac9d 100644 +index 111111111111..222222222222 100644 --- a/include/uapi/drm/rocket_accel.h +++ b/include/uapi/drm/rocket_accel.h @@ -12,8 +12,10 @@ extern "C" { @@ -997,5 +995,5 @@ index 95720702b7c4..374f8370ac9d 100644 } #endif -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch index 3c2623d4f881..acf0a907497d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch @@ -1,8 +1,8 @@ -From 2be26c65a61588e349d57fa84461aa7d0e9ce96e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:32 +0200 -Subject: [PATCH 014/108] FROMGIT(6.18): accel/rocket: Add IOCTLs for - synchronizing memory accesses +Subject: FROMGIT(6.18): accel/rocket: Add IOCTLs for synchronizing memory + accesses The NPU cores have their own access to the memory bus, and this isn't cache coherent with the CPUs. @@ -17,14 +17,14 @@ Reviewed-by: Jeff Hugo Tested-by: Heiko Stuebner Signed-off-by: Tomeu Vizoso --- - drivers/accel/rocket/rocket_drv.c | 2 ++ - drivers/accel/rocket/rocket_gem.c | 56 +++++++++++++++++++++++++++++++ - drivers/accel/rocket/rocket_gem.h | 4 +++ - include/uapi/drm/rocket_accel.h | 34 +++++++++++++++++++ + drivers/accel/rocket/rocket_drv.c | 2 + + drivers/accel/rocket/rocket_gem.c | 56 ++++++++++ + drivers/accel/rocket/rocket_gem.h | 4 + + include/uapi/drm/rocket_accel.h | 34 ++++++ 4 files changed, 96 insertions(+) diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c -index a21aa9aa189b..5c0b63f0a8f0 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_drv.c +++ b/drivers/accel/rocket/rocket_drv.c @@ -134,6 +134,8 @@ static const struct drm_ioctl_desc rocket_drm_driver_ioctls[] = { @@ -37,7 +37,7 @@ index a21aa9aa189b..5c0b63f0a8f0 100644 DEFINE_DRM_ACCEL_FOPS(rocket_accel_driver_fops); diff --git a/drivers/accel/rocket/rocket_gem.c b/drivers/accel/rocket/rocket_gem.c -index 05cf46040865..0551e11cc184 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_gem.c +++ b/drivers/accel/rocket/rocket_gem.c @@ -123,3 +123,59 @@ int rocket_ioctl_create_bo(struct drm_device *dev, void *data, struct drm_file * @@ -101,7 +101,7 @@ index 05cf46040865..0551e11cc184 100644 + return 0; +} diff --git a/drivers/accel/rocket/rocket_gem.h b/drivers/accel/rocket/rocket_gem.h -index 91a1fc09c56c..240430334509 100644 +index 111111111111..222222222222 100644 --- a/drivers/accel/rocket/rocket_gem.h +++ b/drivers/accel/rocket/rocket_gem.h @@ -21,6 +21,10 @@ struct drm_gem_object *rocket_gem_create_object(struct drm_device *dev, size_t s @@ -116,7 +116,7 @@ index 91a1fc09c56c..240430334509 100644 struct rocket_gem_object *to_rocket_bo(struct drm_gem_object *obj) { diff --git a/include/uapi/drm/rocket_accel.h b/include/uapi/drm/rocket_accel.h -index 374f8370ac9d..14b2e12b7c49 100644 +index 111111111111..222222222222 100644 --- a/include/uapi/drm/rocket_accel.h +++ b/include/uapi/drm/rocket_accel.h @@ -13,9 +13,13 @@ extern "C" { @@ -171,5 +171,5 @@ index 374f8370ac9d..14b2e12b7c49 100644 * struct drm_rocket_task - A task to be run on the NPU * -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch index 756878eb967e..0fba08700fc8 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch @@ -1,8 +1,7 @@ -From 2a4747ba6fab4596a99366cea799aa992e262ce6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:33 +0200 -Subject: [PATCH 015/108] FROMGIT(6.18): dt-bindings: npu: rockchip,rknn: Add - bindings +Subject: FROMGIT(6.18): dt-bindings: npu: rockchip,rknn: Add bindings Add the bindings for the Neural Processing Unit IP from Rockchip. @@ -12,13 +11,12 @@ Tested-by: Heiko Stuebner Signed-off-by: Tomeu Vizoso Reviewed-by: Rob Herring (Arm) --- - .../npu/rockchip,rk3588-rknn-core.yaml | 112 ++++++++++++++++++ + Documentation/devicetree/bindings/npu/rockchip,rk3588-rknn-core.yaml | 112 ++++++++++ 1 file changed, 112 insertions(+) - create mode 100644 Documentation/devicetree/bindings/npu/rockchip,rk3588-rknn-core.yaml diff --git a/Documentation/devicetree/bindings/npu/rockchip,rk3588-rknn-core.yaml b/Documentation/devicetree/bindings/npu/rockchip,rk3588-rknn-core.yaml new file mode 100644 -index 000000000000..caca2a4903cd +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/npu/rockchip,rk3588-rknn-core.yaml @@ -0,0 +1,112 @@ @@ -135,5 +133,5 @@ index 000000000000..caca2a4903cd + }; +... -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch index c14d80296cbb..79ea3a3c3176 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch @@ -1,8 +1,8 @@ -From 960534f564d80801fead4231c1e528e8e437ed87 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nicolas Frattaroli Date: Mon, 21 Jul 2025 11:17:34 +0200 -Subject: [PATCH 016/108] FROMGIT(6.18): arm64: dts: rockchip: add pd_npu label - for RK3588 power domains +Subject: FROMGIT(6.18): arm64: dts: rockchip: add pd_npu label for RK3588 + power domains The NPU of the RK3588 has an external supply. This supply also affects the power domain of the NPU, not just the NPU device nodes themselves. @@ -18,7 +18,7 @@ Signed-off-by: Tomeu Vizoso 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -index c1eaff86d5b7..3707aa1af785 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -841,7 +841,7 @@ power: power-controller { @@ -31,5 +31,5 @@ index c1eaff86d5b7..3707aa1af785 100644 #power-domain-cells = <0>; #address-cells = <1>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch index c815e3db80f1..39df6e59b6df 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch @@ -1,8 +1,8 @@ -From 2f38aadba79e366bfbbb4e98bdf01b2fa0b4667d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:35 +0200 -Subject: [PATCH 017/108] FROMGIT(6.18): arm64: dts: rockchip: Add nodes for - NPU and its MMU to rk3588-base +Subject: FROMGIT(6.18): arm64: dts: rockchip: Add nodes for NPU and its MMU to + rk3588-base See Chapter 36 "RKNN" from the RK3588 TRM (Part 1). @@ -15,11 +15,11 @@ The IOMMU of the first core is also special in that it has two subunits Tested-by: Heiko Stuebner Signed-off-by: Tomeu Vizoso --- - arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 91 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 91 ++++++++++ 1 file changed, 91 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -index 3707aa1af785..56bf903eb04f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -1140,6 +1140,97 @@ power-domain@RK3588_PD_SDMMC { @@ -121,5 +121,5 @@ index 3707aa1af785..56bf903eb04f 100644 compatible = "rockchip,rk3588-vpu121", "rockchip,rk3568-vpu"; reg = <0x0 0xfdb50000 0x0 0x800>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch index 4b99fd518af6..ea8ed026c6ac 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch @@ -1,19 +1,18 @@ -From 96fa1545d6e230d6253eb3f74b0eeb20b43cfa56 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 21 Jul 2025 11:17:36 +0200 -Subject: [PATCH 018/108] FROMGIT(6.18): arm64: dts: rockchip: Enable the NPU - on quartzpro64 +Subject: FROMGIT(6.18): arm64: dts: rockchip: Enable the NPU on quartzpro64 Enable the nodes added in a previous commit to the rk3588s device tree. Tested-by: Heiko Stuebner Signed-off-by: Tomeu Vizoso --- - .../boot/dts/rockchip/rk3588-quartzpro64.dts | 30 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 30 ++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts -index 78aaa6635b5d..b2336c36da01 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts @@ -415,6 +415,36 @@ &pcie3x4 { @@ -54,5 +53,5 @@ index 78aaa6635b5d..b2336c36da01 100644 vref-supply = <&vcc_1v8_s0>; status = "okay"; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch index c73004f43cb6..a515aaf50e26 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch @@ -1,8 +1,7 @@ -From 317cce80eb431cd7d4aaf4dc30b319b2b3d5ef92 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nicolas Frattaroli Date: Mon, 21 Jul 2025 09:17:00 +0000 -Subject: [PATCH 019/108] FROMGIT(6.18): arm64: dts: rockchip: enable NPU on - ROCK 5B/5B+/5T +Subject: FROMGIT(6.18): arm64: dts: rockchip: enable NPU on ROCK 5B/5B+/5T The NPU on the ROCK5B uses the same regulator for both the sram-supply and the npu's supply. Add this regulator, and enable all the NPU bits. @@ -14,11 +13,11 @@ Signed-off-by: Tomeu Vizoso [ relocate patch to rk3588-rock-5b-5bp-5t.dtsi ] Signed-off-by: Christian Hewitt --- - .../dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 57 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 57 ++++++++++ 1 file changed, 57 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi -index 973d39a7e0e0..612808d2b4c5 100644 +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 @@ -268,6 +268,29 @@ regulator-state-mem { @@ -100,5 +99,5 @@ index 973d39a7e0e0..612808d2b4c5 100644 vref-supply = <&avcc_1v8_s0>; status = "okay"; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch index 7312799e38bd..8760b20a044c 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch @@ -1,22 +1,19 @@ -From 29b7330ef561ae7007792b9282c05d4ca5a32cd4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Maud Spierings Date: Sat, 23 Aug 2025 14:43:51 +0200 -Subject: [PATCH 020/108] FROMGIT(6.18): arm64: dts: rockchip: Enable HDMI - receiver on orangepi 5 plus -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Subject: FROMGIT(6.18): arm64: dts: rockchip: Enable HDMI receiver on orangepi + 5 plus Enable support for the HDMI input port found on the orangepi 5 plus. Signed-off-by: Maud Spierings -Reviewed-by: Ondřej Jirman +Reviewed-by: Ondrej Jirman --- - .../dts/rockchip/rk3588-orangepi-5-plus.dts | 17 +++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 17 ++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -index 8222f1fae8fa..9950d1147e12 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -160,6 +160,17 @@ &hdmi1_sound { @@ -51,5 +48,5 @@ index 8222f1fae8fa..9950d1147e12 100644 ir_receiver_pin: ir-receiver-pin { rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch index 0eb7654b0bff..9faff39a5f36 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch @@ -1,22 +1,19 @@ -From 17bad86ba250bb1a93bcc42333f0dc1bdee3ea9b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Maud Spierings Date: Sat, 23 Aug 2025 14:43:52 +0200 -Subject: [PATCH 021/108] FROMGIT(6.18): arm64: dts: rockchip: Enable the NPU - on the orangepi 5 boards -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Subject: FROMGIT(6.18): arm64: dts: rockchip: Enable the NPU on the orangepi 5 + boards Enable the NPU and the PMIC that powers it. Signed-off-by: Maud Spierings -Reviewed-by: Ondřej Jirman +Reviewed-by: Ondrej Jirman --- - .../boot/dts/rockchip/rk3588-orangepi-5.dtsi | 56 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi | 56 ++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi -index 8a8f3b26754d..3bceee948458 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi @@ -258,6 +258,28 @@ regulator-state-mem { @@ -90,5 +87,5 @@ index 8a8f3b26754d..3bceee948458 100644 vref-supply = <&vcc_1v8_s0>; status = "okay"; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch index d789c448822e..41c06b3ee5a4 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch @@ -1,8 +1,8 @@ -From ee2f59492e51379da3fb11760c8b2d1bec7ebe48 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "kylepzak@projectinitiative.io" Date: Tue, 19 Aug 2025 21:30:12 -0500 -Subject: [PATCH 022/108] FROMGIT(6.18): arm64: dts: rockchip: rk3588s-rock-5a: - Add green power LED +Subject: FROMGIT(6.18): arm64: dts: rockchip: rk3588s-rock-5a: Add green power + LED The Radxa ROCK 5A board includes a green power LED that is defined in the vendor device tree but is missing from the upstream kernel DTS file. @@ -19,7 +19,7 @@ Signed-off-by: Kyle Petryszak 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -index f894742b1ebe..f70b49d9361a 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -52,6 +52,13 @@ leds { @@ -37,5 +37,5 @@ index f894742b1ebe..f70b49d9361a 100644 color = ; function = LED_FUNCTION_STATUS; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch index b66d7c6abd05..dd095ed63ee0 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch @@ -1,8 +1,7 @@ -From be887c8e5e8938d694e75f8ceb3aa90f2e3aa769 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Mon, 18 Aug 2025 19:18:40 +0200 -Subject: [PATCH 023/108] FROMGIT(6.18): arm64: dts: rockchip: Enable RK3576 - watchdog +Subject: FROMGIT(6.18): arm64: dts: rockchip: Enable RK3576 watchdog The RK3576 watchdog does not need any board specific resources, so let's enable it by default just like we do for RK3588. @@ -13,7 +12,7 @@ Signed-off-by: Sebastian Reichel 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rockchip/rk3576.dtsi -index b99f4bd4c9d9..552e825a96d3 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi @@ -2108,7 +2108,6 @@ wdt: watchdog@2ace0000 { @@ -25,5 +24,5 @@ index b99f4bd4c9d9..552e825a96d3 100644 spi0: spi@2acf0000 { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch index b1958f5969b7..3b3fb2dadf62 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch @@ -1,8 +1,7 @@ -From cfcdbeea880365e4217fede204f3516ef1869618 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 27 Feb 2021 17:52:02 +0100 -Subject: [PATCH 024/108] FROMGIT(6.18): arm64: dts: rockchip: add SPDIF audio - to Beelink A1 +Subject: FROMGIT(6.18): arm64: dts: rockchip: add SPDIF audio to Beelink A1 Add the required nodes to enable SPDIF audio output on the Beelink A1 set-top-box. @@ -10,11 +9,11 @@ the Beelink A1 set-top-box. Signed-off-by: Alex Bee Signed-off-by: Christian Hewitt --- - arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 23 ++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 23 ++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts -index f7c4578865c5..b276a29bdd85 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts @@ -58,6 +58,24 @@ ir-receiver { @@ -55,5 +54,5 @@ index f7c4578865c5..b276a29bdd85 100644 rockchip,hw-tshut-mode = <0>; rockchip,hw-tshut-polarity = <0>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch index 4552e7617423..907abbf2c118 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch @@ -1,8 +1,7 @@ -From ea34273c334899f0a36894ec66eaebe1ab8ab4e3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 21 Aug 2021 17:04:46 +0200 -Subject: [PATCH 025/108] FROMGIT(6.18): arm64: dts: rockchip: add USB3 on - Beelink A1 +Subject: FROMGIT(6.18): arm64: dts: rockchip: add USB3 on Beelink A1 Enable USB3 for the Beelink A1 set-top box. @@ -13,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts -index b276a29bdd85..632b0b22c52f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts @@ -381,6 +381,11 @@ &usb_host0_ehci { @@ -29,5 +28,5 @@ index b276a29bdd85..632b0b22c52f 100644 status = "okay"; }; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch index 5124d04ae9e8..642f1bada566 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch @@ -1,8 +1,7 @@ -From 23521dedf7b946179c07ecd34eebc8d34f6f6409 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 27 Feb 2021 18:01:13 +0100 -Subject: [PATCH 026/108] FROMGIT(6.18): arm64: dts: rockchip: add IR receiver - to rk3328-roc +Subject: FROMGIT(6.18): arm64: dts: rockchip: add IR receiver to rk3328-roc Add the ir-receiver and ir pinctrl nodes to enable the IR receiver on the ROC-RK3328-CC board. @@ -10,11 +9,11 @@ on the ROC-RK3328-CC board. Signed-off-by: Alex Bee Signed-off-by: Christian Hewitt --- - arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 14 ++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 14 ++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi -index b5bd5e7d5748..aa1d5a6d7fd5 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi @@ -84,6 +84,13 @@ vcc_phy: regulator-vcc-phy { @@ -46,5 +45,5 @@ index b5bd5e7d5748..aa1d5a6d7fd5 100644 pmic_int_l: pmic-int-l { rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch index 0f46271d0086..66def385aded 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch @@ -1,8 +1,8 @@ -From 5eb285a0a2db04a425b7198bf4ccad266646b7b0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Wed, 2 Sep 2020 19:52:02 +0200 -Subject: [PATCH 027/108] FROMGIT(6.18): arm64: dts: rockchip: add GPU - powerdomain, opps, and cooling to rk3328 +Subject: FROMGIT(6.18): arm64: dts: rockchip: add GPU powerdomain, opps, and + cooling to rk3328 Add GPU powerdomain, opp-table, and cooling map nodes for the Mali GPU on the RK3328 SoC. Opp-table frequencies are sourced from the @@ -13,11 +13,11 @@ and disabling the 500MHz opp-point avoids instability and crashes. Signed-off-by: Alex Bee Signed-off-by: Christian Hewitt --- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 39 +++++++++++++++++++++++- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 39 +++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 6438c969f9d7..cc93136422c1 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -331,6 +331,11 @@ power: power-controller { @@ -84,5 +84,5 @@ index 6438c969f9d7..cc93136422c1 100644 h265e_mmu: iommu@ff330200 { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch index 361465b9c09c..37362ac02e04 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch @@ -1,8 +1,8 @@ -From 4d3154e1151a869b20cca421792ed2237c75ff9f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Wed, 2 Sep 2020 19:52:02 +0200 -Subject: [PATCH 028/108] FROMGIT(6.18): arm64: dts: rockchip: enable the Mali - GPU on RK3328 boards +Subject: FROMGIT(6.18): arm64: dts: rockchip: enable the Mali GPU on RK3328 + boards Add a gpu node to the rock64 board to enable the Mali GPU and move the existing node from roc-pc to the shared roc dtsi to @@ -17,7 +17,7 @@ Signed-off-by: Christian Hewitt 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts -index 329d03172433..c0b7b98ff788 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts @@ -44,10 +44,6 @@ &codec { @@ -32,7 +32,7 @@ index 329d03172433..c0b7b98ff788 100644 ir { ir_int: ir-int { diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi -index aa1d5a6d7fd5..3fe0c17fd2b1 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi @@ -167,6 +167,10 @@ &gmac2io { @@ -47,7 +47,7 @@ index aa1d5a6d7fd5..3fe0c17fd2b1 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index 5367e5fa9232..592fd8ca21df 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -152,6 +152,10 @@ &gmac2io { @@ -62,5 +62,5 @@ index 5367e5fa9232..592fd8ca21df 100644 avdd-0v9-supply = <&vdd_10>; avdd-1v8-supply = <&vcc_18>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch index 8facb4c5b0cd..34cbb6687a2f 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch @@ -1,8 +1,7 @@ -From 4898362d8fb614e726a5ae7df1d31b7ce3fb3119 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Tue, 2 Feb 2021 17:22:21 +0200 -Subject: [PATCH 029/108] FROMGIT(6.18): ARM: dts: rockchip: add HDMI audio to - rk3288-miqi +Subject: FROMGIT(6.18): ARM: dts: rockchip: add HDMI audio to rk3288-miqi Add the sound and i2s nodes to enable HDMI audio output on the MiQi board. @@ -10,11 +9,11 @@ the MiQi board. Signed-off-by: Alex Bee Signed-off-by: Christian Hewitt --- - arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 20 ++++++++++++++++++++ + arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 20 ++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -index dd42f8d31f70..20df626547bd 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts @@ -78,6 +78,21 @@ vcc_sys: regulator-vsys { @@ -52,5 +51,5 @@ index dd42f8d31f70..20df626547bd 100644 status = "okay"; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch index b16d13c821b2..c9dd452d6c99 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch @@ -1,8 +1,7 @@ -From c0ab4f0e15e2e981996e4014196505b214f074cc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Mon, 1 Mar 2021 21:24:15 +0100 -Subject: [PATCH 030/108] FROMGIT(6.18): ARM: dts: rockchip: add CEC pinctrl to - rk3288-miqi +Subject: FROMGIT(6.18): ARM: dts: rockchip: add CEC pinctrl to rk3288-miqi Enable CEC control on the HDMI port for MiQi. @@ -13,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts -index 20df626547bd..a5f5c6d38f80 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts @@ -145,6 +145,8 @@ &gpu { @@ -26,5 +25,5 @@ index 20df626547bd..a5f5c6d38f80 100644 }; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch index 573c99abee79..d940531be528 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch @@ -1,8 +1,7 @@ -From 9a3ffa8a3b4c8755d57a5b18ad3e664e9cf0cd24 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 17 Feb 2019 22:14:38 +0000 -Subject: [PATCH 031/108] FROMLIST(v1): mmc: core: set initial signal voltage - on power off +Subject: mmc: core: set initial signal voltage on power off Some boards have SD card connectors where the power rail cannot be switched off by the driver. If the card has not been power cycled, it may still be @@ -24,7 +23,7 @@ Signed-off-by: Jonas Karlman 1 file changed, 8 insertions(+) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 874c6fe92855..7a8bede74cdd 100644 +index 111111111111..222222222222 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1373,6 +1373,14 @@ void mmc_power_off(struct mmc_host *host) @@ -43,5 +42,5 @@ index 874c6fe92855..7a8bede74cdd 100644 host->ios.clock = 0; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch index 281933eb576d..213473fa6429 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch @@ -1,8 +1,7 @@ -From 2fe8271be434668d1da551357cd7a934d035e9ba Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Mon, 25 Aug 2025 17:34:40 +0200 -Subject: [PATCH 032/108] FROMLIST(v7): dt-bindings: vendor-prefixes: Add - Verisilicon +Subject: FROMLIST(v7): dt-bindings: vendor-prefixes: Add Verisilicon Verisilicon Microelectronics is a company based in Shanghai, China, developping hardware blocks for SoC. @@ -18,10 +17,10 @@ Acked-by: Conor Dooley 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index 9ec8947dfcad..52b3495ff4db 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -1656,6 +1656,8 @@ patternProperties: +@@ -1704,6 +1704,8 @@ patternProperties: description: Variscite Ltd. "^vdl,.*": description: Van der Laan b.v. @@ -31,5 +30,5 @@ index 9ec8947dfcad..52b3495ff4db 100644 description: Vertexcom Technologies, Inc. "^via,.*": -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch index d4ae42e67488..f6648ac027ba 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch @@ -1,8 +1,8 @@ -From 64fbd58f282af1be1ffdd94df94651baaf0b4f8e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Mon, 25 Aug 2025 17:34:41 +0200 -Subject: [PATCH 033/108] FROMLIST(v7): dt-bindings: iommu: verisilicon: Add - binding for VSI IOMMU +Subject: FROMLIST(v7): dt-bindings: iommu: verisilicon: Add binding for VSI + IOMMU Add a device tree binding for the Verisilicon (VSI) IOMMU. This IOMMU sits in front of hardware encoder and decoder @@ -11,13 +11,12 @@ blocks on SoCs using Verisilicon IP, such as the Rockchip RK3588. Signed-off-by: Benjamin Gaignard Reviewed-by: Conor Dooley --- - .../bindings/iommu/verisilicon,iommu.yaml | 71 +++++++++++++++++++ + Documentation/devicetree/bindings/iommu/verisilicon,iommu.yaml | 71 ++++++++++ 1 file changed, 71 insertions(+) - create mode 100644 Documentation/devicetree/bindings/iommu/verisilicon,iommu.yaml diff --git a/Documentation/devicetree/bindings/iommu/verisilicon,iommu.yaml b/Documentation/devicetree/bindings/iommu/verisilicon,iommu.yaml new file mode 100644 -index 000000000000..d3ce9e603b61 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/verisilicon,iommu.yaml @@ -0,0 +1,71 @@ @@ -93,5 +92,5 @@ index 000000000000..d3ce9e603b61 + }; + }; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch index f41a59582782..316a1e5efb8a 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch @@ -1,7 +1,7 @@ -From 1f06807df186c80abf4ec533df74c6ab07e030c6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Mon, 25 Aug 2025 17:34:42 +0200 -Subject: [PATCH 034/108] FROMLIST(v7): iommu: Add verisilicon IOMMU driver +Subject: FROMLIST(v7): iommu: Add verisilicon IOMMU driver The Verisilicon IOMMU hardware block can be found in combination with Verisilicon hardware video codecs (encoders or decoders) on @@ -13,12 +13,11 @@ Signed-off-by: Benjamin Gaignard --- drivers/iommu/Kconfig | 11 + drivers/iommu/Makefile | 1 + - drivers/iommu/vsi-iommu.c | 779 ++++++++++++++++++++++++++++++++++++++ + drivers/iommu/vsi-iommu.c | 779 ++++++++++ 3 files changed, 791 insertions(+) - create mode 100644 drivers/iommu/vsi-iommu.c diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig -index 70d29b14d851..d3731be630a2 100644 +index 111111111111..222222222222 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -383,4 +383,15 @@ config SPRD_IOMMU @@ -38,7 +37,7 @@ index 70d29b14d851..d3731be630a2 100644 + endif # IOMMU_SUPPORT diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile -index 355294fa9033..68aeff31af8b 100644 +index 111111111111..222222222222 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -34,3 +34,4 @@ obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o @@ -48,7 +47,7 @@ index 355294fa9033..68aeff31af8b 100644 +obj-$(CONFIG_VSI_IOMMU) += vsi-iommu.o diff --git a/drivers/iommu/vsi-iommu.c b/drivers/iommu/vsi-iommu.c new file mode 100644 -index 000000000000..69b5fcb910ef +index 000000000000..111111111111 --- /dev/null +++ b/drivers/iommu/vsi-iommu.c @@ -0,0 +1,779 @@ @@ -832,5 +831,5 @@ index 000000000000..69b5fcb910ef +MODULE_AUTHOR("Benjamin Gaignard "); +MODULE_DESCRIPTION("Verisilicon IOMMU driver"); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch index e41789f00b5a..c2e8bc820fc6 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch @@ -1,8 +1,8 @@ -From 8ba4af5d9c0c85163e6f6b076e22dfc16311d2be Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Mon, 25 Aug 2025 17:34:43 +0200 -Subject: [PATCH 035/108] FROMLIST(v7): media: verisilicon: AV1: Restore IOMMU - context before decoding a frame +Subject: FROMLIST(v7): media: verisilicon: AV1: Restore IOMMU context before + decoding a frame AV1 is a stateless decoder and multiple AV1 bitstreams could be decoded at the same time. Each decoding context got it own iommu domain which @@ -11,13 +11,13 @@ correctly set AV1 driver detach and attach before decoding the frame. Signed-off-by: Benjamin Gaignard --- - drivers/media/platform/verisilicon/hantro.h | 5 +++++ - drivers/media/platform/verisilicon/hantro_drv.c | 11 +++++++++++ - .../platform/verisilicon/rockchip_vpu981_hw_av1_dec.c | 10 ++++++++++ + drivers/media/platform/verisilicon/hantro.h | 5 +++++ + drivers/media/platform/verisilicon/hantro_drv.c | 11 ++++++++++ + drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c | 10 +++++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h -index 81328c63b796..a28a181013b9 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/hantro.h +++ b/drivers/media/platform/verisilicon/hantro.h @@ -12,6 +12,9 @@ @@ -40,7 +40,7 @@ index 81328c63b796..a28a181013b9 100644 union { struct hantro_h264_dec_hw_ctx h264_dec; diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c -index fa972effd4a2..c31fd75902d4 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -674,6 +674,13 @@ static int hantro_open(struct file *filp) @@ -69,7 +69,7 @@ index fa972effd4a2..c31fd75902d4 100644 return 0; diff --git a/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c b/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c -index e4703bb6be7c..b3e52387234f 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c @@ -2095,12 +2095,22 @@ rockchip_vpu981_av1_dec_set_output_buffer(struct hantro_ctx *ctx) @@ -96,5 +96,5 @@ index e4703bb6be7c..b3e52387234f 100644 ret = rockchip_vpu981_av1_dec_prepare_run(ctx); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch index e59eed766d4c..bd69f07e5a0f 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch @@ -1,8 +1,8 @@ -From 8937d64d478bd515e07147a5cfe6fbc54afb251a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Mon, 25 Aug 2025 17:34:44 +0200 -Subject: [PATCH 036/108] FROMLIST(v7): arm64: dts: rockchip: Add verisilicon - IOMMU node on RK3588 +Subject: FROMLIST(v7): arm64: dts: rockchip: Add verisilicon IOMMU node on + RK3588 Add the device tree node for the Verisilicon IOMMU present in the RK3588 SoC. @@ -10,11 +10,11 @@ This IOMMU handles address translation for the VPU hardware blocks. Signed-off-by: Benjamin Gaignard --- - arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 11 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 11 ++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -index 56bf903eb04f..3bd1b5e3b101 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -1418,6 +1418,17 @@ av1d: video-codec@fdc70000 { @@ -36,5 +36,5 @@ index 56bf903eb04f..3bd1b5e3b101 100644 vop: vop@fdd90000 { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch index 68a0ef7c6844..14a206e1616e 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch @@ -1,8 +1,7 @@ -From 48c7a17a11c519e59a7b3e2d53268ff0ace54c51 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Thu, 17 Jul 2025 17:56:18 -0400 -Subject: [PATCH 037/108] FROMLIST(v1): drm/bridge: dw-hdmi-qp: Return 0 in - audio prepare when disconnected +Subject: drm/bridge: dw-hdmi-qp: Return 0 in audio prepare when disconnected To configure audio registers, the clock of the video port in use must be enabled. @@ -36,7 +35,7 @@ Signed-off-by: Detlev Casanova 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -index 39332c57f2c5..3d290f7b015f 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -460,7 +460,7 @@ static int dw_hdmi_qp_audio_prepare(struct drm_bridge *bridge, @@ -49,5 +48,5 @@ index 39332c57f2c5..3d290f7b015f 100644 if (fmt->bit_clk_provider | fmt->frame_clk_provider) { dev_err(hdmi->dev, "unsupported clock settings\n"); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch index b8734461a813..61a8a1d486e4 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch @@ -1,8 +1,7 @@ -From b78e78578111f26f5ae1fd83fbd0a41658449f46 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Thu, 26 Jun 2025 08:53:07 -0400 -Subject: [PATCH 038/108] FROMLIST(v1): drm/bridge: synopsys: Do not warn about - audio params computation +Subject: drm/bridge: synopsys: Do not warn about audio params computation There is no need to warn about non pre-computed values, just change it to dbg. @@ -13,7 +12,7 @@ Signed-off-by: Detlev Casanova 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -index 3d290f7b015f..8f5059edb582 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -277,8 +277,7 @@ static unsigned int dw_hdmi_qp_find_n(struct dw_hdmi_qp *hdmi, unsigned long pix @@ -27,5 +26,5 @@ index 3d290f7b015f..8f5059edb582 100644 return dw_hdmi_qp_compute_n(hdmi, pixel_clk, sample_rate); } -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch index 86365370088e..8d921177b3c7 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch @@ -1,8 +1,7 @@ -From c1674bdd8306651c0fd258fcc32473e562ec078a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Thu, 24 Jul 2025 16:31:25 +0200 -Subject: [PATCH 039/108] FROMLIST(v1): arm64: dts: rockchip: use MAC TX delay - for ROCK 4D +Subject: arm64: dts: rockchip: use MAC TX delay for ROCK 4D According to the Ethernet controller device tree binding "rgmii-id" means, that the PCB does not have extra long lines to add the required @@ -34,7 +33,7 @@ Signed-off-by: Sebastian Reichel 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts b/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts -index 9bc33422ced5..b607afb09635 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts +++ b/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts @@ -272,7 +272,7 @@ &cpu_l3 { @@ -56,5 +55,5 @@ index 9bc33422ced5..b607afb09635 100644 &gpu { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch index 8e144abcc3ea..f77998f261de 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch @@ -1,8 +1,8 @@ -From 1522430dfc988a0f13ceb046c97436b751042e88 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hide Hako Date: Tue, 26 Aug 2025 01:44:00 +0000 -Subject: [PATCH 040/108] FROMLIST(v2): arm64: dts: rockchip: Fix sound output - from the audio jack on OrangePI5 Plus +Subject: FROMLIST(v2): arm64: dts: rockchip: Fix sound output from the audio + jack on OrangePI5 Plus Currently, analog sound is not output from the audio jack. This patch allows you to select analog headphones in alsamixer. @@ -14,7 +14,7 @@ Signed-off-by: Hide Hako 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -index 9950d1147e12..2acadcfe52e4 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -78,6 +78,7 @@ &analog_sound { @@ -26,5 +26,5 @@ index 9950d1147e12..2acadcfe52e4 100644 "Microphone", "Onboard Microphone", "Microphone", "Microphone Jack", -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch index 8700bc6e544f..7a63b059582f 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch @@ -1,8 +1,8 @@ -From 9ee5120322779e070d0c3b38866f21e962d11fcc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Wed, 20 Aug 2025 19:40:47 +0200 -Subject: [PATCH 041/108] FROMLIST(v2): thermal: rockchip: unify struct - rockchip_tsadc_chip format +Subject: FROMLIST(v2): thermal: rockchip: unify struct rockchip_tsadc_chip + format Unify all chip descriptions to the version without any empty lines. @@ -12,11 +12,11 @@ Signed-off-by: Sebastian Reichel Reviewed-by: Heiko Stuebner Reviewed-by: Dragan Simic --- - drivers/thermal/rockchip_thermal.c | 27 --------------------------- + drivers/thermal/rockchip_thermal.c | 27 ---------- 1 file changed, 27 deletions(-) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c -index 3beff9b6fac3..7b18a705dfad 100644 +index 111111111111..222222222222 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -1098,10 +1098,8 @@ static const struct rockchip_tsadc_chip px30_tsadc_data = { @@ -198,5 +198,5 @@ index 3beff9b6fac3..7b18a705dfad 100644 .id = rk3568_code_table, .length = ARRAY_SIZE(rk3568_code_table), -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch index 1c7c88414e5d..c787ebd0784b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch @@ -1,7 +1,7 @@ -From dc6441a5dea8462b3168c6bd00b3dd8685e7bdfd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Wed, 20 Aug 2025 19:40:48 +0200 -Subject: [PATCH 042/108] FROMLIST(v2): thermal: rockchip: shut up GRF warning +Subject: FROMLIST(v2): thermal: rockchip: shut up GRF warning Most of the recent Rockchip devices do not have a GRF associated with the tsadc IP. Let's avoid printing a warning on those devices. @@ -11,11 +11,11 @@ Reviewed-by: Heiko Stuebner Tested-by: Diederik de Haas Reviewed-by: Dragan Simic --- - drivers/thermal/rockchip_thermal.c | 23 ++++++++++++++++++----- + drivers/thermal/rockchip_thermal.c | 23 ++++++++-- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c -index 7b18a705dfad..c49ddf70f86e 100644 +index 111111111111..222222222222 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -74,6 +74,7 @@ struct chip_tsadc_table { @@ -141,5 +141,5 @@ index 7b18a705dfad..c49ddf70f86e 100644 rockchip_get_trim_configuration(dev, np, thermal); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch index 7176f26531a0..95a57ba61c8b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch @@ -1,8 +1,8 @@ -From 6a7b792844c90010f77e6e39ba20458938340090 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Wed, 20 Aug 2025 19:40:49 +0200 -Subject: [PATCH 043/108] FROMLIST(v2): dt-bindings: thermal: rockchip: tighten - grf requirements +Subject: FROMLIST(v2): dt-bindings: thermal: rockchip: tighten grf + requirements Instead of having an optional rockchip,grf property, forbid using it on platforms without registers in a GRF being needed for thermal monitoring @@ -12,11 +12,11 @@ Signed-off-by: Sebastian Reichel Acked-by: Conor Dooley Reviewed-by: Dragan Simic --- - .../bindings/thermal/rockchip-thermal.yaml | 15 +++++++++++++++ + Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml | 15 ++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml -index 573f447cc26e..9fa5c4c49d76 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml @@ -119,6 +119,21 @@ required: @@ -42,5 +42,5 @@ index 573f447cc26e..9fa5c4c49d76 100644 not: properties: -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch index f93b723a30dd..76691dbead5d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch @@ -1,7 +1,7 @@ -From 1e4384c38f0651af63b89609c5dedfba33e21e1b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Fri, 5 Sep 2025 16:19:19 +0000 -Subject: [PATCH 044/108] FROMLIST(v3): media: rkvdec: Add HEVC backend +Subject: FROMLIST(v3): media: rkvdec: Add HEVC backend The Rockchip VDEC supports the HEVC codec with the Main and Main10 Profile up to Level 5.1 High tier: 4096x2304@60 fps. @@ -15,18 +15,16 @@ Tested-by: Nicolas Dufresne Reviewed-by: Nicolas Dufresne Signed-off-by: Jonas Karlman --- - .../media/platform/rockchip/rkvdec/Makefile | 2 +- - .../rockchip/rkvdec/rkvdec-hevc-data.c | 1848 +++++++++++++++++ - .../platform/rockchip/rkvdec/rkvdec-hevc.c | 817 ++++++++ - .../platform/rockchip/rkvdec/rkvdec-regs.h | 2 + - .../media/platform/rockchip/rkvdec/rkvdec.c | 76 + - .../media/platform/rockchip/rkvdec/rkvdec.h | 1 + + drivers/media/platform/rockchip/rkvdec/Makefile | 2 +- + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c | 1848 ++++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 817 ++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h | 2 + + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 76 + + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 1 + 6 files changed, 2745 insertions(+), 1 deletion(-) - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c diff --git a/drivers/media/platform/rockchip/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile -index cb86b429cfaa..a77122641d14 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Makefile +++ b/drivers/media/platform/rockchip/rkvdec/Makefile @@ -1,3 +1,3 @@ @@ -36,7 +34,7 @@ index cb86b429cfaa..a77122641d14 100644 +rockchip-vdec-y += rkvdec.o rkvdec-h264.o rkvdec-hevc.o rkvdec-vp9.o diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c new file mode 100644 -index 000000000000..eac4ea604949 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c @@ -0,0 +1,1848 @@ @@ -1890,7 +1888,7 @@ index 000000000000..eac4ea604949 +}; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c new file mode 100644 -index 000000000000..9b5cf70188db +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -0,0 +1,817 @@ @@ -2712,7 +2710,7 @@ index 000000000000..9b5cf70188db + .get_image_fmt = rkvdec_hevc_get_image_fmt, +}; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h -index 15b9bee92016..540c8bdf24e4 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h @@ -28,6 +28,7 @@ @@ -2732,7 +2730,7 @@ index 15b9bee92016..540c8bdf24e4 100644 #define RKVDEC_MODE_VP9 2 #define RKVDEC_RPS_MODE BIT(24) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index d3b31f461194..f26e4a1150c9 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -158,6 +158,67 @@ static const struct v4l2_ctrl_ops rkvdec_ctrl_ops = { @@ -2826,7 +2824,7 @@ index d3b31f461194..f26e4a1150c9 100644 .fourcc = V4L2_PIX_FMT_H264_SLICE, .frmsize = { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index f6e8bf38add3..c062c5c5bbb2 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -139,6 +139,7 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run); @@ -2838,5 +2836,5 @@ index f6e8bf38add3..c062c5c5bbb2 100644 #endif /* RKVDEC_H_ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch index 17978e9ef4bf..6ddf7974fd3d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch @@ -1,7 +1,7 @@ -From bc218b36dcc4a6472ac65ee1db817cc64cbf790f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Fri, 5 Sep 2025 16:19:20 +0000 -Subject: [PATCH 045/108] FROMLIST(v3): media: rkvdec: Add variants support +Subject: FROMLIST(v3): media: rkvdec: Add variants support Different versions of the Rockchip VDEC IP exists and one way they can differ is what decoding formats are supported. @@ -13,12 +13,12 @@ Signed-off-by: Alex Bee Reviewed-by: Nicolas Dufresne Signed-off-by: Jonas Karlman --- - .../media/platform/rockchip/rkvdec/rkvdec.c | 22 ++++++++++++++++++- - .../media/platform/rockchip/rkvdec/rkvdec.h | 11 ++++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 22 +++++++++- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 11 +++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index f26e4a1150c9..9406805675d8 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -14,6 +14,7 @@ @@ -97,7 +97,7 @@ index f26e4a1150c9..9406805675d8 100644 INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index c062c5c5bbb2..d2e17eb2cca6 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -22,6 +22,10 @@ @@ -140,5 +140,5 @@ index c062c5c5bbb2..d2e17eb2cca6 100644 struct rkvdec_ctx { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch index 74730d215553..414e096125b8 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch @@ -1,8 +1,7 @@ -From 61705b83d47a950b13a03b712581f1f31d410bac Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 10 Aug 2025 21:24:33 +0000 -Subject: [PATCH 046/108] FROMLIST(v3): media: rkvdec: Implement capability - filtering +Subject: FROMLIST(v3): media: rkvdec: Implement capability filtering Add filtering of coded formats and controls depending on a variant capabilities. @@ -10,11 +9,11 @@ capabilities. Signed-off-by: Alex Bee Signed-off-by: Jonas Karlman --- - .../media/platform/rockchip/rkvdec/rkvdec.c | 67 ++++++++++++++----- + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 67 +++++++--- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index 9406805675d8..adbc277a3112 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -365,13 +365,36 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_fmts[] = { @@ -156,5 +155,5 @@ index 9406805675d8..adbc277a3112 100644 ret = v4l2_ctrl_handler_setup(&ctx->ctrl_hdl); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch index a3497c40fb7d..0cc2ac5a8fbe 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch @@ -1,7 +1,7 @@ -From d0a24ad239a154b3e967f8c48856fbe7a1491def Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sun, 10 Aug 2025 21:24:34 +0000 -Subject: [PATCH 047/108] FROMLIST(v3): media: rkvdec: Add RK3288 variant +Subject: FROMLIST(v3): media: rkvdec: Add RK3288 variant Add a RK3288 variant, a version of the Rockchip VDEC IP that only support HEVC decoding. @@ -13,7 +13,7 @@ Signed-off-by: Jonas Karlman 1 file changed, 9 insertions(+) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index adbc277a3112..918ac6d38950 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -1221,6 +1221,11 @@ static void rkvdec_watchdog_func(struct work_struct *work) @@ -40,5 +40,5 @@ index adbc277a3112..918ac6d38950 100644 .compatible = "rockchip,rk3399-vdec", .data = &rk3399_rkvdec_variant, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch index 214c19465378..2f7624c5cd37 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch @@ -1,8 +1,7 @@ -From 887446046b0547e1d76d0eef142a785a339d22b6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sun, 10 Aug 2025 21:24:35 +0000 -Subject: [PATCH 048/108] FROMLIST(v3): media: rkvdec: Disable QoS for HEVC and - VP9 on RK3328 +Subject: FROMLIST(v3): media: rkvdec: Disable QoS for HEVC and VP9 on RK3328 The RK3328 VDEC has a HW quirk that require QoS to be disabled when HEVC or VP9 is decoded, otherwise the decoded picture may become corrupted. @@ -13,15 +12,15 @@ decoding is started. Signed-off-by: Alex Bee Signed-off-by: Jonas Karlman --- - .../platform/rockchip/rkvdec/rkvdec-hevc.c | 3 +++ - .../platform/rockchip/rkvdec/rkvdec-regs.h | 2 ++ - .../platform/rockchip/rkvdec/rkvdec-vp9.c | 4 ++++ - .../media/platform/rockchip/rkvdec/rkvdec.c | 24 +++++++++++++++++++ - .../media/platform/rockchip/rkvdec/rkvdec.h | 5 ++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 3 ++ + drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h | 2 + + drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c | 4 ++ + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 24 ++++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 5 ++ 5 files changed, 38 insertions(+) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c -index 9b5cf70188db..fc7e6a260b0a 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -789,6 +789,9 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx) @@ -35,7 +34,7 @@ index 9b5cf70188db..fc7e6a260b0a 100644 reg = (run.pps->flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED) ? 0 : RKVDEC_WR_DDR_ALIGN_EN; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h -index 540c8bdf24e4..c627b6b6f53a 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h @@ -219,6 +219,8 @@ @@ -48,7 +47,7 @@ index 540c8bdf24e4..c627b6b6f53a 100644 #define RKVDEC_REG_PREF_CHR_CACHE_COMMAND 0x450 diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c -index 0e7e16f20eeb..b4bf01e839ef 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c @@ -824,6 +824,10 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) @@ -63,7 +62,7 @@ index 0e7e16f20eeb..b4bf01e839ef 100644 writel(RKVDEC_INTERRUPT_DEC_E | RKVDEC_CONFIG_DEC_CLK_GATE_E | RKVDEC_TIMEOUT_E | RKVDEC_BUF_EMPTY_E, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index 918ac6d38950..ef0ad92600f3 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -902,6 +902,18 @@ void rkvdec_run_postamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run) @@ -112,7 +111,7 @@ index 918ac6d38950..ef0ad92600f3 100644 .compatible = "rockchip,rk3399-vdec", .data = &rk3399_rkvdec_variant, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index d2e17eb2cca6..892d2380b59d 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -26,6 +26,8 @@ @@ -142,5 +141,5 @@ index d2e17eb2cca6..892d2380b59d 100644 extern const struct rkvdec_coded_fmt_ops rkvdec_hevc_fmt_ops; extern const struct rkvdec_coded_fmt_ops rkvdec_vp9_fmt_ops; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch index 6a707f7da7a2..7eeaa58d69a1 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch @@ -1,8 +1,8 @@ -From c6cad4f9200d4990edea865767d30fe86fa7bdfb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 10 Aug 2025 21:24:36 +0000 -Subject: [PATCH 049/108] FROMLIST(v3): media: dt-bindings: rockchip,vdec: Add - RK3288 compatible +Subject: FROMLIST(v3): media: dt-bindings: rockchip,vdec: Add RK3288 + compatible Add a RK3288 compatible for a version of the Rockchip VDEC IP that only support HEVC decoding. @@ -14,7 +14,7 @@ Acked-by: Conor Dooley 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml -index 96b6c8938768..809fda45b3bd 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml @@ -16,6 +16,7 @@ description: |- @@ -26,5 +26,5 @@ index 96b6c8938768..809fda45b3bd 100644 - const: rockchip,rk3576-vdec - const: rockchip,rk3588-vdec -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch index ed8aa1351bea..2f411437821b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch @@ -1,8 +1,7 @@ -From 5b0a6858cd6203fe8ec20b22ccd8f0779f8236d6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sun, 10 Aug 2025 21:24:37 +0000 -Subject: [PATCH 050/108] FROMLIST(v3): ARM: dts: rockchip: Add vdec node for - RK3288 +Subject: FROMLIST(v3): ARM: dts: rockchip: Add vdec node for RK3288 RK3288 contains a Rockchip VDEC block that only support HEVC decoding. Add a vdec node for this. @@ -10,11 +9,11 @@ decoding. Add a vdec node for this. Signed-off-by: Alex Bee Signed-off-by: Jonas Karlman --- - arch/arm/boot/dts/rockchip/rk3288.dtsi | 17 ++++++++++++++++- + arch/arm/boot/dts/rockchip/rk3288.dtsi | 17 +++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 42d705b544ec..eab0c9a2d482 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -1293,6 +1293,21 @@ vpu_mmu: iommu@ff9a0800 { @@ -49,5 +48,5 @@ index 42d705b544ec..eab0c9a2d482 100644 gpu: gpu@ffa30000 { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch index 034d485051ec..b47476ec4d14 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch @@ -1,7 +1,7 @@ -From 792c0c64580b83df20052e21bd2bbb310b394010 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 3 Sep 2025 21:50:59 +0300 -Subject: [PATCH 051/108] FROMLIST(v4): drm/bridge: dw-hdmi-qp: Add CEC support +Subject: FROMLIST(v4): drm/bridge: dw-hdmi-qp: Add CEC support Add support for the CEC interface of the Synopsys DesignWare HDMI QP TX controller. @@ -20,13 +20,13 @@ Reviewed-by: Dmitry Baryshkov Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/bridge/synopsys/Kconfig | 8 + - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 212 +++++++++++++++++++ - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 14 ++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 212 ++++++++++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 14 + include/drm/bridge/dw_hdmi_qp.h | 1 + 4 files changed, 235 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig -index f3ab2f985f8c..99878f051067 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/Kconfig +++ b/drivers/gpu/drm/bridge/synopsys/Kconfig @@ -54,6 +54,14 @@ config DRM_DW_HDMI_QP @@ -45,7 +45,7 @@ index f3ab2f985f8c..99878f051067 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 8f5059edb582..1ab30dfaf988 100644 +index 111111111111..222222222222 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 @@ @@ -309,7 +309,7 @@ index 8f5059edb582..1ab30dfaf988 100644 if (ret) return ERR_PTR(ret); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h -index 72987e6c4689..91a15f82e32a 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h @@ -488,9 +488,23 @@ @@ -337,7 +337,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 111111111111..222222222222 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 { @@ -349,5 +349,5 @@ index e9be6d507ad9..b4a9b739734e 100644 struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch index 6b53b401fce2..a3c12e8dacd1 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch @@ -1,8 +1,7 @@ -From e22bf4ac4e23f523be5efa42f828f1aee065bcad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 3 Sep 2025 21:51:00 +0300 -Subject: [PATCH 052/108] FROMLIST(v4): drm/bridge: dw-hdmi-qp: Fixup timer - base setup +Subject: FROMLIST(v4): drm/bridge: dw-hdmi-qp: Fixup timer base setup Currently the TIMER_BASE_CONFIG0 register gets initialized to a fixed value as initially found in vendor driver code supporting the RK3588 @@ -21,12 +20,12 @@ dw_hdmi_qp_init_hw(). Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 12 +++++++++--- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 12 +++++++--- include/drm/bridge/dw_hdmi_qp.h | 1 + 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 1ab30dfaf988..a1fc3de58fb7 100644 +index 111111111111..222222222222 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 { @@ -67,7 +66,7 @@ index 1ab30dfaf988..a1fc3de58fb7 100644 ret = devm_request_threaded_irq(dev, 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 111111111111..222222222222 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 +78,5 @@ index b4a9b739734e..76ecf3130199 100644 struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch index ef735efb63a0..4acf8aa8ca07 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch @@ -1,8 +1,8 @@ -From 72dda50cf756db33fb8ee40e861da77f4673d8c5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 3 Sep 2025 21:51:01 +0300 -Subject: [PATCH 053/108] FROMLIST(v4): drm/rockchip: dw_hdmi_qp: Improve error - handling with dev_err_probe() +Subject: FROMLIST(v4): drm/rockchip: dw_hdmi_qp: Improve error handling with + dev_err_probe() The error handling in dw_hdmi_qp_rockchip_bind() is quite inconsistent, i.e. in some cases the error code is not included in the message, while @@ -14,11 +14,11 @@ by switching to dev_err_probe(), which also reduces the code a bit. Reviewed-by: Daniel Stone Signed-off-by: Cristian Ciocaltea --- - .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 62 +++++++------------ + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 62 ++++------ 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 7d531b6f4c09..4e7794aa2dde 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -457,10 +457,8 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, @@ -126,5 +126,5 @@ index 7d531b6f4c09..4e7794aa2dde 100644 return drm_connector_attach_encoder(connector, encoder); } -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch index 13a1b6630cb3..d074f238f677 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch @@ -1,8 +1,8 @@ -From dc1e6185af563cfd6dcf4b927c5a519d4d42e8dc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 3 Sep 2025 21:51:02 +0300 -Subject: [PATCH 054/108] FROMLIST(v4): drm/rockchip: dw_hdmi_qp: Provide CEC - IRQ in dw_hdmi_qp_plat_data +Subject: FROMLIST(v4): 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 block, setup platform data to include the required IRQ number. @@ -14,7 +14,7 @@ Signed-off-by: Cristian Ciocaltea 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 4e7794aa2dde..39b46327afd8 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -527,6 +527,10 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, @@ -29,5 +29,5 @@ index 4e7794aa2dde..39b46327afd8 100644 if (irq < 0) return irq; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch index 04c055373d94..ecee7d4dbe1b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch @@ -1,8 +1,8 @@ -From bb8b943652a1bca73c6ca813e7f8dc0a88901880 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 3 Sep 2025 21:51:03 +0300 -Subject: [PATCH 055/108] FROMLIST(v4): drm/rockchip: dw_hdmi_qp: Provide ref - clock rate in dw_hdmi_qp_plat_data +Subject: FROMLIST(v4): drm/rockchip: dw_hdmi_qp: Provide ref clock rate in + dw_hdmi_qp_plat_data In order to support correct initialization of the timer base in the HDMI QP IP block, setup platform data to include the required reference clock @@ -14,11 +14,11 @@ dw_hdmi_qp_rockchip_bind(). Reviewed-by: Daniel Stone Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 11 ++++++++++- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 11 +++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index 39b46327afd8..5280383febe2 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -431,14 +431,15 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, @@ -54,5 +54,5 @@ index 39b46327afd8..5280383febe2 100644 GPIOD_OUT_HIGH); if (IS_ERR(hdmi->enable_gpio)) -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch index 0e1d3c98fcc2..85354893cd18 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch @@ -1,8 +1,7 @@ -From fbd9100ef71d7b8ad4f38e070055a7c3f40a0a15 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 3 Sep 2025 21:51:04 +0300 -Subject: [PATCH 056/108] FROMLIST(v4): arm64: defconfig: Enable DW HDMI QP CEC - support +Subject: FROMLIST(v4): arm64: defconfig: Enable DW HDMI QP CEC support Enable support for the CEC interface of the Synopsys DesignWare HDMI QP IP block. @@ -15,7 +14,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 58f87d09366c..fca9cca01449 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -963,6 +963,7 @@ CONFIG_DRM_CDNS_MHDP8546=m @@ -27,5 +26,5 @@ index 58f87d09366c..fca9cca01449 100644 CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch index e7b2d268d7b8..f06a427dd9f2 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch @@ -1,8 +1,8 @@ -From f5fcaa3b0bd4e940b09dc0bb62f5723380e5312b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 25 Aug 2025 13:08:32 +0300 -Subject: [PATCH 057/108] FROMLIST(v2): drm/rockchip: vop2: Check bpc before - switching DCLK source +Subject: FROMLIST(v2): drm/rockchip: vop2: Check bpc before switching DCLK + source When making use of the HDMI PHY PLL as a VOP2 DCLK source, it's output rate does normally match the mode clock. But this is only applicable @@ -20,11 +20,11 @@ source. Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 60 ++++++++++++-------- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 60 ++++++---- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -index b50927a824b4..977ccbf16344 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -101,7 +101,7 @@ enum vop2_afbc_format { @@ -109,5 +109,5 @@ index b50927a824b4..977ccbf16344 100644 } } -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch index 46a05fa80105..d1d640192ac5 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch @@ -1,8 +1,8 @@ -From bcb6034e1f56e27cd5526f961f6d71c3a5bebea9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 25 Aug 2025 13:08:33 +0300 -Subject: [PATCH 058/108] FROMLIST(v2): drm/bridge: dw-hdmi-qp: Handle platform - supported formats and color depth +Subject: FROMLIST(v2): drm/bridge: dw-hdmi-qp: Handle platform supported + formats and color depth Extend struct dw_hdmi_qp_plat_data to include the supported display output formats and maximum bits per color channel. When provided by the @@ -13,12 +13,12 @@ to also show the current HDMI output format and bpc. Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 11 +++++++++-- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 11 ++++++++-- include/drm/bridge/dw_hdmi_qp.h | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -index a1fc3de58fb7..54377ba3a607 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -867,8 +867,9 @@ static void dw_hdmi_qp_bridge_atomic_enable(struct drm_bridge *bridge, @@ -47,7 +47,7 @@ index a1fc3de58fb7..54377ba3a607 100644 if (IS_ERR(hdmi->bridge.ddc)) return ERR_CAST(hdmi->bridge.ddc); diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h -index 76ecf3130199..3f461f6b9bbf 100644 +index 111111111111..222222222222 100644 --- a/include/drm/bridge/dw_hdmi_qp.h +++ b/include/drm/bridge/dw_hdmi_qp.h @@ -25,6 +25,10 @@ struct dw_hdmi_qp_plat_data { @@ -62,5 +62,5 @@ index 76ecf3130199..3f461f6b9bbf 100644 struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch index c3e66d4f0307..230e4131b931 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch @@ -1,8 +1,7 @@ -From 3498b6cf10a44db616505ddb82ac399be6bf867c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 25 Aug 2025 13:08:34 +0300 -Subject: [PATCH 059/108] FROMLIST(v2): drm/rockchip: dw_hdmi_qp: Switch to - phy_configure() +Subject: FROMLIST(v2): drm/rockchip: dw_hdmi_qp: Switch to phy_configure() Stop relying on phy_set_bus_width() based workaround to setup the TMDS character rate and, instead, use the recently introduced HDMI PHY @@ -19,11 +18,11 @@ this purpose. Signed-off-by: Cristian Ciocaltea --- - .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 37 ++++++++++--------- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 37 +++++----- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index 5280383febe2..6f2006e7999b 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -13,6 +13,7 @@ @@ -98,5 +97,5 @@ index 5280383febe2..6f2006e7999b 100644 static const struct -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch index 7e5329d1c2f0..2ee63dab96e1 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch @@ -1,8 +1,8 @@ -From 9edb994862d977209a27a5043bb3076d9c38b688 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 25 Aug 2025 13:08:35 +0300 -Subject: [PATCH 060/108] FROMLIST(v2): drm/rockchip: dw_hdmi_qp: Use bit - macros for RK3576 regs +Subject: FROMLIST(v2): drm/rockchip: dw_hdmi_qp: Use bit macros for RK3576 + regs For consistency and improved readability, redefine a few RK3576 specific register configurations by relying on GENMASK() and unshifted values for @@ -14,11 +14,11 @@ required. Signed-off-by: Cristian Ciocaltea --- - .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 21 +++++++------------ + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 21 ++++------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index 6f2006e7999b..0f2b421134af 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -38,21 +38,16 @@ @@ -52,5 +52,5 @@ index 6f2006e7999b..0f2b421134af 100644 #define RK3576_I2S_SEL_MASK BIT(0) #define RK3576_SPDIF_SEL_MASK BIT(1) -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch index 1fbfc54d6b91..929611c0c0d5 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch @@ -1,8 +1,7 @@ -From 297e66d6175b36881e401d27baab14548b3feebc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 25 Aug 2025 13:08:36 +0300 -Subject: [PATCH 061/108] FROMLIST(v2): drm/rockchip: dw_hdmi_qp: Add high - color depth support +Subject: FROMLIST(v2): drm/rockchip: dw_hdmi_qp: Add high color depth support Since both RK3576 and RK3588 SoCs are capable of handling 10 bpc color depth, introduce a pair of new helpers to program the necessary @@ -18,11 +17,11 @@ assignments. Signed-off-by: Cristian Ciocaltea --- - .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 59 ++++++++++++++++++- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 59 +++++++++- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index 0f2b421134af..81f106ac7b56 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -7,6 +7,7 @@ @@ -153,5 +152,5 @@ index 0f2b421134af..81f106ac7b56 100644 encoder = &hdmi->encoder.encoder; encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch index b995d8960e07..e34361684c42 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch @@ -1,8 +1,7 @@ -From 05a6c754cfa875530326c613a59785547de4dd91 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Fri, 18 Jul 2025 14:41:13 +0800 -Subject: [PATCH 062/108] FROMLIST(v1): drm/rockchip: vop2: Add delay between - poll registers +Subject: drm/rockchip: vop2: Add delay between poll registers According to the implementation of read_poll_timeout_atomic, if the delay time is 0, it will only use a simple loop based on timeout_us to @@ -17,7 +16,7 @@ Signed-off-by: Andy Yan 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c -index 42a4833a90a3..bf771b2f2188 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -2066,7 +2066,7 @@ static void rk3568_vop2_wait_for_port_mux_done(struct vop2 *vop2) @@ -39,5 +38,5 @@ index 42a4833a90a3..bf771b2f2188 100644 DRM_DEV_ERROR(vop2->dev, "wait layer cfg done timeout: 0x%x--0x%x\n", atv_layer_cfg, cfg); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch index 6414cc12bf6d..e20e6712f560 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch @@ -1,8 +1,8 @@ -From ec1091a646f0e1fbe8d68c633628c213637029e2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Fri, 18 Jul 2025 14:41:14 +0800 -Subject: [PATCH 063/108] FROMLIST(v1): drm/rockchip: vop2: Only wait for - changed layer cfg done when there is pending cfgdone bits +Subject: drm/rockchip: vop2: Only wait for changed layer cfg done when there + is pending cfgdone bits The write of cfgdone bits always done at .atomic_flush. When userspace makes plane zpos changes of two crtc within one commit, @@ -13,11 +13,11 @@ So only wait when there is pending cfgdone bits to avoid long timeout. Fixes: 3e89a8c68354 ("drm/rockchip: vop2: Fix the update of LAYER/PORT select registers when there are multi display output on rk3588/rk3568") Signed-off-by: Andy Yan --- - drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 13 +++++++++++-- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 13 ++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c -index bf771b2f2188..5a3d8c834ca9 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -2106,6 +2106,7 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp) @@ -48,5 +48,5 @@ index bf771b2f2188..5a3d8c834ca9 100644 vop2_writel(vop2, RK3568_OVL_LAYER_SEL, layer_sel); mutex_unlock(&vop2->ovl_lock); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch index 5a2eaadd09cd..a84c364337e3 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch @@ -1,8 +1,7 @@ -From 733ffb85946a2e09960fd43feea4421651b761b9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Tue, 24 Jun 2025 14:29:38 +0200 -Subject: [PATCH 064/108] FROMLIST(v1): media: verisilicon: Export only needed - pixels formats. +Subject: media: verisilicon: Export only needed pixels formats. When enumerating the pixels formats check if the context request to only export post-processed pixels formats. @@ -17,7 +16,7 @@ Reviewed-by: Nicolas Dufresne 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c -index 7c3515cf7d64..7869faf921f4 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -222,6 +222,7 @@ static int vidioc_enum_fmt(struct file *file, void *priv, @@ -48,5 +47,5 @@ index 7c3515cf7d64..7869faf921f4 100644 bool mode_none = formats[i].codec_mode == HANTRO_MODE_NONE; fmt = &formats[i]; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch index 98b026e0f5c7..ec14866ca217 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch @@ -1,8 +1,8 @@ -From 896424a6dad60bb2faf5375765e559883cb9f31f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Thu, 28 Aug 2025 01:49:00 +0000 -Subject: [PATCH 065/108] FROMLIST(v2): media: verisilicon: Explicitly disable - selection api ioctls for decoders +Subject: FROMLIST(v2): media: verisilicon: Explicitly disable selection api + ioctls for decoders Call the dedicated v4l2_disable_ioctl helper instead of manually checking whether the current context is an encoder for the selection @@ -16,7 +16,7 @@ Reviewed-by: Nicolas Dufresne 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c -index c31fd75902d4..df637f4a8827 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -928,6 +928,8 @@ static int hantro_add_func(struct hantro_dev *vpu, unsigned int funcid) @@ -29,7 +29,7 @@ index c31fd75902d4..df637f4a8827 100644 video_set_drvdata(vfd, vpu); diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c -index 7869faf921f4..f7231a3d8183 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -667,8 +667,7 @@ static int vidioc_g_selection(struct file *file, void *priv, @@ -53,5 +53,5 @@ index 7869faf921f4..f7231a3d8183 100644 /* Change not allowed if the queue is streaming. */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch index 281c70feb7f0..fdcb69bd735c 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch @@ -1,8 +1,7 @@ -From f099b720f1cef83dd8073cb08b1d1272496d2695 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nicolas Frattaroli Date: Mon, 23 Jun 2025 18:05:29 +0200 -Subject: [PATCH 066/108] DETLEV(v3): bitmap: introduce hardware-specific - bitfield operations +Subject: DETLEV(v3): bitmap: introduce hardware-specific bitfield operations Hardware of various vendors, but very notably Rockchip, often uses 32-bit registers where the upper 16-bit half of the register is a @@ -29,26 +28,12 @@ initializers, like FIELD_PREP_CONST. Suggested-by: Signed-off-by: Nicolas Frattaroli --- - MAINTAINERS | 1 + - include/linux/hw_bitfield.h | 62 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 63 insertions(+) - create mode 100644 include/linux/hw_bitfield.h + include/linux/hw_bitfield.h | 62 ++++++++++ + 1 file changed, 62 insertions(+) -diff --git a/MAINTAINERS b/MAINTAINERS -index a19231134b01..db4cb02cf04e 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -4276,6 +4276,7 @@ F: include/linux/bits.h - F: include/linux/cpumask.h - F: include/linux/cpumask_types.h - F: include/linux/find.h -+F: include/linux/hw_bitfield.h - F: include/linux/nodemask.h - F: include/linux/nodemask_types.h - F: include/uapi/linux/bits.h diff --git a/include/linux/hw_bitfield.h b/include/linux/hw_bitfield.h new file mode 100644 -index 000000000000..df202e167ce4 +index 000000000000..111111111111 --- /dev/null +++ b/include/linux/hw_bitfield.h @@ -0,0 +1,62 @@ @@ -115,5 +100,5 @@ index 000000000000..df202e167ce4 + +#endif /* _LINUX_HW_BITFIELD_H */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch index 645aaa6c4a1f..35af39e5b499 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch @@ -1,8 +1,7 @@ -From 2568fcb4a2bfc6388f1ef634986fa580c7b688dd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 27 May 2025 11:00:22 -0400 -Subject: [PATCH 067/108] DETLEV(v3): media: rkvdec: Switch to using structs - instead of writel +Subject: DETLEV(v3): media: rkvdec: Switch to using structs instead of writel In an effort to merge the rkvdec2 driver [1] with this one, switch from writel() calls to using structs to represent the register mappings. @@ -40,16 +39,16 @@ This also shows that the fluster score hasn't changed. Signed-off-by: Detlev Casanova --- - .../platform/rockchip/rkvdec/rkvdec-h264.c | 165 +++-- - .../platform/rockchip/rkvdec/rkvdec-hevc.c | 66 +- - .../platform/rockchip/rkvdec/rkvdec-regs.h | 571 ++++++++++++------ - .../platform/rockchip/rkvdec/rkvdec-vp9.c | 231 +++---- - .../media/platform/rockchip/rkvdec/rkvdec.c | 10 +- - .../media/platform/rockchip/rkvdec/rkvdec.h | 1 + + drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c | 165 ++- + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 66 +- + drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h | 571 +++++++--- + drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c | 231 ++-- + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 10 +- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 1 + 6 files changed, 589 insertions(+), 455 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c -index d14b4d173448..1adb2e1f5f0e 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c @@ -115,6 +115,7 @@ struct rkvdec_h264_run { @@ -298,7 +297,7 @@ index d14b4d173448..1adb2e1f5f0e 100644 writel(1, rkvdec->regs + RKVDEC_REG_PREF_CHR_CACHE_COMMAND); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c -index fc7e6a260b0a..4de4a75f0f44 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -129,6 +129,7 @@ struct rkvdec_hevc_run { @@ -431,7 +430,7 @@ index fc7e6a260b0a..4de4a75f0f44 100644 writel(1, rkvdec->regs + RKVDEC_REG_PREF_CHR_CACHE_COMMAND); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h -index c627b6b6f53a..2d6ba5f1df9a 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h @@ -3,7 +3,12 @@ @@ -1023,7 +1022,7 @@ index c627b6b6f53a..2d6ba5f1df9a 100644 + #endif /* RKVDEC_REGS_H_ */ diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c -index b4bf01e839ef..e1f6957ccdac 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c @@ -163,6 +163,7 @@ struct rkvdec_vp9_ctx { @@ -1397,7 +1396,7 @@ index b4bf01e839ef..e1f6957ccdac 100644 rkvdec_quirks_disable_qos(ctx); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index ef0ad92600f3..540d549ec08d 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -914,6 +914,15 @@ void rkvdec_quirks_disable_qos(struct rkvdec_ctx *ctx) @@ -1425,7 +1424,7 @@ index ef0ad92600f3..540d549ec08d 100644 } } diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index 892d2380b59d..9ffc3060ce25 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -151,6 +151,7 @@ struct rkvdec_aux_buf { @@ -1437,5 +1436,5 @@ index 892d2380b59d..9ffc3060ce25 100644 void rkvdec_quirks_disable_qos(struct rkvdec_ctx *ctx); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch index 135f314321d3..09f687b9d1ad 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch @@ -1,23 +1,21 @@ -From 01b65b0e479cf2f72373fa2e57d6509bde350124 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 10:34:55 -0400 -Subject: [PATCH 068/108] DETLEV(v3): media: rkvdec: Move cabac tables to their - own source file +Subject: DETLEV(v3): media: rkvdec: Move cabac tables to their own source file This is in preparation to add support for new variants that will use the same tables. Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/Makefile | 7 +- - .../{rkvdec-hevc-data.c => rkvdec-cabac.c} | 506 +++++++++++++++++- - .../platform/rockchip/rkvdec/rkvdec-h264.c | 501 +---------------- - .../platform/rockchip/rkvdec/rkvdec-hevc.c | 6 +- + drivers/media/platform/rockchip/rkvdec/Makefile | 7 +- + drivers/media/platform/rockchip/rkvdec/{rkvdec-hevc-data.c => rkvdec-cabac.c} | 506 +++++++++- + drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c | 501 +-------- + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 6 +- 4 files changed, 514 insertions(+), 506 deletions(-) - rename drivers/media/platform/rockchip/rkvdec/{rkvdec-hevc-data.c => rkvdec-cabac.c} (86%) diff --git a/drivers/media/platform/rockchip/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile -index a77122641d14..a8ff5e3d7bec 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Makefile +++ b/drivers/media/platform/rockchip/rkvdec/Makefile @@ -1,3 +1,8 @@ @@ -34,7 +32,7 @@ diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c b/drivers similarity index 86% rename from drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c rename to drivers/media/platform/rockchip/rkvdec/rkvdec-cabac.c -index eac4ea604949..bc87f59636ea 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-data.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-cabac.c @@ -1,19 +1,517 @@ @@ -560,7 +558,7 @@ index eac4ea604949..bc87f59636ea 100644 0x68, 0x48, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x07, 0x40, 0x40, 0x68, 0x58, 0x60, 0x40, 0x1f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x48, 0x48, 0x60, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c -index 1adb2e1f5f0e..15f2378bbc02 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c @@ -15,6 +15,8 @@ @@ -1079,7 +1077,7 @@ index 1adb2e1f5f0e..15f2378bbc02 100644 { u8 bit = field.offset % 32, word = field.offset / 32; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c -index 4de4a75f0f44..e8b8b7bc6cdc 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -16,7 +16,6 @@ @@ -1110,5 +1108,5 @@ index 4de4a75f0f44..e8b8b7bc6cdc 100644 struct rkvdec_sps_pps_packet param_set[RKV_PPS_LEN]; struct rkvdec_rps_packet rps[RKV_RPS_LEN]; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch index af99ffa029e5..22c9a50c7f4d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch @@ -1,8 +1,7 @@ -From 44fc0f7334d7b7818e2ee63bd1d22692c49d9883 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Wed, 11 Jun 2025 12:28:56 -0400 -Subject: [PATCH 069/108] DETLEV(v3): media: rkvdec: Use structs to represent - the HW RPS +Subject: DETLEV(v3): media: rkvdec: Use structs to represent the HW RPS This is in preparation to add support for other variants of the decoder. @@ -11,11 +10,11 @@ support that is present in e.g. rk3588. Signed-off-by: Detlev Casanova --- - .../platform/rockchip/rkvdec/rkvdec-h264.c | 97 ++++++++++++++++--- + drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c | 97 ++++++++-- 1 file changed, 86 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c -index 15f2378bbc02..3527919aa8ff 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c @@ -19,7 +19,6 @@ extern const s8 rkvdec_h264_cabac_table[4][464][2]; @@ -167,5 +166,5 @@ index 15f2378bbc02..3527919aa8ff 100644 } } -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch index edb3b98f0600..1f1efa5bdf1a 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch @@ -1,8 +1,7 @@ -From c7b2662ce199453cd088ea7568849fa4ef09e854 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 13:16:24 -0400 -Subject: [PATCH 070/108] DETLEV(v3): media: rkvdec: Move h264 functions to - common file +Subject: DETLEV(v3): media: rkvdec: Move h264 functions to common file This is a preparation commit to add support for new variants of the decoder. @@ -12,16 +11,14 @@ The functions will later be shared with vdpu381 (rk3588) and vdpu383 Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/Makefile | 1 + - .../rockchip/rkvdec/rkvdec-h264-common.c | 253 ++++++++++++++ - .../rockchip/rkvdec/rkvdec-h264-common.h | 79 +++++ - .../platform/rockchip/rkvdec/rkvdec-h264.c | 308 +----------------- + drivers/media/platform/rockchip/rkvdec/Makefile | 1 + + drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.c | 253 ++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h | 79 +++ + drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c | 308 +--------- 4 files changed, 337 insertions(+), 304 deletions(-) - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.c - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h diff --git a/drivers/media/platform/rockchip/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile -index a8ff5e3d7bec..d2ba7a7c15e5 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Makefile +++ b/drivers/media/platform/rockchip/rkvdec/Makefile @@ -4,5 +4,6 @@ rockchip-vdec-y += \ @@ -33,7 +30,7 @@ index a8ff5e3d7bec..d2ba7a7c15e5 100644 rkvdec-vp9.o diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.c new file mode 100644 -index 000000000000..e7557c3a5cfa +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.c @@ -0,0 +1,253 @@ @@ -292,7 +289,7 @@ index 000000000000..e7557c3a5cfa + diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h new file mode 100644 -index 000000000000..df95a1678734 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h @@ -0,0 +1,79 @@ @@ -376,7 +373,7 @@ index 000000000000..df95a1678734 +int rkvdec_h264_validate_sps(struct rkvdec_ctx *ctx, const struct v4l2_ctrl_h264_sps *sps); +void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_h264_run *run); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c -index 3527919aa8ff..a80b5b44a570 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c @@ -14,6 +14,7 @@ @@ -756,5 +753,5 @@ index 3527919aa8ff..a80b5b44a570 100644 rkvdec_run_postamble(ctx, &run.base); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch index 7b56efabe039..736ba7988c71 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch @@ -1,8 +1,7 @@ -From c9b6428c52f3bdb692e8cbaa8aec2cdcfecc66ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Fri, 15 Aug 2025 17:24:37 -0400 -Subject: [PATCH 071/108] DETLEV(v3): media: rkvdec: Move hevc functions to - common file +Subject: DETLEV(v3): media: rkvdec: Move hevc functions to common file This is a preparation commit to add support for new variants of the decoder. @@ -12,16 +11,14 @@ The functions will later be shared with vdpu381 (rk3588) and vdpu383 Signed-off-by: Detlev Casanova --- - .../rockchip/rkvdec/rkvdec-hevc-common.c | 230 +++++++++++++++++ - .../rockchip/rkvdec/rkvdec-hevc-common.h | 46 ++++ - .../platform/rockchip/rkvdec/rkvdec-hevc.c | 240 +----------------- + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c | 230 +++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h | 46 ++ + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 240 +--------- 3 files changed, 282 insertions(+), 234 deletions(-) - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c new file mode 100644 -index 000000000000..6fd3b703ac11 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c @@ -0,0 +1,230 @@ @@ -257,7 +254,7 @@ index 000000000000..6fd3b703ac11 +} diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h new file mode 100644 -index 000000000000..bebab62a861e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h @@ -0,0 +1,46 @@ @@ -308,7 +305,7 @@ index 000000000000..bebab62a861e +int rkvdec_hevc_try_ctrl(struct rkvdec_ctx *ctx, struct v4l2_ctrl *ctrl); +void rkvdec_hevc_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_hevc_run *run); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c -index e8b8b7bc6cdc..887b6c165a7e 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -16,6 +16,7 @@ @@ -612,5 +609,5 @@ index e8b8b7bc6cdc..887b6c165a7e 100644 .adjust_fmt = rkvdec_hevc_adjust_fmt, .start = rkvdec_hevc_start, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch index 0d73c7685d7f..7a0ad194c3af 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch @@ -1,20 +1,19 @@ -From f76fef2efa1a4fe481e10c118870cb54d349c5a2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 14:05:08 -0400 -Subject: [PATCH 072/108] DETLEV(v3): media: rkvdec: Add per variant - configuration +Subject: DETLEV(v3): media: rkvdec: Add per variant configuration This is to prepare for adding different variants of the decoder and support specific formats and ops. Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/rkvdec.c | 33 +++++++++++++------ - .../media/platform/rockchip/rkvdec/rkvdec.h | 11 ++++++- + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 33 +++++++--- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 11 +++- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index 540d549ec08d..033c03051f2e 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -390,12 +390,13 @@ rkvdec_enum_coded_fmt_desc(struct rkvdec_ctx *ctx, int index) @@ -101,7 +100,7 @@ index 540d549ec08d..033c03051f2e 100644 INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index 9ffc3060ce25..d8a1b3e8e0ef 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -70,8 +70,9 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) @@ -138,5 +137,5 @@ index 9ffc3060ce25..d8a1b3e8e0ef 100644 struct rkvdec_ctx { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch index 1248ce5f0d3d..160a72f6d958 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch @@ -1,7 +1,7 @@ -From 3beb7a1601be3f294c3352ccca0b93cb290bbaa8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 14:53:27 -0400 -Subject: [PATCH 073/108] DETLEV(v3): media: rkvdec: Add RCB and SRAM support +Subject: DETLEV(v3): media: rkvdec: Add RCB and SRAM support The RCB (Rows and Cols Buffers) are a set of buffers used by other variations of the decoder to store temporary data. @@ -23,17 +23,15 @@ This commit is in preparation of other variants support. Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/Makefile | 1 + - .../platform/rockchip/rkvdec/rkvdec-rcb.c | 174 ++++++++++++++++++ - .../platform/rockchip/rkvdec/rkvdec-rcb.h | 29 +++ - .../media/platform/rockchip/rkvdec/rkvdec.c | 29 ++- - .../media/platform/rockchip/rkvdec/rkvdec.h | 13 ++ + drivers/media/platform/rockchip/rkvdec/Makefile | 1 + + drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.c | 174 ++++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.h | 29 ++ + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 29 +- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 13 + 5 files changed, 242 insertions(+), 4 deletions(-) - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.c - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.h diff --git a/drivers/media/platform/rockchip/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile -index d2ba7a7c15e5..3b34f39b17d6 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Makefile +++ b/drivers/media/platform/rockchip/rkvdec/Makefile @@ -6,4 +6,5 @@ rockchip-vdec-y += \ @@ -44,7 +42,7 @@ index d2ba7a7c15e5..3b34f39b17d6 100644 rkvdec-vp9.o diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.c new file mode 100644 -index 000000000000..210e59db2c62 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.c @@ -0,0 +1,174 @@ @@ -224,7 +222,7 @@ index 000000000000..210e59db2c62 + diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.h new file mode 100644 -index 000000000000..30e8002555c8 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.h @@ -0,0 +1,29 @@ @@ -258,7 +256,7 @@ index 000000000000..30e8002555c8 +int rkvdec_rcb_buf_count(struct rkvdec_ctx *ctx); +void rkvdec_free_rcb(struct rkvdec_ctx *ctx); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index 033c03051f2e..19deb1d34a18 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -10,6 +10,7 @@ @@ -360,7 +358,7 @@ index 033c03051f2e..19deb1d34a18 100644 } diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index d8a1b3e8e0ef..86d1af5dee5e 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -19,6 +19,7 @@ @@ -423,5 +421,5 @@ index d8a1b3e8e0ef..86d1af5dee5e 100644 void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch index d8790941b859..c537198bcaa0 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch @@ -1,20 +1,19 @@ -From c6b8b1969778e5e3fe6e805cbd087b1fbd64c73a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 15:13:46 -0400 -Subject: [PATCH 074/108] DETLEV(v3): media: rkvdec: Support per-variant - interrupt handler +Subject: DETLEV(v3): media: rkvdec: Support per-variant interrupt handler Preparation commit for supporting different variants with different interrupt management. Signed-off-by: Detlev Casanova --- - drivers/media/platform/rockchip/rkvdec/rkvdec.c | 15 ++++++++++++--- + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 15 ++++++++-- drivers/media/platform/rockchip/rkvdec/rkvdec.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index 19deb1d34a18..a0dca7bff071 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -1218,10 +1218,9 @@ static void rkvdec_iommu_restore(struct rkvdec_dev *rkvdec) @@ -55,7 +54,7 @@ index 19deb1d34a18..a0dca7bff071 100644 static const struct rkvdec_variant rk3288_rkvdec_variant = { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index 86d1af5dee5e..117ebf198a1e 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -121,6 +121,7 @@ struct rkvdec_config { @@ -67,5 +66,5 @@ index 86d1af5dee5e..117ebf198a1e 100644 struct rkvdec_dev { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch index 8c6043b33c98..00c2c95b198e 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch @@ -1,8 +1,7 @@ -From 4533e8af728b440b1addd0115c52d67a2d2c0ac1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 16:40:09 -0400 -Subject: [PATCH 075/108] DETLEV(v3): media: rkvdec: Enable all clocks without - naming them +Subject: DETLEV(v3): media: rkvdec: Enable all clocks without naming them For other variants, the clock names and number will differ. @@ -11,12 +10,12 @@ them to avoid having a list for each variant. Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/rkvdec.c | 24 +++++-------------- - .../media/platform/rockchip/rkvdec/rkvdec.h | 1 + + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 24 +++------- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 1 + 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index a0dca7bff071..3f9f2e8857f4 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -1311,15 +1311,10 @@ static const struct of_device_id of_rkvdec_match[] = { @@ -78,7 +77,7 @@ index a0dca7bff071..3f9f2e8857f4 100644 return 0; } diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index 117ebf198a1e..5c238e443d7d 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -131,6 +131,7 @@ struct rkvdec_dev { @@ -90,5 +89,5 @@ index 117ebf198a1e..5c238e443d7d 100644 struct mutex vdev_lock; /* serializes ioctls */ struct delayed_work watchdog_work; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch index 8fd498c2d03c..2616d9219329 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch @@ -1,8 +1,7 @@ -From d8d4918709c884597c505f70a6dead48581699e9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 15:53:52 -0400 -Subject: [PATCH 076/108] DETLEV(v3): media: rkvdec: Add H264 support for the - VDPU381 variant +Subject: DETLEV(v3): media: rkvdec: Add H264 support for the VDPU381 variant This decoder variant is found in Rockchip RK3588 SoC family. @@ -19,19 +18,17 @@ Fluster score for JVT-AVC_V1 is 129/135. Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/Makefile | 1 + - .../rockchip/rkvdec/rkvdec-h264-common.h | 2 + - .../platform/rockchip/rkvdec/rkvdec-h264.c | 2 - - .../rockchip/rkvdec/rkvdec-vdpu381-h264.c | 469 ++++++++++++++++++ - .../rockchip/rkvdec/rkvdec-vdpu381-regs.h | 427 ++++++++++++++++ - .../media/platform/rockchip/rkvdec/rkvdec.c | 173 ++++++- - .../media/platform/rockchip/rkvdec/rkvdec.h | 6 + + drivers/media/platform/rockchip/rkvdec/Makefile | 1 + + drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h | 2 + + drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c | 2 - + drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c | 469 ++++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h | 427 +++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 173 +++- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 6 + 7 files changed, 1076 insertions(+), 4 deletions(-) - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h diff --git a/drivers/media/platform/rockchip/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile -index 3b34f39b17d6..c4167eb6fc79 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Makefile +++ b/drivers/media/platform/rockchip/rkvdec/Makefile @@ -7,4 +7,5 @@ rockchip-vdec-y += \ @@ -41,7 +38,7 @@ index 3b34f39b17d6..c4167eb6fc79 100644 + rkvdec-vdpu381-h264.o \ rkvdec-vp9.o diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h -index df95a1678734..38446e2886e3 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h @@ -66,6 +66,8 @@ struct rkvdec_rps { @@ -54,7 +51,7 @@ index df95a1678734..38446e2886e3 100644 void assemble_hw_rps(struct v4l2_h264_reflist_builder *builder, struct rkvdec_h264_run *run, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c -index a80b5b44a570..d50e985cff95 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c @@ -16,8 +16,6 @@ @@ -68,7 +65,7 @@ index a80b5b44a570..d50e985cff95 100644 #define RKV_ERROR_INFO_SIZE (256 * 144 * 4) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c new file mode 100644 -index 000000000000..e65a56bc9c63 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c @@ -0,0 +1,469 @@ @@ -543,7 +540,7 @@ index 000000000000..e65a56bc9c63 +}; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h new file mode 100644 -index 000000000000..11b545e9ee7e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h @@ -0,0 +1,427 @@ @@ -975,7 +972,7 @@ index 000000000000..11b545e9ee7e + +#endif /* __RKVDEC_REGS_H__ */ diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index 3f9f2e8857f4..b8efee7af74c 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -29,6 +29,7 @@ @@ -1220,7 +1217,7 @@ index 3f9f2e8857f4..b8efee7af74c 100644 rkvdec->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(rkvdec->regs)) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index 5c238e443d7d..23c5237de5f7 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -122,6 +122,8 @@ struct rkvdec_config { @@ -1256,5 +1253,5 @@ index 5c238e443d7d..23c5237de5f7 100644 + #endif /* RKVDEC_H_ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch index f6822ec8ba81..1dcc2945e297 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch @@ -1,8 +1,7 @@ -From f4b2e0c1cce961b7a1abd8bb27760857af6e7faa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Tue, 10 Jun 2025 17:45:17 -0400 -Subject: [PATCH 077/108] DETLEV(v3): media: rkvdec: Add H264 support for the - VDPU383 variant +Subject: DETLEV(v3): media: rkvdec: Add H264 support for the VDPU383 variant This variant is used on the RK3576 SoC. @@ -17,23 +16,20 @@ The other test suites are not supported yet. Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/Kconfig | 1 + - .../media/platform/rockchip/rkvdec/Makefile | 3 + - .../rockchip/rkvdec/rkvdec-hevc-common.c | 413 ++++++++++-- - .../rockchip/rkvdec/rkvdec-hevc-common.h | 84 ++- - .../platform/rockchip/rkvdec/rkvdec-hevc.c | 5 +- - .../rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 588 ++++++++++++++++++ - .../rockchip/rkvdec/rkvdec-vdpu383-h264.c | 582 +++++++++++++++++ - .../rockchip/rkvdec/rkvdec-vdpu383-regs.h | 284 +++++++++ - .../media/platform/rockchip/rkvdec/rkvdec.c | 212 ++++++- - .../media/platform/rockchip/rkvdec/rkvdec.h | 10 +- + drivers/media/platform/rockchip/rkvdec/Kconfig | 1 + + drivers/media/platform/rockchip/rkvdec/Makefile | 3 + + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c | 413 ++++++- + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h | 84 +- + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 5 +- + drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 588 ++++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c | 582 +++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-regs.h | 284 +++++ + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 212 +++- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 10 +- 10 files changed, 2109 insertions(+), 73 deletions(-) - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-regs.h diff --git a/drivers/media/platform/rockchip/rkvdec/Kconfig b/drivers/media/platform/rockchip/rkvdec/Kconfig -index 5f3bdd848a2c..3303b0ce3280 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Kconfig +++ b/drivers/media/platform/rockchip/rkvdec/Kconfig @@ -8,6 +8,7 @@ config VIDEO_ROCKCHIP_VDEC @@ -45,7 +41,7 @@ index 5f3bdd848a2c..3303b0ce3280 100644 help Support for the Rockchip Video Decoder IP present on Rockchip SoCs, diff --git a/drivers/media/platform/rockchip/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile -index c4167eb6fc79..e30fdd7d51c3 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Makefile +++ b/drivers/media/platform/rockchip/rkvdec/Makefile @@ -6,6 +6,9 @@ rockchip-vdec-y += \ @@ -59,7 +55,7 @@ index c4167eb6fc79..e30fdd7d51c3 100644 + rkvdec-vdpu383-h264.o \ rkvdec-vp9.o diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c -index 6fd3b703ac11..3646b3ce4ea0 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c @@ -18,6 +18,143 @@ @@ -556,7 +552,7 @@ index 6fd3b703ac11..3646b3ce4ea0 100644 rkvdec_run_preamble(ctx, &run->base); } diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h -index bebab62a861e..da58da149566 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h @@ -15,14 +15,68 @@ @@ -666,7 +662,7 @@ index bebab62a861e..da58da149566 100644 int rkvdec_hevc_try_ctrl(struct rkvdec_ctx *ctx, struct v4l2_ctrl *ctrl); void rkvdec_hevc_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_hevc_run *run); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c -index 887b6c165a7e..b28d54b8bb57 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -25,9 +25,6 @@ @@ -690,7 +686,7 @@ index 887b6c165a7e..b28d54b8bb57 100644 assemble_sw_rps(ctx, &run); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c new file mode 100644 -index 000000000000..96dfa3576a8b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c @@ -0,0 +1,588 @@ @@ -1284,7 +1280,7 @@ index 000000000000..96dfa3576a8b +}; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c new file mode 100644 -index 000000000000..bb2c62d9c3d4 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c @@ -0,0 +1,582 @@ @@ -1872,7 +1868,7 @@ index 000000000000..bb2c62d9c3d4 +}; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-regs.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-regs.h new file mode 100644 -index 000000000000..2b614393a3af +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-regs.h @@ -0,0 +1,284 @@ @@ -2161,7 +2157,7 @@ index 000000000000..2b614393a3af + +#endif /* __RKVDEC_VDPU838_REGS_H__ */ diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index b8efee7af74c..ad8ab9d37add 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -9,6 +9,7 @@ @@ -2475,7 +2471,7 @@ index b8efee7af74c..ad8ab9d37add 100644 ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); if (ret) { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index 23c5237de5f7..33cd3406b5ea 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -124,6 +124,8 @@ struct rkvdec_config { @@ -2516,5 +2512,5 @@ index 23c5237de5f7..33cd3406b5ea 100644 #endif /* RKVDEC_H_ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch index adcf21f0b77e..9f48054e6d59 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch @@ -1,8 +1,7 @@ -From 093791bfc067b55252555e4a05d7291baf4b6231 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Wed, 11 Jun 2025 17:04:28 -0400 -Subject: [PATCH 078/108] DETLEV(v3): media: rkvdec: Add HEVC support for the - VDPU383 variant +Subject: DETLEV(v3): media: rkvdec: Add HEVC support for the VDPU383 variant The VDPU383 decoder is used on the RK3576 SoC and has support for HEVC. @@ -13,16 +12,15 @@ The fluster score for JCT-VC-HEVC_V1 is 146/147. Signed-off-by: Detlev Casanova --- - .../media/platform/rockchip/rkvdec/Makefile | 1 + - .../rockchip/rkvdec/rkvdec-hevc-common.c | 49 +- - .../rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 680 ++++++++++++++++++ - .../media/platform/rockchip/rkvdec/rkvdec.c | 94 ++- - .../media/platform/rockchip/rkvdec/rkvdec.h | 2 + + drivers/media/platform/rockchip/rkvdec/Makefile | 1 + + drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c | 49 +- + drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 680 ++++++++++ + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 94 +- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 2 + 5 files changed, 783 insertions(+), 43 deletions(-) - create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c diff --git a/drivers/media/platform/rockchip/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile -index e30fdd7d51c3..e629d571e4d8 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/Makefile +++ b/drivers/media/platform/rockchip/rkvdec/Makefile @@ -11,4 +11,5 @@ rockchip-vdec-y += \ @@ -32,7 +30,7 @@ index e30fdd7d51c3..e629d571e4d8 100644 + rkvdec-vdpu383-hevc.o \ rkvdec-vp9.o diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c -index 3646b3ce4ea0..e5d240d97792 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c @@ -155,60 +155,25 @@ static void set_ref_poc(struct rkvdec_rps_short_term_ref_set *set, int poc, int @@ -105,7 +103,7 @@ index 3646b3ce4ea0..e5d240d97792 100644 } diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c new file mode 100644 -index 000000000000..7d53c28e954e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c @@ -0,0 +1,680 @@ @@ -790,7 +788,7 @@ index 000000000000..7d53c28e954e + .get_image_fmt = rkvdec_hevc_get_image_fmt, +}; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c -index ad8ab9d37add..1e263f6d73b8 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -526,6 +526,22 @@ static const struct rkvdec_coded_fmt_desc vdpu383_coded_fmts[] = { @@ -930,7 +928,7 @@ index ad8ab9d37add..1e263f6d73b8 100644 static const struct of_device_id of_rkvdec_match[] = { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h -index 33cd3406b5ea..aa77b6f69d62 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -125,6 +125,7 @@ struct rkvdec_config { @@ -949,5 +947,5 @@ index 33cd3406b5ea..aa77b6f69d62 100644 #endif /* RKVDEC_H_ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch index 588d6dfabb7e..fc1129383435 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch @@ -1,8 +1,8 @@ -From e188edc9095f85bf1b31fef871b71fa2ed215d0c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 28 Jul 2025 22:52:42 +0300 -Subject: [PATCH 079/108] FROMLIST(v1): phy: rockchip: samsung-hdptx: Fix - reported clock rate in high bpc mode +Subject: phy: rockchip: samsung-hdptx: Fix reported clock rate in high bpc + mode When making use of the clock provider functionality, the output clock does normally match the TMDS character rate, which is what the PHY PLL @@ -22,11 +22,11 @@ Fixes: 9d0ec51d7c22 ("phy: rockchip: samsung-hdptx: Add high color depth managem Reported-by: Andy Yan Signed-off-by: Cristian Ciocaltea --- - drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 14 ++++++++------ + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 14 ++++++---- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 79db57ee90d1..8adf6e84fc0b 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -1038,7 +1038,8 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx) @@ -66,5 +66,5 @@ index 79db57ee90d1..8adf6e84fc0b 100644 /* -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch index 87fe4e9981a2..095eb7718264 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch @@ -1,8 +1,7 @@ -From 72423228c09903350f4fffb49725a6974e708d63 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 5 Jun 2025 20:09:27 +0300 -Subject: [PATCH 080/108] FROMLIST(v1): phy: rockchip: samsung-hdptx: Reduce - ROPLL loop bandwidth +Subject: phy: rockchip: samsung-hdptx: Reduce ROPLL loop bandwidth Due to its relatively low frequency, a noise stemming from the 24MHz PLL reference clock may traverse the low-pass loop filter of ROPLL, which @@ -19,7 +18,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 8adf6e84fc0b..9751f7ad00f4 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -500,9 +500,7 @@ static const struct reg_sequence rk_hdtpx_common_cmn_init_seq[] = { @@ -42,5 +41,5 @@ index 8adf6e84fc0b..9751f7ad00f4 100644 REG_SEQ0(CMN_REG(005c), 0x25), REG_SEQ0(CMN_REG(005e), 0x4f), -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch index 47bededcdc57..6ac608c99368 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch @@ -1,8 +1,8 @@ -From 3b9abe6ec5bea5ccedaec0b955704a2f6401b717 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 5 Jun 2025 22:33:29 +0300 -Subject: [PATCH 081/108] FROMLIST(v1): phy: rockchip: samsung-hdptx: Prevent - Inter-Pair Skew from exceeding the limits +Subject: phy: rockchip: samsung-hdptx: Prevent Inter-Pair Skew from exceeding + the limits Fixup PHY deskew FIFO to prevent the phase of D2 lane going ahead of other lanes. It's worth noting this might only happen when dealing with @@ -17,7 +17,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 9751f7ad00f4..5605610465bc 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -668,13 +668,9 @@ static const struct reg_sequence rk_hdtpx_common_lane_init_seq[] = { @@ -47,5 +47,5 @@ index 9751f7ad00f4..5605610465bc 100644 static struct tx_drv_ctrl tx_drv_ctrl_rbr[4][4] = { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch index a61f716332d8..41fb58e8dc16 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch @@ -1,8 +1,7 @@ -From 37d415b4ca7709e66a731960de178d2b8f037238 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 30 May 2025 00:56:48 +0300 -Subject: [PATCH 082/108] FROMLIST(v4): phy: hdmi: Add HDMI 2.1 FRL - configuration options +Subject: FROMLIST(v4): phy: hdmi: Add HDMI 2.1 FRL configuration options The HDMI 2.1 specification introduced the Fixed Rate Link (FRL) mode, aiming to replace the older Transition-Minimized Differential Signaling @@ -19,11 +18,11 @@ Add support for configuring the FRL mode for HDMI PHYs. Signed-off-by: Cristian Ciocaltea --- - include/linux/phy/phy-hdmi.h | 19 +++++++++++++++++-- + include/linux/phy/phy-hdmi.h | 19 +++++++++- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/include/linux/phy/phy-hdmi.h b/include/linux/phy/phy-hdmi.h -index f0ec963c6e84..d4cf4430ee8f 100644 +index 111111111111..222222222222 100644 --- a/include/linux/phy/phy-hdmi.h +++ b/include/linux/phy/phy-hdmi.h @@ -6,16 +6,31 @@ @@ -61,5 +60,5 @@ index f0ec963c6e84..d4cf4430ee8f 100644 #endif /* __PHY_HDMI_H_ */ -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch index 378c9def5aed..72d9e90f73f6 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch @@ -1,8 +1,8 @@ -From 619a6bd21c5e9614436d0c10593c69f2459f3593 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 28 May 2025 13:21:49 +0300 -Subject: [PATCH 083/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Use - usleep_range() instead of udelay() +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Use usleep_range() + instead of udelay() rk_hdptx_dp_reset() is allowed to sleep, hence replace the busy waiting with usleep_range(), to allow other threads to run. @@ -13,7 +13,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 5605610465bc..83ec892bd676 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -1075,7 +1075,7 @@ static void rk_hdptx_dp_reset(struct rk_hdptx_phy *hdptx) @@ -26,5 +26,5 @@ index 5605610465bc..83ec892bd676 100644 regmap_update_bits(hdptx->regmap, LANE_REG(0301), -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch index d8f357446569..d3980750bf4f 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch @@ -1,8 +1,8 @@ -From 0b918f0ad444ecd4724ff9cdc3012c5e0b9a46aa Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 28 May 2025 13:35:01 +0300 -Subject: [PATCH 084/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Fix - coding style alignment +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Fix coding style + alignment Handle a bunch of reported checkpatch.pl complaints: @@ -10,11 +10,11 @@ Handle a bunch of reported checkpatch.pl complaints: Signed-off-by: Cristian Ciocaltea --- - drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 12 ++++++------ + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 12 +++++----- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 83ec892bd676..495427fc44b3 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -1657,11 +1657,11 @@ static void rk_hdptx_phy_set_voltage(struct rk_hdptx_phy *hdptx, @@ -60,5 +60,5 @@ index 83ec892bd676..495427fc44b3 100644 LN_TX_SER_40BIT_EN_HBR2_MASK, FIELD_PREP(LN_TX_SER_40BIT_EN_HBR2_MASK, 0x1)); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch index 6522e0dd7336..94e254da5c5b 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch @@ -1,8 +1,8 @@ -From 4791689329ad6f2825579aa8a175bc0ea9d5be9a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 4 Jun 2025 12:03:11 +0300 -Subject: [PATCH 085/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: - Consistently use [rk_]hdptx_[tmds_] prefixes +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Consistently use + [rk_]hdptx_[tmds_] prefixes Fix the naming inconsistencies for some of the functions and global variables: @@ -13,11 +13,11 @@ variables: Signed-off-by: Cristian Ciocaltea --- - .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 62 +++++++++---------- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 62 +++++----- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 495427fc44b3..f2202b1195e7 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -32,17 +32,17 @@ @@ -222,5 +222,5 @@ index 495427fc44b3..f2202b1195e7 100644 static const struct clk_ops hdptx_phy_clk_ops = { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch index 98f434fa1cc9..738980dc8a2f 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch @@ -1,8 +1,8 @@ -From 5b006eeec285767ac34a21e70e186833d21a1a21 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 4 Jun 2025 10:25:49 +0300 -Subject: [PATCH 086/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Enable - lane output in common helper +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Enable lane output in + common helper In preparation to support FRL mode, move the PHY lane output enablement from the TMDS specific configuration to the common *_post_enable_lane() @@ -14,7 +14,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index f2202b1195e7..3bb4ce993088 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -830,6 +830,8 @@ static int rk_hdptx_post_enable_lane(struct rk_hdptx_phy *hdptx) @@ -43,5 +43,5 @@ index f2202b1195e7..3bb4ce993088 100644 rk_hdptx_multi_reg_write(hdptx, rk_hdptx_common_lane_init_seq); rk_hdptx_multi_reg_write(hdptx, rk_hdptx_tmds_lane_init_seq); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch index da3ca90d9205..d8db01c05646 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch @@ -1,8 +1,8 @@ -From b0bb97f5d92761409c626b98ebe9e1ff5d9788ef Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 5 Jun 2025 21:31:22 +0300 -Subject: [PATCH 087/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Cleanup - *_cmn_init_seq lists +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Cleanup *_cmn_init_seq + lists Drop redundant reg_sequence entries from rk_hdptx_common_cmn_init_seq[], i.e. those that are either duplicated or overridden in @@ -16,11 +16,11 @@ No functional changes intended at this point. Signed-off-by: Cristian Ciocaltea --- - .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 22 ++++--------------- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 22 ++-------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 3bb4ce993088..699b86732b8d 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -465,13 +465,11 @@ static const struct reg_sequence rk_hdptx_common_cmn_init_seq[] = { @@ -111,5 +111,5 @@ index 3bb4ce993088..699b86732b8d 100644 REG_SEQ0(CMN_REG(0089), 0x00), REG_SEQ0(CMN_REG(0095), 0x00), -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch index f4723aae937e..0f8718f6bb50 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch @@ -1,8 +1,8 @@ -From 28365add3cd89ed89b26368df2adca48fa9bdd3c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 6 Jun 2025 18:18:23 +0300 -Subject: [PATCH 088/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Compute - clk rate from PLL config +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Compute clk rate from PLL + config Improve ->recalc_rate() callback of hdptx_phy_clk_ops to calculate the initial clock rate based on the actual PHY PLL configuration as @@ -10,11 +10,11 @@ retrieved from the related hardware registers. Signed-off-by: Cristian Ciocaltea --- - .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 91 ++++++++++++++++++- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 91 +++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 699b86732b8d..6e2443f78968 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -1851,12 +1851,101 @@ static void rk_hdptx_phy_clk_unprepare(struct clk_hw *hw) @@ -121,5 +121,5 @@ index 699b86732b8d..6e2443f78968 100644 static long rk_hdptx_phy_clk_round_rate(struct clk_hw *hw, unsigned long rate, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch index 63ea9c338950..22cc4c327cc5 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch @@ -1,8 +1,7 @@ -From bbbde68b59ec0489a6d6f011ce90b104bbc0c782 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 1 Aug 2025 17:10:15 +0300 -Subject: [PATCH 089/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Drop - hw_rate driver data +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Drop hw_rate driver data The ->hw_rate member of struct rk_hdptx_phy was mainly used to keep track of the clock rate programmed in hardware and support implementing @@ -13,11 +12,11 @@ work reliably, hence remove the now redundant struct member. Signed-off-by: Cristian Ciocaltea --- - drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 13 ++----------- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 13 ++-------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 6e2443f78968..4195387108d8 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -401,7 +401,6 @@ struct rk_hdptx_phy { @@ -62,5 +61,5 @@ index 6e2443f78968..4195387108d8 100644 if (ret || !(status & HDPTX_I_PLL_EN)) return 0; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch index 0186e3baa2a7..09167326ebba 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch @@ -1,8 +1,8 @@ -From 2389df2772d3d3eacf1bb853567bec0516e14e36 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 7 Jul 2025 23:23:52 +0300 -Subject: [PATCH 090/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Switch to - driver specific HDMI config +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Switch to driver specific + HDMI config In preparation to support the FRL operation mode which gets configured via the lanes and rate per lane tuple, switch to a driver specific @@ -15,11 +15,11 @@ operating in FRL mode. Signed-off-by: Cristian Ciocaltea --- - .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 44 +++++++++++-------- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 44 ++++++---- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 4195387108d8..a44614bc73e9 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -387,6 +387,11 @@ struct rk_hdptx_phy_cfg { @@ -167,5 +167,5 @@ index 4195387108d8..a44614bc73e9 100644 /* -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch index a265c1b767bf..08d32df40634 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch @@ -1,7 +1,7 @@ -From f3e898eab91001240ab1e3b3c9a0bea18db959fd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Tue, 8 Jul 2025 12:19:37 +0300 -Subject: [PATCH 091/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Extend +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Extend rk_hdptx_phy_verify_hdmi_config() helper In order to facilitate introduction of HDMI 2.1 FRL support and to avoid @@ -14,11 +14,11 @@ parameter. Signed-off-by: Cristian Ciocaltea --- - .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 35 ++++++++++--------- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 35 +++++----- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index a44614bc73e9..58eac67cc3b2 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -1472,25 +1472,24 @@ static int rk_hdptx_phy_power_off(struct phy *phy) @@ -112,5 +112,5 @@ index a44614bc73e9..58eac67cc3b2 100644 /* -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch index f28e5a04851d..eedf9e334913 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch @@ -1,8 +1,7 @@ -From 2927cd7f8d3dfa8180a55c1bb394250e8472f3ab Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 30 May 2025 00:58:26 +0300 -Subject: [PATCH 092/108] FROMLIST(v4): phy: rockchip: samsung-hdptx: Add HDMI - 2.1 FRL support +Subject: FROMLIST(v4): phy: rockchip: samsung-hdptx: Add HDMI 2.1 FRL support The PHY is capable of handling four HDMI 2.1 Fixed Rate Link (FRL) lanes, and each one can operate at any of the rates of 3Gbps, 6Gbps, @@ -14,11 +13,11 @@ Co-developed-by: Algea Cao Signed-off-by: Algea Cao Signed-off-by: Cristian Ciocaltea --- - .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 459 +++++++++++++++++- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 459 +++++++++- 1 file changed, 436 insertions(+), 23 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 58eac67cc3b2..bb8738e42b01 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -22,6 +22,7 @@ @@ -665,5 +664,5 @@ index 58eac67cc3b2..bb8738e42b01 100644 static const struct clk_ops hdptx_phy_clk_ops = { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch index ff4a7fb7278c..e1bb97565011 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch @@ -1,7 +1,7 @@ -From 8edd688a06834f43c9b7f1698cfe4fc57f2ff54a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Tue, 19 Aug 2025 11:21:35 +0300 -Subject: [PATCH 093/108] FROMLIST(v1): drm: Add CRTC background color property +Subject: drm: Add CRTC background color property Some display controllers can be hardware programmed to show non-black colors for pixels that are either not covered by any plane or are @@ -24,17 +24,17 @@ Signed-off-by: Matt Roper Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/drm_atomic_state_helper.c | 1 + - drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ - drivers/gpu/drm/drm_blend.c | 37 ++++++++++++++++++++--- - drivers/gpu/drm/drm_mode_config.c | 6 ++++ - include/drm/drm_blend.h | 4 ++- - include/drm/drm_crtc.h | 12 ++++++++ - include/drm/drm_mode_config.h | 5 +++ - include/uapi/drm/drm_mode.h | 36 ++++++++++++++++++++++ + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_blend.c | 37 +++++++++- + drivers/gpu/drm/drm_mode_config.c | 6 ++ + include/drm/drm_blend.h | 4 +- + include/drm/drm_crtc.h | 12 +++ + include/drm/drm_mode_config.h | 5 ++ + include/uapi/drm/drm_mode.h | 36 +++++++++ 8 files changed, 100 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c -index 7142e163e618..fc93ef6eebc4 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -75,6 +75,7 @@ __drm_atomic_helper_crtc_state_reset(struct drm_crtc_state *crtc_state, @@ -46,7 +46,7 @@ index 7142e163e618..fc93ef6eebc4 100644 EXPORT_SYMBOL(__drm_atomic_helper_crtc_state_reset); diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c -index ecc73d52bfae..1d6693e9a268 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -407,6 +407,8 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, @@ -68,7 +68,7 @@ index ecc73d52bfae..1d6693e9a268 100644 *val = 0; else if (property == crtc->scaling_filter_property) diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c -index 6852d73c931c..3af042f087c2 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/drm_blend.c +++ b/drivers/gpu/drm/drm_blend.c @@ -191,10 +191,6 @@ @@ -127,7 +127,7 @@ index 6852d73c931c..3af042f087c2 100644 +} +EXPORT_SYMBOL(drm_crtc_attach_background_color_property); diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c -index 25f376869b3a..6d70bfab45ca 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -375,6 +375,12 @@ static int drm_mode_create_standard_properties(struct drm_device *dev) @@ -144,7 +144,7 @@ index 25f376869b3a..6d70bfab45ca 100644 DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, "IN_FORMATS", 0); diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h -index 88bdfec3bd88..c7e888767c81 100644 +index 111111111111..222222222222 100644 --- a/include/drm/drm_blend.h +++ b/include/drm/drm_blend.h @@ -31,8 +31,9 @@ @@ -165,7 +165,7 @@ index 88bdfec3bd88..c7e888767c81 100644 +void drm_crtc_attach_background_color_property(struct drm_crtc *crtc); #endif diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h -index caa56e039da2..cd769f0726ef 100644 +index 111111111111..222222222222 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -274,6 +274,18 @@ struct drm_crtc_state { @@ -188,7 +188,7 @@ index caa56e039da2..cd769f0726ef 100644 * @target_vblank: * diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h -index 2e848b816218..ea422afec5c4 100644 +index 111111111111..222222222222 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -814,6 +814,11 @@ struct drm_mode_config { @@ -204,7 +204,7 @@ index 2e848b816218..ea422afec5c4 100644 /** * @suggested_x_property: Optional connector property with a hint for diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h -index c082810c08a8..be117fecb654 100644 +index 111111111111..222222222222 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -1355,6 +1355,42 @@ struct drm_mode_closefb { @@ -251,5 +251,5 @@ index c082810c08a8..be117fecb654 100644 } #endif -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch index 9ea161994e3f..e567fa96df5c 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch @@ -1,8 +1,7 @@ -From 97c862211e36128d84364a4a0cc76645e2a351d1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 15 Aug 2025 18:36:54 +0300 -Subject: [PATCH 094/108] FROMLIST(v1): drm/rockchip: vop2: Support setting - custom background color +Subject: drm/rockchip: vop2: Support setting custom background color VOP2 allows configuring the background color of each video output port. @@ -16,12 +15,12 @@ controller. Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 13 ++++++++++++- - drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 4 ++++ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 13 +++++++++- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 4 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -index 977ccbf16344..565bd060fe5a 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1548,6 +1548,7 @@ static void vop2_post_config(struct drm_crtc *crtc) @@ -66,7 +65,7 @@ index 977ccbf16344..565bd060fe5a 100644 if (vop2->lut_regs) { const struct vop2_video_port_data *vp_data = &vop2_data->vp[vp->id]; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h -index fa5c56f16047..596558adc120 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h @@ -659,6 +659,10 @@ enum dst_factor_mode { @@ -81,5 +80,5 @@ index fa5c56f16047..596558adc120 100644 #define RK3568_VP_POST_SCL_CTRL__HSCALEDOWN BIT(0) -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch index 094eabe1adac..56f1fe466468 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch @@ -1,7 +1,7 @@ -From e6bf6df2c65f1ab644f2c7e4fa2cae88f675d1f6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 10 Jan 2025 22:48:01 +0200 -Subject: [PATCH 095/108] [WIP-SCRAMB] drm/bridge: Add ->detect_ctx() hook +Subject: [WIP-SCRAMB] drm/bridge: Add ->detect_ctx() hook Add a ->detect() variant that also provides a drm_modeset_acquire_ctx reference for greater flexibility in operation, e.g. to support adding @@ -17,7 +17,7 @@ Signed-off-by: Cristian Ciocaltea 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c -index 4bde00083047..9d74ef28b6ad 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -1244,6 +1244,9 @@ drm_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector) @@ -31,7 +31,7 @@ index 4bde00083047..9d74ef28b6ad 100644 } EXPORT_SYMBOL_GPL(drm_bridge_detect); diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h -index b0e6653ee42e..ca52f9fce7ed 100644 +index 111111111111..222222222222 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -663,6 +663,13 @@ struct drm_bridge_funcs { @@ -49,5 +49,5 @@ index b0e6653ee42e..ca52f9fce7ed 100644 * @get_modes: * -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch index 49f94d286600..d5c13634defa 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch @@ -1,8 +1,8 @@ -From 1bcc6e8cccb0206ba43da361f51d30c38874065d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 10 Jan 2025 23:04:23 +0200 -Subject: [PATCH 096/108] [WIP-SCRAMB] drm/bridge-connector: Switch from - ->detect() to ->detect_ctx() +Subject: [WIP-SCRAMB] drm/bridge-connector: Switch from ->detect() to + ->detect_ctx() In preparation to provide scrambling support to the HDMI Connector framework, make use of the more flexible ->detect_ctx() bridge connector @@ -10,11 +10,11 @@ helper hook instead of ->detect(). Signed-off-by: Cristian Ciocaltea --- - .../gpu/drm/display/drm_bridge_connector.c | 77 ++++++++++--------- + drivers/gpu/drm/display/drm_bridge_connector.c | 77 +++++----- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c -index 5eb7e9bfe361..908029d93516 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -200,39 +200,6 @@ static void drm_bridge_connector_disable_hpd(struct drm_connector *connector) @@ -130,5 +130,5 @@ index 5eb7e9bfe361..908029d93516 100644 .enable_hpd = drm_bridge_connector_enable_hpd, .disable_hpd = drm_bridge_connector_disable_hpd, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch index 710c3ba08ede..373f34f206e1 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch @@ -1,8 +1,8 @@ -From 305c4919507121e097dc5e3845997119d157a122 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Fri, 13 Sep 2024 17:30:35 +0300 -Subject: [PATCH 097/108] [WIP-SCRAMB] drm/bridge: dw-hdmi-qp: Add high TMDS - clock ratio and scrambling support +Subject: [WIP-SCRAMB] drm/bridge: dw-hdmi-qp: Add high TMDS clock ratio and + scrambling support Enable use of HDMI 2.0 display modes, e.g. 4K@60Hz, by permitting TMDS character rates above the 340 MHz limit of HDMI 1.4b. @@ -14,11 +14,11 @@ Additionally, filter out HDMI 2.1 display modes. Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 214 ++++++++++++++++++- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 214 +++++++++- 1 file changed, 203 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -index 54377ba3a607..16736bcf26e1 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -20,6 +20,7 @@ @@ -323,5 +323,5 @@ index 54377ba3a607..16736bcf26e1 100644 regs = devm_platform_ioremap_resource(pdev, 0); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch index 53fff7ee9695..029fb12cc846 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch @@ -1,20 +1,19 @@ -From 9032e47657fb721baec689a428d9f1746d983d92 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 4 Dec 2024 13:26:13 +0200 -Subject: [PATCH 098/108] [WIP-YUV420] drm/rockchip: vop2: Add YUV420 output - format support +Subject: [WIP-YUV420] drm/rockchip: vop2: Add YUV420 output format support TODO: proper colorspace conversion handling Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 + - drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 43 ++++++++++++++++++++ - drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 3 ++ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 43 ++++++++++ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 3 + 3 files changed, 48 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -index c183e82a42a5..36417c86da2d 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -57,6 +57,8 @@ struct rockchip_crtc_state { @@ -27,7 +26,7 @@ index c183e82a42a5..36417c86da2d 100644 * Rockchip drm private structure. * diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -index 565bd060fe5a..3987be9fdec3 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -655,6 +655,39 @@ static void vop2_setup_scale(struct vop2 *vop2, const struct vop2_win *win, @@ -95,7 +94,7 @@ index 565bd060fe5a..3987be9fdec3 100644 static int us_to_vertical_line(struct drm_display_mode *mode, int us) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h -index 596558adc120..27cd4a573b57 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h @@ -666,6 +666,9 @@ enum dst_factor_mode { @@ -109,5 +108,5 @@ index 596558adc120..27cd4a573b57 100644 #define RK3568_SYS_DSP_INFACE_EN_LVDS1 BIT(24) #define RK3568_SYS_DSP_INFACE_EN_MIPI1_MUX GENMASK(22, 21) -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch index c31ada312c79..6103b82130c8 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch @@ -1,19 +1,19 @@ -From 60c2ed834b282e0fdaef4f3bb1c2266dfeaf6f59 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Wed, 4 Dec 2024 14:09:35 +0200 -Subject: [PATCH 099/108] [WIP-YUV420] drm/rockchip: dw_hdmi_qp: Add YUV420 - output format support +Subject: [WIP-YUV420] drm/rockchip: dw_hdmi_qp: Add YUV420 output format + support Program the necessary bridge registers to allow using the YUV420 color format. Signed-off-by: Cristian Ciocaltea --- - .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 28 ++++++++++++++++++- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 28 +++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index 81f106ac7b56..75a0ea019ede 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -10,6 +10,8 @@ @@ -89,5 +89,5 @@ index 81f106ac7b56..75a0ea019ede 100644 encoder = &hdmi->encoder.encoder; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch index 55c94fb64219..d9d0ffcbc349 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch @@ -1,8 +1,8 @@ -From 390e4d53e0d0eb9875fe5f3c5754f70003680d50 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 29 May 2025 19:15:40 +0300 -Subject: [PATCH 100/108] [WIP-FRL] dt-bindings: display: rockchip: Add - tmds-enable-gpios property to rk3588-dw-hdmi-qp +Subject: [WIP-FRL] dt-bindings: display: rockchip: Add tmds-enable-gpios + property to rk3588-dw-hdmi-qp Add an optional property to RK3588 HDMI TX Controller binding describing a GPIO line to be asserted when operating in HDMI 1.4/2.0 TMDS mode and @@ -12,11 +12,11 @@ This is used to control an external level shifter for HDMI data lines. Signed-off-by: Cristian Ciocaltea --- - .../display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 10 ++++++++++ + Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml -index 96b4b088eebe..eec0d40c91ea 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml @@ -113,6 +113,13 @@ properties: @@ -53,5 +53,5 @@ index 96b4b088eebe..eec0d40c91ea 100644 ports { #address-cells = <1>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch index 0804a73d9430..1b2d4d5d11d2 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch @@ -1,8 +1,8 @@ -From f0e4a4ddcfabe86c58bdb0ab37492ff7c224a13a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 29 May 2025 19:50:25 +0300 -Subject: [PATCH 101/108] [WIP-FRL] drm/rockchip: dw_hdmi_qp: Fixup usage of - enable_gpio member in main struct +Subject: [WIP-FRL] drm/rockchip: dw_hdmi_qp: Fixup usage of enable_gpio member + in main struct The name of the enable_gpio member in struct rockchip_hdmi_qp is too generic, as initially "borrowed" from downstream BSP code. Moreover, @@ -20,11 +20,11 @@ devm_gpiod_get_optional() and rename the struct member accordingly. Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 14 +++++++------- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 14 +++++----- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index 75a0ea019ede..c18c0a9bf06c 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -96,7 +96,7 @@ struct rockchip_hdmi_qp { @@ -63,5 +63,5 @@ index 75a0ea019ede..c18c0a9bf06c 100644 hdmi->phy = devm_of_phy_get_by_index(dev, dev->of_node, 0); if (IS_ERR(hdmi->phy)) -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch index b69440f3cd9f..65c65dbf9480 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch @@ -1,8 +1,8 @@ -From 64347702316aadcff64bf18bd8f12d284752619d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 29 May 2025 19:31:51 +0300 -Subject: [PATCH 102/108] [WIP-FRL] arm64: dts: rockchip: Add tmds-enable-gpios - to rk3588-rock-5b +Subject: [WIP-FRL] arm64: dts: rockchip: Add tmds-enable-gpios to + rk3588-rock-5b In preparation to support HDMI 2.1 FRL operating mode, make use of the GPIO4_B1 and GPIO4_A1 lines (labeled HDMI0_TX_ON_H & HDMI1_TX_ON_H in @@ -18,7 +18,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi -index 612808d2b4c5..bd07021e9cc3 100644 +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 @@ -170,6 +170,7 @@ &gpu { @@ -38,5 +38,5 @@ index 612808d2b4c5..bd07021e9cc3 100644 }; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch index 17c56090c1d0..3958c3a5ee26 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch @@ -1,8 +1,7 @@ -From d77ca8c2a3dbf2a6e9fe19c6e32220e41c771e2e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Tue, 8 Jul 2025 20:12:00 +0300 -Subject: [PATCH 103/108] [WIP-FRL] arm64: dts: rockchip: Assign ACLK_VOP to - 750 MHz on rk3588 +Subject: [WIP-FRL] arm64: dts: rockchip: Assign ACLK_VOP to 750 MHz on rk3588 In preparation to support HDMI 2.1 display modes on RK3588, e.g. 4K@120Hz, increase ACLK_VOP from the default 500 MHz to 750 MHz. @@ -23,7 +22,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -index 3bd1b5e3b101..d4d66e456069 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -1436,6 +1436,8 @@ vop: vop@fdd90000 { @@ -36,5 +35,5 @@ index 3bd1b5e3b101..d4d66e456069 100644 <&cru HCLK_VOP>, <&cru DCLK_VOP0>, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch index fde9c4b1b643..2879ce65944f 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch @@ -1,8 +1,7 @@ -From af71d660b54edde6ae30380e5c378e60f68b3ce8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 3 Jul 2025 12:47:17 +0300 -Subject: [PATCH 104/108] [WIP-FRL] drm/connector: hdmi: Handle FRL in - hdmi_clock_valid() +Subject: [WIP-FRL] drm/connector: hdmi: Handle FRL in hdmi_clock_valid() Do not limit clock validation to max_tmds_clock if the sink advertises FRL support. @@ -15,7 +14,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c -index a561f124be99..0608443985f1 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -535,7 +535,9 @@ hdmi_clock_valid(const struct drm_connector *connector, @@ -30,5 +29,5 @@ index a561f124be99..0608443985f1 100644 if (funcs && funcs->tmds_char_rate_valid) { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch index 12a932f3673f..859426b9ba17 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch @@ -1,8 +1,7 @@ -From c9e07e82566586e8d4b15cf28c0b985afaaaea88 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 3 Jul 2025 12:42:38 +0300 -Subject: [PATCH 105/108] [WIP-FRL] drm/bridge: dw-hdmi-qp: Add HDMI 2.1 FRL - support +Subject: [WIP-FRL] drm/bridge: dw-hdmi-qp: Add HDMI 2.1 FRL support Implement the link training state machine required to support HDMI 2.1 FRL display modes. @@ -15,12 +14,12 @@ is the actual hardware limitation. Signed-off-by: Cristian Ciocaltea --- - drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 582 ++++++++++++++++++- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 582 +++++++++- include/drm/bridge/dw_hdmi_qp.h | 11 + 2 files changed, 577 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -index 16736bcf26e1..cbd97b1b15e7 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -41,9 +41,26 @@ @@ -706,7 +705,7 @@ index 16736bcf26e1..cbd97b1b15e7 100644 hdmi->dev = dev; diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h -index 3f461f6b9bbf..f2560dd5b510 100644 +index 111111111111..222222222222 100644 --- a/include/drm/bridge/dw_hdmi_qp.h +++ b/include/drm/bridge/dw_hdmi_qp.h @@ -7,16 +7,27 @@ @@ -738,5 +737,5 @@ index 3f461f6b9bbf..f2560dd5b510 100644 struct dw_hdmi_qp_plat_data { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch index 00068a804fd8..96e0f885718d 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch @@ -1,8 +1,7 @@ -From 10a7b19d103e899d0019d04b509d3862c0fb9f29 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 3 Jul 2025 12:44:04 +0300 -Subject: [PATCH 106/108] [WIP-FRL] drm/rockchip: dw_hdmi_qp: Add HDMI 2.1 FRL - support +Subject: [WIP-FRL] drm/rockchip: dw_hdmi_qp: Add HDMI 2.1 FRL support Extend ->enc_init() hooks of {rk3576,rk3588}_hdmi_ctrl_ops to enable HDMI 2.1 FRL operation mode. @@ -12,11 +11,11 @@ configuration when switching between TMDS and FRL. Signed-off-by: Cristian Ciocaltea --- - .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 243 ++++++++++++++++-- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 243 ++++++++-- 1 file changed, 215 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index c18c0a9bf06c..69e9a76d4656 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -64,12 +64,17 @@ @@ -365,5 +364,5 @@ index c18c0a9bf06c..69e9a76d4656 100644 val = HIWORD_UPDATE(FIELD_PREP(RK3588_COLOR_DEPTH_MASK, RK3588_10BPC), RK3588_COLOR_DEPTH_MASK); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch index a71f2df88196..e0692f8bbd59 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch @@ -1,8 +1,7 @@ -From 0da627d4a92eb13f93cd8af89cf6daf33d4671c5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Thu, 19 Jun 2025 23:57:01 +0300 -Subject: [PATCH 107/108] [WIP-FRL] drm/rockchip: vop2: Add HDMI 2.1 FRL - support +Subject: [WIP-FRL] drm/rockchip: vop2: Add HDMI 2.1 FRL support TODO: this has been "borrowed" from downstream code, although it might not really be required. @@ -13,7 +12,7 @@ Signed-off-by: Cristian Ciocaltea 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c -index 5a3d8c834ca9..74b6275da45d 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -1578,6 +1578,15 @@ static unsigned long rk3588_calc_cru_cfg(struct vop2_video_port *vp, int id, @@ -33,5 +32,5 @@ index 5a3d8c834ca9..74b6275da45d 100644 /* * edp_pixclk = edp_dclk > dclk_core -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch index 6a2279a75fdc..875281b127bc 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch +++ b/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch @@ -1,8 +1,7 @@ -From d1726bef24dda956d6247c2a853b984ddd6ca62b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Tue, 10 Dec 2024 21:56:10 +0300 -Subject: [PATCH 108/108] WIP: arm64: dts: rockchip: add pcie wifi support to - OrangePi-5b +Subject: WIP: arm64: dts: rockchip: add pcie wifi support to OrangePi-5b Add the PCIe nodes to OrangePi-5b to allow the OrangePi AP6275P WiFi module to work. @@ -10,11 +9,11 @@ AP6275P WiFi module to work. Signed-off-by: Muhammed Efe Cetin Signed-off-by: Christian Hewitt --- - .../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 33 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts | 33 ++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts -index d21ec320d295..56e191ea8457 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts @@ -12,6 +12,39 @@ aliases { @@ -58,5 +57,5 @@ index d21ec320d295..56e191ea8457 100644 &sdhci { -- -2.34.1 +Armbian