Module Name: src
Committed By: skrll
Date: Tue Oct 15 09:07:48 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_obio.c files.bcm2835
src/sys/arch/evbarm/conf: RPI std.rpi
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Switch to dwctwo(4) from dotg(4) for the RaspberryPi port. This brings
DMA support and (initial) isoc transfer support.
Remove URTWN_DOTG_WORKAROUND as dwctwo doesn't appear to need it.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm2835_obio.c \
src/sys/arch/arm/broadcom/files.bcm2835
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/std.rpi
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/rpi/rpi_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/broadcom/bcm2835_obio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_obio.c:1.18 src/sys/arch/arm/broadcom/bcm2835_obio.c:1.19
--- src/sys/arch/arm/broadcom/bcm2835_obio.c:1.18 Sun Mar 24 19:52:11 2013
+++ src/sys/arch/arm/broadcom/bcm2835_obio.c Tue Oct 15 09:07:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_obio.c,v 1.18 2013/03/24 19:52:11 jmcneill Exp $ */
+/* $NetBSD: bcm2835_obio.c,v 1.19 2013/10/15 09:07:48 skrll 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.18 2013/03/24 19:52:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.19 2013/10/15 09:07:48 skrll Exp $");
#include "locators.h"
#include "obio.h"
@@ -134,7 +134,7 @@ static const struct ambadev_locators bcm
},
{
/* DesignWare_OTG USB controller */
- .ad_name = "dotg",
+ .ad_name = "dwctwo",
.ad_addr = BCM2835_USB_BASE,
.ad_size = BCM2835_USB_SIZE,
.ad_intr = BCM2835_INT_USB,
Index: src/sys/arch/arm/broadcom/files.bcm2835
diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.18 src/sys/arch/arm/broadcom/files.bcm2835:1.19
--- src/sys/arch/arm/broadcom/files.bcm2835:1.18 Tue Oct 15 07:23:20 2013
+++ src/sys/arch/arm/broadcom/files.bcm2835 Tue Oct 15 09:07:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.bcm2835,v 1.18 2013/10/15 07:23:20 skrll Exp $
+# $NetBSD: files.bcm2835,v 1.19 2013/10/15 09:07:48 skrll Exp $
#
# Configuration info for Broadcom BCM2835 ARM Peripherals
#
@@ -55,10 +55,6 @@ attach sdhc at obio with bcmemmc
file arch/arm/broadcom/bcm2835_emmc.c bcmemmc
# USB (BCM2835_USB_BASE)
-attach dotg at obio with dotg_amba
-file arch/arm/broadcom/bcm2835_dotg.c dotg needs-flag
-
-# USB (BCM2835_USB_BASE)
attach dwctwo at obio with bcmdwctwo
file arch/arm/broadcom/bcm2835_dwctwo.c bcmdwctwo needs-flag
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.40 src/sys/arch/evbarm/conf/RPI:1.41
--- src/sys/arch/evbarm/conf/RPI:1.40 Mon Aug 12 23:41:54 2013
+++ src/sys/arch/evbarm/conf/RPI Tue Oct 15 09:07:48 2013
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.40 2013/08/12 23:41:54 matt Exp $
+# $NetBSD: RPI,v 1.41 2013/10/15 09:07:48 skrll Exp $
#
# RPi -- Raspberry Pi
#
@@ -209,8 +209,8 @@ sdmmc* at sdhc?
ld* at sdmmc?
# On-board USB
-dotg* at obio?
-usb* at dotg?
+dwctwo* at obio?
+usb* at dwctwo?
# USB device drivers
include "dev/usb/usbdevices.config"
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.10 src/sys/arch/evbarm/conf/std.rpi:1.11
--- src/sys/arch/evbarm/conf/std.rpi:1.10 Tue Sep 17 07:13:13 2013
+++ src/sys/arch/evbarm/conf/std.rpi Tue Oct 15 09:07:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.rpi,v 1.10 2013/09/17 07:13:13 skrll Exp $
+# $NetBSD: std.rpi,v 1.11 2013/10/15 09:07:48 skrll Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
@@ -15,7 +15,6 @@ options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options TPIDRPRW_IS_CURCPU
options ARM_HAS_VBAR
options KERNEL_BASE_EXT=0xc0000000
-options URTWN_DOTG_WORKAROUND
options EVBARM_BOARDTYPE="rpi"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.rpi"
Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.37 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.38
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.37 Sat May 11 14:19:44 2013
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Tue Oct 15 09:07:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.37 2013/05/11 14:19:44 skrll Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.38 2013/10/15 09:07:48 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.37 2013/05/11 14:19:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.38 2013/10/15 09:07:48 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "sdhc.h"
-#include "dotg.h"
+#include "bcmdwctwo.h"
#include "bcmspi.h"
#include "bsciic.h"
#include "plcom.h"
@@ -385,7 +385,7 @@ rpi_bootparams(void)
#if (NPLCOM > 0)
(1 << VCPM_POWER_UART0) |
#endif
-#if (NDOTG > 0)
+#if (NBCMDWCTWO > 0)
(1 << VCPM_POWER_USB) |
#endif
#if (NBSCIIC > 0)
