[src/trunk]: src/sys/arch Xuhost bits for Exynos5 are located in the two top ...

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

details:   https://anonhg.NetBSD.org/src/rev/3107292d04a4
branches:  trunk
changeset: 332173:3107292d04a4
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Tue Sep 09 21:21:22 2014 +0000

description:
Xuhost bits for Exynos5 are located in the two top bits

diffstat:

 sys/arch/arm/samsung/exynos_gpio.c      |   6 +++---
 sys/arch/evbarm/odroid/odroid_machdep.c |  10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r f9c3640811b6 -r 3107292d04a4 sys/arch/arm/samsung/exynos_gpio.c
--- a/sys/arch/arm/samsung/exynos_gpio.c        Tue Sep 09 21:04:05 2014 +0000
+++ b/sys/arch/arm/samsung/exynos_gpio.c        Tue Sep 09 21:21:22 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exynos_gpio.c,v 1.9 2014/09/05 08:01:05 skrll Exp $    */
+/*     $NetBSD: exynos_gpio.c,v 1.10 2014/09/09 21:21:22 reinoud Exp $ */
 
 /*-
 * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include "gpio.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.9 2014/09/05 08:01:05 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.10 2014/09/09 21:21:22 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -170,7 +170,7 @@
        GPIO_GRP(4, RIGHT, 0x01C0, GPY5, 8),
        GPIO_GRP(4, RIGHT, 0x01E0, GPY6, 8),
        GPIO_GRP(4, RIGHT, 0x0200, ETC0, 6),
-       GPIO_GRP(4, RIGHT, 0x0220, ETC6, 7),
+       GPIO_GRP(4, RIGHT, 0x0220, ETC6, 8),
        GPIO_GRP(4, RIGHT, 0x0260, GPM0, 8),
        GPIO_GRP(4, RIGHT, 0x0280, GPM1, 7),
        GPIO_GRP(4, RIGHT, 0x02A0, GPM2, 5),
diff -r f9c3640811b6 -r 3107292d04a4 sys/arch/evbarm/odroid/odroid_machdep.c
--- a/sys/arch/evbarm/odroid/odroid_machdep.c   Tue Sep 09 21:04:05 2014 +0000
+++ b/sys/arch/evbarm/odroid/odroid_machdep.c   Tue Sep 09 21:21:22 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: odroid_machdep.c,v 1.32 2014/09/03 15:24:52 reinoud Exp $ */
+/*     $NetBSD: odroid_machdep.c,v 1.33 2014/09/09 21:21:22 reinoud Exp $ */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: odroid_machdep.c,v 1.32 2014/09/03 15:24:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: odroid_machdep.c,v 1.33 2014/09/09 21:21:22 reinoud Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_exynos.h"
@@ -450,7 +450,7 @@
        bus_space_handle_t bsh = EXYNOS_IOPHYSTOVIRT(iobase);
        u_int i;
        /*      
-        * No need to guess at the UART frequency since we can caclulate it.
+        * No need to guess at the UART frequency since we can calculate it.
         */
        uint32_t freq = conspeed
           * (16 * (bus_space_read_4(bst, bsh, SSCOM_UBRDIV) + 1)
@@ -564,8 +564,8 @@
        prop_dictionary_set_uint32(dict, "nc-GPY5", 0xff - 0b00000000);
        prop_dictionary_set_uint32(dict, "nc-GPY6", 0xff - 0b00000000);
        prop_dictionary_set_uint32(dict, "nc-ETC0", 0x3f - 0b00000000);
-       /* standard Xuhost bits at pin 5,6 */
-       prop_dictionary_set_uint32(dict, "nc-ETC6", 0x7f - 0b01100000);
+       /* standard Xuhost bits at pin 6,7 */
+       prop_dictionary_set_uint32(dict, "nc-ETC6", 0xff - 0b11000000);
        prop_dictionary_set_uint32(dict, "nc-GPM0", 0xff - 0b00000000);
        prop_dictionary_set_uint32(dict, "nc-GPM1", 0x7f - 0b00000000);
        prop_dictionary_set_uint32(dict, "nc-GPM2", 0x1f - 0b00000000);