Module Name: src
Committed By: jmcneill
Date: Sat May 9 12:07:11 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_gpio.c
Log Message:
tegra_gpio_acquire: if a pin is required and not in GPIO mode, switch
configuration instead of bailing out
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_gpio.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/nvidia/tegra_gpio.c
diff -u src/sys/arch/arm/nvidia/tegra_gpio.c:1.2 src/sys/arch/arm/nvidia/tegra_gpio.c:1.3
--- src/sys/arch/arm/nvidia/tegra_gpio.c:1.2 Sat May 2 17:06:53 2015
+++ src/sys/arch/arm/nvidia/tegra_gpio.c Sat May 9 12:07:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_gpio.c,v 1.2 2015/05/02 17:06:53 jmcneill Exp $ */
+/* $NetBSD: tegra_gpio.c,v 1.3 2015/05/09 12:07:11 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_gpio.c,v 1.2 2015/05/02 17:06:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_gpio.c,v 1.3 2015/05/09 12:07:11 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -298,7 +298,7 @@ tegra_gpio_acquire(const char *pinname,
const uint32_t cnf = GPIO_READ(&bank, GPIO_CNF_REG);
if ((cnf & __BIT(pin)) == 0)
- return NULL;
+ GPIO_WRITE(&bank, GPIO_CNF_REG, cnf | __BIT(pin));
gpin = kmem_alloc(sizeof(*gpin), KM_SLEEP);
gpin->pin_bank = bank;
