Skip to content

Commit baba217

Browse files
Sowjanya Komatinenistorulf
authored andcommitted
arm64: tegra: Add missing timeout clock to Tegra186 SDMMC nodes
commit 39cb62c ("arm64: tegra: Add Tegra186 support") Tegra186 uses separate SDMMC_LEGACY_TM clock for data timeout and this clock is not enabled currently which is not recommended. Tegra186 SDMMC advertises 12Mhz as timeout clock frequency in host capability register and uses it by default. So, this clock should be kept enabled by the SDMMC driver. Fixes: 39cb62c ("arm64: tegra: Add Tegra186 support") Cc: stable <stable@vger.kernel.org> # 5.4 Tested-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com> Link: https://lore.kernel.org/r/1598548861-32373-6-git-send-email-skomatineni@nvidia.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 679f71f commit baba217

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

arch/arm64/boot/dts/nvidia/tegra186.dtsi

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,9 @@
337337
compatible = "nvidia,tegra186-sdhci";
338338
reg = <0x0 0x03400000 0x0 0x10000>;
339339
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
340-
clocks = <&bpmp TEGRA186_CLK_SDMMC1>;
341-
clock-names = "sdhci";
340+
clocks = <&bpmp TEGRA186_CLK_SDMMC1>,
341+
<&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
342+
clock-names = "sdhci", "tmclk";
342343
resets = <&bpmp TEGRA186_RESET_SDMMC1>;
343344
reset-names = "sdhci";
344345
interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRA &emc>,
@@ -366,8 +367,9 @@
366367
compatible = "nvidia,tegra186-sdhci";
367368
reg = <0x0 0x03420000 0x0 0x10000>;
368369
interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
369-
clocks = <&bpmp TEGRA186_CLK_SDMMC2>;
370-
clock-names = "sdhci";
370+
clocks = <&bpmp TEGRA186_CLK_SDMMC2>,
371+
<&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
372+
clock-names = "sdhci", "tmclk";
371373
resets = <&bpmp TEGRA186_RESET_SDMMC2>;
372374
reset-names = "sdhci";
373375
interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRAA &emc>,
@@ -390,8 +392,9 @@
390392
compatible = "nvidia,tegra186-sdhci";
391393
reg = <0x0 0x03440000 0x0 0x10000>;
392394
interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
393-
clocks = <&bpmp TEGRA186_CLK_SDMMC3>;
394-
clock-names = "sdhci";
395+
clocks = <&bpmp TEGRA186_CLK_SDMMC3>,
396+
<&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
397+
clock-names = "sdhci", "tmclk";
395398
resets = <&bpmp TEGRA186_RESET_SDMMC3>;
396399
reset-names = "sdhci";
397400
interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCR &emc>,
@@ -416,8 +419,9 @@
416419
compatible = "nvidia,tegra186-sdhci";
417420
reg = <0x0 0x03460000 0x0 0x10000>;
418421
interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
419-
clocks = <&bpmp TEGRA186_CLK_SDMMC4>;
420-
clock-names = "sdhci";
422+
clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
423+
<&bpmp TEGRA186_CLK_SDMMC_LEGACY_TM>;
424+
clock-names = "sdhci", "tmclk";
421425
assigned-clocks = <&bpmp TEGRA186_CLK_SDMMC4>,
422426
<&bpmp TEGRA186_CLK_PLLC4_VCO>;
423427
assigned-clock-parents = <&bpmp TEGRA186_CLK_PLLC4_VCO>;

0 commit comments

Comments
 (0)