rk3318-box: rewrite u-boot patches against v2024.07-rc5

2024-07-07 00:11:29 +02:00 · 2024-07-07 00:11:29 +02:00 · f60b3bbfe2
commit f60b3bbfe2
parent 07084b64b7
7 changed files with 339 additions and 143 deletions
--- a/patch/u-boot/v2024.07/board_rk3318-box/general-support-rmii-integrated-phy.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/general-support-rmii-integrated-phy.patch
@ -1,8 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo <paolo.sabatino@gmail.com>
+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 <paolo.sabatino@gmail.com>
+> 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 <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: Many changes for rk322x target:
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision c0c099e78cc4a4536c38b7b070d24cd814ab9d9e: https://github.com/armbian/build/commit/c0c099e78cc4a4536c38b7b070d24cd814ab9d9e
+> X-Git-Archeology:   Date: Sun, 17 Jan 2021 11:23:47 +0000
+> X-Git-Archeology:   From: paolo <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: Added support for rk3328 FE gmac in u-boot, useful for stable ethernet MAC address
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
+> X-Git-Archeology:   Date: Tue, 26 Oct 2021 22:14:41 +0200
+> X-Git-Archeology:   From: Piotr Szczepanik <piter75@gmail.com>
+> X-Git-Archeology:   Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0: https://github.com/armbian/build/commit/71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0
+> X-Git-Archeology:   Date: Thu, 11 Nov 2021 23:49:52 +0100
+> X-Git-Archeology:   From: Piotr Szczepanik <piter75@gmail.com>
+> X-Git-Archeology:   Subject: Switched rockchip64 u-boot to v2021.07 (#3233)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7bc069d68138a13a3de2388450289f2622c75fce: https://github.com/armbian/build/commit/7bc069d68138a13a3de2388450289f2622c75fce
+> X-Git-Archeology:   Date: Mon, 22 Apr 2024 12:39:09 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: move rockchip patches into rk3318_box directory
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision efee17f217e58a93e795c165e303bfd0a2a0a32a: https://github.com/armbian/build/commit/efee17f217e58a93e795c165e303bfd0a2a0a32a
+> X-Git-Archeology:   Date: Mon, 22 Apr 2024 12:39:09 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: rockchip64: bump rk3318-box uboot to v2024.01
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928
+> X-Git-Archeology:   Date: Tue, 02 Jul 2024 23:31:50 +0000
+> X-Git-Archeology:   From: Paolo <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855)
+> X-Git-Archeology:
+---
+ arch/arm/dts/rk3229-evb.dts                     |  32 +-
+ arch/arm/dts/rk322x.dtsi                        |   8 +-
+ arch/arm/include/asm/arch-rockchip/cru_rk322x.h |   1 +
+ configs/evb-rk3229_defconfig                    |   2 +
+ configs/evb-rk3328_defconfig                    |   2 +
+ doc/device-tree-bindings/net/phy.txt            |  13 +
+ drivers/clk/rockchip/clk_rk322x.c               |  14 +-
+ drivers/clk/rockchip/clk_rk3328.c               |  86 +++
+ drivers/net/gmac_rockchip.c                     | 341 +++++++++-
+ 9 files changed, 453 insertions(+), 46 deletions(-)
+
 diff --git a/arch/arm/dts/rk3229-evb.dts b/arch/arm/dts/rk3229-evb.dts
-index 632cdc9bc3..f868524ae1 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/dts/rk3229-evb.dts
 +++ b/arch/arm/dts/rk3229-evb.dts
-@@ -50,19 +50,25 @@
+@@ -146,19 +146,25 @@
 };
 
 &gmac {
@ -40,12 +108,12 @@ index 632cdc9bc3..f868524ae1 100644
 +        };
 };
 
