Module Name: src
Committed By: kiyohara
Date: Sat Jul 21 05:11:45 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: mvsoc.c
Log Message:
Add 88F6282 parameters.
Use MVSOC_UNITID_PEX instead of {ORION,KIRKWOOD}_UNITID_PEX. This PEX UNITID
is generic UNITID for MVSoC maybe.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/arch/arm/marvell/mvsoc.c:1.6
--- src/sys/arch/arm/marvell/mvsoc.c:1.5 Sun Feb 12 16:34:07 2012
+++ src/sys/arch/arm/marvell/mvsoc.c Sat Jul 21 05:11:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc.c,v 1.5 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: mvsoc.c,v 1.6 2012/07/21 05:11:45 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.5 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc.c,v 1.6 2012/07/21 05:11:45 kiyohara Exp $");
#include "opt_cputypes.h"
#include "opt_mvsoc.h"
@@ -90,9 +90,9 @@ static struct {
{ ORION_TAG_FLASH_CS,
ORION_ATTR_FLASH_CS, MVSOC_UNITID_DEVBUS },
{ ORION_TAG_PEX0_MEM,
- ORION_ATTR_PEX_MEM, ORION_UNITID_PEX },
+ ORION_ATTR_PEX_MEM, MVSOC_UNITID_PEX },
{ ORION_TAG_PEX0_IO,
- ORION_ATTR_PEX_IO, ORION_UNITID_PEX },
+ ORION_ATTR_PEX_IO, MVSOC_UNITID_PEX },
{ ORION_TAG_PEX1_MEM,
ORION_ATTR_PEX_MEM, ORION_UNITID_PEX1 },
{ ORION_TAG_PEX1_IO,
@@ -113,9 +113,13 @@ static struct {
{ KIRKWOOD_TAG_BOOTROM,
KIRKWOOD_ATTR_BOOTROM, MVSOC_UNITID_DEVBUS },
{ KIRKWOOD_TAG_PEX_MEM,
- KIRKWOOD_ATTR_PEX_MEM, KIRKWOOD_UNITID_PEX },
+ KIRKWOOD_ATTR_PEX_MEM, MVSOC_UNITID_PEX },
{ KIRKWOOD_TAG_PEX_IO,
- KIRKWOOD_ATTR_PEX_IO, KIRKWOOD_UNITID_PEX },
+ KIRKWOOD_ATTR_PEX_IO, MVSOC_UNITID_PEX },
+ { KIRKWOOD_TAG_PEX1_MEM,
+ KIRKWOOD_ATTR_PEX1_MEM, MVSOC_UNITID_PEX },
+ { KIRKWOOD_TAG_PEX1_IO,
+ KIRKWOOD_ATTR_PEX1_IO, MVSOC_UNITID_PEX },
{ KIRKWOOD_TAG_CRYPT,
KIRKWOOD_ATTR_CRYPT, KIRKWOOD_UNITID_CRYPT },
#endif
@@ -170,12 +174,15 @@ static struct {
#if defined(KIRKWOOD)
{ KIRKWOOD(88F6180), 2, "88F6180", "A0", "Kirkwood" },
+ { KIRKWOOD(88F6180), 3, "88F6180", "A1", "Kirkwood" },
{ KIRKWOOD(88F6192), 0, "88F619x", "Z0", "Kirkwood" },
{ KIRKWOOD(88F6192), 2, "88F619x", "A0", "Kirkwood" },
{ KIRKWOOD(88F6192), 3, "88F619x", "A1", "Kirkwood" },
{ KIRKWOOD(88F6281), 0, "88F6281", "Z0", "Kirkwood" },
{ KIRKWOOD(88F6281), 2, "88F6281", "A0", "Kirkwood" },
{ KIRKWOOD(88F6281), 3, "88F6281", "A1", "Kirkwood" },
+ { KIRKWOOD(88F6282), 0, "88F6282", "A0", "Kirkwood" },
+ { KIRKWOOD(88F6282), 1, "88F6282", "A1", "Kirkwood" },
#endif
#if defined(MV78XX0)
@@ -342,6 +349,23 @@ static const struct mvsoc_periph {
{ KIRKWOOD(88F6281),"mvpex", 0, MVSOC_PEX_BASE, KIRKWOOD_IRQ_PEX0INT },
{ KIRKWOOD(88F6281),"mvsata", 0, KIRKWOOD_SATAHC_BASE,KIRKWOOD_IRQ_SATA },
{ KIRKWOOD(88F6281),"mvsdio", 0, KIRKWOOD_SDIO_BASE,KIRKWOOD_IRQ_SDIOINT },
+
+ { KIRKWOOD(88F6282),"mvsoctmr",0, MVSOC_TMR_BASE, IRQ_DEFAULT },
+ { KIRKWOOD(88F6282),"mvsocgpp",0, MVSOC_GPP_BASE, KIRKWOOD_IRQ_GPIOLO7_0},
+ { KIRKWOOD(88F6282),"mvsocrtc",0, KIRKWOOD_RTC_BASE,IRQ_DEFAULT },
+ { 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),"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},
+ { KIRKWOOD(88F6282),"mvgbec", 0, KIRKWOOD_GBE0_BASE,IRQ_DEFAULT },
+ { KIRKWOOD(88F6282),"mvgbec", 1, KIRKWOOD_GBE1_BASE,IRQ_DEFAULT },
+ { KIRKWOOD(88F6282),"mvpex", 0, MVSOC_PEX_BASE, KIRKWOOD_IRQ_PEX0INT },
+ { KIRKWOOD(88F6282),"mvpex", 1, KIRKWOOD_PEX1_BASE,KIRKWOOD_IRQ_PEX1INT },
+ { KIRKWOOD(88F6282),"mvsata", 0, KIRKWOOD_SATAHC_BASE,KIRKWOOD_IRQ_SATA },
+ { KIRKWOOD(88F6282),"mvsdio", 0, KIRKWOOD_SDIO_BASE,KIRKWOOD_IRQ_SDIOINT },
#endif
#if defined(MV78XX0)
