Module Name: src
Committed By: reinoud
Date: Tue Sep 9 21:21:22 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_gpio.c
src/sys/arch/evbarm/odroid: odroid_machdep.c
Log Message:
Xuhost bits for Exynos5 are located in the two top bits
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/samsung/exynos_gpio.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/odroid/odroid_machdep.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/samsung/exynos_gpio.c
diff -u src/sys/arch/arm/samsung/exynos_gpio.c:1.9 src/sys/arch/arm/samsung/exynos_gpio.c:1.10
--- src/sys/arch/arm/samsung/exynos_gpio.c:1.9 Fri Sep 5 08:01:05 2014
+++ src/sys/arch/arm/samsung/exynos_gpio.c Tue Sep 9 21:21:22 2014
@@ -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 @@ static struct exynos_gpio_pin_group exyn
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),
Index: src/sys/arch/evbarm/odroid/odroid_machdep.c
diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.32 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.33
--- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.32 Wed Sep 3 15:24:52 2014
+++ src/sys/arch/evbarm/odroid/odroid_machdep.c Tue Sep 9 21:21:22 2014
@@ -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 @@ consinit(void)
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 @@ odroid_exynos4_gpio_ncs(device_t self, p
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);
