From fd54fed45c929ded4b6c68e5ee1215636a542b39 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 10 Mar 2025 16:01:28 +0800 Subject: [PATCH] kernel: bump 6.12 to 6.12.18 --- include/kernel-6.12 | 4 ++-- ...phy-rockchip-naneng-combphy-fix-phy-reset.patch | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 target/linux/rockchip/patches-6.12/220-phy-rockchip-naneng-combphy-fix-phy-reset.patch diff --git a/include/kernel-6.12 b/include/kernel-6.12 index 15d3cb6d6..f10c62f87 100644 --- a/include/kernel-6.12 +++ b/include/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .16 -LINUX_KERNEL_HASH-6.12.16 = 5f81362a694f51520bff9faecb73f1cc9bc7bece6fdd10d5c27e348df39d7dc4 +LINUX_VERSION-6.12 = .18 + LINUX_KERNEL_HASH-6.12.18 = beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d diff --git a/target/linux/rockchip/patches-6.12/220-phy-rockchip-naneng-combphy-fix-phy-reset.patch b/target/linux/rockchip/patches-6.12/220-phy-rockchip-naneng-combphy-fix-phy-reset.patch deleted file mode 100644 index 86a909823..000000000 --- a/target/linux/rockchip/patches-6.12/220-phy-rockchip-naneng-combphy-fix-phy-reset.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c -+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c -@@ -324,7 +324,10 @@ static int rockchip_combphy_parse_dt(str - - priv->ext_refclk = device_property_present(dev, "rockchip,ext-refclk"); - -- priv->phy_rst = devm_reset_control_get(dev, "phy"); -+ priv->phy_rst = devm_reset_control_get_exclusive(dev, "phy"); -+ /* fallback to old behaviour */ -+ if (PTR_ERR(priv->phy_rst) == -ENOENT) -+ priv->phy_rst = devm_reset_control_array_get_exclusive(dev); - if (IS_ERR(priv->phy_rst)) - return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy reset\n"); -