Module Name: src
Committed By: kiyohara
Date: Sat Oct 15 15:14:20 UTC 2016
Modified Files:
src/sys/arch/arm/omap: omap2_obio.c
Log Message:
Attach icu before attaching gpio.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/omap/omap2_obio.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/omap/omap2_obio.c
diff -u src/sys/arch/arm/omap/omap2_obio.c:1.23 src/sys/arch/arm/omap/omap2_obio.c:1.24
--- src/sys/arch/arm/omap/omap2_obio.c:1.23 Mon Apr 25 13:17:16 2016
+++ src/sys/arch/arm/omap/omap2_obio.c Sat Oct 15 15:14:20 2016
@@ -1,7 +1,7 @@
-/* $Id: omap2_obio.c,v 1.23 2016/04/25 13:17:16 kiyohara Exp $ */
+/* $Id: omap2_obio.c,v 1.24 2016/10/15 15:14:20 kiyohara Exp $ */
/* adapted from: */
-/* $NetBSD: omap2_obio.c,v 1.23 2016/04/25 13:17:16 kiyohara Exp $ */
+/* $NetBSD: omap2_obio.c,v 1.24 2016/10/15 15:14:20 kiyohara Exp $ */
/*
@@ -103,7 +103,7 @@
#include "opt_omap.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.23 2016/04/25 13:17:16 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.24 2016/10/15 15:14:20 kiyohara Exp $");
#include "locators.h"
#include "obio.h"
@@ -378,6 +378,9 @@ static const struct {
#if defined(OMAP_3530)
{ .name = "avic", .addr = INTC_BASE_3530, .required = true },
#endif
+#if defined(TI_AM335X)
+ { .name = "omapicu", .addr = 0x48200000, .required = true },
+#endif
{ .name = "gpio1", .addr = GPIO1_BASE, .required = false },
{ .name = "gpio2", .addr = GPIO2_BASE, .required = false },
{ .name = "gpio3", .addr = GPIO3_BASE, .required = false },
@@ -400,7 +403,6 @@ static const struct {
{ .name = "dmac", .addr = DMAC_BASE, .required = true },
#endif
#if defined(TI_AM335X)
- { .name = "omapicu", .addr = 0x48200000, .required = true },
{ .name = "prcm", .addr = 0x44e00000, .required = true },
{ .name = "sitaracm", .addr = 0x44e10000, .required = true },
{ .name = "edma", .addr = 0x49000000, .required = false },
