svn commit: r330038 - in head/sys: conf dev/mmc/host

[Emmanuel Vadot]

Author: manu
Date: Mon Feb 26 21:29:01 2018
New Revision: 330038
URL: https://svnweb.freebsd.org/changeset/base/330038

Log:
  dwmmc_rockchip: Add support for rk3328-dw-mshc
  
  * Do not use pio mode like rk2928
  * Change clocks frequency in update_ios
  
  Tested-On:    Pine64 Rock64 (RK3328)

Modified:
  head/sys/conf/files.arm64
  head/sys/dev/mmc/host/dwmmc_rockchip.c

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Mon Feb 26 21:27:42 2018	(r330037)
+++ head/sys/conf/files.arm64	Mon Feb 26 21:29:01 2018	(r330038)
@@ -185,6 +185,7 @@ dev/hwpmc/hwpmc_arm64_md.c	optional	hwpmc
 dev/mbox/mbox_if.m		optional	soc_brcm_bcm2837
 dev/mmc/host/dwmmc.c		optional	dwmmc fdt
 dev/mmc/host/dwmmc_hisi.c	optional	dwmmc fdt soc_hisi_hi6220
+dev/mmc/host/dwmmc_rockchip.c	optional	dwmmc fdt soc_rockchip_rk3328
 dev/neta/if_mvneta_fdt.c	optional	neta fdt
 dev/neta/if_mvneta.c		optional	neta mdio mii
 dev/ofw/ofw_cpu.c		optional	fdt

Modified: head/sys/dev/mmc/host/dwmmc_rockchip.c
==============================================================================
--- head/sys/dev/mmc/host/dwmmc_rockchip.c	Mon Feb 26 21:27:42 2018	(r330037)
+++ head/sys/dev/mmc/host/dwmmc_rockchip.c	Mon Feb 26 21:29:01 2018	(r330038)
@@ -41,11 +41,19 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/mmc/host/dwmmc_var.h>
 
+enum RKTYPE {
+	RK2928 = 1,
+	RK3328,
+};
+
 static struct ofw_compat_data compat_data[] = {
-	{"rockchip,rk2928-dw-mshc",	1},
+	{"rockchip,rk2928-dw-mshc",	RK2928},
+	{"rockchip,rk3328-dw-mshc",	RK3328},
 	{NULL,				0},
 };
 
+static int dwmmc_rockchip_update_ios(struct dwmmc_softc *sc, struct mmc_ios *ios);
+
 static int
 rockchip_dwmmc_probe(device_t dev)
 {
@@ -66,14 +74,50 @@ static int
 rockchip_dwmmc_attach(device_t dev)
 {
 	struct dwmmc_softc *sc;
+	int type;
 
 	sc = device_get_softc(dev);
 	sc->hwtype = HWTYPE_ROCKCHIP;
+	type = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
 
-	sc->use_pio = 1;
+	switch (type) {
+	case RK2928:
+		sc->use_pio = 1;
+		break;
+	}
+
 	sc->pwren_inverted = 1;
 
+	sc->update_ios = &dwmmc_rockchip_update_ios;
+
 	return (dwmmc_attach(dev));
+}
+
+static int
+dwmmc_rockchip_update_ios(struct dwmmc_softc *sc, struct mmc_ios *ios)
+{
+	unsigned int clock;
+	int error;
+
+	if (ios->clock && ios->clock != sc->bus_hz) {
+		sc->bus_hz = clock = ios->clock;
+		/* Set the MMC clock. */
+		if (sc->ciu) {
+			/* 
+			 * Apparently you need to set the ciu clock to
+			 * the double of bus_hz
+			 */
+			error = clk_set_freq(sc->ciu, clock * 2,
+			    CLK_SET_ROUND_DOWN);
+			if (error != 0) {
+				device_printf(sc->dev,
+				    "failed to set frequency to %u Hz: %d\n",
+				    clock, error);
+				return (error);
+			}
+		}
+	}
+	return (0);
 }
 
 static device_method_t rockchip_dwmmc_methods[] = {