Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/fdt Use more generic rk3288 compatible string, and d...



details:   https://anonhg.NetBSD.org/src/rev/189c481d28f5
branches:  trunk
changeset: 363813:189c481d28f5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 12 16:34:28 2018 +0000

description:
Use more generic rk3288 compatible string, and do clock assignments when present

diffstat:

 sys/dev/fdt/dwcmmc_fdt.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 0dd0f7237932 -r 189c481d28f5 sys/dev/fdt/dwcmmc_fdt.c
--- a/sys/dev/fdt/dwcmmc_fdt.c  Sun Aug 12 16:33:58 2018 +0000
+++ b/sys/dev/fdt/dwcmmc_fdt.c  Sun Aug 12 16:34:28 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.6 2018/07/17 00:42:06 christos Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.7 2018/08/12 16:34:28 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.6 2018/07/17 00:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.7 2018/08/12 16:34:28 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -52,12 +52,12 @@
        u_int           ciu_div;
 };
 
-static const struct dwcmmc_fdt_config dwcmmc_rk3328_config = {
+static const struct dwcmmc_fdt_config dwcmmc_rk3288_config = {
        .ciu_div = 2,
 };
 
 static const struct of_compat_data compat_data[] = {
-       { "rockchip,rk3328-dw-mshc",    (uintptr_t)&dwcmmc_rk3328_config },
+       { "rockchip,rk3288-dw-mshc",    (uintptr_t)&dwcmmc_rk3288_config },
        { NULL }
 };
 
@@ -102,6 +102,8 @@
        if (of_getprop_uint32(phandle, "fifo-depth", &fifo_depth))
                fifo_depth = 0;
 
+       fdtbus_clock_assign(phandle);
+
        esc->sc_clk_biu = fdtbus_clock_get(phandle, "biu");
        if (esc->sc_clk_biu == NULL) {
                aprint_error(": couldn't get clock biu\n");



Home | Main Index | Thread Index | Old Index