diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-11-10 00:19:37 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-11-10 00:19:37 +0000 |
commit | eb3c698c2767c90649d023695dcf9a8e1f4ebd53 (patch) | |
tree | fd360b91f7a522dbb3dc5378c858f19b7a74f5ce | |
parent | 0f8ab9c81ddf4c96e0d1969f67044f674a1924e7 (diff) |
Add gumstix overo support. It's very similar to be beagleboard at this
point. So add it's card id and handle it like the beagleboard.
ok drahn@, miod@
-rw-r--r-- | sys/arch/beagle/beagle/ahb.h | 3 | ||||
-rw-r--r-- | sys/arch/beagle/beagle/beagle_machdep.c | 6 | ||||
-rw-r--r-- | sys/arch/beagle/dev/ampintc.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/gptimer.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/intc.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/omap_com.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/omdog.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/omehci.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/omgpio.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/ommmc.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/omusbtll.c | 3 | ||||
-rw-r--r-- | sys/arch/beagle/dev/prcm.c | 3 |
12 files changed, 27 insertions, 12 deletions
diff --git a/sys/arch/beagle/beagle/ahb.h b/sys/arch/beagle/beagle/ahb.h index ddcbe9a936c..f8c13fbcb20 100644 --- a/sys/arch/beagle/beagle/ahb.h +++ b/sys/arch/beagle/beagle/ahb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ahb.h,v 1.2 2011/10/21 22:55:01 drahn Exp $ */ +/* $OpenBSD: ahb.h,v 1.3 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2005,2008 Dale Rahn <drahn@drahn.com> * @@ -30,5 +30,6 @@ void *avic_intr_establish(int irqno, int level, int (*func)(void *), /* board identification - from uboot */ #define BOARD_ID_OMAP3_BEAGLE 1546 +#define BOARD_ID_OMAP3_OVERO 1798 #define BOARD_ID_OMAP4_PANDA 2791 extern uint32_t board_id; diff --git a/sys/arch/beagle/beagle/beagle_machdep.c b/sys/arch/beagle/beagle/beagle_machdep.c index 40f12e1628d..d15c9a1d803 100644 --- a/sys/arch/beagle/beagle/beagle_machdep.c +++ b/sys/arch/beagle/beagle/beagle_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: beagle_machdep.c,v 1.12 2011/11/08 23:01:11 krw Exp $ */ +/* $OpenBSD: beagle_machdep.c,v 1.13 2011/11/10 00:19:36 matthieu Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -887,6 +887,9 @@ initarm(void *arg0, void *arg1, void *arg2) case BOARD_ID_OMAP3_BEAGLE: printf("board type: beagle\n"); break; + case BOARD_ID_OMAP3_OVERO: + printf("board type: overo\n"); + break; case BOARD_ID_OMAP4_PANDA: printf("board type: panda\n"); break; @@ -979,6 +982,7 @@ consinit(void) #if NCOM > 0 switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: paddr = 0x49020000; break; case BOARD_ID_OMAP4_PANDA: diff --git a/sys/arch/beagle/dev/ampintc.c b/sys/arch/beagle/dev/ampintc.c index f3c1aa3c465..7b88bf3df1a 100644 --- a/sys/arch/beagle/dev/ampintc.c +++ b/sys/arch/beagle/dev/ampintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ampintc.c,v 1.6 2011/11/09 00:17:15 drahn Exp $ */ +/* $OpenBSD: ampintc.c,v 1.7 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org> * @@ -189,6 +189,7 @@ ampintc_match(struct device *parent, void *v, void *aux) { switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: return 0; /* not ported yet ??? - different */ case BOARD_ID_OMAP4_PANDA: break; /* continue trying */ diff --git a/sys/arch/beagle/dev/gptimer.c b/sys/arch/beagle/dev/gptimer.c index 01e498d6053..dfc92824858 100644 --- a/sys/arch/beagle/dev/gptimer.c +++ b/sys/arch/beagle/dev/gptimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gptimer.c,v 1.10 2011/11/06 01:34:53 drahn Exp $ */ +/* $OpenBSD: gptimer.c,v 1.11 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -145,6 +145,7 @@ gptimer_match(struct device *parent, void *v, void *aux) { switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: break; /* continue trying */ case BOARD_ID_OMAP4_PANDA: return 0; /* not ported yet ??? - different */ diff --git a/sys/arch/beagle/dev/intc.c b/sys/arch/beagle/dev/intc.c index 5e1a14aba32..6d6433a5791 100644 --- a/sys/arch/beagle/dev/intc.c +++ b/sys/arch/beagle/dev/intc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.c,v 1.8 2011/10/24 22:49:07 drahn Exp $ */ +/* $OpenBSD: intc.c,v 1.9 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -141,6 +141,7 @@ intc_match(struct device *parent, void *v, void *aux) { switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: break; /* continue trying */ case BOARD_ID_OMAP4_PANDA: return 0; /* not ported yet ??? - different */ diff --git a/sys/arch/beagle/dev/omap_com.c b/sys/arch/beagle/dev/omap_com.c index 858fc483c1d..e2dcc307a0c 100644 --- a/sys/arch/beagle/dev/omap_com.c +++ b/sys/arch/beagle/dev/omap_com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap_com.c,v 1.7 2011/10/24 22:49:07 drahn Exp $ */ +/* $OpenBSD: omap_com.c,v 1.8 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. * All rights reserved. @@ -74,6 +74,7 @@ omapuart_match(struct device *parent, void *cf, void *aux) /* XXX */ switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: if (aa->aa_addr == 0x4806A000 && aa->aa_intr == 72) { rv = 1; break; diff --git a/sys/arch/beagle/dev/omdog.c b/sys/arch/beagle/dev/omdog.c index ddeb98a1802..e8409cdaf91 100644 --- a/sys/arch/beagle/dev/omdog.c +++ b/sys/arch/beagle/dev/omdog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omdog.c,v 1.2 2011/10/21 22:55:01 drahn Exp $ */ +/* $OpenBSD: omdog.c,v 1.3 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -75,6 +75,7 @@ omdog_match(struct device *parent, void *v, void *aux) { switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: break; /* continue trying */ case BOARD_ID_OMAP4_PANDA: return 0; /* not ported yet */ diff --git a/sys/arch/beagle/dev/omehci.c b/sys/arch/beagle/dev/omehci.c index cb77b85d7b2..13cf9bc9160 100644 --- a/sys/arch/beagle/dev/omehci.c +++ b/sys/arch/beagle/dev/omehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omehci.c,v 1.8 2011/11/09 10:17:57 miod Exp $ */ +/* $OpenBSD: omehci.c,v 1.9 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -64,6 +64,7 @@ omehci_match(struct device *parent, void *match, void *aux) switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: break; /* continue trying */ case BOARD_ID_OMAP4_PANDA: return 0; /* not ported yet ??? - different */ diff --git a/sys/arch/beagle/dev/omgpio.c b/sys/arch/beagle/dev/omgpio.c index 8d4dfd5702c..1f55d1fa2bf 100644 --- a/sys/arch/beagle/dev/omgpio.c +++ b/sys/arch/beagle/dev/omgpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omgpio.c,v 1.6 2011/10/24 22:49:07 drahn Exp $ */ +/* $OpenBSD: omgpio.c,v 1.7 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -108,6 +108,7 @@ omgpio_match(struct device *parent, void *v, void *aux) { switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: break; /* continue trying */ case BOARD_ID_OMAP4_PANDA: return 0; /* not ported yet ??? - different */ diff --git a/sys/arch/beagle/dev/ommmc.c b/sys/arch/beagle/dev/ommmc.c index 370e4a7c05f..328d064507e 100644 --- a/sys/arch/beagle/dev/ommmc.c +++ b/sys/arch/beagle/dev/ommmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ommmc.c,v 1.10 2011/10/24 22:49:07 drahn Exp $ */ +/* $OpenBSD: ommmc.c,v 1.11 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org> @@ -355,6 +355,7 @@ ommmc_match(struct device *parent, void *v, void *aux) /* XXX */ switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: if (aa->aa_addr == MMCHS1_ADDR && aa->aa_intr == 83) return 1; else if (aa->aa_addr == MMCHS2_ADDR && aa->aa_intr == 86) diff --git a/sys/arch/beagle/dev/omusbtll.c b/sys/arch/beagle/dev/omusbtll.c index 40f6e515ddd..5442683d0e3 100644 --- a/sys/arch/beagle/dev/omusbtll.c +++ b/sys/arch/beagle/dev/omusbtll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omusbtll.c,v 1.2 2011/10/21 22:55:01 drahn Exp $ */ +/* $OpenBSD: omusbtll.c,v 1.3 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2010 Dale Rahn <drahn@openbsd.org> * @@ -112,6 +112,7 @@ omusbtll_match(struct device *parent, void *v, void *aux) { switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: break; /* continue trying */ case BOARD_ID_OMAP4_PANDA: return 0; /* not ported yet ??? - different */ diff --git a/sys/arch/beagle/dev/prcm.c b/sys/arch/beagle/dev/prcm.c index 02ab214aaa9..fd883a1d2cd 100644 --- a/sys/arch/beagle/dev/prcm.c +++ b/sys/arch/beagle/dev/prcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prcm.c,v 1.7 2011/10/21 22:55:01 drahn Exp $ */ +/* $OpenBSD: prcm.c,v 1.8 2011/11/10 00:19:36 matthieu Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -180,6 +180,7 @@ prcm_match(struct device *parent, void *v, void *aux) /* only attach once */ switch (board_id) { case BOARD_ID_OMAP3_BEAGLE: + case BOARD_ID_OMAP3_OVERO: break; /* continue trying */ case BOARD_ID_OMAP4_PANDA: return 0; /* not ported yet */ |