]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: amlogic: g12a: fix mmc A peripheral clock
authorJerome Brunet <jbrunet@baylibre.com>
Fri, 13 Dec 2024 10:03:23 +0000 (11:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:30:58 +0000 (14:30 +0200)
[ Upstream commit 0079e77c08de692cb20b38e408365c830a44b1ef ]

The bit index of the peripheral clock for mmc A is wrong
This was probably not a problem for mmc A as the peripheral is likely left
enabled by the bootloader.

No issues has been reported so far but it could be a problem, most likely
some form of conflict between the ethernet and mmc A clock, breaking
ethernet on init.

Use the value provided by the documentation for mmc A before this
becomes an actual problem.

Fixes: 085a4ea93d54 ("clk: meson: g12a: add peripheral clock controller")
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20241213-amlogic-clk-g12a-mmca-fix-v1-1-5af421f58b64@baylibre.com
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/meson/g12a.c

index 870cac6dd04537c85a6d4bb1f44b46e9439852ef..3280b7410a13f05c2e8935d3284a513d7c7afaeb 100644 (file)
@@ -4136,7 +4136,7 @@ static MESON_GATE(g12a_spicc_1,                   HHI_GCLK_MPEG0, 14);
 static MESON_GATE(g12a_hiu_reg,                        HHI_GCLK_MPEG0, 19);
 static MESON_GATE(g12a_mipi_dsi_phy,           HHI_GCLK_MPEG0, 20);
 static MESON_GATE(g12a_assist_misc,            HHI_GCLK_MPEG0, 23);
-static MESON_GATE(g12a_emmc_a,                 HHI_GCLK_MPEG0, 4);
+static MESON_GATE(g12a_emmc_a,                 HHI_GCLK_MPEG0, 24);
 static MESON_GATE(g12a_emmc_b,                 HHI_GCLK_MPEG0, 25);
 static MESON_GATE(g12a_emmc_c,                 HHI_GCLK_MPEG0, 26);
 static MESON_GATE(g12a_audio_codec,            HHI_GCLK_MPEG0, 28);