From: Joshua Covington Date: Sun, 2 Aug 2026 11:18:40 +0000 (+0000) Subject: bcm27xx: drop dwcmshc_remove() timeout_clk disable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f9fc05f2d6c5b61517ced7aba15fa884938931d;p=thirdparty%2Fopenwrt.git bcm27xx: drop dwcmshc_remove() timeout_clk disable The quilt rebase of 0299-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch matched the wrong occurrence of the two clk_disable_unprepare() calls for pltfm_host->clk and priv->bus_clk, which appear both in dwcmshc_probe()'s error path and in dwcmshc_remove(). This added a clk_disable_unprepare(pltfm_host->timeout_clk) call inside dwcmshc_remove() that is present in neither mainline Linux nor raspberrypi/linux's rpi-6.18.y. Drop it for now rather than carry an unverified addition. If it turns out timeout_clk does need disabling on remove, it can be reinstated with a clear rationale. Fixes: 7105bec48f27 ("kernel: bump 6.18 to 6.18.40") See: https://github.com/openwrt/openwrt/pull/24419 Signed-off-by: Joshua Covington Link: https://github.com/openwrt/openwrt/pull/24275 Signed-off-by: Jonas Jelonek --- diff --git a/target/linux/bcm27xx/patches-6.18/0299-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch b/target/linux/bcm27xx/patches-6.18/0299-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch index f4ab8f13dcd..9ba508a4d7a 100644 --- a/target/linux/bcm27xx/patches-6.18/0299-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch +++ b/target/linux/bcm27xx/patches-6.18/0299-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch @@ -15,10 +15,10 @@ Differentiate the RP1 variant of the Designware MSHC controller(s). Signed-off-by: Jonathan Bell --- - drivers/mmc/host/sdhci-of-dwcmshc.c | 62 ++++++++++++++++++++++++++----- + drivers/mmc/host/sdhci-of-dwcmshc.c | 61 ++++++++++++++++++++++++++----- drivers/mmc/host/sdhci-pltfm.c | 8 +++++ drivers/mmc/host/sdhci-pltfm.h | 3 ++ - 3 files changed, 68 insertions(+), 5 deletions(-) + 3 files changed, 67 insertions(+), 5 deletions(-) --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -155,14 +155,6 @@ Signed-off-by: Jonathan Bell err_bus_clk: clk_disable_unprepare(priv->bus_clk); err_clk: -@@ -1529,6 +1580,7 @@ static void dwcmshc_remove(struct platfo - - clk_disable_unprepare(pltfm_host->clk); - clk_disable_unprepare(priv->bus_clk); -+ clk_disable_unprepare(pltfm_host->timeout_clk); - clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks); - } - --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -32,6 +32,14 @@ unsigned int sdhci_pltfm_clk_get_max_clo