Module Name: src
Committed By: jakllsch
Date: Sat Jan 5 20:31:23 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_obio.c files.bcm2835
Added Files:
src/sys/arch/arm/broadcom: bcm2835_spi.c bcm2835_spireg.h
Log Message:
Add driver for BCM2835 SPI0 controller.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm2835_obio.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/broadcom/bcm2835_spi.c \
src/sys/arch/arm/broadcom/bcm2835_spireg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/files.bcm2835
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/broadcom/bcm2835_obio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_obio.c:1.8 src/sys/arch/arm/broadcom/bcm2835_obio.c:1.9
--- src/sys/arch/arm/broadcom/bcm2835_obio.c:1.8 Sat Jan 5 20:15:17 2013
+++ src/sys/arch/arm/broadcom/bcm2835_obio.c Sat Jan 5 20:31:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_obio.c,v 1.8 2013/01/05 20:15:17 jakllsch Exp $ */
+/* $NetBSD: bcm2835_obio.c,v 1.9 2013/01/05 20:31:23 jakllsch Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.8 2013/01/05 20:15:17 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.9 2013/01/05 20:31:23 jakllsch Exp $");
#include "locators.h"
#include "obio.h"
@@ -112,6 +112,12 @@ static const struct ambadev_locators bcm
.ad_intr = BCM2835_INT_EMMC,
},
{
+ .ad_name = "bcmspi",
+ .ad_addr = BCM2835_SPI0_BASE,
+ .ad_size = BCM2835_SPI0_SIZE,
+ .ad_intr = BCM2835_INT_SPI0,
+ },
+ {
.ad_name = "bcmbsc",
.ad_addr = BCM2835_BSC0_BASE,
.ad_size = BCM2835_BSC_SIZE,
Index: src/sys/arch/arm/broadcom/files.bcm2835
diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.7 src/sys/arch/arm/broadcom/files.bcm2835:1.8
--- src/sys/arch/arm/broadcom/files.bcm2835:1.7 Sat Jan 5 20:15:17 2013
+++ src/sys/arch/arm/broadcom/files.bcm2835 Sat Jan 5 20:31:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.bcm2835,v 1.7 2013/01/05 20:15:17 jakllsch Exp $
+# $NetBSD: files.bcm2835,v 1.8 2013/01/05 20:31:23 jakllsch Exp $
#
# Configuration info for Broadcom BCM2835 ARM Peripherals
#
@@ -52,6 +52,11 @@ file arch/arm/broadcom/bcm2835_emmc.c bc
define bcm2835_gpio_subr
file arch/arm/broadcom/bcm2835_gpio_subr.c bcm2835_gpio_subr
+# SPI controller (BCM2835_SPI0_BASE)
+device bcmspi: spibus, bcm2835_gpio_subr
+attach bcmspi at obio
+file arch/arm/broadcom/bcm2835_spi.c bcmspi
+
# BSC (I2C) controller (BCM2835_BSC[01]_BASE)
device bsciic: i2cbus, bcm2835_gpio_subr
attach bsciic at obio
Added files:
Index: src/sys/arch/arm/broadcom/bcm2835_spi.c
diff -u /dev/null src/sys/arch/arm/broadcom/bcm2835_spi.c:1.1
--- /dev/null Sat Jan 5 20:31:23 2013
+++ src/sys/arch/arm/broadcom/bcm2835_spi.c Sat Jan 5 20:31:23 2013
@@ -0,0 +1,303 @@
+/* $NetBSD: bcm2835_spi.c,v 1.1 2013/01/05 20:31:23 jakllsch Exp $ */
+
+/*
+ * Copyright (c) 2012 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_spi.c,v 1.1 2013/01/05 20:31:23 jakllsch Exp $");
+
+#include <sys/param.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/mutex.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
+#include <sys/kernel.h>
+
+#include <sys/bitops.h>
+#include <dev/spi/spivar.h>
+
+#include <arm/broadcom/bcm_amba.h>
+#include <arm/broadcom/bcm2835reg.h>
+#include <arm/broadcom/bcm2835_spireg.h>
+#include <arm/broadcom/bcm2835_gpio_subr.h>
+
+struct bcmspi_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_iot;
+ bus_space_handle_t sc_ioh;
+ bus_size_t sc_ios;
+ void *sc_intrh;
+ struct spi_controller sc_spi;
+ SIMPLEQ_HEAD(,spi_transfer) sc_q;
+ struct spi_transfer *sc_transfer;
+ struct spi_chunk *sc_wchunk;
+ struct spi_chunk *sc_rchunk;
+ uint32_t sc_CS;
+ volatile bool sc_running;
+};
+
+static int bcmspi_match(device_t, cfdata_t, void *);
+static void bcmspi_attach(device_t, device_t, void *);
+
+static int bcmspi_configure(void *, int, int, int);
+static int bcmspi_transfer(void *, struct spi_transfer *);
+
+static void bcmspi_start(struct bcmspi_softc * const);
+static int bcmspi_intr(void *);
+
+static void bcmspi_send(struct bcmspi_softc * const);
+static void bcmspi_recv(struct bcmspi_softc * const);
+
+CFATTACH_DECL_NEW(bcmspi, sizeof(struct bcmspi_softc),
+ bcmspi_match, bcmspi_attach, NULL, NULL);
+
+static int
+bcmspi_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct amba_attach_args * const aaa = aux;
+
+ if (strcmp(aaa->aaa_name, "bcmspi") != 0)
+ return 0;
+
+ return 1;
+}
+
+static void
+bcmspi_attach(device_t parent, device_t self, void *aux)
+{
+ struct amba_attach_args * const aaa = aux;
+ struct bcmspi_softc * const sc = device_private(self);
+ struct spibus_attach_args sba;
+
+ aprint_naive("\n");
+ aprint_normal(": SPI\n");
+
+ sc->sc_dev = self;
+ SIMPLEQ_INIT(&sc->sc_q);
+ sc->sc_iot = aaa->aaa_iot;
+ if (bus_space_map(aaa->aaa_iot, aaa->aaa_addr, aaa->aaa_size, 0,
+ &sc->sc_ioh) != 0) {
+ aprint_error_dev(sc->sc_dev, "unable to map device\n");
+ return;
+ }
+ sc->sc_ios = aaa->aaa_size;
+
+ for (u_int pin = 7; pin <= 11; pin++)
+ bcm2835gpio_function_select(pin, BCM2835_GPIO_ALT0);
+
+ sc->sc_intrh = bcm2835_intr_establish(aaa->aaa_intr, IPL_BIO,
+ bcmspi_intr, sc);
+ if (sc->sc_intrh == NULL) {
+ aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
+ return;
+ }
+
+ sc->sc_spi.sct_cookie = sc;
+ sc->sc_spi.sct_configure = bcmspi_configure;
+ sc->sc_spi.sct_transfer = bcmspi_transfer;
+ sc->sc_spi.sct_nslaves = 3;
+
+ sba.sba_controller = &sc->sc_spi;
+
+ (void) config_found_ia(self, "spibus", &sba, spibus_print);
+}
+
+static int
+bcmspi_configure(void *cookie, int slave, int mode, int speed)
+{
+ struct bcmspi_softc * const sc = cookie;
+ uint32_t cs, clk;
+
+ cs = SPI_CS_INTR | SPI_CS_INTD;
+
+ if (slave > 2)
+ return EINVAL;
+
+ if (speed <= 0)
+ return EINVAL;
+
+ switch (mode) {
+ case SPI_MODE_0:
+ cs |= 0;
+ break;
+ case SPI_MODE_1:
+ cs |= SPI_CS_CPHA;
+ break;
+ case SPI_MODE_2:
+ cs |= SPI_CS_CPOL;
+ break;
+ case SPI_MODE_3:
+ cs |= SPI_CS_CPHA|SPI_CS_CPOL;
+ break;
+ default:
+ return EINVAL;
+ }
+
+ sc->sc_CS = cs;
+
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, SPI_CS, cs);
+
+ clk = 2 * 250000000 / speed; /* XXX 250MHz */
+ clk = (clk / 2) + (clk & 1);
+ clk = roundup(clk, 2);
+ clk = __SHIFTIN(clk, SPI_CLK_CDIV);
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, SPI_CLK, clk);
+
+ return 0;
+}
+
+static int
+bcmspi_transfer(void *cookie, struct spi_transfer *st)
+{
+ struct bcmspi_softc * const sc = cookie;
+ int s;
+
+ s = splbio();
+ spi_transq_enqueue(&sc->sc_q, st);
+ if (sc->sc_running == false) {
+ bcmspi_start(sc);
+ }
+ splx(s);
+ return 0;
+}
+
+static void
+bcmspi_start(struct bcmspi_softc * const sc)
+{
+ struct spi_transfer *st;
+ uint32_t cs;
+
+ while ((st = spi_transq_first(&sc->sc_q)) != NULL) {
+
+ spi_transq_dequeue(&sc->sc_q);
+
+ KASSERT(sc->sc_transfer == NULL);
+ sc->sc_transfer = st;
+ sc->sc_rchunk = sc->sc_wchunk = st->st_chunks;
+
+ cs = sc->sc_CS;
+ cs |= SPI_CS_TA;
+ cs |= SPI_CS_CLEAR_TX;
+ cs |= SPI_CS_CLEAR_RX;
+ KASSERT(st->st_slave <= 2);
+ cs |= __SHIFTIN(st->st_slave, SPI_CS_CS);
+ sc->sc_running = true;
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, SPI_CS, cs);
+
+ if (!cold)
+ return;
+
+ int s = splbio();
+ for (;;) {
+ bcmspi_intr(sc);
+ if (ISSET(st->st_flags, SPI_F_DONE))
+ break;
+ }
+ splx(s);
+ }
+
+ sc->sc_running = false;
+}
+
+static void
+bcmspi_send(struct bcmspi_softc * const sc)
+{
+ uint32_t fd;
+ uint32_t cs;
+ struct spi_chunk *chunk;
+
+ while ((chunk = sc->sc_wchunk) != NULL) {
+ while (chunk->chunk_wresid) {
+ cs = bus_space_read_4(sc->sc_iot, sc->sc_ioh, SPI_CS);
+ if ((cs & SPI_CS_TXD) == 0)
+ return;
+ if (chunk->chunk_wptr) {
+ fd = *chunk->chunk_wptr++;
+ } else {
+ fd = '\0';
+ }
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, SPI_FIFO, fd);
+ chunk->chunk_wresid--;
+ }
+ sc->sc_wchunk = sc->sc_wchunk->chunk_next;
+ }
+}
+
+static void
+bcmspi_recv(struct bcmspi_softc * const sc)
+{
+ uint32_t fd;
+ uint32_t cs;
+ struct spi_chunk *chunk;
+
+ while ((chunk = sc->sc_rchunk) != NULL) {
+ while (chunk->chunk_rresid) {
+ cs = bus_space_read_4(sc->sc_iot, sc->sc_ioh, SPI_CS);
+ if ((cs & SPI_CS_RXD) == 0)
+ return;
+ fd = bus_space_read_4(sc->sc_iot, sc->sc_ioh, SPI_FIFO);
+ if (chunk->chunk_rptr) {
+ *chunk->chunk_rptr++ = fd & 0xff;
+ }
+ chunk->chunk_rresid--;
+ }
+ sc->sc_rchunk = sc->sc_rchunk->chunk_next;
+ }
+}
+
+static int
+bcmspi_intr(void *cookie)
+{
+ struct bcmspi_softc * const sc = cookie;
+ struct spi_transfer *st;
+ uint32_t cs;
+
+ cs = bus_space_read_4(sc->sc_iot, sc->sc_ioh, SPI_CS);
+ if (ISSET(cs, SPI_CS_DONE)) {
+ if (sc->sc_wchunk != NULL) {
+ bcmspi_send(sc);
+ goto end;
+ } else {
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, SPI_CS,
+ sc->sc_CS);
+ bcmspi_recv(sc);
+ sc->sc_rchunk = sc->sc_wchunk = NULL;
+ st = sc->sc_transfer;
+ sc->sc_transfer = NULL;
+ KASSERT(st != NULL);
+ spi_done(st, 0);
+ sc->sc_running = false;
+ goto end;
+ }
+ } else if (ISSET(cs, SPI_CS_RXR)) {
+ bcmspi_recv(sc);
+ bcmspi_send(sc);
+ }
+
+end:
+ return ISSET(cs, SPI_CS_DONE|SPI_CS_RXR);
+}
Index: src/sys/arch/arm/broadcom/bcm2835_spireg.h
diff -u /dev/null src/sys/arch/arm/broadcom/bcm2835_spireg.h:1.1
--- /dev/null Sat Jan 5 20:31:23 2013
+++ src/sys/arch/arm/broadcom/bcm2835_spireg.h Sat Jan 5 20:31:23 2013
@@ -0,0 +1,75 @@
+/* $NetBSD: bcm2835_spireg.h,v 1.1 2013/01/05 20:31:23 jakllsch Exp $ */
+
+/*
+ * Copyright (c) 2012 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_SPIREG_H_
+#define _BROADCOM_BCM2835_SPIREG_H_
+
+#include <sys/cdefs.h>
+
+#define __BIT32(x) ((uint32_t)__BIT(x))
+#define __BITS32(x, y) ((uint32_t)__BITS((x), (y)))
+
+#define SPI_CS 0x000
+#define SPI_CS_CS __BITS32(1,0)
+#define SPI_CS_CPHA __BIT32(2)
+#define SPI_CS_CPOL __BIT32(3)
+#define SPI_CS_CLEAR_TX __BIT32(4)
+#define SPI_CS_CLEAR_RX __BIT32(5)
+#define SPI_CS_CSPOL __BIT32(6)
+#define SPI_CS_TA __BIT32(7)
+#define SPI_CS_DMAEN __BIT32(8)
+#define SPI_CS_INTD __BIT32(9)
+#define SPI_CS_INTR __BIT32(10)
+#define SPI_CS_ADCS __BIT32(11)
+#define SPI_CS_REN __BIT32(12)
+#define SPI_CS_LEN __BIT32(13)
+#define SPI_CS_LMONO __BIT32(14)
+#define SPI_CS_TE_EN __BIT32(15)
+#define SPI_CS_DONE __BIT32(16)
+#define SPI_CS_RXD __BIT32(17)
+#define SPI_CS_TXD __BIT32(18)
+#define SPI_CS_RXR __BIT32(19)
+#define SPI_CS_RXF __BIT32(20)
+#define SPI_CS_CSPOL0 __BIT32(21)
+#define SPI_CS_CSPOL1 __BIT32(22)
+#define SPI_CS_CSPOL2 __BIT32(23)
+#define SPI_CS_DMA_LEN __BIT32(24)
+#define SPI_CS_LEN_LONG __BIT32(25)
+
+#define SPI_FIFO 0x004
+
+#define SPI_CLK 0x008
+#define SPI_CLK_CDIV __BITS32(15,0)
+
+#define SPI_DLEN 0x00c
+
+#define SPI_LTOH 0x010
+
+#define SPI_DC 0x014
+
+#endif /* _BROADCOM_BCM2835_SPIREG_H_ */