- &emmc {
+ &io_domains {
 diff --git a/arch/arm/dts/rk322x.dtsi b/arch/arm/dts/rk322x.dtsi
-index 4a8be5dabb..3c2861f271 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/dts/rk322x.dtsi
 +++ b/arch/arm/dts/rk322x.dtsi
-@@ -448,13 +448,13 @@
+@@ -870,13 +870,13 @@
 		clocks = <&cru SCLK_MAC>, <&cru SCLK_MAC_RX>,
 			<&cru SCLK_MAC_TX>, <&cru SCLK_MAC_REF>,
 			<&cru SCLK_MAC_REFOUT>, <&cru ACLK_GMAC>,
@ -64,10 +132,10 @@ index 4a8be5dabb..3c2861f271 100644
 		status = "disabled";
 	};
 diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
-index c87c830716..15039c87be 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
 +++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
-@@ -12,6 +12,7 @@
+@@ -10,6 +10,7 @@
 
 #define APLL_HZ		(600 * MHz)
 #define GPLL_HZ		(594 * MHz)
@ -76,10 +144,10 @@ index c87c830716..15039c87be 100644
 #define CORE_PERI_HZ	150000000
 #define CORE_ACLK_HZ	300000000
 diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
-index f8e648bbb4..5fd2bd3ba2 100644
+index 111111111111..222222222222 100644
 --- a/configs/evb-rk3229_defconfig
 +++ b/configs/evb-rk3229_defconfig
-@@ -58,6 +58,8 @@ CONFIG_GMAC_ROCKCHIP=y
+@@ -62,6 +62,8 @@ CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_RAM=y
@ -89,10 +157,10 @@ index f8e648bbb4..5fd2bd3ba2 100644
 CONFIG_TPL_RAM=y
 CONFIG_BAUDRATE=1500000
 diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
-index 5bbdc00214..19c09e4503 100644
+index 111111111111..222222222222 100644
 --- a/configs/evb-rk3328_defconfig
 +++ b/configs/evb-rk3328_defconfig
-@@ -71,6 +71,8 @@ CONFIG_DM_REGULATOR_FIXED=y
+@@ -75,6 +75,8 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
@ -100,9 +168,9 @@ index 5bbdc00214..19c09e4503 100644
 +CONFIG_RESET_ROCKCHIP=y
 CONFIG_SPL_RAM=y
 CONFIG_TPL_RAM=y
- CONFIG_BAUDRATE=1500000
+ CONFIG_DM_RNG=y
 diff --git a/doc/device-tree-bindings/net/phy.txt b/doc/device-tree-bindings/net/phy.txt
-index 6599c667b5..ca1a4a8526 100644
+index 111111111111..222222222222 100644
 --- a/doc/device-tree-bindings/net/phy.txt
 +++ b/doc/device-tree-bindings/net/phy.txt
@@ -8,6 +8,19 @@ Required properties:
@ -126,10 +194,10 @@ index 6599c667b5..ca1a4a8526 100644
 
 ethernet-phy@0 {
 diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
-index ef33adbf29..c427e0438b 100644
+index 111111111111..222222222222 100644
 --- a/drivers/clk/rockchip/clk_rk322x.c
 +++ b/drivers/clk/rockchip/clk_rk322x.c
-@@ -38,6 +38,7 @@ enum {
+@@ -42,6 +42,7 @@ enum {
 /* use integer mode*/
 static const struct pll_div apll_init_cfg = PLL_DIVISORS(APLL_HZ, 1, 3, 1);
 static const struct pll_div gpll_init_cfg = PLL_DIVISORS(GPLL_HZ, 2, 2, 1);
@ -137,7 +205,7 @@ index ef33adbf29..c427e0438b 100644
 
 static int rkclk_set_pll(struct rk322x_cru *cru, enum rk_clk_id clk_id,
 			 const struct pll_div *div)
-@@ -87,11 +88,13 @@ static void rkclk_init(struct rk322x_cru *cru)
+@@ -91,11 +92,13 @@ static void rkclk_init(struct rk322x_cru *cru)
 	rk_clrsetreg(&cru->cru_mode_con,
 		     GPLL_MODE_MASK | APLL_MODE_MASK,
 		     GPLL_MODE_SLOW << GPLL_MODE_SHIFT |
@ -152,7 +220,7 @@ index ef33adbf29..c427e0438b 100644
 
 	/*
 	 * select apll as cpu/core clock pll source and
-@@ -164,7 +167,8 @@ static void rkclk_init(struct rk322x_cru *cru)
+@@ -168,7 +171,8 @@ static void rkclk_init(struct rk322x_cru *cru)
 	rk_clrsetreg(&cru->cru_mode_con,
 		     GPLL_MODE_MASK | APLL_MODE_MASK,
 		     GPLL_MODE_NORM << GPLL_MODE_SHIFT |
@ -162,7 +230,7 @@ index ef33adbf29..c427e0438b 100644
 }
 
 /* Get pll rate by id */
-@@ -254,11 +258,10 @@ static ulong rk322x_mac_set_clk(struct rk322x_cru *cru, uint freq)
+@@ -258,11 +262,10 @@ static ulong rk322x_mac_set_clk(struct rk322x_cru *cru, uint freq)
 		ulong pll_rate;
 		u8 div;
 
@ -176,7 +244,7 @@ index ef33adbf29..c427e0438b 100644
 
 		div = DIV_ROUND_UP(pll_rate, freq) - 1;
 		if (div <= 0x1f)
-@@ -387,6 +390,7 @@ static ulong rk322x_clk_set_rate(struct clk *clk, ulong rate)
+@@ -391,6 +394,7 @@ static ulong rk322x_clk_set_rate(struct clk *clk, ulong rate)
 	case CLK_DDR:
 		new_rate = rk322x_ddr_set_clk(priv->cru, rate);
 		break;
@ -185,10 +253,10 @@ index ef33adbf29..c427e0438b 100644
 		new_rate = rk322x_mac_set_clk(priv->cru, rate);
 		break;
 diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
-index 8e867c58df..ba2b34c626 100644
+index 111111111111..222222222222 100644
 --- a/drivers/clk/rockchip/clk_rk3328.c
 +++ b/drivers/clk/rockchip/clk_rk3328.c
-@@ -93,6 +93,14 @@ enum {
+@@ -96,6 +96,14 @@ enum {
 	PCLK_DBG_DIV_SHIFT		= 0,
 	PCLK_DBG_DIV_MASK		= 0xF << PCLK_DBG_DIV_SHIFT,
 
@ -203,7 +271,7 @@ index 8e867c58df..ba2b34c626 100644
 	/* CLKSEL_CON27 */
 	GMAC2IO_PLL_SEL_SHIFT		= 7,
 	GMAC2IO_PLL_SEL_MASK		= 1 << GMAC2IO_PLL_SEL_SHIFT,
-@@ -440,6 +448,39 @@ static ulong rk3328_gmac2io_set_clk(struct rk3328_cru *cru, ulong rate)
+@@ -447,6 +455,39 @@ static ulong rk3328_gmac2io_set_clk(struct rk3328_cru *cru, ulong rate)
 	return ret;
 }
 
@ -243,7 +311,7 @@ index 8e867c58df..ba2b34c626 100644
 static ulong rk3328_mmc_get_clk(struct rk3328_cru *cru, uint clk_id)
 {
 	u32 div, con, con_id;
-@@ -608,6 +649,12 @@ static ulong rk3328_clk_set_rate(struct clk *clk, ulong rate)
+@@ -739,6 +780,12 @@ static ulong rk3328_clk_set_rate(struct clk *clk, ulong rate)
 	case SCLK_MAC2IO:
 		ret = rk3328_gmac2io_set_clk(priv->cru, rate);
 		break;
@ -256,7 +324,7 @@ index 8e867c58df..ba2b34c626 100644
 	case SCLK_PWM:
 		ret = rk3328_pwm_set_clk(priv->cru, rate);
 		break;
-@@ -728,6 +775,43 @@ static int rk3328_gmac2io_ext_set_parent(struct clk *clk, struct clk *parent)
+@@ -868,6 +915,43 @@ static int rk3328_gmac2io_ext_set_parent(struct clk *clk, struct clk *parent)
 	return -EINVAL;
 }
 
@ -300,37 +368,37 @@ index 8e867c58df..ba2b34c626 100644
 static int rk3328_clk_set_parent(struct clk *clk, struct clk *parent)
 {
 	switch (clk->id) {
-@@ -735,6 +819,8 @@ static int rk3328_clk_set_parent(struct clk *clk, struct clk *parent)
+@@ -875,6 +959,8 @@ static int rk3328_clk_set_parent(struct clk *clk, struct clk *parent)
 		return rk3328_gmac2io_set_parent(clk, parent);
 	case SCLK_MAC2IO_EXT:
 		return rk3328_gmac2io_ext_set_parent(clk, parent);
 +	case SCLK_MAC2PHY:
 +		return rk3328_gmac2phy_set_parent(clk, parent);
 	case DCLK_LCDC:
+ 	case USB480M:
 	case SCLK_PDM:
- 	case SCLK_RTC32K:
 diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
-index e152faf083..d3f6973043 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/gmac_rockchip.c
 +++ b/drivers/net/gmac_rockchip.c
-@@ -9,6 +9,7 @@
- #include <dm.h>
- #include <clk.h>
+@@ -11,6 +11,7 @@
+ #include <log.h>
+ #include <net.h>
 #include <phy.h>
 +#include <reset.h>
 #include <syscon.h>
 #include <asm/global_data.h>
- #include <asm/io.h>
-@@ -23,6 +24,8 @@
+ #include <asm/arch-rockchip/periph.h>
+@@ -25,6 +26,8 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/grf_rv1108.h>
 #include <dm/pinctrl.h>
 +#include <dm/of_access.h>
 +#include <linux/delay.h>
 #include <dt-bindings/clock/rk3288-cru.h>
+ #include <linux/bitops.h>
 #include "designware.h"
- 
-@@ -39,21 +41,29 @@ DECLARE_GLOBAL_DATA_PTR;
+@@ -42,21 +45,29 @@ DECLARE_GLOBAL_DATA_PTR;
 struct gmac_rockchip_plat {
 	struct dw_eth_pdata dw_eth_pdata;
 	bool clock_input;
@ -361,7 +429,7 @@ index e152faf083..d3f6973043 100644
 
 	string = dev_read_string(dev, "clock_in_out");
 	if (!strcmp(string, "input"))
-@@ -61,6 +71,25 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
+@@ -64,6 +75,25 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
 	else
 		pdata->clock_input = false;
 
@ -387,7 +455,7 @@ index e152faf083..d3f6973043 100644
 	/* Check the new naming-style first... */
 	pdata->tx_delay = dev_read_u32_default(dev, "tx_delay", -ENOENT);
 	pdata->rx_delay = dev_read_u32_default(dev, "rx_delay", -ENOENT);
-@@ -74,7 +103,8 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
+@@ -77,7 +107,8 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
 	return designware_eth_of_to_plat(dev);
 }
 
@ -397,7 +465,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct px30_grf *grf;
 	struct clk clk_speed;
-@@ -115,7 +145,43 @@ static int px30_gmac_fix_mac_speed(struct dw_eth_dev *priv)
+@@ -118,7 +149,43 @@ static int px30_gmac_fix_mac_speed(struct dw_eth_dev *priv)
 	return 0;
 }
 
@ -442,7 +510,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct rk322x_grf *grf;
 	int clk;
-@@ -148,7 +214,8 @@ static int rk3228_gmac_fix_mac_speed(struct dw_eth_dev *priv)
+@@ -151,7 +218,8 @@ static int rk3228_gmac_fix_mac_speed(struct dw_eth_dev *priv)
 	return 0;
 }
 
@ -452,7 +520,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct rk3288_grf *grf;
 	int clk;
-@@ -174,7 +241,8 @@ static int rk3288_gmac_fix_mac_speed(struct dw_eth_dev *priv)
+@@ -177,7 +245,8 @@ static int rk3288_gmac_fix_mac_speed(struct dw_eth_dev *priv)
 	return 0;
 }
 
@ -462,7 +530,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct rk3308_grf *grf;
 	struct clk clk_speed;
-@@ -215,7 +283,43 @@ static int rk3308_gmac_fix_mac_speed(struct dw_eth_dev *priv)
+@@ -218,7 +287,43 @@ static int rk3308_gmac_fix_mac_speed(struct dw_eth_dev *priv)
 	return 0;
 }
 
@ -507,7 +575,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct rk3328_grf_regs *grf;
 	int clk;
-@@ -248,7 +352,8 @@ static int rk3328_gmac_fix_mac_speed(struct dw_eth_dev *priv)
+@@ -251,7 +356,8 @@ static int rk3328_gmac_fix_mac_speed(struct dw_eth_dev *priv)
 	return 0;
 }
 
@ -517,7 +585,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct rk3368_grf *grf;
 	int clk;
-@@ -280,7 +385,8 @@ static int rk3368_gmac_fix_mac_speed(struct dw_eth_dev *priv)
+@@ -283,7 +389,8 @@ static int rk3368_gmac_fix_mac_speed(struct dw_eth_dev *priv)
 	return 0;
 }
 
@ -527,7 +595,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct rk3399_grf_regs *grf;
 	int clk;
-@@ -306,7 +412,8 @@ static int rk3399_gmac_fix_mac_speed(struct dw_eth_dev *priv)
+@@ -309,7 +416,8 @@ static int rk3399_gmac_fix_mac_speed(struct dw_eth_dev *priv)
 	return 0;
 }
 
@ -537,7 +605,7 @@ index e152faf083..d3f6973043 100644
 {
 	struct rv1108_grf *grf;
 	int clk, speed;
-@@ -357,6 +464,28 @@ static void px30_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
+@@ -360,6 +468,28 @@ static void px30_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
 		     PX30_GMAC_PHY_INTF_SEL_RMII);
 }
 
