[src/trunk]: src/sys/arch/arm/broadcom Add a function for adjusting the pin m...

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

details:   https://anonhg.NetBSD.org/src/rev/698b37556320
branches:  trunk
changeset: 783720:698b37556320
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Jan 05 19:55:18 2013 +0000

description:
Add a function for adjusting the pin muxer in the GPIO block.
(This should probably be revisited later.)

diffstat:

 sys/arch/arm/broadcom/bcm2835_gpio_subr.c |  69 +++++++++++++++++++++++++++++++
 sys/arch/arm/broadcom/bcm2835_gpio_subr.h |  36 ++++++++++++++++
 sys/arch/arm/broadcom/bcm2835_gpioreg.h   |  45 ++++++++++++++++++++
 sys/arch/arm/broadcom/files.bcm2835       |   6 ++-
 4 files changed, 155 insertions(+), 1 deletions(-)

diffs (179 lines):

diff -r 7597d71fe171 -r 698b37556320 sys/arch/arm/broadcom/bcm2835_gpio_subr.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_gpio_subr.c Sat Jan 05 19:55:18 2013 +0000
@@ -0,0 +1,69 @@
+/*     $NetBSD: bcm2835_gpio_subr.c,v 1.1 2013/01/05 19:55:18 jakllsch Exp $   */
+
+/*
+ * Copyright (c) 2013 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio_subr.c,v 1.1 2013/01/05 19:55:18 jakllsch Exp $");
+
+#include <sys/param.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
+
+#include <arm/broadcom/bcm_amba.h>
+#include <arm/broadcom/bcm2835reg.h>
+#include <arm/broadcom/bcm2835_gpioreg.h>
+#include <arm/broadcom/bcm2835_gpio_subr.h>
+
+void
+bcm2835gpio_function_select(u_int pin, u_int func)
+{
+       const bus_space_tag_t iot = &bcm2835_bs_tag;
+       const bus_space_handle_t ioh = BCM2835_IOPHYSTOVIRT(BCM2835_GPIO_BASE);
+       const u_int mask = (1 << BCM2835_GPIO_GPFSEL_BITS_PER_PIN) - 1;
+       const u_int regid = (pin / BCM2835_GPIO_GPFSEL_PINS_PER_REGISTER);
+       const u_int shift = (pin % BCM2835_GPIO_GPFSEL_PINS_PER_REGISTER) *
+           BCM2835_GPIO_GPFSEL_BITS_PER_PIN;
+       uint32_t v;
+
+
+       KASSERT(func <= mask);
+
+       v = bus_space_read_4(iot, ioh, BCM2835_GPIO_GPFSEL(regid));
+
+       if (((v >> shift) & mask) == func) {
+               return;
+       }
+
+       aprint_verbose("bcm2835: changing FSEL%u to %#o\n", pin, func);
+
+       v &= ~(mask << shift);
+       v |=  (func << shift);
+
+       bus_space_write_4(iot, ioh, BCM2835_GPIO_GPFSEL(regid), v);
+}
diff -r 7597d71fe171 -r 698b37556320 sys/arch/arm/broadcom/bcm2835_gpio_subr.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_gpio_subr.h Sat Jan 05 19:55:18 2013 +0000
@@ -0,0 +1,36 @@
+/*     $NetBSD: bcm2835_gpio_subr.h,v 1.1 2013/01/05 19:55:18 jakllsch Exp $   */
+
+/*
+ * Copyright (c) 2013 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BROADCOM_BCM2835_GPIO_SUBR_H_
+#define _BROADCOM_BCM2835_GPIO_SUBR_H_
+
+#include <arm/broadcom/bcm2835_gpioreg.h>
+
+void bcm2835gpio_function_select(u_int, u_int);
+
+#endif /* _BROADCOM_BCM2835_GPIOVAR_H_ */
diff -r 7597d71fe171 -r 698b37556320 sys/arch/arm/broadcom/bcm2835_gpioreg.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_gpioreg.h   Sat Jan 05 19:55:18 2013 +0000
@@ -0,0 +1,45 @@
+/*     $NetBSD: bcm2835_gpioreg.h,v 1.1 2013/01/05 19:55:18 jakllsch Exp $     */
+
+/*
+ * Copyright (c) 2013 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BROADCOM_BCM2835_GPIOREG_H_
+#define _BROADCOM_BCM2835_GPIOREG_H_
+
+#define BCM2835_GPIO_GPFSEL(x) (0x000 + (x) * sizeof(uint32_t))
+#define BCM2835_GPIO_GPFSEL_PINS_PER_REGISTER  10
+#define BCM2835_GPIO_GPFSEL_BITS_PER_PIN       3 
+
+#define BCM2835_GPIO_IN                00
+#define BCM2835_GPIO_OUT       01
+#define BCM2835_GPIO_ALT5      02
+#define BCM2835_GPIO_ALT4      03
+#define BCM2835_GPIO_ALT0      04
+#define BCM2835_GPIO_ALT1      05
+#define BCM2835_GPIO_ALT2      06
+#define BCM2835_GPIO_ALT3      07
+
+#endif /* _BROADCOM_BCM2835_GPIOREG_H_ */
diff -r 7597d71fe171 -r 698b37556320 sys/arch/arm/broadcom/files.bcm2835
--- a/sys/arch/arm/broadcom/files.bcm2835       Sat Jan 05 19:47:17 2013 +0000
+++ b/sys/arch/arm/broadcom/files.bcm2835       Sat Jan 05 19:55:18 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.bcm2835,v 1.5 2012/08/22 13:21:31 jakllsch Exp $
+#      $NetBSD: files.bcm2835,v 1.6 2013/01/05 19:55:18 jakllsch Exp $
 #
 # Configuration info for Broadcom BCM2835 ARM Peripherals
 #
@@ -47,3 +47,7 @@
 # External Mass Media Controller (BCM2835_EMMC_BASE)
 attach sdhc at obio with bcmemmc
 file   arch/arm/broadcom/bcm2835_emmc.c        bcmemmc
+
+# GPIO misc. functions
+define bcm2835_gpio_subr
+file   arch/arm/broadcom/bcm2835_gpio_subr.c   bcm2835_gpio_subr