MIPS: Alchemy: devboard register abstraction

All Alchemy development boards have external CPLDs with a few registers
in them.  They all share an identical register layout with only a few
minor differences (except the PB1000) in bit functions and base
addresses.

This patch
- adds a primitive facility to initialize and use these external
  registers,
- replaces all occurrences of bcsr->xxx accesses with calls to the new
  functions (the pb1200 cascade irq handling code is special).
- collects BCSR register information scattered throughout the board
  headers in a central place.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Manuel Lauss
2009-10-04 14:55:24 +02:00
committed by Ralf Baechle
parent ebc89718a4
commit 9bdcf336d0
19 changed files with 475 additions and 596 deletions

View File

@ -0,0 +1,235 @@
/*
* bcsr.h -- Db1xxx/Pb1xxx Devboard CPLD registers ("BCSR") abstraction.
*
* All Alchemy development boards (except, of course, the weird PB1000)
* have a few registers in a CPLD with standardised layout; they mostly
* only differ in base address and bit meanings in the RESETS and BOARD
* registers.
*
* All data taken from the official AMD board documentation sheets.
*/
#ifndef _DB1XXX_BCSR_H_
#define _DB1XXX_BCSR_H_
/* BCSR base addresses on various boards. BCSR base 2 refers to the
* physical address of the first HEXLEDS register, which is usually
* a variable offset from the WHOAMI register.
*/
/* DB1000, DB1100, DB1500, PB1100, PB1500 */
#define DB1000_BCSR_PHYS_ADDR 0x0E000000
#define DB1000_BCSR_HEXLED_OFS 0x01000000
#define DB1550_BCSR_PHYS_ADDR 0x0F000000
#define DB1550_BCSR_HEXLED_OFS 0x00400000
#define PB1550_BCSR_PHYS_ADDR 0x0F000000
#define PB1550_BCSR_HEXLED_OFS 0x00800000
#define DB1200_BCSR_PHYS_ADDR 0x19800000
#define DB1200_BCSR_HEXLED_OFS 0x00400000
#define PB1200_BCSR_PHYS_ADDR 0x0D800000
#define PB1200_BCSR_HEXLED_OFS 0x00400000
enum bcsr_id {
/* BCSR base 1 */
BCSR_WHOAMI = 0,
BCSR_STATUS,
BCSR_SWITCHES,
BCSR_RESETS,
BCSR_PCMCIA,
BCSR_BOARD,
BCSR_LEDS,
BCSR_SYSTEM,
/* Au1200/1300 based boards */
BCSR_INTCLR,
BCSR_INTSET,
BCSR_MASKCLR,
BCSR_MASKSET,
BCSR_SIGSTAT,
BCSR_INTSTAT,
/* BCSR base 2 */
BCSR_HEXLEDS,
BCSR_RSVD1,
BCSR_HEXCLEAR,
BCSR_CNT,
};
/* register offsets, valid for all Db1xxx/Pb1xxx boards */
#define BCSR_REG_WHOAMI 0x00
#define BCSR_REG_STATUS 0x04
#define BCSR_REG_SWITCHES 0x08
#define BCSR_REG_RESETS 0x0c
#define BCSR_REG_PCMCIA 0x10
#define BCSR_REG_BOARD 0x14
#define BCSR_REG_LEDS 0x18
#define BCSR_REG_SYSTEM 0x1c
/* Au1200/Au1300 based boards: CPLD IRQ muxer */
#define BCSR_REG_INTCLR 0x20
#define BCSR_REG_INTSET 0x24
#define BCSR_REG_MASKCLR 0x28
#define BCSR_REG_MASKSET 0x2c
#define BCSR_REG_SIGSTAT 0x30
#define BCSR_REG_INTSTAT 0x34
/* hexled control, offset from BCSR base 2 */
#define BCSR_REG_HEXLEDS 0x00
#define BCSR_REG_HEXCLEAR 0x08
/*
* Register Bits and Pieces.
*/
#define BCSR_WHOAMI_DCID(x) ((x) & 0xf)
#define BCSR_WHOAMI_CPLD(x) (((x) >> 4) & 0xf)
#define BCSR_WHOAMI_BOARD(x) (((x) >> 8) & 0xf)
/* register "WHOAMI" bits 11:8 identify the board */
enum bcsr_whoami_boards {
BCSR_WHOAMI_PB1500 = 1,
BCSR_WHOAMI_PB1500R2,
BCSR_WHOAMI_PB1100,
BCSR_WHOAMI_DB1000,
BCSR_WHOAMI_DB1100,
BCSR_WHOAMI_DB1500,
BCSR_WHOAMI_DB1550,
BCSR_WHOAMI_PB1550_DDR,
BCSR_WHOAMI_PB1550 = BCSR_WHOAMI_PB1550_DDR,
BCSR_WHOAMI_PB1550_SDR,
BCSR_WHOAMI_PB1200_DDR1,
BCSR_WHOAMI_PB1200 = BCSR_WHOAMI_PB1200_DDR1,
BCSR_WHOAMI_PB1200_DDR2,
BCSR_WHOAMI_DB1200,
};
/* STATUS reg. Unless otherwise noted, they're valid on all boards.
* PB1200 = DB1200.
*/
#define BCSR_STATUS_PC0VS 0x0003
#define BCSR_STATUS_PC1VS 0x000C
#define BCSR_STATUS_PC0FI 0x0010
#define BCSR_STATUS_PC1FI 0x0020
#define BCSR_STATUS_PB1550_SWAPBOOT 0x0040
#define BCSR_STATUS_SRAMWIDTH 0x0080
#define BCSR_STATUS_FLASHBUSY 0x0100
#define BCSR_STATUS_ROMBUSY 0x0400
#define BCSR_STATUS_SD0WP 0x0400 /* DB1200 */
#define BCSR_STATUS_SD1WP 0x0800
#define BCSR_STATUS_USBOTGID 0x0800 /* PB/DB1550 */
#define BCSR_STATUS_DB1000_SWAPBOOT 0x2000
#define BCSR_STATUS_DB1200_SWAPBOOT 0x0040 /* DB1200 */
#define BCSR_STATUS_IDECBLID 0x0200 /* DB1200 */
#define BCSR_STATUS_DB1200_U0RXD 0x1000 /* DB1200 */
#define BCSR_STATUS_DB1200_U1RXD 0x2000 /* DB1200 */
#define BCSR_STATUS_FLASHDEN 0xC000
#define BCSR_STATUS_DB1550_U0RXD 0x1000 /* DB1550 */
#define BCSR_STATUS_DB1550_U3RXD 0x2000 /* DB1550 */
#define BCSR_STATUS_PB1550_U0RXD 0x1000 /* PB1550 */
#define BCSR_STATUS_PB1550_U1RXD 0x2000 /* PB1550 */
#define BCSR_STATUS_PB1550_U3RXD 0x8000 /* PB1550 */
/* DB/PB1000,1100,1500,1550 */
#define BCSR_RESETS_PHY0 0x0001
#define BCSR_RESETS_PHY1 0x0002
#define BCSR_RESETS_DC 0x0004
#define BCSR_RESETS_FIR_SEL 0x2000
#define BCSR_RESETS_IRDA_MODE_MASK 0xC000
#define BCSR_RESETS_IRDA_MODE_FULL 0x0000
#define BCSR_RESETS_PB1550_WSCFSM 0x2000
#define BCSR_RESETS_IRDA_MODE_OFF 0x4000
#define BCSR_RESETS_IRDA_MODE_2_3 0x8000
#define BCSR_RESETS_IRDA_MODE_1_3 0xC000
#define BCSR_RESETS_DMAREQ 0x8000 /* PB1550 */
#define BCSR_BOARD_PCIM66EN 0x0001
#define BCSR_BOARD_SD0PWR 0x0040
#define BCSR_BOARD_SD1PWR 0x0080
#define BCSR_BOARD_PCIM33 0x0100
#define BCSR_BOARD_PCIEXTARB 0x0200
#define BCSR_BOARD_GPIO200RST 0x0400
#define BCSR_BOARD_PCICLKOUT 0x0800
#define BCSR_BOARD_PCICFG 0x1000
#define BCSR_BOARD_SPISEL 0x4000 /* PB/DB1550 */
#define BCSR_BOARD_SD0WP 0x4000 /* DB1100 */
#define BCSR_BOARD_SD1WP 0x8000 /* DB1100 */
/* DB/PB1200 */
#define BCSR_RESETS_ETH 0x0001
#define BCSR_RESETS_CAMERA 0x0002
#define BCSR_RESETS_DC 0x0004
#define BCSR_RESETS_IDE 0x0008
#define BCSR_RESETS_TV 0x0010 /* DB1200 */
/* Not resets but in the same register */
#define BCSR_RESETS_PWMR1MUX 0x0800 /* DB1200 */
#define BCSR_RESETS_PB1200_WSCFSM 0x0800 /* PB1200 */
#define BCSR_RESETS_PSC0MUX 0x1000
#define BCSR_RESETS_PSC1MUX 0x2000
#define BCSR_RESETS_SPISEL 0x4000
#define BCSR_RESETS_SD1MUX 0x8000 /* PB1200 */
#define BCSR_BOARD_LCDVEE 0x0001
#define BCSR_BOARD_LCDVDD 0x0002
#define BCSR_BOARD_LCDBL 0x0004
#define BCSR_BOARD_CAMSNAP 0x0010
#define BCSR_BOARD_CAMPWR 0x0020
#define BCSR_BOARD_SD0PWR 0x0040
#define BCSR_SWITCHES_DIP 0x00FF
#define BCSR_SWITCHES_DIP_1 0x0080
#define BCSR_SWITCHES_DIP_2 0x0040
#define BCSR_SWITCHES_DIP_3 0x0020
#define BCSR_SWITCHES_DIP_4 0x0010
#define BCSR_SWITCHES_DIP_5 0x0008
#define BCSR_SWITCHES_DIP_6 0x0004
#define BCSR_SWITCHES_DIP_7 0x0002
#define BCSR_SWITCHES_DIP_8 0x0001
#define BCSR_SWITCHES_ROTARY 0x0F00
#define BCSR_PCMCIA_PC0VPP 0x0003
#define BCSR_PCMCIA_PC0VCC 0x000C
#define BCSR_PCMCIA_PC0DRVEN 0x0010
#define BCSR_PCMCIA_PC0RST 0x0080
#define BCSR_PCMCIA_PC1VPP 0x0300
#define BCSR_PCMCIA_PC1VCC 0x0C00
#define BCSR_PCMCIA_PC1DRVEN 0x1000
#define BCSR_PCMCIA_PC1RST 0x8000
#define BCSR_LEDS_DECIMALS 0x0003
#define BCSR_LEDS_LED0 0x0100
#define BCSR_LEDS_LED1 0x0200
#define BCSR_LEDS_LED2 0x0400
#define BCSR_LEDS_LED3 0x0800
#define BCSR_SYSTEM_RESET 0x8000 /* clear to reset */
#define BCSR_SYSTEM_PWROFF 0x4000 /* set to power off */
#define BCSR_SYSTEM_VDDI 0x001F /* PB1xxx boards */
/* initialize BCSR for a board. Provide the PHYSICAL addresses of both
* BCSR spaces.
*/
void __init bcsr_init(unsigned long bcsr1_phys, unsigned long bcsr2_phys);
/* read a board register */
unsigned short bcsr_read(enum bcsr_id reg);
/* write to a board register */
void bcsr_write(enum bcsr_id reg, unsigned short val);
/* modify a register. clear bits set in 'clr', set bits set in 'set' */
void bcsr_mod(enum bcsr_id reg, unsigned short clr, unsigned short set);
#endif