@ -566,7 +634,7 @@ index e152faf083..d3f6973043 100644
 static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
 {
 	struct rk322x_grf *grf;
-@@ -435,6 +564,25 @@ static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
+@@ -438,6 +568,25 @@ static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
 		     RK3308_GMAC_PHY_INTF_SEL_RMII);
 }
 
@ -592,7 +660,7 @@ index e152faf083..d3f6973043 100644
 static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
 {
 	struct rk3328_grf_regs *grf;
-@@ -550,6 +698,126 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
+@@ -553,6 +702,126 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
 		     RV1108_GMAC_PHY_INTF_SEL_RMII);
 }
 
@ -719,7 +787,7 @@ index e152faf083..d3f6973043 100644
 static int gmac_rockchip_probe(struct udevice *dev)
 {
 	struct gmac_rockchip_plat *pdata = dev_get_plat(dev);
-@@ -569,6 +837,9 @@ static int gmac_rockchip_probe(struct udevice *dev)
+@@ -572,6 +841,9 @@ static int gmac_rockchip_probe(struct udevice *dev)
 	if (ret)
 		return ret;
 
@ -729,7 +797,16 @@ index e152faf083..d3f6973043 100644
 	switch (eth_pdata->phy_interface) {
 	case PHY_INTERFACE_MODE_RGMII:
 		/* Set to RGMII mode */
-@@ -652,7 +923,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
+@@ -619,7 +891,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
+ 
+ 		if (!pdata->clock_input) {
+ 			rate = clk_set_rate(&clk, 50000000);
+-			if (rate != 50000000)
+			if (rate != 50000000 && rate != 49500000)
+ 				return -EINVAL;
+ 		}
+ 		break;
+@@ -655,7 +927,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
 		break;
 
 	default:
@ -738,7 +815,7 @@ index e152faf083..d3f6973043 100644
 		return -ENXIO;
 	}
 
-@@ -661,18 +932,33 @@ static int gmac_rockchip_probe(struct udevice *dev)
+@@ -664,18 +936,33 @@ static int gmac_rockchip_probe(struct udevice *dev)
 
 static int gmac_rockchip_eth_start(struct udevice *dev)
 {
@ -777,7 +854,7 @@ index e152faf083..d3f6973043 100644
 	ret = designware_eth_enable(priv);
 	if (ret)
 		return ret;
-@@ -690,42 +976,48 @@ const struct eth_ops gmac_rockchip_eth_ops = {
+@@ -693,42 +980,48 @@ const struct eth_ops gmac_rockchip_eth_ops = {
 };
 
 const struct rk_gmac_ops px30_gmac_ops = {
@ -834,16 +911,6 @@ index e152faf083..d3f6973043 100644
 	.set_to_rmii = rv1108_gmac_set_to_rmii,
 };
 
-diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
-index ae9fe9da..92514af1 100644
--- a/drivers/net/gmac_rockchip.c
-+++ b/drivers/net/gmac_rockchip.c
-@@ -891,7 +891,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
- 
- 		if (!pdata->clock_input) {
- 			rate = clk_set_rate(&clk, 50000000);
-			if (rate != 50000000)
-+			if (rate != 50000000 && rate != 49500000)
- 				return -EINVAL;
- 		}
- 		break;
+-- 
+Armbian
+
--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch
@ -1,6 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Oleg <balbes-150@yandex.ru>
+Date: Wed, 27 Oct 2021 18:56:02 +0200
+Subject: [ARCHEOLOGY] u-boot usb m1 (#3221)
+
+> X-Git-Archeology: - Revision 7789fef83f10954ab442401a86a0e5a166e5db55: https://github.com/armbian/build/commit/7789fef83f10954ab442401a86a0e5a166e5db55
+> X-Git-Archeology:   Date: Wed, 27 Oct 2021 18:56:02 +0200
+> X-Git-Archeology:   From: Oleg <balbes-150@yandex.ru>
+> X-Git-Archeology:   Subject: u-boot usb m1 (#3221)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision fd33c6545bbb4bf2383fc212dd305f3b09e47fac: https://github.com/armbian/build/commit/fd33c6545bbb4bf2383fc212dd305f3b09e47fac
+> X-Git-Archeology:   Date: Wed, 27 Oct 2021 20:28:50 +0200
+> X-Git-Archeology:   From: Piotr Szczepanik <piter75@gmail.com>
+> X-Git-Archeology:   Subject: Moved remaining u-boot rockchip64 mainline patches to new directory
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 2b431a49151f7bc1e0e593b4b1b4fea9dfefe229: https://github.com/armbian/build/commit/2b431a49151f7bc1e0e593b4b1b4fea9dfefe229
+> X-Git-Archeology:   Date: Thu, 16 Jun 2022 19:29:16 +0200
+> X-Git-Archeology:   From: Piotr Szczepanik <piter75@gmail.com>
+> X-Git-Archeology:   Subject: Adjust u-boot configs for Station M1 and Station P1 (#3900)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 2ca6a9381db4b875533926e0eae9d3d17f68ad06: https://github.com/armbian/build/commit/2ca6a9381db4b875533926e0eae9d3d17f68ad06
+> X-Git-Archeology:   Date: Thu, 23 Jun 2022 08:30:54 +0200
+> X-Git-Archeology:   From: Paolo <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: rockchip64: add rk3318-box tvbox board patch and configurations (#3921)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 4707e71e35ce43f35509ca65b1406d74d3e1c16f: https://github.com/armbian/build/commit/4707e71e35ce43f35509ca65b1406d74d3e1c16f
+> X-Git-Archeology:   Date: Sun, 26 Nov 2023 13:58:04 +0100
+> X-Git-Archeology:   From: Alex Shumsky <alexthreed@gmail.com>
+> X-Git-Archeology:   Subject: rk3318-box: Enable uboot BTRFS support
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision eec57ef6ce5837cf9a69b1ef03422a3ebeb9d556: https://github.com/armbian/build/commit/eec57ef6ce5837cf9a69b1ef03422a3ebeb9d556
+> X-Git-Archeology:   Date: Mon, 18 Dec 2023 10:03:17 +0100
+> X-Git-Archeology:   From: Alex Shumsky <alexthreed@gmail.com>
+> X-Git-Archeology:   Subject: rk3318: add uboot Recovery button support
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 6154b98851b93e868acfa0dc5e2a9abedfce2308: https://github.com/armbian/build/commit/6154b98851b93e868acfa0dc5e2a9abedfce2308
+> X-Git-Archeology:   Date: Fri, 23 Feb 2024 11:20:57 +0100
+> X-Git-Archeology:   From: Alex Shumsky <alexthreed@gmail.com>
+> X-Git-Archeology:   Subject: rk3318: enable uboot gpio command
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision efee17f217e58a93e795c165e303bfd0a2a0a32a: https://github.com/armbian/build/commit/efee17f217e58a93e795c165e303bfd0a2a0a32a
+> X-Git-Archeology:   Date: Mon, 22 Apr 2024 12:39:09 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: rockchip64: bump rk3318-box uboot to v2024.01
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision e127109e2dddb7ed48a9fef0b1b60fc8d064cff0: https://github.com/armbian/build/commit/e127109e2dddb7ed48a9fef0b1b60fc8d064cff0
+> X-Git-Archeology:   Date: Fri, 14 Jun 2024 00:35:08 +0200
+> X-Git-Archeology:   From: Alex Shumsky <alexthreed@gmail.com>
+> X-Git-Archeology:   Subject: rockchip64/rk3318-box: move stack further from base addr to allow bigger uboot image
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928
+> X-Git-Archeology:   Date: Tue, 02 Jul 2024 23:31:50 +0000
+> X-Git-Archeology:   From: Paolo <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855)
+> X-Git-Archeology:
+---
+ configs/rk3318-box_defconfig | 131 ++++++++++
+ 1 file changed, 131 insertions(+)
+
 diff --git a/configs/rk3318-box_defconfig b/configs/rk3318-box_defconfig
 new file mode 100644
-index 0000000000..97bb10576e
+index 000000000000..111111111111
 --- /dev/null
 +++ b/configs/rk3318-box_defconfig
@@ -0,0 +1,131 @@
@ -135,3 +194,6 @@ index 0000000000..97bb10576e
 +CONFIG_TPL_TINY_MEMSET=y
 +CONFIG_ERRNO_STR=y
 +# CONFIG_EFI_LOADER is not set
+-- 
+Armbian
+
--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch
@ -1,18 +1,16 @@
-From 07a80d60680491abbf0db91071a66fe17ceeae4f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
 Date: Sun, 16 Jun 2024 16:00:41 +0200
-Subject: [PATCH] Add rk3318-box device tree
+Subject: Add rk3318-box device tree

 ---
- arch/arm/dts/Makefile               |   3 +
- arch/arm/dts/rk3318-box-u-boot.dtsi |  58 +++
- dts/upstream/src/arm64/rockchip/rk3318-box.dts         | 648 ++++++++++++++++++++++++++++
+ arch/arm/dts/Makefile                          |   3 +
+ arch/arm/dts/rk3318-box-u-boot.dtsi            |  58 +
+ dts/upstream/src/arm64/rockchip/rk3318-box.dts | 648 ++++++++++
 3 files changed, 709 insertions(+)
- create mode 100644 arch/arm/dts/rk3318-box-u-boot.dtsi
- create mode 100644 arch/arm/dts/rk3318-box.dts

 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 8fb6a8a1f1..a08f1a82e4 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
@@ -90,6 +90,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
@ -27,7 +25,7 @@ index 8fb6a8a1f1..a08f1a82e4 100644
 	rk3368-sheep.dtb \
 diff --git a/arch/arm/dts/rk3318-box-u-boot.dtsi b/arch/arm/dts/rk3318-box-u-boot.dtsi
 new file mode 100644
-index 0000000000..ffe48d8932
+index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm/dts/rk3318-box-u-boot.dtsi
@@ -0,0 +1,58 @@
@ -91,7 +89,7 @@ index 0000000000..ffe48d8932
 +};
 diff --git a/dts/upstream/src/arm64/rockchip/rk3318-box.dts b/dts/upstream/src/arm64/rockchip/rk3318-box.dts
 new file mode 100644
-index 0000000000..ad98288ea9
+index 000000000000..111111111111
 --- /dev/null
 +++ b/dts/upstream/src/arm64/rockchip/rk3318-box.dts
@@ -0,0 +1,648 @@
@ -744,5 +742,5 @@ index 0000000000..ad98288ea9
 +	status = "okay";
 +};
 -- 
-2.34.1
+Armbian

--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-makefile.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-makefile.patch
@ -1,5 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo <paolo.sabatino@gmail.com>
+Date: Thu, 23 Jun 2022 08:30:54 +0200
+Subject: [ARCHEOLOGY] rockchip64: add rk3318-box tvbox board patch and
+ configurations (#3921)
+
+> X-Git-Archeology: > recovered message: > * rockchip64: add rk3318-box tvbox board patch and configurations
+> X-Git-Archeology: > recovered message: > * rockchip64: add missing bcm43342 patch for edge kernel
+> X-Git-Archeology: - Revision 2ca6a9381db4b875533926e0eae9d3d17f68ad06: https://github.com/armbian/build/commit/2ca6a9381db4b875533926e0eae9d3d17f68ad06
+> X-Git-Archeology:   Date: Thu, 23 Jun 2022 08:30:54 +0200
+> X-Git-Archeology:   From: Paolo <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: rockchip64: add rk3318-box tvbox board patch and configurations (#3921)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
+> X-Git-Archeology:   Date: Mon, 07 Nov 2022 21:29:00 +0100
+> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
+> X-Git-Archeology:   Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision efee17f217e58a93e795c165e303bfd0a2a0a32a: https://github.com/armbian/build/commit/efee17f217e58a93e795c165e303bfd0a2a0a32a
+> X-Git-Archeology:   Date: Mon, 22 Apr 2024 12:39:09 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: rockchip64: bump rk3318-box uboot to v2024.01
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928
+> X-Git-Archeology:   Date: Tue, 02 Jul 2024 23:31:50 +0000
+> X-Git-Archeology:   From: Paolo <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855)
+> X-Git-Archeology:
+---
+ arch/arm/mach-rockchip/rk3328/Kconfig  |  8 ++
+ board/rockchip/rk3318_box/Kconfig      | 15 ++
+ board/rockchip/rk3318_box/MAINTAINERS  | 26 ++++
+ board/rockchip/rk3318_box/Makefile     |  7 +
+ board/rockchip/rk3318_box/README       | 70 ++++++++++
+ board/rockchip/rk3318_box/rk3318-box.c |  5 +
+ include/configs/rk3318-box.h           | 28 ++++
+ 7 files changed, 159 insertions(+)
+
 diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig
-index d13a1690..f2d8dab4 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/rk3328/Kconfig
 +++ b/arch/arm/mach-rockchip/rk3328/Kconfig
@@ -10,6 +10,13 @@ config TARGET_EVB_RK3328
@ -16,8 +54,8 @@ index d13a1690..f2d8dab4 100644
 endchoice
 
 config ROCKCHIP_BOOT_MODE_REG
-@@ -40,5 +47,6 @@ config TPL_STACK
- 	default 0xff098000
+@@ -37,5 +44,6 @@ config TPL_SYS_MALLOC_F_LEN
+ 	default 0x800
 
 source "board/rockchip/evb_rk3328/Kconfig"
 +source "board/rockchip/rk3318_box/Kconfig"
@ -25,7 +63,7 @@ index d13a1690..f2d8dab4 100644
 endif
 diff --git a/board/rockchip/rk3318_box/Kconfig b/board/rockchip/rk3318_box/Kconfig
 new file mode 100644
-index 00000000..4b146413
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/Kconfig
@@ -0,0 +1,15 @@
@ -46,7 +84,7 @@ index 00000000..4b146413
 +endif
 diff --git a/board/rockchip/rk3318_box/MAINTAINERS b/board/rockchip/rk3318_box/MAINTAINERS
 new file mode 100644
-index 00000000..e7dd59ff
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/MAINTAINERS
@@ -0,0 +1,26 @@
@ -78,7 +116,7 @@ index 00000000..e7dd59ff
 +F:      arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
 diff --git a/board/rockchip/rk3318_box/Makefile b/board/rockchip/rk3318_box/Makefile
 new file mode 100644
-index 00000000..5eba9dfb
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/Makefile
@@ -0,0 +1,7 @@
@ -91,7 +129,7 @@ index 00000000..5eba9dfb
 +obj-y	+= rk3318-box.o
 diff --git a/board/rockchip/rk3318_box/README b/board/rockchip/rk3318_box/README
 new file mode 100644
-index 00000000..6cbb66a4
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/README
@@ -0,0 +1,70 @@
@ -167,7 +205,7 @@ index 00000000..6cbb66a4
 +You should be able to get U-Boot log message in console/UART2 now.
 diff --git a/board/rockchip/rk3318_box/rk3318-box.c b/board/rockchip/rk3318_box/rk3318-box.c
 new file mode 100644
-index 00000000..779bc646
+index 000000000000..111111111111
 --- /dev/null
 +++ b/board/rockchip/rk3318_box/rk3318-box.c
@@ -0,0 +1,5 @@
@ -178,7 +216,7 @@ index 00000000..779bc646
 +
 diff --git a/include/configs/rk3318-box.h b/include/configs/rk3318-box.h
 new file mode 100644
-index 0000000000..dfbf9d7177
+index 000000000000..111111111111
 --- /dev/null
 +++ b/include/configs/rk3318-box.h
@@ -0,0 +1,28 @@
@ -210,3 +248,6 @@ index 0000000000..dfbf9d7177
 +
 +
 +#endif
+-- 
+Armbian
+
--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3328-add-usb-reset-props.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3328-add-usb-reset-props.patch
@ -1,49 +1,34 @@
-diff --git a/dts/upstream/src/arm64/rockchip/rk3328.dtsi b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
-index 7b4c15c4a9..a7830155dd 100644
--- a/dts/upstream/src/arm64/rockchip/rk3328.dtsi
-+++ b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
-@@ -977,6 +998,8 @@
- 		g-tx-fifo-size = <256 128 128 64 32 16>;
- 		phys = <&u2phy_otg>;
- 		phy-names = "usb2-phy";
-+		resets = <&cru SRST_USB2OTG>;
-+		reset-names = "otg";
- 		status = "disabled";
- 	};
- 
-@@ -987,6 +1010,8 @@
- 		clocks = <&cru HCLK_HOST0>, <&u2phy>;
- 		phys = <&u2phy_host>;
- 		phy-names = "usb";
-+		resets = <&cru SRST_USB2HOST_EHCIPHY>;
-+		reset-names = "ehci";
- 		status = "disabled";
- 	};
- 
-@@ -997,6 +1022,8 @@
- 		clocks = <&cru HCLK_HOST0>, <&u2phy>;
- 		phys = <&u2phy_host>;
- 		phy-names = "usb";
-+		resets = <&cru SRST_USB2HOST_EHCIPHY>;
-+		reset-names = "ehci";
- 		status = "disabled";
- 	};
- 
-@@ -1010,6 +1037,8 @@
- 			      "bus_clk";
- 		dr_mode = "otg";
- 		phy_type = "utmi_wide";
-+		resets = <&cru SRST_USB3OTG>;
-+		reset-names = "otg";
- 		snps,dis-del-phy-power-chg-quirk;
- 		snps,dis_enblslpm_quirk;
- 		snps,dis-tx-ipgap-linecheck-quirk;
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <paolo.sabatino@gmail.com>
+Date: Mon, 6 May 2024 15:50:14 +0100
+Subject: [ARCHEOLOGY] rockchip: add reset props for usb on rk322x
+
+> X-Git-Archeology: - Revision 5657ec0798045ad9cff0df0033ff1c963dfcdd66: https://github.com/armbian/build/commit/5657ec0798045ad9cff0df0033ff1c963dfcdd66
+> X-Git-Archeology:   Date: Mon, 06 May 2024 15:50:14 +0100
+> X-Git-Archeology:   From: Paolo Sabatino <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: rockchip: add reset props for usb on rk322x
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 4b51f88e56c54e3b517e584916241c4942dbfc5f: https://github.com/armbian/build/commit/4b51f88e56c54e3b517e584916241c4942dbfc5f
+> X-Git-Archeology:   Date: Sun, 02 Jun 2024 09:23:31 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: rk322x: keep usb resets deasserted on exit
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928
+> X-Git-Archeology:   Date: Tue, 02 Jul 2024 23:31:50 +0000
+> X-Git-Archeology:   From: Paolo <paolo.sabatino@gmail.com>
+> X-Git-Archeology:   Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855)
+> X-Git-Archeology:
+---
+ drivers/usb/host/dwc2.c                     | 5 ++++-
+ drivers/usb/host/ehci-generic.c             | 6 +++---
+ dts/upstream/src/arm64/rockchip/rk3328.dtsi | 8 ++++++++
+ 3 files changed, 15 insertions(+), 4 deletions(-)

 diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
-index 936e30438d..09d3805e78 100644
+index 111111111111..222222222222 100644
 --- a/drivers/usb/host/dwc2.c
 +++ b/drivers/usb/host/dwc2.c
-@@ -1436,7 +1438,10 @@ static int dwc2_usb_remove(struct udevice *dev)
+@@ -1438,7 +1438,10 @@ static int dwc2_usb_remove(struct udevice *dev)
 
 	dwc2_uninit_common(priv->regs);
 
@ -56,7 +41,7 @@ index 936e30438d..09d3805e78 100644
 	clk_release_bulk(&priv->clks);
 
 diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
-index 936e30438d..09d3805e78 100644
+index 111111111111..222222222222 100644
 --- a/drivers/usb/host/ehci-generic.c
 +++ b/drivers/usb/host/ehci-generic.c
@@ -148,9 +148,9 @@ static int ehci_usb_remove(struct udevice *dev)
@ -72,3 +57,46 @@ index 936e30438d..09d3805e78 100644
 
 	return clk_release_bulk(&priv->clocks);
 }
