Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Jun 2012 04:49:50 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r237743 - head/sys/arm/at91
Message-ID:  <201206290449.q5T4noUX019367@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Fri Jun 29 04:49:50 2012
New Revision: 237743
URL: http://svn.freebsd.org/changeset/base/237743

Log:
  Ooops, replaced the at91sam9g20 interrupt list with the at91sam9x25 ones.

Modified:
  head/sys/arm/at91/at91sam9x25.c

Modified: head/sys/arm/at91/at91sam9x25.c
==============================================================================
--- head/sys/arm/at91/at91sam9x25.c	Fri Jun 29 04:18:52 2012	(r237742)
+++ head/sys/arm/at91/at91sam9x25.c	Fri Jun 29 04:49:50 2012	(r237743)
@@ -59,38 +59,38 @@ struct at91sam9x25_softc {
  */
 static const int at91_irq_prio[32] =
 {
-	7,	/* Advanced Interrupt Controller */
+	7,	/* Advanced Interrupt Controller (FIQ) */
 	7,	/* System Peripherals */
-	1,	/* Parallel IO Controller A */
-	1,	/* Parallel IO Controller B */
-	1,	/* Parallel IO Controller C */
-	0,	/* Analog-to-Digital Converter */
+	1,	/* Parallel IO Controller A and B */
+	1,	/* Parallel IO Controller C and D */
+	4,	/* Soft Modem */
 	5,	/* USART 0 */
 	5,	/* USART 1 */
 	5,	/* USART 2 */
-	0,	/* Multimedia Card Interface */
-	2,	/* USB Device Port */
-	6,	/* Two-Wire Interface */
+	5,	/* USART 3 */
+	6,	/* Two-Wire Interface 0 */
+	6,	/* Two-Wire Interface 1 */
+	6,	/* Two-Wire Interface 2 */
+	0,	/* Multimedia Card Interface 0 */
 	5,	/* Serial Peripheral Interface 0 */
 	5,	/* Serial Peripheral Interface 1 */
-	5,	/* Serial Synchronous Controller */
-	0,	/* (reserved) */
-	0,	/* (reserved) */
-	0,	/* Timer Counter 0 */
-	0,	/* Timer Counter 1 */
-	0,	/* Timer Counter 2 */
-	2,	/* USB Host port */
-	3,	/* Ethernet */
-	0,	/* Image Sensor Interface */
-	5,	/* USART 3 */
-	5,	/* USART 4 */
-	5,	/* USART 5 */
-	0,	/* Timer Counter 3 */
-	0,	/* Timer Counter 4 */
-	0,	/* Timer Counter 5 */
-	0,	/* Advanced Interrupt Controller IRQ0 */
-	0,	/* Advanced Interrupt Controller IRQ1 */
-	0,	/* Advanced Interrupt Controller IRQ2 */
+	5,	/* UART 0 */
+	5,	/* UART 1 */
+	0,	/* Timer Counter 0, 1, 2, 3, 4 and 5 */
+	0,	/* Pulse Width Modulation Controller */
+	0,	/* ADC Controller */
+	0,	/* DMA Controller 0 */
+	0,	/* DMA Controller 1 */
+	2,	/* USB Host High Speed port */
+	2,	/* USB Device High speed port */
+	3,	/* Ethernet MAC 0 */
+	3,	/* LDC Controller or Image Sensor Interface */
+	0,	/* Multimedia Card Interface 1 */
+	3,	/* Ethernet MAC 1 */
+	4,	/* Synchronous Serial Interface */
+	4,	/* CAN Controller 0 */
+	4,	/* CAN Controller 1 */
+	0,	/* Advanced Interrupt Controller (IRQ0) */
 };
 
 #define DEVICE(_name, _id, _unit)		\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206290449.q5T4noUX019367>