Skip to content

Commit 18236cb

Browse files
committed
rockchip: fix build with kernel 6.12
1 parent 38b7954 commit 18236cb

3 files changed

Lines changed: 3 additions & 87 deletions

File tree

target/linux/rockchip/patches-6.12/113-ethernet-stmicro-stmmac-Add-SGMII-QSGMII-support.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ Signed-off-by: David Wu <david.wu@rock-chips.com>
260260
struct regulator *ldo = bsp_priv->regulator;
261261
int ret;
262262
@@ -1832,6 +2002,18 @@ static struct rk_priv_data *rk_gmac_setu
263-
"rockchip,grf");
264-
bsp_priv->php_grf = syscon_regmap_lookup_by_phandle(dev->of_node,
265-
"rockchip,php-grf");
263+
return ERR_CAST(bsp_priv->php_grf);
264+
}
265+
}
266266
+ bsp_priv->xpcs = syscon_regmap_lookup_by_phandle(dev->of_node,
267267
+ "rockchip,xpcs");
268268
+ if (!IS_ERR(bsp_priv->xpcs)) {

target/linux/rockchip/patches-6.12/312-02-v6.13-rk3576-otp-support.patch

Lines changed: 0 additions & 48 deletions
This file was deleted.

target/linux/rockchip/patches-6.12/312-04-v6.13-rk3576-otp-support.patch

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)