+diff --git a/dts/upstream/src/arm64/rockchip/rk3328.dtsi b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
+index 111111111111..222222222222 100644
+--- a/dts/upstream/src/arm64/rockchip/rk3328.dtsi
+++ b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
+@@ -977,6 +977,8 @@
+ 		g-tx-fifo-size = <256 128 128 64 32 16>;
+ 		phys = <&u2phy_otg>;
+ 		phy-names = "usb2-phy";
+		resets = <&cru SRST_USB2OTG>;
+		reset-names = "otg";
+ 		status = "disabled";
+ 	};
+ 
+@@ -987,6 +989,8 @@
+ 		clocks = <&cru HCLK_HOST0>, <&u2phy>;
+ 		phys = <&u2phy_host>;
+ 		phy-names = "usb";
+		resets = <&cru SRST_USB2HOST_EHCIPHY>;
+		reset-names = "ehci";
+ 		status = "disabled";
+ 	};
+ 
+@@ -997,6 +1001,8 @@
+ 		clocks = <&cru HCLK_HOST0>, <&u2phy>;
+ 		phys = <&u2phy_host>;
+ 		phy-names = "usb";
+		resets = <&cru SRST_USB2HOST_EHCIPHY>;
+		reset-names = "ehci";
+ 		status = "disabled";
+ 	};
+ 
+@@ -1010,6 +1016,8 @@
+ 			      "bus_clk";
+ 		dr_mode = "otg";
+ 		phy_type = "utmi_wide";
+		resets = <&cru SRST_USB3OTG>;
+		reset-names = "otg";
+ 		snps,dis-del-phy-power-chg-quirk;
+ 		snps,dis_enblslpm_quirk;
+ 		snps,dis-tx-ipgap-linecheck-quirk;
+-- 
+Armbian
+
--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3328-resets-for-mmc-controllers.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3328-resets-for-mmc-controllers.patch
@ -1,17 +1,17 @@
-From 91b83f2920631e3104fd5691bde107e39a98feee Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
 Date: Fri, 5 Nov 2021 16:03:11 +0000
