mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
659f4a13dd
With Linux 6.1 many of our downstream patches and out-of-tree files can be removed or at least replaced by backported upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org> [fix CMDLINE_OVERRIDE for arm64] Signed-off-by: Bjørn Mork <bjorn@mork.no>
19 lines
595 B
Diff
19 lines
595 B
Diff
--- a/drivers/spi/spi-mt65xx.c
|
|
+++ b/drivers/spi/spi-mt65xx.c
|
|
@@ -1225,8 +1225,15 @@ static int mtk_spi_probe(struct platform
|
|
if (ret < 0)
|
|
return dev_err_probe(dev, ret, "failed to enable hclk\n");
|
|
|
|
+ ret = clk_prepare_enable(mdata->sel_clk);
|
|
+ if (ret < 0) {
|
|
+ clk_disable_unprepare(mdata->spi_hclk);
|
|
+ return dev_err_probe(dev, ret, "failed to enable sel_clk\n");
|
|
+ }
|
|
+
|
|
ret = clk_prepare_enable(mdata->spi_clk);
|
|
if (ret < 0) {
|
|
+ clk_disable_unprepare(mdata->sel_clk);
|
|
clk_disable_unprepare(mdata->spi_hclk);
|
|
return dev_err_probe(dev, ret, "failed to enable spi_clk\n");
|
|
}
|