[src/trunk]: src/sys/dev/ic Separate clock frequency from maximum supported b...

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

details:   https://anonhg.NetBSD.org/src/rev/0978616a6bd8
branches:  trunk
changeset: 824347:0978616a6bd8
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jun 02 11:01:15 2017 +0000

description:
Separate clock frequency from maximum supported bus frequency.

diffstat:

 sys/dev/ic/pl181.c    |  7 ++++---
 sys/dev/ic/pl181var.h |  3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 671d9b839c81 -r 0978616a6bd8 sys/dev/ic/pl181.c
--- a/sys/dev/ic/pl181.c        Fri Jun 02 10:46:07 2017 +0000
+++ b/sys/dev/ic/pl181.c        Fri Jun 02 11:01:15 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pl181.c,v 1.2 2017/06/01 16:57:12 jmcneill Exp $ */
+/* $NetBSD: pl181.c,v 1.3 2017/06/02 11:01:15 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.2 2017/06/01 16:57:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.3 2017/06/02 11:01:15 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -117,7 +117,8 @@
        saa.saa_sct = &plmmc_chip_functions;
        saa.saa_sch = sc;
        saa.saa_clkmin = 400;
-       saa.saa_clkmax = sc->sc_clock_freq / 1000;
+       saa.saa_clkmax = sc->sc_max_freq > 0 ?
+           sc->sc_max_freq / 1000 : sc->sc_clock_freq / 1000;
        saa.saa_caps = SMC_CAPS_4BIT_MODE | SMC_CAPS_SINGLE_ONLY;
 
        sc->sc_sdmmc_dev = config_found(sc->sc_dev, &saa, NULL);
diff -r 671d9b839c81 -r 0978616a6bd8 sys/dev/ic/pl181var.h
--- a/sys/dev/ic/pl181var.h     Fri Jun 02 10:46:07 2017 +0000
+++ b/sys/dev/ic/pl181var.h     Fri Jun 02 11:01:15 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pl181var.h,v 1.1 2015/01/27 16:33:26 jmcneill Exp $ */
+/* $NetBSD: pl181var.h,v 1.2 2017/06/02 11:01:15 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -35,6 +35,7 @@
        bus_space_handle_t      sc_bsh;
        void                    *sc_ih;
        unsigned int            sc_clock_freq;
+       unsigned int            sc_max_freq;
 
        device_t                sc_sdmmc_dev;
        kmutex_t                sc_intr_lock;