svn commit: r238415 - head/sys/arm/at91
Warner Losh
imp at FreeBSD.org
Fri Jul 13 04:22:08 UTC 2012
Author: imp
Date: Fri Jul 13 04:22:08 2012
New Revision: 238415
URL: http://svn.freebsd.org/changeset/base/238415
Log:
For our at91rm9200 boards, register which subtype of SoC is on the
board. We'll use this later to control the differences between these
two variants' pins.
Added:
head/sys/arm/at91/at91rm9200_devices.c (contents, props changed)
head/sys/arm/at91/at91rm9200var.h (contents, props changed)
Modified:
head/sys/arm/at91/board_bwct.c
head/sys/arm/at91/board_hl200.c
head/sys/arm/at91/board_kb920x.c
head/sys/arm/at91/board_tsc4370.c
head/sys/arm/at91/files.at91
Added: head/sys/arm/at91/at91rm9200_devices.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/at91/at91rm9200_devices.c Fri Jul 13 04:22:08 2012 (r238415)
@@ -0,0 +1,62 @@
+/*-
+ * Copyright (c) 2012 M. Warner Losh. 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 AUTHOR 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 AUTHOR 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>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+
+#define _ARM32_BUS_DMA_PRIVATE
+#include <machine/bus.h>
+
+#include <arm/at91/at91var.h>
+#include <arm/at91/at91rm9200var.h>
+
+/*
+ * The AT91RM9200 uses the same silicon for both the BGA and PQFP
+ * packages. There's no documented way to detect this at runtime,
+ * so we require the board code to register what type of SoC is on the
+ * board in question. The pinouts are not quite compatible, and we
+ * use this information to cope with the slight differences.
+ */
+void
+at91rm9200_set_subtype(enum at91_soc_subtype st)
+{
+
+ switch (st) {
+ case AT91_ST_RM9200_BGA:
+ case AT91_ST_RM9200_PQFP:
+ soc_info.subtype = st;
+ break;
+ default:
+ panic("Bad SoC subtype %d for at91rm9200_set_subtype.", st);
+ break;
+ }
+}
Added: head/sys/arm/at91/at91rm9200var.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/at91/at91rm9200var.h Fri Jul 13 04:22:08 2012 (r238415)
@@ -0,0 +1,33 @@
+/*-
+ * Copyright (c) 2012 M. Warner Losh. 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 AUTHOR 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 AUTHOR 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.
+ */
+
+/* $FreeBSD$ */
+
+#ifndef ARM_AT91_AT91RM9200VAR_H
+#define ARM_AT91_AT91RM9200VAR_H
+
+void at91rm9200_set_subtype(enum at91_soc_subtype st);
+
+#endif /* ARM_AT91_AT91RM9200VAR_H */
Modified: head/sys/arm/at91/board_bwct.c
==============================================================================
--- head/sys/arm/at91/board_bwct.c Fri Jul 13 04:10:41 2012 (r238414)
+++ head/sys/arm/at91/board_bwct.c Fri Jul 13 04:22:08 2012 (r238415)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
- * Copyright (c) 2005-2008 Warner Losh. All rights reserved.
+ * Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,13 +31,18 @@ __FBSDID("$FreeBSD$");
#include <machine/board.h>
#include <arm/at91/at91board.h>
+#include <arm/at91/at91var.h>
#include <arm/at91/at91rm92reg.h>
+#include <arm/at91/at91rm9200var.h>
#include <arm/at91/at91_piovar.h>
#include <arm/at91/at91_pio_rm9200.h>
BOARD_INIT long
board_init(void)
{
+
+ at91rm9200_set_subtype(AT91_ST_RM9200_BGA);
+
/*
* Since the USART supports RS-485 multidrop mode, it allows the
* TX pins to float. However, for RS-232 operations, we don't want
Modified: head/sys/arm/at91/board_hl200.c
==============================================================================
--- head/sys/arm/at91/board_hl200.c Fri Jul 13 04:10:41 2012 (r238414)
+++ head/sys/arm/at91/board_hl200.c Fri Jul 13 04:22:08 2012 (r238415)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
- * Copyright (c) 2005-2008 Warner Losh. All rights reserved.
+ * Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,13 +31,18 @@ __FBSDID("$FreeBSD$");
#include <machine/board.h>
#include <arm/at91/at91board.h>
+#include <arm/at91/at91var.h>
#include <arm/at91/at91rm92reg.h>
+#include <arm/at91/at91rm9200var.h>
#include <arm/at91/at91_piovar.h>
#include <arm/at91/at91_pio_rm9200.h>
BOARD_INIT long
board_init(void)
{
+
+ at91rm9200_set_subtype(AT91_ST_RM9200_BGA);
+
/*
* Since the USART supports RS-485 multidrop mode, it allows the
* TX pins to float. However, for RS-232 operations, we don't want
Modified: head/sys/arm/at91/board_kb920x.c
==============================================================================
--- head/sys/arm/at91/board_kb920x.c Fri Jul 13 04:10:41 2012 (r238414)
+++ head/sys/arm/at91/board_kb920x.c Fri Jul 13 04:22:08 2012 (r238415)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
- * Copyright (c) 2005-2008 Warner Losh. All rights reserved.
+ * Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,15 +30,19 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <machine/board.h>
-#include <arm/at91/at91var.h>
#include <arm/at91/at91board.h>
+#include <arm/at91/at91var.h>
#include <arm/at91/at91rm92reg.h>
+#include <arm/at91/at91rm9200var.h>
#include <arm/at91/at91_piovar.h>
#include <arm/at91/at91_pio_rm9200.h>
BOARD_INIT long
board_init(void)
{
+
+ at91rm9200_set_subtype(AT91_ST_RM9200_PQFP);
+
/*
* Since the USART supports RS-485 multidrop mode, it allows the
* TX pins to float. However, for RS-232 operations, we don't want
Modified: head/sys/arm/at91/board_tsc4370.c
==============================================================================
--- head/sys/arm/at91/board_tsc4370.c Fri Jul 13 04:10:41 2012 (r238414)
+++ head/sys/arm/at91/board_tsc4370.c Fri Jul 13 04:22:08 2012 (r238415)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
- * Copyright (c) 2005-2008 Warner Losh. All rights reserved.
+ * Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,13 +31,18 @@ __FBSDID("$FreeBSD$");
#include <machine/board.h>
#include <arm/at91/at91board.h>
+#include <arm/at91/at91var.h>
#include <arm/at91/at91rm92reg.h>
+#include <arm/at91/at91rm9200var.h>
#include <arm/at91/at91_piovar.h>
#include <arm/at91/at91_pio_rm9200.h>
BOARD_INIT long
board_init(void)
{
+
+ at91rm9200_set_subtype(AT91_ST_RM9200_PQFP);
+
/*
* Since the USART supports RS-485 multidrop mode, it allows the
* TX pins to float. However, for RS-232 operations, we don't want
Modified: head/sys/arm/at91/files.at91
==============================================================================
--- head/sys/arm/at91/files.at91 Fri Jul 13 04:10:41 2012 (r238414)
+++ head/sys/arm/at91/files.at91 Fri Jul 13 04:22:08 2012 (r238415)
@@ -29,6 +29,7 @@ arm/at91/uart_dev_at91usart.c optional u
#
arm/at91/at91soc.c standard
arm/at91/at91rm9200.c optional at91rm9200
+arm/at91/at91rm9200_devices.c optional at91rm9200
arm/at91/at91sam9260.c optional at91sam9260
arm/at91/at91sam9g20.c optional at91sam9g20
arm/at91/at91sam9x25.c optional at91sam9x25
More information about the svn-src-all
mailing list