-Subject: [PATCH 1/2] rk3328: resets for mmc controllers
+Subject: rk3328: resets for mmc controllers

 ---
 dts/upstream/src/arm64/rockchip/rk3328.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

 diff --git a/dts/upstream/src/arm64/rockchip/rk3328.dtsi b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
-index 945387e5..3314d5e4 100644
+index 111111111111..222222222222 100644
 --- a/dts/upstream/src/arm64/rockchip/rk3328.dtsi
 +++ b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
-@@ -859,6 +859,8 @@
+@@ -872,6 +872,8 @@
 		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
 			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@ -20,7 +20,7 @@ index 945387e5..3314d5e4 100644
 		fifo-depth = <0x100>;
 		max-frequency = <150000000>;
 		status = "disabled";
-@@ -871,6 +873,8 @@
+@@ -884,6 +886,8 @@
 		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
 			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@ -29,7 +29,7 @@ index 945387e5..3314d5e4 100644
 		fifo-depth = <0x100>;
 		max-frequency = <150000000>;
 		status = "disabled";
-@@ -883,8 +887,11 @@
+@@ -896,8 +900,11 @@
 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@ -42,5 +42,5 @@ index 945387e5..3314d5e4 100644
 	};
 
 -- 
-2.30.2
+Armbian

--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3328-sdmmc_ext-node.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3328-sdmmc_ext-node.patch
@ -1,17 +1,17 @@
-From 073b28838387a4f7c5947d7a3f07d326f13b72f4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
 Date: Fri, 5 Nov 2021 16:03:53 +0000
