Skip to content

Commit 3a115d4

Browse files
jbrun3tsuperna9999
authored andcommitted
arm64: dts: amlogic: s4: fix mmc clock assignment
MMC A and C are mis-represented as having their "clkin0" input connected to xtal while it is actually connected to the MMC clock, probably in an attempt to provide 24MHz to the device on this input. Fix this and assign the clock to 24MHz to actually provide the required rate. Fixes: 3ab9d54 ("arm64: dts: amlogic: enable some device nodes for S4") Tested-by: Nick Xie <nick@khadas.com> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patch.msgid.link/20260114-amlogic-s4-mmc-fixup-v3-2-a4d3e136b3f2@baylibre.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
1 parent 86124a8 commit 3a115d4

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

arch/arm64/boot/dts/amlogic/meson-s4.dtsi

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,13 +819,16 @@
819819
reg = <0x0 0xfe088000 0x0 0x800>;
820820
interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
821821
clocks = <&clkc_periphs CLKID_SDEMMC_A>,
822-
<&xtal>,
822+
<&clkc_periphs CLKID_SD_EMMC_A>,
823823
<&clkc_pll CLKID_FCLK_DIV2>;
824824
clock-names = "core", "clkin0", "clkin1";
825825
resets = <&reset RESET_SD_EMMC_A>;
826826
cap-sdio-irq;
827827
keep-power-in-suspend;
828828
status = "disabled";
829+
830+
assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_A>;
831+
assigned-clock-rates = <24000000>;
829832
};
830833

831834
sd: mmc@fe08a000 {
@@ -848,13 +851,16 @@
848851
reg = <0x0 0xfe08c000 0x0 0x800>;
849852
interrupts = <GIC_SPI 178 IRQ_TYPE_EDGE_RISING>;
850853
clocks = <&clkc_periphs CLKID_NAND>,
851-
<&xtal>,
854+
<&clkc_periphs CLKID_SD_EMMC_C>,
852855
<&clkc_pll CLKID_FCLK_DIV2>;
853856
clock-names = "core", "clkin0", "clkin1";
854857
resets = <&reset RESET_NAND_EMMC>;
855858
no-sdio;
856859
no-sd;
857860
status = "disabled";
861+
862+
assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_C>;
863+
assigned-clock-rates = <24000000>;
858864
};
859865
};
860866
};

0 commit comments

Comments
 (0)