Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xuhost bits for Exynos5 are located in the two top bits

Browse Source
This commit is contained in:
reinoud 2014-09-09 21:21:22 +00:00
parent 2b1896b5df
commit b1ed2b886e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm/samsung/exynos_gpio.c
View File

@ -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 exynos4_pin_groups[] = {
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),

10
sys/arch/evbarm/odroid/odroid_machdep.c
View File

@ -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, prop_dictionary_t dict) {
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);