Consistency wrt phys physical and KSEG1 addresses.
This commit is contained in:
gdamore
parent
b3d46538fd
commit
cf9fe31b7c
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dbau1500.c,v 1.1 2006/02/08 09:04:01 gdamore Exp $ */
|
||||
/* $NetBSD: dbau1500.c,v 1.2 2006/02/12 06:43:03 gdamore Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.1 2006/02/08 09:04:01 gdamore Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.2 2006/02/12 06:43:03 gdamore Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <machine/bus.h>
|
||||
|
|
@ -76,7 +76,7 @@ dbau1500_init(void)
|
|||
panic("dbau1500: CPU not an AU1500!");
|
||||
|
||||
/* check the whoami register for a match */
|
||||
whoami = *((volatile uint32_t *)DBAU1500_WHOAMI);
|
||||
whoami = *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(DBAU1500_WHOAMI));
|
||||
|
||||
if (DBAU1500_WHOAMI_BOARD(whoami) != DBAU1500_WHOAMI_DBAU1500)
|
||||
panic("dbau1500: WHOAMI (%x) not DBAu1500!", whoami);
|
||||
|
|
@ -91,7 +91,6 @@ dbau1500_init(void)
|
|||
printf("no daughtercard\n");
|
||||
|
||||
/* leave console and clocks alone -- YAMON should have got it right! */
|
||||
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dbau1500reg.h,v 1.2 2006/02/08 17:09:04 gdamore Exp $ */
|
||||
/* $NetBSD: dbau1500reg.h,v 1.3 2006/02/12 06:43:03 gdamore Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -35,7 +35,10 @@
|
|||
* Board-specific registers for DBAu1500.
|
||||
*/
|
||||
|
||||
#define DBAU1500_WHOAMI 0xAE000000
|
||||
#define DBAU1500_WHOAMI 0x0E000000
|
||||
#define DBAU1500_STATUS 0x0E000004
|
||||
|
||||
/* DBAU1550_WHOAMI */
|
||||
#define DBAU1500_WHOAMI_BOARD_MASK 0x00000f00
|
||||
#define DBAU1500_WHOAMI_DBAU1500 0x6
|
||||
|
||||
|
|
@ -43,9 +46,9 @@
|
|||
#define DBAU1500_WHOAMI_CPLD(x) (((x) >> 4) & 0xf)
|
||||
#define DBAU1500_WHOAMI_DAUGHTER(x) ((x) & 0xf)
|
||||
|
||||
#define DBAU1500_BCSR 0xAE000004
|
||||
#define DBAU1500_BCSR_SWAPBOOT 0x20000000
|
||||
#define DBAU1500_BCSR_PCMCIA1_INSERTED 0x00000020
|
||||
#define DBAU1500_BCSR_PCMCIA0_INSERTED 0x00000010
|
||||
#define DBAU1500_BCSR_PCMCIA1_VS 0x0000000c
|
||||
#define DBAU1500_BCSR_PCMCIA0_VS 0x00000003
|
||||
/* DBAU1550_STATUS */
|
||||
#define DBAU1500_STATUS_SWAPBOOT 0x20000000
|
||||
#define DBAU1500_STATUS_PCMCIA1_INSERTED 0x00000020
|
||||
#define DBAU1500_STATUS_PCMCIA0_INSERTED 0x00000010
|
||||
#define DBAU1500_STATUS_PCMCIA1_VS 0x0000000c
|
||||
#define DBAU1500_STATUS_PCMCIA0_VS 0x00000003
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dbau1550.c,v 1.1 2006/02/08 09:04:01 gdamore Exp $ */
|
||||
/* $NetBSD: dbau1550.c,v 1.2 2006/02/12 06:43:03 gdamore Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.1 2006/02/08 09:04:01 gdamore Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.2 2006/02/12 06:43:03 gdamore Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <machine/bus.h>
|
||||
|
|
@ -72,13 +72,13 @@ board_info(void)
|
|||
void
|
||||
dbau1550_init(void)
|
||||
{
|
||||
uint32_t whoami;
|
||||
uint32_t whoami;
|
||||
|
||||
if (MIPS_PRID_COPTS(cpu_id) != MIPS_AU1550)
|
||||
panic("dbau1550: CPU not Au1550");
|
||||
|
||||
/* check the whoami register for a match */
|
||||
whoami = *((volatile uint32_t *)DBAU1550_WHOAMI);
|
||||
whoami = *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(DBAU1550_WHOAMI));
|
||||
|
||||
if (DBAU1550_WHOAMI_BOARD(whoami) != DBAU1550_WHOAMI_DBAU1550_REV1)
|
||||
panic("dbau1550: WHOAMI (%x) not DBAu1550!", whoami);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dbau1550reg.h,v 1.2 2006/02/08 17:09:04 gdamore Exp $ */
|
||||
/* $NetBSD: dbau1550reg.h,v 1.3 2006/02/12 06:43:03 gdamore Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -35,7 +35,20 @@
|
|||
* Board-specific registers for DBAu1550.
|
||||
*/
|
||||
|
||||
#define DBAU1550_WHOAMI 0xAF000000
|
||||
#define DBAU1550_WHOAMI 0x0F000000
|
||||
#define DBAU1550_STATUS 0x0F000004
|
||||
#define DBAU1550_SWITCHES 0x0F000008
|
||||
#define DBAU1550_RESETS 0x0F00000C
|
||||
#define DBAU1550_PCMCIA_CONTROL 0x0F000010
|
||||
#define DBAU1550_BOARD_SPECIFIC 0x0F000014
|
||||
#define DBAU1550_DISC_LEDS 0x0F000018
|
||||
#define DBAU1550_SOFTWARE_RESET 0x0F00001C
|
||||
#define DBAU1550_HEX_LEDS 0x0F400000
|
||||
#define DBAU1550_HEX_BLANK 0x0F400008
|
||||
|
||||
/*
|
||||
* DBAU1550_WHOAMI
|
||||
*/
|
||||
#define DBAU1550_WHOAMI_BOARD_MASK 0x00000f00
|
||||
#define DBAU1550_WHOAMI_PB1500_REV1 0x1
|
||||
#define DBAU1550_WHOAMI_PB1500_REV2 0x2
|
||||
|
|
@ -51,9 +64,26 @@
|
|||
#define DBAU1550_WHOAMI_CPLD(x) (((x) >> 4) & 0xf)
|
||||
#define DBAU1550_WHOAMI_DAUGHTER(x) ((x) & 0xf)
|
||||
|
||||
#define DBAU1550_BCSR 0xAF000004
|
||||
#define DBAU1550_BCSR_SWAPBOOT 0x20000000
|
||||
#define DBAU1550_BCSR_PCMCIA1_INSERTED 0x00000020
|
||||
#define DBAU1550_BCSR_PCMCIA0_INSERTED 0x00000010
|
||||
#define DBAU1550_BCSR_PCMCIA1_VS 0x0000000c
|
||||
#define DBAU1550_BCSR_PCMCIA0_VS 0x00000003
|
||||
/*
|
||||
* DBAU1550_BCSR
|
||||
*/
|
||||
#define DBAU1550_STATUS_SWAPBOOT 0x20000000
|
||||
#define DBAU1550_STATUS_PCMCIA1_INSERTED 0x00000020
|
||||
#define DBAU1550_STATUS_PCMCIA0_INSERTED 0x00000010
|
||||
#define DBAU1550_STATUS_PCMCIA1_VS 0x0000000c
|
||||
#define DBAU1550_STATUS_PCMCIA0_VS 0x00000003
|
||||
|
||||
/*
|
||||
* DBAU1550_BOARD_SPECIFIC
|
||||
*/
|
||||
#define DBAU1550_PCI_SPI_DEV_SEL (1 << 13)
|
||||
#define DBAU1550_PCI_CFG_HOST (1 << 12)
|
||||
#define DBAU1550_PCI_EN_GPIO200_RST (1 << 10)
|
||||
#define DBAU1550_PCI_M33 (1 << 8)
|
||||
#define DBAU1550_PCI_M66EN (1 << 0)
|
||||
|
||||
/*
|
||||
* DBAU1550_SOFTWARE_RESET
|
||||
*/
|
||||
#define DBAU1550_SOFTWARE_RESET_RESET (1 << 15)
|
||||
#define DBAU1550_SOFTWARE_RESET_PWROFF (1 << 14)
|
||||
|
|
|
|||
Loading…
Reference in New Issue