View File

@ -45,113 +45,6 @@
#define AC97_PSC_BASE PSC1_BASE_ADDR
#define I2S_PSC_BASE PSC1_BASE_ADDR
#define BCSR_KSEG1_ADDR 0xB9800000
typedef volatile struct
{
/*00*/ u16 whoami;
u16 reserved0;
/*04*/ u16 status;
u16 reserved1;
/*08*/ u16 switches;
u16 reserved2;
/*0C*/ u16 resets;
u16 reserved3;
/*10*/ u16 pcmcia;
u16 reserved4;
/*14*/ u16 board;
u16 reserved5;
/*18*/ u16 disk_leds;
u16 reserved6;
/*1C*/ u16 system;
u16 reserved7;
/*20*/ u16 intclr;
u16 reserved8;
/*24*/ u16 intset;
u16 reserved9;
/*28*/ u16 intclr_mask;
u16 reserved10;
/*2C*/ u16 intset_mask;
u16 reserved11;
/*30*/ u16 sig_status;
u16 reserved12;
/*34*/ u16 int_status;
u16 reserved13;
/*38*/ u16 reserved14;
u16 reserved15;
/*3C*/ u16 reserved16;
u16 reserved17;
} BCSR;
static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
/*
* Register bit definitions for the BCSRs
*/
#define BCSR_WHOAMI_DCID 0x000F
#define BCSR_WHOAMI_CPLD 0x00F0
#define BCSR_WHOAMI_BOARD 0x0F00
#define BCSR_STATUS_PCMCIA0VS 0x0003
#define BCSR_STATUS_PCMCIA1VS 0x000C
#define BCSR_STATUS_SWAPBOOT 0x0040
#define BCSR_STATUS_FLASHBUSY 0x0100
#define BCSR_STATUS_IDECBLID 0x0200
#define BCSR_STATUS_SD0WP 0x0400
#define BCSR_STATUS_U0RXD 0x1000
#define BCSR_STATUS_U1RXD 0x2000
#define BCSR_SWITCHES_OCTAL 0x00FF
#define BCSR_SWITCHES_DIP_1 0x0080
#define BCSR_SWITCHES_DIP_2 0x0040
#define BCSR_SWITCHES_DIP_3 0x0020
#define BCSR_SWITCHES_DIP_4 0x0010
#define BCSR_SWITCHES_DIP_5 0x0008
#define BCSR_SWITCHES_DIP_6 0x0004
#define BCSR_SWITCHES_DIP_7 0x0002
#define BCSR_SWITCHES_DIP_8 0x0001
#define BCSR_SWITCHES_ROTARY 0x0F00
#define BCSR_RESETS_ETH 0x0001
#define BCSR_RESETS_CAMERA 0x0002
#define BCSR_RESETS_DC 0x0004
#define BCSR_RESETS_IDE 0x0008
#define BCSR_RESETS_TV 0x0010
/* Not resets but in the same register */
#define BCSR_RESETS_PWMR1MUX 0x0800
#define BCSR_RESETS_PCS0MUX 0x1000
#define BCSR_RESETS_PCS1MUX 0x2000
#define BCSR_RESETS_SPISEL 0x4000
#define BCSR_PCMCIA_PC0VPP 0x0003
#define BCSR_PCMCIA_PC0VCC 0x000C
#define BCSR_PCMCIA_PC0DRVEN 0x0010
#define BCSR_PCMCIA_PC0RST 0x0080
#define BCSR_PCMCIA_PC1VPP 0x0300
#define BCSR_PCMCIA_PC1VCC 0x0C00
#define BCSR_PCMCIA_PC1DRVEN 0x1000
#define BCSR_PCMCIA_PC1RST 0x8000
#define BCSR_BOARD_LCDVEE 0x0001
#define BCSR_BOARD_LCDVDD 0x0002
#define BCSR_BOARD_LCDBL 0x0004
#define BCSR_BOARD_CAMSNAP 0x0010
#define BCSR_BOARD_CAMPWR 0x0020
#define BCSR_BOARD_SD0PWR 0x0040
#define BCSR_LEDS_DECIMALS 0x0003
#define BCSR_LEDS_LED0 0x0100
#define BCSR_LEDS_LED1 0x0200
#define BCSR_LEDS_LED2 0x0400
#define BCSR_LEDS_LED3 0x0800
#define BCSR_SYSTEM_POWEROFF 0x4000
#define BCSR_SYSTEM_RESET 0x8000
/* Bit positions for the different interrupt sources */
#define BCSR_INT_IDE 0x0001
#define BCSR_INT_ETH 0x0002
@ -222,7 +115,7 @@ enum external_pb1200_ints {
#define BOARD_PC0_INT DB1200_PC0_INT
#define BOARD_PC1_INT DB1200_PC1_INT
#define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1 << (8 + (2 * SOCKET)))
#define BOARD_CARD_INSERTED(SOCKET) (bcsr_read(BCSR_SIGSTAT) & (1 << (8 + (2 * SOCKET))))
/* NAND chip select */
#define NAND_CS 1

View File

@ -41,102 +41,10 @@
#define SMBUS_PSC_BASE PSC2_BASE_ADDR
#define I2S_PSC_BASE PSC3_BASE_ADDR
#define BCSR_KSEG1_ADDR 0xAF000000
#define NAND_PHYS_ADDR 0x20000000
#else
#define BCSR_KSEG1_ADDR 0xAE000000
#endif
/*
* Overlay data structure of the DBAu1x00 board registers.
* Registers are located at physical 0E0000xx, KSEG1 0xAE0000xx.
*/
typedef volatile struct
{
/*00*/ unsigned short whoami;
unsigned short reserved0;
/*04*/ unsigned short status;
unsigned short reserved1;
/*08*/ unsigned short switches;
unsigned short reserved2;
/*0C*/ unsigned short resets;
unsigned short reserved3;
/*10*/ unsigned short pcmcia;
unsigned short reserved4;
/*14*/ unsigned short specific;
unsigned short reserved5;
/*18*/ unsigned short leds;
unsigned short reserved6;
/*1C*/ unsigned short swreset;
unsigned short reserved7;
} BCSR;
/*
* Register/mask bit definitions for the BCSRs
*/
#define BCSR_WHOAMI_DCID 0x000F
#define BCSR_WHOAMI_CPLD 0x00F0
#define BCSR_WHOAMI_BOARD 0x0F00
#define BCSR_STATUS_PC0VS 0x0003
#define BCSR_STATUS_PC1VS 0x000C
#define BCSR_STATUS_PC0FI 0x0010
#define BCSR_STATUS_PC1FI 0x0020
#define BCSR_STATUS_FLASHBUSY 0x0100
#define BCSR_STATUS_ROMBUSY 0x0400
#define BCSR_STATUS_SWAPBOOT 0x2000
#define BCSR_STATUS_FLASHDEN 0xC000
#define BCSR_SWITCHES_DIP 0x00FF
#define BCSR_SWITCHES_DIP_1 0x0080
#define BCSR_SWITCHES_DIP_2 0x0040
#define BCSR_SWITCHES_DIP_3 0x0020
#define BCSR_SWITCHES_DIP_4 0x0010
#define BCSR_SWITCHES_DIP_5 0x0008
#define BCSR_SWITCHES_DIP_6 0x0004
#define BCSR_SWITCHES_DIP_7 0x0002
#define BCSR_SWITCHES_DIP_8 0x0001
#define BCSR_SWITCHES_ROTARY 0x0F00
#define BCSR_RESETS_PHY0 0x0001
#define BCSR_RESETS_PHY1 0x0002
#define BCSR_RESETS_DC 0x0004
#define BCSR_RESETS_FIR_SEL 0x2000
#define BCSR_RESETS_IRDA_MODE_MASK 0xC000
#define BCSR_RESETS_IRDA_MODE_FULL 0x0000
#define BCSR_RESETS_IRDA_MODE_OFF 0x4000
#define BCSR_RESETS_IRDA_MODE_2_3 0x8000
#define BCSR_RESETS_IRDA_MODE_1_3 0xC000
#define BCSR_PCMCIA_PC0VPP 0x0003
#define BCSR_PCMCIA_PC0VCC 0x000C
#define BCSR_PCMCIA_PC0DRVEN 0x0010
#define BCSR_PCMCIA_PC0RST 0x0080
#define BCSR_PCMCIA_PC1VPP 0x0300
#define BCSR_PCMCIA_PC1VCC 0x0C00
#define BCSR_PCMCIA_PC1DRVEN 0x1000
#define BCSR_PCMCIA_PC1RST 0x8000
#define BCSR_BOARD_PCIM66EN 0x0001
#define BCSR_BOARD_SD0_PWR 0x0040
#define BCSR_BOARD_SD1_PWR 0x0080
#define BCSR_BOARD_PCIM33 0x0100
#define BCSR_BOARD_GPIO200RST 0x0400
#define BCSR_BOARD_PCICFG 0x1000
#define BCSR_BOARD_SD0_WP 0x4000
#define BCSR_BOARD_SD1_WP 0x8000
#define BCSR_LEDS_DECIMALS 0x0003
#define BCSR_LEDS_LED0 0x0100
#define BCSR_LEDS_LED1 0x0200
#define BCSR_LEDS_LED2 0x0400
#define BCSR_LEDS_LED3 0x0800
#define BCSR_SWRESET_RESET 0x0080
/* PCMCIA DBAu1x00 specific defines */
#define PCMCIA_MAX_SOCK 1
#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1)