[src/trunk]: src/sys/arch/arm/nvidia Set parent clock rate to 100MHz when SDR...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7178738e1b0
branches:  trunk
changeset: 823427:d7178738e1b0
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Apr 22 17:41:20 2017 +0000

description:
Set parent clock rate to 100MHz when SDR104 is disabled

diffstat:

 sys/arch/arm/nvidia/tegra_sdhc.c |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (60 lines):

diff -r e08e419b90ba -r d7178738e1b0 sys/arch/arm/nvidia/tegra_sdhc.c
--- a/sys/arch/arm/nvidia/tegra_sdhc.c  Sat Apr 22 17:40:47 2017 +0000
+++ b/sys/arch/arm/nvidia/tegra_sdhc.c  Sat Apr 22 17:41:20 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_sdhc.c,v 1.17 2017/04/16 13:27:19 jmcneill Exp $ */
+/* $NetBSD: tegra_sdhc.c,v 1.18 2017/04/22 17:41:20 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,10 +26,12 @@
  * SUCH DAMAGE.
  */
 
+#define        TEGRA_SDHC_NO_SDR104
+
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_sdhc.c,v 1.17 2017/04/16 13:27:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_sdhc.c,v 1.18 2017/04/22 17:41:20 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -124,6 +126,7 @@
        }
        sc->sc_bsz = size;
 
+#ifdef TEGRA_SDHC_NO_SDR104
        /* XXX SDR104 requires a custom tuning method on Tegra K1 */
        sc->sc.sc_flags |= SDHC_FLAG_HOSTCAPS;
        sc->sc.sc_caps = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
@@ -131,6 +134,7 @@
        sc->sc.sc_caps2 = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
            SDHC_CAPABILITIES2);
        sc->sc.sc_caps2 &= ~SDHC_SDR104_SUPP;
+#endif
 
        sc->sc_pin_power = fdtbus_gpio_acquire(faa->faa_phandle,
            "power-gpios", GPIO_PIN_OUTPUT);
@@ -162,7 +166,11 @@
        }
 
        fdtbus_reset_assert(sc->sc_rst);
+#ifdef TEGRA_SDHC_NO_SDR104
+       error = clk_set_rate(sc->sc_clk, 100000000);
+#else
        error = clk_set_rate(sc->sc_clk, 204000000);
+#endif
        if (error) {
                aprint_error(": couldn't set frequency: %d\n", error);
                return;
@@ -177,7 +185,7 @@
        sc->sc.sc_clkbase = clk_get_rate(sc->sc_clk) / 1000;
 
        aprint_naive("\n");
-       aprint_normal(": SDMMC\n");
+       aprint_normal(": SDMMC (%u kHz)\n", sc->sc.sc_clkbase);
 
        if (sc->sc.sc_clkbase == 0) {
                aprint_error_dev(self, "couldn't determine frequency\n");