Module Name: src
Committed By: matt
Date: Fri Jun 28 00:50:23 UTC 2013
Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c omap3_sdmmcreg.h
Log Message:
Add TIAM335X SDMMC BASE definitions
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omap3_sdhc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap3_sdmmcreg.h
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/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.11 src/sys/arch/arm/omap/omap3_sdhc.c:1.12
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.11 Tue Jun 18 15:04:53 2013
+++ src/sys/arch/arm/omap/omap3_sdhc.c Fri Jun 28 00:50:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_sdhc.c,v 1.11 2013/06/18 15:04:53 matt Exp $ */
+/* $NetBSD: omap3_sdhc.c,v 1.12 2013/06/28 00:50:22 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.11 2013/06/18 15:04:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.12 2013/06/28 00:50:22 matt Exp $");
#include "opt_omap.h"
@@ -89,9 +89,9 @@ struct am335x_sdhc {
static const struct am335x_sdhc am335x_sdhc[] = {
/* XXX All offset by 0x100 because of the am335x's mmc registers. */
- { "MMCHS0", 0x48060100, 64, { AM335X_PRCM_CM_PER, 0x3c } },
- { "MMC1", 0x481d8100, 28, { AM335X_PRCM_CM_PER, 0xf4 } },
- { "MMCHS2", 0x47810100, 29, { AM335X_PRCM_CM_WKUP, 0xf8 } },
+ { "MMCHS0", SDMMC1_BASE_TIAM335X, 64, { AM335X_PRCM_CM_PER, 0x3c } },
+ { "MMC1", SDMMC2_BASE_TIAM335X, 28, { AM335X_PRCM_CM_PER, 0xf4 } },
+ { "MMCHS2", SDMMC3_BASE_TIAM335X, 29, { AM335X_PRCM_CM_WKUP, 0xf8 } },
};
#endif
Index: src/sys/arch/arm/omap/omap3_sdmmcreg.h
diff -u src/sys/arch/arm/omap/omap3_sdmmcreg.h:1.5 src/sys/arch/arm/omap/omap3_sdmmcreg.h:1.6
--- src/sys/arch/arm/omap/omap3_sdmmcreg.h:1.5 Tue Jun 18 15:04:53 2013
+++ src/sys/arch/arm/omap/omap3_sdmmcreg.h Fri Jun 28 00:50:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_sdmmcreg.h,v 1.5 2013/06/18 15:04:53 matt Exp $ */
+/* $NetBSD: omap3_sdmmcreg.h,v 1.6 2013/06/28 00:50:23 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -45,6 +45,10 @@
#define SDMMC4_BASE_4430 0x480D1000 // same for omap5
#define SDMMC5_BASE_4430 0x480D5000 // same for omap5
+#define SDMMC1_BASE_TIAM335X 0x48006100
+#define SDMMC2_BASE_TIAM335X 0x481d8100
+#define SDMMC3_BASE_TIAM335X 0x47810100
+
#define OMAP3_SDMMC_SDHC_OFFSET 0x100
#define OMAP3_SDMMC_SDHC_SIZE 0x100