-Subject: [PATCH 2/2] rk3328: sdmmc_ext node
+Subject: rk3328: sdmmc_ext node

 ---
- /dts/upstream/src/arm64/rockchip/rk3328.dtsi | 14 ++++++++++++++
+ dts/upstream/src/arm64/rockchip/rk3328.dtsi | 14 ++++++++++
 1 file changed, 14 insertions(+)

-diff --git a//dts/upstream/src/arm64/rockchip/rk3328.dtsi b//dts/upstream/src/arm64/rockchip/rk3328.dtsi
-index 3314d5e4..a1fedc56 100644
--- a//dts/upstream/src/arm64/rockchip/rk3328.dtsi
-+++ b//dts/upstream/src/arm64/rockchip/rk3328.dtsi
-@@ -895,6 +895,20 @@
+diff --git a/dts/upstream/src/arm64/rockchip/rk3328.dtsi b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
+index 111111111111..222222222222 100644
+--- a/dts/upstream/src/arm64/rockchip/rk3328.dtsi
+++ b/dts/upstream/src/arm64/rockchip/rk3328.dtsi
+@@ -908,6 +908,20 @@
 		status = "disabled";
 	};
 
@ -33,5 +33,5 @@ index 3314d5e4..a1fedc56 100644
 		compatible = "rockchip,rk3328-gmac";
 		reg = <0x0 0xff540000 0x0 0x10000>;
 -- 
-2.30.2
+Armbian