Module Name: src
Committed By: kiyohara
Date: Mon Jul 23 06:19:04 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: mvsoc.c
Log Message:
Enable idmac.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/mvsoc.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/marvell/mvsoc.c
diff -u src/sys/arch/arm/marvell/mvsoc.c:1.6 src/sys/arch/arm/marvell/mvsoc.c:1.7
--- src/sys/arch/arm/marvell/mvsoc.c:1.6 Sat Jul 21 05:11:45 2012
+++ src/sys/arch/arm/marvell/mvsoc.c Mon Jul 23 06:19:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc.c,v 1.6 2012/07/21 05:11:45 kiyohara Exp $ */
+/* $NetBSD: mvsoc.c,v 1.7 2012/07/23 06:19:04 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc.c,v 1.6 2012/07/21 05:11:45 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc.c,v 1.7 2012/07/23 06:19:04 kiyohara Exp $");
#include "opt_cputypes.h"
#include "opt_mvsoc.h"
@@ -216,7 +216,7 @@ static const struct mvsoc_periph {
{ ORION_1(88F5082), "com", 1, MVSOC_COM1_BASE, ORION_IRQ_UART1 },
{ ORION_1(88F5082), "ehci", 0, ORION_USB0_BASE, ORION_IRQ_USBCNT0 },
{ ORION_1(88F5082), "ehci", 1, ORION_USB1_BASE, ORION_IRQ_USBCNT1 },
-// { ORION_1(88F5082), "gtidmac", 0, ORION_IDMAC_BASE, 0 },
+ { ORION_1(88F5082), "gtidmac", 0, ORION_IDMAC_BASE, IRQ_DEFAULT },
{ ORION_1(88F5082), "gttwsi", 0, MVSOC_TWSI_BASE, ORION_IRQ_TWSI },
{ ORION_1(88F5082), "mvcesa", 0, ORION_CESA_BASE, ORION_IRQ_SECURITYINTR},
{ ORION_1(88F5082), "mvgbec", 0, ORION_GBE_BASE, IRQ_DEFAULT },
@@ -228,7 +228,7 @@ static const struct mvsoc_periph {
{ ORION_1(88F5180N),"com", 0, MVSOC_COM0_BASE, ORION_IRQ_UART0 },
{ ORION_1(88F5180N),"com", 1, MVSOC_COM1_BASE, ORION_IRQ_UART1 },
{ ORION_1(88F5180N),"ehci", 0, ORION_USB0_BASE, ORION_IRQ_USBCNT0 },
-// { ORION_1(88F5180N),"gtidmac", 0, ORION_IDMAC_BASE, 0 },
+ { ORION_1(88F5180N),"gtidmac", 0, ORION_IDMAC_BASE, IRQ_DEFAULT },
{ ORION_1(88F5180N),"gtpci", 0, ORION_PCI_BASE, ORION_IRQ_PEX0INT },
{ ORION_1(88F5180N),"gttwsi", 0, MVSOC_TWSI_BASE, ORION_IRQ_TWSI },
{ ORION_1(88F5180N),"mvgbec", 0, ORION_GBE_BASE, IRQ_DEFAULT },
@@ -239,7 +239,7 @@ static const struct mvsoc_periph {
{ ORION_1(88F5181), "com", 0, MVSOC_COM0_BASE, ORION_IRQ_UART0 },
{ ORION_1(88F5181), "com", 1, MVSOC_COM1_BASE, ORION_IRQ_UART1 },
{ ORION_1(88F5181), "ehci", 0, ORION_USB0_BASE, ORION_IRQ_USBCNT0 },
-// { ORION_1(88F5181), "gtidmac", 0, ORION_IDMAC_BASE, 0 },
+ { ORION_1(88F5181), "gtidmac", 0, ORION_IDMAC_BASE, IRQ_DEFAULT },
{ ORION_1(88F5181), "gtpci", 0, ORION_PCI_BASE, ORION_IRQ_PEX0INT },
{ ORION_1(88F5181), "gttwsi", 0, MVSOC_TWSI_BASE, ORION_IRQ_TWSI },
{ ORION_1(88F5181), "mvcesa", 0, ORION_CESA_BASE, ORION_IRQ_SECURITYINTR},
@@ -252,7 +252,7 @@ static const struct mvsoc_periph {
{ ORION_1(88F5182), "com", 1, MVSOC_COM1_BASE, ORION_IRQ_UART1 },
{ ORION_1(88F5182), "ehci", 0, ORION_USB0_BASE, ORION_IRQ_USBCNT0 },
{ ORION_1(88F5182), "ehci", 1, ORION_USB1_BASE, ORION_IRQ_USBCNT1 },
- { ORION_1(88F5182), "gtidmac", 0, ORION_IDMAC_BASE, ORION_IRQ_IDMA0 },
+ { ORION_1(88F5182), "gtidmac", 0, ORION_IDMAC_BASE, IRQ_DEFAULT },
{ ORION_1(88F5182), "gtpci", 0, ORION_PCI_BASE, ORION_IRQ_PEX0INT },
{ ORION_1(88F5182), "gttwsi", 0, MVSOC_TWSI_BASE, ORION_IRQ_TWSI },
{ ORION_1(88F5182), "mvgbec", 0, ORION_GBE_BASE, IRQ_DEFAULT },
@@ -280,7 +280,7 @@ static const struct mvsoc_periph {
{ ORION_1(88W8660), "com", 0, MVSOC_COM0_BASE, ORION_IRQ_UART0 },
{ ORION_1(88W8660), "com", 1, MVSOC_COM1_BASE, ORION_IRQ_UART1 },
{ ORION_1(88W8660), "ehci", 0, ORION_USB0_BASE, ORION_IRQ_USBCNT0 },
-// { ORION_1(88W8660), "gtidmac", 0, ORION_IDMAC_BASE, 0 },
+ { ORION_1(88W8660), "gtidmac", 0, ORION_IDMAC_BASE, IRQ_DEFAULT },
{ ORION_1(88W8660), "gtpci", 0, ORION_PCI_BASE, ORION_IRQ_PEX0INT },
{ ORION_1(88W8660), "gttwsi", 0, MVSOC_TWSI_BASE, ORION_IRQ_TWSI },
{ ORION_1(88W8660), "mvgbec", 0, ORION_GBE_BASE, IRQ_DEFAULT },
@@ -299,7 +299,7 @@ static const struct mvsoc_periph {
{ ORION_2(88F5281), "com", 0, MVSOC_COM0_BASE, ORION_IRQ_UART0 },
{ ORION_2(88F5281), "com", 1, MVSOC_COM1_BASE, ORION_IRQ_UART1 },
{ ORION_2(88F5281), "ehci", 0, ORION_USB0_BASE, ORION_IRQ_USBCNT0 },
-// { ORION_2(88F5281), "gtidmac", 0, ORION_IDMAC_BASE, 0 },
+ { ORION_2(88F5281), "gtidmac", 0, ORION_IDMAC_BASE, IRQ_DEFAULT },
{ ORION_2(88F5281), "gtpci", 0, ORION_PCI_BASE, ORION_IRQ_PEX0INT },
{ ORION_2(88F5281), "gttwsi", 0, MVSOC_TWSI_BASE, ORION_IRQ_TWSI },
{ ORION_2(88F5281), "mvgbec", 0, ORION_GBE_BASE, IRQ_DEFAULT },
@@ -313,7 +313,7 @@ static const struct mvsoc_periph {
{ KIRKWOOD(88F6180),"com", 0, MVSOC_COM0_BASE, KIRKWOOD_IRQ_UART0INT },
{ KIRKWOOD(88F6180),"com", 1, MVSOC_COM1_BASE, KIRKWOOD_IRQ_UART1INT },
{ KIRKWOOD(88F6180),"ehci", 0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
-// { KIRKWOOD(88F6180),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,? },
+ { KIRKWOOD(88F6180),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,IRQ_DEFAULT },
{ KIRKWOOD(88F6180),"gttwsi", 0, MVSOC_TWSI_BASE, KIRKWOOD_IRQ_TWSI },
{ KIRKWOOD(88F6180),"mvcesa", 0, KIRKWOOD_CESA_BASE,KIRKWOOD_IRQ_SECURITYINT},
{ KIRKWOOD(88F6180),"mvgbec", 0, KIRKWOOD_GBE0_BASE,IRQ_DEFAULT },
@@ -326,7 +326,7 @@ static const struct mvsoc_periph {
{ KIRKWOOD(88F6192),"com", 0, MVSOC_COM0_BASE, KIRKWOOD_IRQ_UART0INT },
{ KIRKWOOD(88F6192),"com", 1, MVSOC_COM1_BASE, KIRKWOOD_IRQ_UART1INT },
{ KIRKWOOD(88F6192),"ehci", 0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
-// { KIRKWOOD(88F6192),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,? },
+ { KIRKWOOD(88F6192),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,IRQ_DEFAULT },
{ KIRKWOOD(88F6192),"gttwsi", 0, MVSOC_TWSI_BASE, KIRKWOOD_IRQ_TWSI },
{ KIRKWOOD(88F6192),"mvcesa", 0, KIRKWOOD_CESA_BASE,KIRKWOOD_IRQ_SECURITYINT},
{ KIRKWOOD(88F6192),"mvgbec", 0, KIRKWOOD_GBE0_BASE,IRQ_DEFAULT },
@@ -341,7 +341,7 @@ static const struct mvsoc_periph {
{ KIRKWOOD(88F6281),"com", 0, MVSOC_COM0_BASE, KIRKWOOD_IRQ_UART0INT },
{ KIRKWOOD(88F6281),"com", 1, MVSOC_COM1_BASE, KIRKWOOD_IRQ_UART1INT },
{ KIRKWOOD(88F6281),"ehci", 0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
-// { KIRKWOOD(88F6281),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,? },
+ { KIRKWOOD(88F6281),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,IRQ_DEFAULT },
{ KIRKWOOD(88F6281),"gttwsi", 0, MVSOC_TWSI_BASE, KIRKWOOD_IRQ_TWSI },
{ KIRKWOOD(88F6281),"mvcesa", 0, KIRKWOOD_CESA_BASE,KIRKWOOD_IRQ_SECURITYINT},
{ KIRKWOOD(88F6281),"mvgbec", 0, KIRKWOOD_GBE0_BASE,IRQ_DEFAULT },
@@ -356,7 +356,7 @@ static const struct mvsoc_periph {
{ KIRKWOOD(88F6282),"com", 0, MVSOC_COM0_BASE, KIRKWOOD_IRQ_UART0INT },
{ KIRKWOOD(88F6282),"com", 1, MVSOC_COM1_BASE, KIRKWOOD_IRQ_UART1INT },
{ KIRKWOOD(88F6282),"ehci", 0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
-// { KIRKWOOD(88F6282),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,? },
+ { KIRKWOOD(88F6282),"gtidmac", 0, KIRKWOOD_IDMAC_BASE,IRQ_DEFAULT },
{ KIRKWOOD(88F6282),"gttwsi", 0, MVSOC_TWSI_BASE, KIRKWOOD_IRQ_TWSI },
{ KIRKWOOD(88F6282),"gttwsi", 1, KIRKWOOD_TWSI1_BASE,KIRKWOOD_IRQ_TWSI1 },
{ KIRKWOOD(88F6282),"mvcesa", 0, KIRKWOOD_CESA_BASE,KIRKWOOD_IRQ_SECURITYINT},
