[src/trunk]: src/sys/arch/arm/omap More OMAP5 support

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11ea8df889e2
branches:  trunk
changeset: 787396:11ea8df889e2
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jun 15 21:59:37 2013 +0000

description:
More OMAP5 support

diffstat:

 sys/arch/arm/omap/omap2_gpio.c    |  16 ++++++++++++++--
 sys/arch/arm/omap/omap2_gpmcreg.h |   4 ++--
 sys/arch/arm/omap/omap2_obioreg.h |  25 ++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 5 deletions(-)

diffs (94 lines):

diff -r 622fd44f2786 -r 11ea8df889e2 sys/arch/arm/omap/omap2_gpio.c
--- a/sys/arch/arm/omap/omap2_gpio.c    Sat Jun 15 21:58:20 2013 +0000
+++ b/sys/arch/arm/omap/omap2_gpio.c    Sat Jun 15 21:59:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_gpio.c,v 1.15 2013/04/18 01:33:18 khorben Exp $  */
+/*     $NetBSD: omap2_gpio.c,v 1.16 2013/06/15 21:59:37 matt Exp $     */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpio.c,v 1.15 2013/04/18 01:33:18 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpio.c,v 1.16 2013/06/15 21:59:37 matt Exp $");
 
 #define _INTR_PRIVATE
 
@@ -372,6 +372,18 @@
                return 1;
 #endif
 
+#ifdef OMAP_5430
+       if (oa->obio_addr == GPIO1_BASE_5430
+           || oa->obio_addr == GPIO2_BASE_5430
+           || oa->obio_addr == GPIO3_BASE_5430
+           || oa->obio_addr == GPIO4_BASE_5430
+           || oa->obio_addr == GPIO5_BASE_5430
+           || oa->obio_addr == GPIO6_BASE_5430
+           || oa->obio_addr == GPIO7_BASE_5430
+           || oa->obio_addr == GPIO8_BASE_5430)
+               return 1;
+#endif
+
 #ifdef TI_AM335X
        if (oa->obio_addr == GPIO0_BASE_TI_AM335X
            || oa->obio_addr == GPIO1_BASE_TI_AM335X
diff -r 622fd44f2786 -r 11ea8df889e2 sys/arch/arm/omap/omap2_gpmcreg.h
--- a/sys/arch/arm/omap/omap2_gpmcreg.h Sat Jun 15 21:58:20 2013 +0000
+++ b/sys/arch/arm/omap/omap2_gpmcreg.h Sat Jun 15 21:59:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_gpmcreg.h,v 1.9 2012/12/11 01:54:42 khorben Exp $        */
+/*     $NetBSD: omap2_gpmcreg.h,v 1.10 2013/06/15 21:59:37 matt Exp $  */
 /*
  * Copyright (c) 2007 Microsoft
  * All rights reserved.
@@ -50,7 +50,7 @@
 #ifdef OMAP_3530
 #define GPMC_BASE                      0x6e000000
 #endif
-#if defined(TI_AM335X) || defined(OMAP_4430)
+#if defined(TI_AM335X) || defined(OMAP_4430) || defined(OMAP_5430)
 #define GPMC_BASE                      0x50000000
 #endif
 #ifdef TI_DM37XX
diff -r 622fd44f2786 -r 11ea8df889e2 sys/arch/arm/omap/omap2_obioreg.h
--- a/sys/arch/arm/omap/omap2_obioreg.h Sat Jun 15 21:58:20 2013 +0000
+++ b/sys/arch/arm/omap/omap2_obioreg.h Sat Jun 15 21:59:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_obioreg.h,v 1.7 2012/12/11 01:54:42 khorben Exp $        */
+/*     $NetBSD: omap2_obioreg.h,v 1.8 2013/06/15 21:59:37 matt Exp $   */
 
 /*
  * Copyright (c) 2007 Microsoft
@@ -119,6 +119,29 @@
 #define        GPIO6_BASE              GPIO6_BASE_4430
 #endif
 
+#if defined(OMAP_5430)
+#define        OMAP2_OBIO_0_BASE       OMAP5430_L4_CORE_BASE
+#define        OMAP2_OBIO_0_SIZE       OMAP5430_L4_CORE_SIZE
+
+#define        OMAP2_OBIO_1_BASE       OMAP5430_L4_WAKEUP_BASE
+#define        OMAP2_OBIO_1_SIZE       OMAP5430_L4_WAKEUP_SIZE
+
+#define        OMAP2_OBIO_2_BASE       OMAP5430_L4_PERIPHERAL_BASE
+#define        OMAP2_OBIO_2_SIZE       OMAP5430_L4_PERIPHERAL_SIZE
+
+#define        OMAP2_OBIO_3_BASE       OMAP5430_L4_ABE_BASE
+#define        OMAP2_OBIO_3_SIZE       OMAP5430_L4_ABE_SIZE
+
+#define        GPIO1_BASE              GPIO1_BASE_5430
+#define        GPIO2_BASE              GPIO2_BASE_5430
+#define        GPIO3_BASE              GPIO3_BASE_5430
+#define        GPIO4_BASE              GPIO4_BASE_5430
+#define        GPIO5_BASE              GPIO5_BASE_5430
+#define        GPIO6_BASE              GPIO6_BASE_5430
+#define        GPIO7_BASE              GPIO7_BASE_5430
+#define        GPIO8_BASE              GPIO8_BASE_5430
+#endif
+
 #if defined(TI_AM335X)
 #define        OMAP2_OBIO_0_BASE       TI_AM335X_L4_WAKEUP_BASE
 #define        OMAP2_OBIO_0_SIZE       TI_AM335X_L4_WAKEUP_SIZE