qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rockchip64: rewrite patches

This commit is contained in:
Werner 2025-06-24 17:35:41 +02:00 committed by Igor
parent b27c86e620
commit dbe1b2bf4f
26 changed files with 107 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patch/kernel/archive/rockchip64-6.16/board-nanopi-m4v2-dts-add-sound-card.patch
View File

@ -169,7 +169,7 @@ diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 111111111111..222222222222 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -65,6 +65,15 @@ config SND_SOC_ROCKCHIP_RT5645
@@ -75,6 +75,15 @@ config SND_SOC_ROCKCHIP_RT5645
Say Y or M here if you want to add support for SoC audio on Rockchip
boards using the RT5645/RT5650 codec, such as Veyron.

14
patch/kernel/archive/rockchip64-6.16/board-nanopi-r3s-fix-leds.patch
View File

@ -123,7 +123,7 @@ index 111111111111..222222222222 100644
#include <linux/tcp.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
@@ -2438,6 +2439,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
@@ -2375,6 +2376,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
}
}
@ -139,7 +139,7 @@ index 111111111111..222222222222 100644
static void rtl8168_config_eee_mac(struct rtl8169_private *tp)
{
/* Adjust EEE LED frequency */
@@ -3449,6 +3459,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
@@ -3392,6 +3402,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
rtl8168_config_eee_mac(tp);
@ -151,8 +151,8 @@ diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/re
index 111111111111..222222222222 100644
--- a/drivers/net/phy/realtek/realtek_main.c
+++ b/drivers/net/phy/realtek/realtek_main.c
@@ -135,6 +135,15 @@ static int rtl821x_write_page(struct phy_device *phydev, int page)
return __phy_write(phydev, RTL821x_PAGE_SELECT, page);
@@ -215,6 +215,15 @@ static int rtl821x_modify_ext_page(struct phy_device *phydev, u16 ext_page,
return phy_restore_page(phydev, oldpage, ret);
}
+static void rtl821x_led_of_init(struct phy_device *phydev)
@ -167,15 +167,15 @@ index 111111111111..222222222222 100644
static int rtl821x_probe(struct phy_device *phydev)
{
struct device *dev = &phydev->mdio.dev;
@@ -460,6 +469,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
@@ -589,6 +598,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
if (ret)
return ret;
+ rtl821x_led_of_init(phydev);
+
if (priv->has_phycr2) {
ret = phy_modify_paged(phydev, 0xa43, RTL8211F_PHYCR2,
RTL8211F_CLKOUT_EN, priv->phycr2);
ret = phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE,
RTL8211F_PHYCR2, RTL8211F_CLKOUT_EN,
--
Armbian

28
patch/kernel/archive/rockchip64-6.16/board-pbp-add-dp-alt-mode.patch
View File

@ -157,7 +157,7 @@ index 111111111111..222222222222 100644
break;
case DP_STATE_EXIT_PRIME:
if (typec_cable_altmode_exit(dp->plug_prime, TYPEC_PLUG_SOP_P))
@@ -733,8 +775,14 @@ int dp_altmode_probe(struct typec_altmode *alt)
@@ -737,8 +779,14 @@ int dp_altmode_probe(struct typec_altmode *alt)
if (!(DP_CAP_PIN_ASSIGN_DFP_D(port->vdo) &
DP_CAP_PIN_ASSIGN_UFP_D(alt->vdo)) &&
!(DP_CAP_PIN_ASSIGN_UFP_D(port->vdo) &
@ -186,7 +186,7 @@ index 111111111111..222222222222 100644
#include <linux/hrtimer.h>
#include <linux/jiffies.h>
#include <linux/kernel.h>
@@ -575,6 +576,11 @@ struct tcpm_port {
@@ -580,6 +581,11 @@ struct tcpm_port {
unsigned int message_id_prime;
unsigned int rx_msgid_prime;
@ -198,7 +198,7 @@ index 111111111111..222222222222 100644
/* Timer deadline values configured at runtime */
struct pd_timings timings;
@@ -968,6 +974,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
@@ -983,6 +989,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
port->ams = NONE_AMS;
}
@ -234,7 +234,7 @@ index 111111111111..222222222222 100644
static int tcpm_pd_transmit(struct tcpm_port *port,
enum tcpm_transmit_type tx_sop_type,
const struct pd_message *msg)
@@ -1207,6 +1242,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
@@ -1222,6 +1257,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached, int state,
typec_set_data_role(port->typec_port, data);
typec_set_pwr_role(port->typec_port, role);
@ -243,7 +243,7 @@ index 111111111111..222222222222 100644
return 0;
}
@@ -1780,7 +1817,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
@@ -1845,7 +1882,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
paltmode->mode = i;
paltmode->vdo = p[i];
@ -252,7 +252,7 @@ index 111111111111..222222222222 100644
pmdata->altmodes, paltmode->svid,
paltmode->mode, paltmode->vdo);
@@ -1804,6 +1841,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
@@ -1869,6 +1906,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
tcpm_log(port, "Failed to register partner SVID 0x%04x",
modep->altmode_desc[i].svid);
altmode = NULL;
@ -261,7 +261,7 @@ index 111111111111..222222222222 100644
}
port->partner_altmode[i] = altmode;
}
@@ -2180,11 +2219,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
@@ -2245,11 +2284,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
modep->svid_index++;
if (modep->svid_index < modep->nsvids) {
u16 svid = modep->svids[modep->svid_index];
@ -275,7 +275,7 @@ index 111111111111..222222222222 100644
*response_tx_sop_type = TCPC_TX_SOP_PRIME;
response[0] = VDO(USB_SID_PD, 1,
typec_get_cable_svdm_version(typec),
@@ -4413,6 +4454,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
@@ -4471,6 +4512,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
port->cable = NULL;
if (port->connected) {
if (port->partner) {
@ -283,7 +283,7 @@ index 111111111111..222222222222 100644
typec_partner_set_usb_power_delivery(port->partner, NULL);
typec_unregister_partner(port->partner);
port->partner = NULL;
@@ -4507,6 +4549,8 @@ static void tcpm_detach(struct tcpm_port *port)
@@ -4565,6 +4607,8 @@ static void tcpm_detach(struct tcpm_port *port)
}
tcpm_reset_port(port);
@ -292,7 +292,7 @@ index 111111111111..222222222222 100644
}
static void tcpm_src_detach(struct tcpm_port *port)
@@ -7164,6 +7208,64 @@ static void tcpm_fw_get_timings(struct tcpm_port *port, struct fwnode_handle *fw
@@ -7274,6 +7318,64 @@ static void tcpm_fw_get_timings(struct tcpm_port *port, struct fwnode_handle *fw
port->timings.snk_bc12_cmpletion_time = val;
}
@ -356,8 +356,8 @@ index 111111111111..222222222222 100644
+
static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode)
{
struct fwnode_handle *capabilities, *child, *caps = NULL;
@@ -7177,6 +7279,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
struct fwnode_handle *capabilities, *caps = NULL;
@@ -7287,6 +7389,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
if (!fwnode)
return -EINVAL;
@ -381,7 +381,7 @@ index 111111111111..222222222222 100644
/*
* This fwnode has a "compatible" property, but is never populated as a
* struct device. Instead we simply parse it to read the properties.
@@ -7748,6 +7867,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
@@ -7856,6 +7975,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
tcpm_fw_get_pd_revision(port, tcpc->fwnode);
port->try_role = port->typec_caps.prefer_role;
@ -399,7 +399,7 @@ index 111111111111..222222222222 100644
port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */
@@ -7797,6 +7927,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
@@ -7905,6 +8035,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
&tcpm_cable_ops);
port->registered = true;

11
patch/kernel/archive/rockchip64-6.16/board-rockpro64-fix-spi1-flash-speed.patch
View File

@ -9,12 +9,10 @@ See Revision ea20f750bfead37ced7b604a44f8f014e317abad
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
index 14cdf715535e..0b4bdb555f65 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -850,11 +850,11 @@ &spi1 {
status = "okay";
@@ -852,7 +852,7 @@ &spi1 {
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
@ -23,7 +21,6 @@ index 14cdf715535e..0b4bdb555f65 100644
vcc-supply = <&vcc_3v0>;
};
};
&tcphy0 {
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

12
patch/kernel/archive/rockchip64-6.16/board-rocks0.patch
View File

@ -1,17 +1,17 @@
From b6bb3bd96fa150019d6f6a6adb602359596ce361 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sat, 5 Apr 2025 17:59:02 +0200
Subject: [PATCH] Add some missing nodes in rk3308-rock-so device tree
Subject: Add some missing nodes in rk3308-rock-so device tree
This is the consolidation of these two legacy patches:
* https://github.com/paolosabatino/armbian-build/blob/935149d2822cd2a2c63891ca6614563f5538b706/patch/kernel/archive/rockchip64-6.12/board-rocks0-0001-deviceTree.patch
* https://github.com/paolosabatino/armbian-build/blob/935149d2822cd2a2c63891ca6614563f5538b706/patch/kernel/archive/rockchip64-6.12/board-rocks0-0002-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch
---
.../boot/dts/rockchip/rk3308-rock-s0.dts | 76 ++++++++++++++++++-
1 file changed, 74 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 79 +++++++---
1 file changed, 61 insertions(+), 18 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
index 8311af4c8689..ea4b063cb7bd 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
@@ -34,6 +34,34 @@ led-green {
@ -143,5 +143,5 @@ index 8311af4c8689..ea4b063cb7bd 100644
};
--
2.43.0
Armbian

2
patch/kernel/archive/rockchip64-6.16/general-add-panel-simple-dsi.patch
View File

@ -65,7 +65,7 @@ diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o
@@ -12,6 +12,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o
obj-$(CONFIG_DRM_PANEL_DSI_CM) += panel-dsi-cm.o
obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o
obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o

6
patch/kernel/archive/rockchip64-6.16/general-cryptov1-trng.patch
View File

@ -18,7 +18,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -700,6 +700,14 @@ config CRYPTO_DEV_ROCKCHIP
@@ -694,6 +694,14 @@ config CRYPTO_DEV_ROCKCHIP
This driver interfaces with the hardware crypto accelerator.
Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.
@ -163,7 +163,7 @@ diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rock
index 111111111111..222222222222 100644
--- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c
+++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
@@ -296,6 +296,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
@@ -298,6 +298,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
goto theend;
}
@ -171,7 +171,7 @@ index 111111111111..222222222222 100644
rk_ahash_reg_init(areq, rkc);
while (sg) {
@@ -330,6 +331,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
@@ -332,6 +333,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
}
theend:

2
patch/kernel/archive/rockchip64-6.16/general-disable-mtu-validation.patch
View File

@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
index 111111111111..222222222222 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5921,27 +5921,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
@@ -5934,27 +5934,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
{
struct stmmac_priv *priv = netdev_priv(dev);

24
patch/kernel/archive/rockchip64-6.16/general-driver-tm16xx-led-driver.patch
View File

@ -1,20 +1,18 @@
From 1f6c39c03f03b131f49d7d4631b1cda6c1f336e0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sat, 21 Jun 2025 15:07:40 +0200
Subject: [PATCH] Add tm16xx led auxiliary display driver
Subject: Add tm16xx led auxiliary display driver
---
.../bindings/auxdisplay/tm16xx.yaml | 150 +++
drivers/auxdisplay/Kconfig | 10 +
drivers/auxdisplay/Makefile | 1 +
drivers/auxdisplay/tm16xx.c | 1187 +++++++++++++++++
Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml | 150 ++
drivers/auxdisplay/Kconfig | 10 +
drivers/auxdisplay/Makefile | 1 +
drivers/auxdisplay/tm16xx.c | 1187 ++++++++++
4 files changed, 1348 insertions(+)
create mode 100644 Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml
create mode 100644 drivers/auxdisplay/tm16xx.c
diff --git a/Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml b/Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml
new file mode 100644
index 000000000000..f3d411f4f4a0
index 000000000000..111111111111
--- /dev/null
+++ b/Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml
@@ -0,0 +1,150 @@
@ -169,7 +167,7 @@ index 000000000000..f3d411f4f4a0
+ };
+ };
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index bedc6133f970..4e4bb1a2b131 100644
index 111111111111..222222222222 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -49,6 +49,16 @@ config HD44780
@ -190,7 +188,7 @@ index bedc6133f970..4e4bb1a2b131 100644
tristate "lcd2s 20x4 character display over I2C console"
depends on I2C
diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile
index f5c13ed1cd4f..066f452b1e26 100644
index 111111111111..222222222222 100644
--- a/drivers/auxdisplay/Makefile
+++ b/drivers/auxdisplay/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_CHARLCD) += charlcd.o
@ -203,7 +201,7 @@ index f5c13ed1cd4f..066f452b1e26 100644
obj-$(CONFIG_LCD2S) += lcd2s.o
diff --git a/drivers/auxdisplay/tm16xx.c b/drivers/auxdisplay/tm16xx.c
new file mode 100644
index 000000000000..72c4031f20d1
index 000000000000..111111111111
--- /dev/null
+++ b/drivers/auxdisplay/tm16xx.c
@@ -0,0 +1,1187 @@
@ -1395,5 +1393,5 @@ index 000000000000..72c4031f20d1
+MODULE_ALIAS("spi:tm16xx");
+MODULE_ALIAS("i2c:tm16xx");
--
2.43.0
Armbian

15
patch/kernel/archive/rockchip64-6.16/general-rockchip-overlays.patch
View File

@ -12,22 +12,19 @@ Signed-off-by: Werner <werner@armbian.com>
1 file changed, 3 insertions(+)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index a6461ea411f7..33d4f5e86db0 100644
index 111111111111..222222222222 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -105,10 +105,13 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
# userprogs-always-y is likewise.
@@ -107,6 +107,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
userprogs += $(userprogs-always-y) $(userprogs-always-m)
always-y += $(userprogs-always-y) $(userprogs-always-m)
+# Overlay targets
+extra-y += $(dtbo-y) $(scr-y) $(dtbotxt-y)
+
# Add subdir path
ifneq ($(obj),.)
extra-y := $(addprefix $(obj)/, $(extra-y))
always-y := $(addprefix $(obj)/, $(always-y))
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

4
patch/kernel/archive/rockchip64-6.16/general-st7796-driver.patch
View File

@ -13,7 +13,7 @@ diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/staging/fbtft/Kconfig
+++ b/drivers/staging/fbtft/Kconfig
@@ -80,6 +80,12 @@ config FB_TFT_ILI9481
@@ -70,6 +70,12 @@ config FB_TFT_ILI9481
help
Generic Framebuffer support for ILI9481
@ -25,7 +25,7 @@ index 111111111111..222222222222 100644
+
config FB_TFT_ILI9486
tristate "FB driver for the ILI9486 LCD Controller"
depends on FB_TFT
help
diff --git a/drivers/staging/fbtft/Makefile b/drivers/staging/fbtft/Makefile
index 111111111111..222222222222 100644
--- a/drivers/staging/fbtft/Makefile

2
patch/kernel/archive/rockchip64-6.16/general-v4l2-iep-driver.patch
View File

@ -155,7 +155,7 @@ diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
@@ -993,14 +993,25 @@ crypto: crypto@ff8a0000 {
@@ -990,14 +990,25 @@ crypto: crypto@ff8a0000 {
reset-names = "crypto-rst";
};

20
patch/kernel/archive/rockchip64-6.16/general-v4l2-rkvdec-01-vp9.patch
View File

@ -13,7 +13,7 @@ diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvde
index 111111111111..222222222222 100644
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -1128,9 +1128,9 @@ static void rkvdec_remove(struct platform_device *pdev)
@@ -1176,9 +1176,9 @@ static void rkvdec_remove(struct platform_device *pdev)
cancel_delayed_work_sync(&rkvdec->watchdog_work);
@ -51,7 +51,7 @@ diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/
index 111111111111..222222222222 100644
--- a/drivers/pmdomain/rockchip/pm-domains.c
+++ b/drivers/pmdomain/rockchip/pm-domains.c
@@ -399,6 +399,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
@@ -417,6 +417,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
return 0;
}
@ -221,7 +221,7 @@ index 111111111111..222222222222 100644
#include <linux/slab.h>
#include <linux/videodev2.h>
#include <linux/workqueue.h>
@@ -718,6 +721,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx,
@@ -766,6 +769,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx,
pm_runtime_mark_last_busy(rkvdec->dev);
pm_runtime_put_autosuspend(rkvdec->dev);
@ -233,7 +233,7 @@ index 111111111111..222222222222 100644
rkvdec_job_finish_no_pm(ctx, result);
}
@@ -755,6 +763,33 @@ static void rkvdec_device_run(void *priv)
@@ -803,6 +811,33 @@ static void rkvdec_device_run(void *priv)
if (WARN_ON(!desc))
return;
@ -267,7 +267,7 @@ index 111111111111..222222222222 100644
ret = pm_runtime_resume_and_get(rkvdec->dev);
if (ret < 0) {
@@ -1021,6 +1056,11 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
@@ -1069,6 +1104,11 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
if (cancel_delayed_work(&rkvdec->watchdog_work)) {
struct rkvdec_ctx *ctx;
@ -279,7 +279,7 @@ index 111111111111..222222222222 100644
ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
rkvdec_job_finish(ctx, state);
}
@@ -1038,6 +1078,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
@@ -1086,6 +1126,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
if (ctx) {
dev_err(rkvdec->dev, "Frame processing timed out!\n");
@ -287,7 +287,7 @@ index 111111111111..222222222222 100644
writel(RKVDEC_IRQ_DIS, rkvdec->regs + RKVDEC_REG_INTERRUPT);
writel(0, rkvdec->regs + RKVDEC_REG_SYSCTRL);
rkvdec_job_finish(ctx, VB2_BUF_STATE_ERROR);
@@ -1106,6 +1147,18 @@ static int rkvdec_probe(struct platform_device *pdev)
@@ -1154,6 +1195,18 @@ static int rkvdec_probe(struct platform_device *pdev)
return ret;
}
@ -336,7 +336,7 @@ index 111111111111..222222222222 100644
struct rkvdec_ctx;
struct rkvdec_ctrl_desc {
@@ -96,6 +103,8 @@ struct rkvdec_dev {
@@ -110,6 +117,8 @@ struct rkvdec_dev {
void __iomem *regs;
struct mutex vdev_lock; /* serializes ioctls */
struct delayed_work watchdog_work;
@ -374,7 +374,7 @@ index 111111111111..222222222222 100644
#define RK3588_ACLK_MAX_FREQ (300 * 1000 * 1000)
#define ROCKCHIP_VPU981_MIN_SIZE 64
@@ -447,13 +448,20 @@ static int rk3588_vpu981_hw_init(struct hantro_dev *vpu)
@@ -461,13 +462,20 @@ static int rk3588_vpu981_hw_init(struct hantro_dev *vpu)
return 0;
}
@ -396,7 +396,7 @@ index 111111111111..222222222222 100644
static void rk3066_vpu_dec_reset(struct hantro_ctx *ctx)
{
struct hantro_dev *vpu = ctx->dev;
@@ -709,7 +717,7 @@ const struct hantro_variant rk3288_vpu_variant = {
@@ -723,7 +731,7 @@ const struct hantro_variant rk3288_vpu_variant = {
.codec_ops = rk3288_vpu_codec_ops,
.irqs = rockchip_vpu1_irqs,
.num_irqs = ARRAY_SIZE(rockchip_vpu1_irqs),

4
patch/kernel/archive/rockchip64-6.16/media-0001-Add-rkvdec2-Support-v3.patch
View File

@ -3679,7 +3679,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -2973,6 +2973,16 @@ system_sram2: sram@ff001000 {
@@ -3093,6 +3093,16 @@ system_sram2: sram@ff001000 {
ranges = <0x0 0x0 0xff001000 0xef000>;
#address-cells = <1>;
#size-cells = <1>;
@ -3696,7 +3696,7 @@ index 111111111111..222222222222 100644
};
pinctrl: pinctrl {
@@ -3042,6 +3052,46 @@ gpio4: gpio@fec50000 {
@@ -3162,6 +3172,46 @@ gpio4: gpio@fec50000 {
#interrupt-cells = <2>;
};
};

6
patch/kernel/archive/rockchip64-6.16/media-0003-rk3568-disable-hantro-h264.patch
View File

@ -20,7 +20,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1137,7 +1137,7 @@ power-domain@RK3588_PD_SDMMC {
@@ -1141,7 +1141,7 @@ power-domain@RK3588_PD_SDMMC {
};
vpu121: video-codec@fdb50000 {
@ -57,7 +57,7 @@ diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/medi
index 111111111111..222222222222 100644
--- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
+++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
@@ -726,10 +726,9 @@ const struct hantro_variant rk3288_vpu_variant = {
@@ -740,10 +740,9 @@ const struct hantro_variant rk3288_vpu_variant = {
const struct hantro_variant rk3328_vpu_variant = {
.dec_offset = 0x400,
@ -71,7 +71,7 @@ index 111111111111..222222222222 100644
.codec_ops = rk3399_vpu_codec_ops,
.irqs = rockchip_vdpu2_irqs,
.num_irqs = ARRAY_SIZE(rockchip_vdpu2_irqs),
@@ -773,20 +772,6 @@ const struct hantro_variant rk3568_vepu_variant = {
@@ -787,20 +786,6 @@ const struct hantro_variant rk3568_vepu_variant = {
.num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names)
};

8
patch/kernel/archive/rockchip64-6.16/net-usb-r8152-add-LED-configuration-from-OF.patch
View File

@ -24,7 +24,7 @@ index 111111111111..222222222222 100644
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -7047,6 +7048,22 @@ static void rtl_tally_reset(struct r8152 *tp)
@@ -7017,6 +7018,22 @@ static void rtl_tally_reset(struct r8152 *tp)
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
}
@ -47,7 +47,7 @@ index 111111111111..222222222222 100644
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -7088,6 +7105,8 @@ static void r8152b_init(struct r8152 *tp)
@@ -7058,6 +7075,8 @@ static void r8152b_init(struct r8152 *tp)
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@ -56,7 +56,7 @@ index 111111111111..222222222222 100644
}
static void r8153_init(struct r8152 *tp)
@@ -7228,6 +7247,8 @@ static void r8153_init(struct r8152 *tp)
@@ -7198,6 +7217,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
@ -65,7 +65,7 @@ index 111111111111..222222222222 100644
}
static void r8153b_init(struct r8152 *tp)
@@ -7310,6 +7331,8 @@ static void r8153b_init(struct r8152 *tp)
@@ -7280,6 +7301,8 @@ static void r8153b_init(struct r8152 *tp)
rtl_tally_reset(tp);
tp->coalesce = 15000; /* 15 us */

6
patch/kernel/archive/rockchip64-6.16/regulator-add-fan53200-driver.patch
View File

@ -24,7 +24,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 111111111111..222222222222 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -786,6 +786,7 @@ CONFIG_REGULATOR_BD9571MWV=y
@@ -792,6 +792,7 @@ CONFIG_REGULATOR_BD9571MWV=y
CONFIG_REGULATOR_CROS_EC=y
CONFIG_REGULATOR_DA9211=m
CONFIG_REGULATOR_FAN53555=y
@ -36,7 +36,7 @@ diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -421,6 +421,17 @@ config REGULATOR_FAN53880
@@ -432,6 +432,17 @@ config REGULATOR_FAN53880
(PMIC), it is controlled by I2C and provides one BUCK, one BOOST
and four LDO outputs.
@ -58,7 +58,7 @@ diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 111111111111..222222222222 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
@@ -51,6 +51,7 @@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o
obj-$(CONFIG_REGULATOR_FAN53880) += fan53880.o

2
patch/kernel/archive/rockchip64-6.16/rk3328-add-dmc-driver.patch
View File

@ -588,7 +588,7 @@ diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
index 111111111111..222222222222 100644
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@ -600,7 +600,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.
*/

4
patch/kernel/archive/rockchip64-6.16/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
View File

@ -20,7 +20,7 @@ diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/adm
index 111111111111..222222222222 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4924,6 +4924,14 @@
@@ -4959,6 +4959,14 @@
nomsi Do not use MSI for native PCIe PME signaling (this makes
all PCIe root ports use INTx for all services).
@ -110,7 +110,7 @@ diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pci
index 111111111111..222222222222 100644
--- a/drivers/pci/controller/pcie-rockchip.h
+++ b/drivers/pci/controller/pcie-rockchip.h
@@ -350,6 +350,8 @@ struct rockchip_pcie {
@@ -351,6 +351,8 @@ struct rockchip_pcie {
phys_addr_t msg_bus_addr;
bool is_rc;
struct resource *mem_res;

10
patch/kernel/archive/rockchip64-6.16/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch
View File

@ -8,12 +8,10 @@ Subject: arm64: dts: rock-5b: Slow down emmc freq and add tsadc node
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
index 6052787d2560..3bfdf495415c 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
@@ -495,10 +495,11 @@ &saradc {
&sdhci {
bus-width = <8>;
@@ -497,6 +497,7 @@ &sdhci {
no-sdio;
no-sd;
non-removable;
@ -21,8 +19,6 @@ index 6052787d2560..3bfdf495415c 100644
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
status = "okay";
};
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

40
patch/kernel/archive/rockchip64-6.16/rk3588-1040-board-khadas-edge2-add-nodes.patch
View File

@ -9,12 +9,10 @@ Signed-off-by: John Doe <john.doe@somewhere.on.planet>
1 file changed, 119 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
index 4d55e4e31a86..5c5984f9d41f 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -5,10 +5,11 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
@@ -7,6 +7,7 @@
#include <dt-bindings/pinctrl/rockchip.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/soc/rockchip,vop2.h>
@ -22,11 +20,7 @@ index 4d55e4e31a86..5c5984f9d41f 100644
#include "rk3588s.dtsi"
/ {
model = "Khadas Edge2";
compatible = "khadas,edge2", "rockchip,rk3588s";
@@ -86,10 +87,22 @@ blue_led: led-2 {
max-brightness = <255>;
pwms = <&pwm15 0 25000 0>;
@@ -88,6 +89,18 @@ blue_led: led-2 {
};
};
@ -45,11 +39,7 @@ index 4d55e4e31a86..5c5984f9d41f 100644
vcc3v3_pcie_wl: regulator-vcc3v3-pcie-wl {
compatible = "regulator-fixed";
enable-active-high;
gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
@@ -262,10 +275,61 @@ regulator-state-mem {
};
@@ -264,6 +277,57 @@ regulator-state-mem {
&i2c2 {
status = "okay";
@ -107,11 +97,7 @@ index 4d55e4e31a86..5c5984f9d41f 100644
hym8563: rtc@51 {
compatible = "haoyu,hym8563";
reg = <0x51>;
#clock-cells = <0>;
clock-output-names = "hym8563";
@@ -365,10 +429,20 @@ usb {
vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -304,6 +368,16 @@ vcc5v0_host_en: vcc5v0-host-en {
};
};
@ -128,11 +114,7 @@ index 4d55e4e31a86..5c5984f9d41f 100644
ir-receiver {
ir_receiver_pin: ir-receiver-pin {
rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -822,10 +896,18 @@ bluetooth {
vbat-supply = <&vcc_3v3_s3>;
vddio-supply = <&vcc_1v8_s3>;
@@ -761,6 +835,14 @@ bluetooth {
};
};
@ -147,11 +129,7 @@ index 4d55e4e31a86..5c5984f9d41f 100644
&u2phy2 {
status = "okay";
};
&u2phy2_host {
@@ -848,10 +930,47 @@ &usb_host0_ehci {
&usb_host0_ohci {
@@ -787,6 +869,43 @@ &usb_host0_ohci {
status = "okay";
};
@ -195,8 +173,6 @@ index 4d55e4e31a86..5c5984f9d41f 100644
&usb_host1_ehci {
status = "okay";
};
&usb_host1_ohci {
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

6
patch/kernel/archive/rockchip64-6.16/rk3588-1041-board-khadas-edge2-mcu.patch
View File

@ -343,7 +343,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -326,6 +326,13 @@ hym8563: rtc@51 {
@@ -335,6 +335,13 @@ hym8563: rtc@51 {
clock-output-names = "hym8563";
wakeup-source;
};
@ -356,7 +356,7 @@ index 111111111111..222222222222 100644
+ };
};
&pd_gpu {
&i2s5_8ch {
--
Armbian
@ -373,7 +373,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -339,6 +339,62 @@ &pd_gpu {
@@ -352,6 +352,62 @@ &pd_gpu {
domain-supply = <&vdd_gpu_s0>;
};

6
patch/kernel/archive/rockchip64-6.16/rk3588-1051-board-nanopc-t6-fan-support.patch
View File

@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -78,6 +78,14 @@ usr_led: led-1 {
@@ -89,6 +89,14 @@ usr_led: led-1 {
};
};
@ -27,8 +27,8 @@ index 111111111111..222222222222 100644
sound {
compatible = "simple-audio-card";
pinctrl-names = "default";
@@ -531,6 +539,34 @@ i2s0_8ch_p0_0: endpoint {
};
@@ -580,6 +588,34 @@ &i2s6_8ch {
status = "okay";
};
+&package_thermal {

8
patch/kernel/archive/rockchip64-6.16/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch
View File

@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -1060,6 +1060,7 @@ &u2phy0 {
@@ -1109,6 +1109,7 @@ &u2phy0 {
};
&u2phy0_otg {
@ -20,13 +20,13 @@ index 111111111111..222222222222 100644
status = "okay";
};
@@ -1125,6 +1126,7 @@ &usb_host0_ohci {
@@ -1185,6 +1186,7 @@ usb_host0_xhci_drd_sw: endpoint {
&usb_host0_xhci {
&usb_host1_xhci {
dr_mode = "host";
+ extcon = <&u2phy0>;
status = "okay";
usb-role-switch;
};
--
Armbian

2
patch/kernel/archive/rockchip64-6.16/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch
View File

@ -15,7 +15,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -404,6 +404,17 @@ &hdmi1_sound {
@@ -399,6 +399,17 @@ &hdmi1_sound {
status = "okay";
};

6
patch/kernel/archive/rockchip64-6.16/rk35xx-montjoie-crypto-v2-rk35xx.patch
View File

@ -102,8 +102,8 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1973,6 +1973,18 @@ rng@fe378000 {
resets = <&scmi_reset 48>;
@@ -2061,6 +2061,18 @@ rng@fe378000 {
resets = <&scmi_reset SCMI_SRST_H_TRNG_NS>;
};
+ crypto: crypto@fe370000 {
@ -345,7 +345,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -726,6 +726,35 @@ config CRYPTO_DEV_TEGRA
@@ -720,6 +720,35 @@ config CRYPTO_DEV_TEGRA
Select this to enable Tegra Security Engine which accelerates various
AES encryption/decryption and HASH algorithms.