[src/trunk]: src/sys/arch/evbarm/netwalker adapt to changes in imx51reg.h

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

details:   https://anonhg.NetBSD.org/src/rev/ea6da9097f2c
branches:  trunk
changeset: 759430:ea6da9097f2c
user:      bsh <bsh%NetBSD.org@localhost>
date:      Thu Dec 09 05:00:14 2010 +0000

description:
adapt to changes in imx51reg.h
CVS: ----------------------------------------------------------------------
CVS: CVSROOT  cvs.NetBSD.org:/cvsroot
CVS: please use "PR category/123" to have the commitmsg appended to PR 123
CVS:
CVS: Please evaluate your changes and consider the following.
CVS: Abort checkin if you answer no.
CVS: => For all changes:
CVS: Do the changed files compile?
CVS: Has the change been tested?
CVS: => If you are not completely familiar with the changed components:
CVS: Has the change been posted for review?
CVS: Have you allowed enough time for feedback?
CVS: => If the change is major:
CVS: => If the change adds files to, or removes files from $DESTDIR:
CVS: => If you are changing a library or kernel interface:
CVS: Have you successfully run "./build.sh release"?

diffstat:

 sys/arch/evbarm/netwalker/netwalker_machdep.c |  61 +++++++++++++++-----------
 1 files changed, 34 insertions(+), 27 deletions(-)

diffs (107 lines):

diff -r 4be4b60cd4e4 -r ea6da9097f2c sys/arch/evbarm/netwalker/netwalker_machdep.c
--- a/sys/arch/evbarm/netwalker/netwalker_machdep.c     Thu Dec 09 04:40:22 2010 +0000
+++ b/sys/arch/evbarm/netwalker/netwalker_machdep.c     Thu Dec 09 05:00:14 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netwalker_machdep.c,v 1.2 2010/11/28 08:23:24 hannken Exp $    */
+/*     $NetBSD: netwalker_machdep.c,v 1.3 2010/12/09 05:00:14 bsh Exp $        */
 
 /*
  * Copyright (c) 2002, 2003, 2005, 2010  Genetec Corporation. 
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.2 2010/11/28 08:23:24 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.3 2010/12/09 05:00:14 bsh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -946,45 +946,25 @@
 
        /* left buttons */
        IOMUX_DATA(EIM_EB2, IOMUX_CONFIG_ALT1,
-                  PAD_CTL_HYS_ENABLE),
+                  PAD_CTL_HYS),
        /* right buttons */
        IOMUX_DATA(EIM_EB3, IOMUX_CONFIG_ALT1,
-                  PAD_CTL_HYS_ENABLE),
-                  
+                  PAD_CTL_HYS),
 
-#if 0
-       /* UART1 */
-       IOMUX_DATA(UART1_RXD, IOMUX_CONFIG_ALT0,
-                  (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
-                   PAD_CTL_PUE_PULL     | PAD_CTL_DSE_HIGH   |
-                   PAD_CTL_SRE_FAST)),
-       IOMUX_DATA(UART1_TXD, IOMUX_CONFIG_ALT0,
-                  (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
-                   PAD_CTL_PUE_PULL     | PAD_CTL_DSE_HIGH   |
-                   PAD_CTL_SRE_FAST)),
-       IOMUX_DATA(UART1_RTS, IOMUX_CONFIG_ALT0,
-                  (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
-                   PAD_CTL_PUE_PULL     | PAD_CTL_DSE_HIGH)),
-       IOMUX_DATA(UART1_CTS, IOMUX_CONFIG_ALT0,
-                  (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
-                   PAD_CTL_PUE_PULL     | PAD_CTL_DSE_HIGH)),
-#else
        /* UART1 */
 #if 1
        IOMUX_DATA(UART1_RXD, IOMUX_CONFIG_ALT0,
-                  PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
+                  PAD_CTL_DSE_HIGH | PAD_CTL_SRE),
 #else
        IOMUX_DATA(UART1_RXD, IOMUX_CONFIG_ALT3,        /* gpio4[28] */
-                  PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
+                  PAD_CTL_DSE_HIGH | PAD_CTL_SRE),
 #endif
        IOMUX_DATA(UART1_TXD, IOMUX_CONFIG_ALT0,
-                  PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
+                  PAD_CTL_DSE_HIGH | PAD_CTL_SRE),
        IOMUX_DATA(UART1_RTS, IOMUX_CONFIG_ALT0,
                   PAD_CTL_DSE_HIGH),
        IOMUX_DATA(UART1_CTS, IOMUX_CONFIG_ALT0,
                   PAD_CTL_DSE_HIGH),
-#endif
-
 };
 
 static void
@@ -1157,6 +1137,9 @@
        }
        printf("\n");
 
+       printf("\nCCM\n");
+       dump_sub(CCM_BASE, CCM_SIZE);
+
 #if 0
        /* disable power down counter in watch dog,
           This must be done within 16 seconds of start-up. */
@@ -1181,3 +1164,27 @@
 
 }
 #endif
+
+
+#if 0
+#include <arm/imx/imxgpiovar.h>
+
+void gpio_test(void)
+void
+gpio_test(void)
+{
+       int left, right;
+
+       gpio_set_direction(GPIO_NO(2, 22), GPIO_DIR_IN);
+       gpio_set_direction(GPIO_NO(2, 23), GPIO_DIR_IN);
+
+       for (;;) {
+               left = gpio_data_read(GPIO_NO(2, 22));
+               right = gpio_data_read(GPIO_NO(2, 23));
+
+               printf("\r%s %s",
+                   left ? "off" : "ON ",
+                   right ? "off" : "ON ");
+       }
+}
+#endif