Module Name: src
Committed By: jmcneill
Date: Mon Feb 19 20:26:51 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: sunxi_mmc.c
Log Message:
Add H6 support
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/sunxi/sunxi_mmc.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/arch/arm/sunxi/sunxi_mmc.c
diff -u src/sys/arch/arm/sunxi/sunxi_mmc.c:1.19 src/sys/arch/arm/sunxi/sunxi_mmc.c:1.20
--- src/sys/arch/arm/sunxi/sunxi_mmc.c:1.19 Mon Jan 8 14:40:18 2018
+++ src/sys/arch/arm/sunxi/sunxi_mmc.c Mon Feb 19 20:26:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.19 2018/01/08 14:40:18 jakllsch Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.20 2018/02/19 20:26:51 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_sunximmc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.19 2018/01/08 14:40:18 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.20 2018/02/19 20:26:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -252,6 +252,22 @@ static const struct sunxi_mmc_config sun
.flags = SUNXI_MMC_FLAG_CALIB_REG,
};
+static const struct sunxi_mmc_config sun50i_h6_mmc_config = {
+ .idma_xferlen = 0x10000,
+ .dma_ftrglevel = 0x20070008,
+ .delays = NULL,
+ .flags = SUNXI_MMC_FLAG_CALIB_REG |
+ SUNXI_MMC_FLAG_NEW_TIMINGS |
+ SUNXI_MMC_FLAG_MASK_DATA0,
+};
+
+static const struct sunxi_mmc_config sun50i_h6_emmc_config = {
+ .idma_xferlen = 0x2000,
+ .dma_ftrglevel = 0x20070008,
+ .delays = NULL,
+ .flags = SUNXI_MMC_FLAG_CALIB_REG,
+};
+
static const struct of_compat_data compat_data[] = {
{ "allwinner,sun4i-a10-mmc", (uintptr_t)&sun4i_a10_mmc_config },
{ "allwinner,sun5i-a13-mmc", (uintptr_t)&sun5i_a13_mmc_config },
@@ -260,6 +276,8 @@ static const struct of_compat_data compa
{ "allwinner,sun9i-a80-mmc", (uintptr_t)&sun9i_a80_mmc_config },
{ "allwinner,sun50i-a64-mmc", (uintptr_t)&sun50i_a64_mmc_config },
{ "allwinner,sun50i-a64-emmc", (uintptr_t)&sun50i_a64_emmc_config },
+ { "allwinner,sun50i-h6-mmc", (uintptr_t)&sun50i_h6_mmc_config },
+ { "allwinner,sun50i-h6-emmc", (uintptr_t)&sun50i_h6_emmc_config },
{ NULL }
};
