CVS commit: src/sys/dev/fdt

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Sun Aug 12 16:34:28 UTC 2018

Modified Files:
        src/sys/dev/fdt: dwcmmc_fdt.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/fdt/dwcmmc_fdt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/fdt/dwcmmc_fdt.c
diff -u src/sys/dev/fdt/dwcmmc_fdt.c:1.6 src/sys/dev/fdt/dwcmmc_fdt.c:1.7
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.6	Tue Jul 17 00:42:06 2018
+++ src/sys/dev/fdt/dwcmmc_fdt.c	Sun Aug 12 16:34:28 2018
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ struct dwcmmc_fdt_config {
 	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 @@ dwcmmc_fdt_attach(device_t parent, devic
 	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");