diff options
Diffstat (limited to 'include/ppc405.h')
| -rw-r--r-- | include/ppc405.h | 395 | 
1 files changed, 129 insertions, 266 deletions
| diff --git a/include/ppc405.h b/include/ppc405.h index 55649e474..5e5689781 100644 --- a/include/ppc405.h +++ b/include/ppc405.h @@ -42,54 +42,39 @@   * DMA   ******************************************************************************/  #define DMA_DCR_BASE 0x100 -#define dmacr0	(DMA_DCR_BASE+0x00)  /* DMA channel control register 0	     */ -#define dmact0	(DMA_DCR_BASE+0x01)  /* DMA count register 0		     */ -#define dmada0	(DMA_DCR_BASE+0x02)  /* DMA destination address register 0   */ -#define dmasa0	(DMA_DCR_BASE+0x03)  /* DMA source address register 0	     */ -#define dmasb0	(DMA_DCR_BASE+0x04)  /* DMA scatter/gather descriptor addr 0 */ -#define dmacr1	(DMA_DCR_BASE+0x08)  /* DMA channel control register 1	     */ -#define dmact1	(DMA_DCR_BASE+0x09)  /* DMA count register 1		     */ -#define dmada1	(DMA_DCR_BASE+0x0a)  /* DMA destination address register 1   */ -#define dmasa1	(DMA_DCR_BASE+0x0b)  /* DMA source address register 1	     */ -#define dmasb1	(DMA_DCR_BASE+0x0c)  /* DMA scatter/gather descriptor addr 1 */ -#define dmacr2	(DMA_DCR_BASE+0x10)  /* DMA channel control register 2	     */ -#define dmact2	(DMA_DCR_BASE+0x11)  /* DMA count register 2		     */ -#define dmada2	(DMA_DCR_BASE+0x12)  /* DMA destination address register 2   */ -#define dmasa2	(DMA_DCR_BASE+0x13)  /* DMA source address register 2	     */ -#define dmasb2	(DMA_DCR_BASE+0x14)  /* DMA scatter/gather descriptor addr 2 */ -#define dmacr3	(DMA_DCR_BASE+0x18)  /* DMA channel control register 3	     */ -#define dmact3	(DMA_DCR_BASE+0x19)  /* DMA count register 3		     */ -#define dmada3	(DMA_DCR_BASE+0x1a)  /* DMA destination address register 3   */ -#define dmasa3	(DMA_DCR_BASE+0x1b)  /* DMA source address register 3	     */ -#define dmasb3	(DMA_DCR_BASE+0x1c)  /* DMA scatter/gather descriptor addr 3 */ -#define dmasr	(DMA_DCR_BASE+0x20)  /* DMA status register		     */ -#define dmasgc	(DMA_DCR_BASE+0x23)  /* DMA scatter/gather command register  */ -#define dmaadr	(DMA_DCR_BASE+0x24)  /* DMA address decode register	     */ +#define DMACR0	(DMA_DCR_BASE+0x00)  /* DMA channel control register 0	     */ +#define DMACT0	(DMA_DCR_BASE+0x01)  /* DMA count register 0		     */ +#define DMADA0	(DMA_DCR_BASE+0x02)  /* DMA destination address register 0   */ +#define DMASA0	(DMA_DCR_BASE+0x03)  /* DMA source address register 0	     */ +#define DMASB0	(DMA_DCR_BASE+0x04)  /* DMA scatter/gather descriptor addr 0 */ +#define DMACR1	(DMA_DCR_BASE+0x08)  /* DMA channel control register 1	     */ +#define DMACT1	(DMA_DCR_BASE+0x09)  /* DMA count register 1		     */ +#define DMADA1	(DMA_DCR_BASE+0x0a)  /* DMA destination address register 1   */ +#define DMASA1	(DMA_DCR_BASE+0x0b)  /* DMA source address register 1	     */ +#define DMASB1	(DMA_DCR_BASE+0x0c)  /* DMA scatter/gather descriptor addr 1 */ +#define DMACR2	(DMA_DCR_BASE+0x10)  /* DMA channel control register 2	     */ +#define DMACT2	(DMA_DCR_BASE+0x11)  /* DMA count register 2		     */ +#define DMADA2	(DMA_DCR_BASE+0x12)  /* DMA destination address register 2   */ +#define DMASA2	(DMA_DCR_BASE+0x13)  /* DMA source address register 2	     */ +#define DMASB2	(DMA_DCR_BASE+0x14)  /* DMA scatter/gather descriptor addr 2 */ +#define DMACR3	(DMA_DCR_BASE+0x18)  /* DMA channel control register 3	     */ +#define DMACT3	(DMA_DCR_BASE+0x19)  /* DMA count register 3		     */ +#define DMADA3	(DMA_DCR_BASE+0x1a)  /* DMA destination address register 3   */ +#define DMASA3	(DMA_DCR_BASE+0x1b)  /* DMA source address register 3	     */ +#define DMASB3	(DMA_DCR_BASE+0x1c)  /* DMA scatter/gather descriptor addr 3 */ +#define DMASR	(DMA_DCR_BASE+0x20)  /* DMA status register		     */ +#define DMASGC	(DMA_DCR_BASE+0x23)  /* DMA scatter/gather command register  */ +#define DMAADR	(DMA_DCR_BASE+0x24)  /* DMA address decode register	     */  #ifndef CONFIG_405EP  /******************************************************************************   * Decompression Controller   ******************************************************************************/  #define DECOMP_DCR_BASE 0x14 -#define kiar  (DECOMP_DCR_BASE+0x0)  /* Decompression controller addr reg    */ -#define kidr  (DECOMP_DCR_BASE+0x1)  /* Decompression controller data reg    */ -  /* values for kiar register - indirect addressing of these regs */ -  #define kitor0      0x00    /* index table origin register 0	      */ -  #define kitor1      0x01    /* index table origin register 1	      */ -  #define kitor2      0x02    /* index table origin register 2	      */ -  #define kitor3      0x03    /* index table origin register 3	      */ -  #define kaddr0      0x04    /* address decode definition regsiter 0 */ -  #define kaddr1      0x05    /* address decode definition regsiter 1 */ -  #define kconf       0x40    /* decompression core config register   */ -  #define kid	      0x41    /* decompression core ID	   register   */ -  #define kver	      0x42    /* decompression core version # reg     */ -  #define kpear       0x50    /* bus error addr reg (PLB addr)	      */ -  #define kbear       0x51    /* bus error addr reg (DCP to EBIU addr)*/ -  #define kesr0       0x52    /* bus error status reg 0  (R/clear)    */ -  #define kesr0s      0x53    /* bus error status reg 0  (set)	      */ -  /* There are 0x400 of the following registers, from krom0 to krom3ff*/ -  /* Only the first one is given here.				      */ -  #define krom0      0x400    /* SRAM/ROM read/write		      */ +#define KIAR  (DECOMP_DCR_BASE+0x0)  /* Decompression controller addr reg    */ +#define KIDR  (DECOMP_DCR_BASE+0x1)  /* Decompression controller data reg    */ +/* values for kiar register - indirect addressing of these regs */ +#define KCONF       0x40    /* decompression core config register   */  #endif  /****************************************************************************** @@ -100,38 +85,37 @@  #else  #define POWERMAN_DCR_BASE 0xb8  #endif -#define cpmsr (POWERMAN_DCR_BASE+0x0) /* Power management status	     */ -#define cpmer (POWERMAN_DCR_BASE+0x1) /* Power management enable	     */ -#define cpmfr (POWERMAN_DCR_BASE+0x2) /* Power management force		     */ +#define CPMSR (POWERMAN_DCR_BASE+0x0) /* Power management status	     */ +#define CPMER (POWERMAN_DCR_BASE+0x1) /* Power management enable	     */ +#define CPMFR (POWERMAN_DCR_BASE+0x2) /* Power management force		     */  /******************************************************************************   * Extrnal Bus Controller   ******************************************************************************/ -  /* values for ebccfga register - indirect addressing of these regs */ -  #define pb0cr       0x00    /* periph bank 0 config reg	     */ -  #define pb1cr       0x01    /* periph bank 1 config reg	     */ -  #define pb2cr       0x02    /* periph bank 2 config reg	     */ -  #define pb3cr       0x03    /* periph bank 3 config reg	     */ -  #define pb4cr       0x04    /* periph bank 4 config reg	     */ +  /* values for EBC0_CFGADDR register - indirect addressing of these regs */ +  #define PB0CR       0x00    /* periph bank 0 config reg	     */ +  #define PB1CR       0x01    /* periph bank 1 config reg	     */ +  #define PB2CR       0x02    /* periph bank 2 config reg	     */ +  #define PB3CR       0x03    /* periph bank 3 config reg	     */ +  #define PB4CR       0x04    /* periph bank 4 config reg	     */  #ifndef CONFIG_405EP -  #define pb5cr       0x05    /* periph bank 5 config reg	     */ -  #define pb6cr       0x06    /* periph bank 6 config reg	     */ -  #define pb7cr       0x07    /* periph bank 7 config reg	     */ +  #define PB5CR       0x05    /* periph bank 5 config reg	     */ +  #define PB6CR       0x06    /* periph bank 6 config reg	     */ +  #define PB7CR       0x07    /* periph bank 7 config reg	     */  #endif -  #define pb0ap       0x10    /* periph bank 0 access parameters     */ -  #define pb1ap       0x11    /* periph bank 1 access parameters     */ -  #define pb2ap       0x12    /* periph bank 2 access parameters     */ -  #define pb3ap       0x13    /* periph bank 3 access parameters     */ -  #define pb4ap       0x14    /* periph bank 4 access parameters     */ +  #define PB0AP       0x10    /* periph bank 0 access parameters     */ +  #define PB1AP       0x11    /* periph bank 1 access parameters     */ +  #define PB2AP       0x12    /* periph bank 2 access parameters     */ +  #define PB3AP       0x13    /* periph bank 3 access parameters     */ +  #define PB4AP       0x14    /* periph bank 4 access parameters     */  #ifndef CONFIG_405EP -  #define pb5ap       0x15    /* periph bank 5 access parameters     */ -  #define pb6ap       0x16    /* periph bank 6 access parameters     */ -  #define pb7ap       0x17    /* periph bank 7 access parameters     */ +  #define PB5AP       0x15    /* periph bank 5 access parameters     */ +  #define PB6AP       0x16    /* periph bank 6 access parameters     */ +  #define PB7AP       0x17    /* periph bank 7 access parameters     */  #endif -  #define pbear       0x20    /* periph bus error addr reg	     */ -  #define pbesr0      0x21    /* periph bus error status reg 0	     */ -  #define pbesr1      0x22    /* periph bus error status reg 1	     */ -  #define epcr	      0x23    /* external periph control reg	     */ +  #define PBEAR       0x20    /* periph bus error addr reg	     */ +  #define PBESR0      0x21    /* periph bus error status reg 0	     */ +  #define PBESR1      0x22    /* periph bus error status reg 1	     */  #define EBC0_CFG	0x23	/* external bus configuration reg	*/  #ifdef CONFIG_405EP @@ -139,12 +123,12 @@   * Control   ******************************************************************************/  #define CNTRL_DCR_BASE 0x0f0 -#define cpc0_pllmr0   (CNTRL_DCR_BASE+0x0)  /* PLL mode  register 0		   */ -#define cpc0_boot     (CNTRL_DCR_BASE+0x1)  /* Clock status register		   */ -#define cpc0_epctl    (CNTRL_DCR_BASE+0x3)  /* EMAC to PHY control register	   */ -#define cpc0_pllmr1   (CNTRL_DCR_BASE+0x4)  /* PLL mode  register 1		   */ -#define cpc0_ucr      (CNTRL_DCR_BASE+0x5)  /* UART control register		   */ -#define cpc0_pci      (CNTRL_DCR_BASE+0x9)  /* PCI control register		   */ +#define CPC0_PLLMR0   (CNTRL_DCR_BASE+0x0)  /* PLL mode  register 0		   */ +#define CPC0_BOOT     (CNTRL_DCR_BASE+0x1)  /* Clock status register		   */ +#define CPC0_EPCTL    (CNTRL_DCR_BASE+0x3)  /* EMAC to PHY control register	   */ +#define CPC0_PLLMR1   (CNTRL_DCR_BASE+0x4)  /* PLL mode  register 1		   */ +#define CPC0_UCR      (CNTRL_DCR_BASE+0x5)  /* UART control register		   */ +#define CPC0_PCI      (CNTRL_DCR_BASE+0x9)  /* PCI control register		   */  #define CPC0_PLLMR0  (CNTRL_DCR_BASE+0x0)  /* PLL mode 0 register	   */  #define CPC0_BOOT    (CNTRL_DCR_BASE+0x1)  /* Chip Clock Status register   */ @@ -401,10 +385,10 @@  #define VCO_MIN     500  #define VCO_MAX     1000  #elif defined(CONFIG_405EZ) -#define sdrnand0	0x4000 -#define sdrultra0	0x4040 -#define sdrultra1	0x4050 -#define sdricintstat	0x4510 +#define SDR0_NAND0	0x4000 +#define SDR0_ULTRA0	0x4040 +#define SDR0_ULTRA1	0x4050 +#define SDR0_ICINTSTAT	0x4510  #define SDR_NAND0_NDEN		0x80000000  #define SDR_NAND0_NDBTEN	0x40000000 @@ -429,21 +413,19 @@  #define SDR_ICTX0_STAT	0x40000000  #define SDR_ICTX1_STAT	0x20000000 -#define SDR_PINSTP	0x40 +#define SDR0_PINSTP	0x40  /******************************************************************************   * Control   ******************************************************************************/  /* CPR Registers */ -#define cprclkupd	0x020		/* CPR_CLKUPD */ -#define cprpllc		0x040		/* CPR_PLLC */ -#define cprplld		0x060		/* CPR_PLLD */ -#define cprprimad	0x080		/* CPR_PRIMAD */ -#define cprperd0	0x0e0		/* CPR_PERD0 */ -#define cprperd1	0x0e1		/* CPR_PERD1 */ -#define cprperc0	0x180		/* CPR_PERC0 */ -#define cprmisc0	0x181		/* CPR_MISC0 */ -#define cprmisc1	0x182		/* CPR_MISC1 */ +#define CPR0_CLKUP	0x020		/* CPR_CLKUPD */ +#define CPR0_PLLC		0x040		/* CPR_PLLC */ +#define CPR0_PLLD		0x060		/* CPR_PLLD */ +#define CPC0_PRIMAD	0x080		/* CPR_PRIMAD */ +#define CPC0_PERD0	0x0e0		/* CPR_PERD0 */ +#define CPC0_PERD1	0x0e1		/* CPR_PERD1 */ +#define CPC0_PERC0	0x180		/* CPR_PERC0 */  #define CPR_CLKUPD_ENPLLCH_EN  0x40000000     /* Enable CPR PLL Changes */  #define CPR_CLKUPD_ENDVCH_EN   0x20000000     /* Enable CPR Sys. Div. Changes */ @@ -470,21 +452,14 @@   * Control   ******************************************************************************/  #define CNTRL_DCR_BASE 0x0b0 -#define pllmd	(CNTRL_DCR_BASE+0x0)  /* PLL mode  register		     */ -#define cntrl0	(CNTRL_DCR_BASE+0x1)  /* Control 0 register		     */ -#define cntrl1	(CNTRL_DCR_BASE+0x2)  /* Control 1 register		     */ -#define reset	(CNTRL_DCR_BASE+0x3)  /* reset register			     */ -#define strap	(CNTRL_DCR_BASE+0x4)  /* strap register			     */ - -#define CPC0_CR0  (CNTRL_DCR_BASE+0x1)	/* chip control register 0	     */ -#define CPC0_CR1  (CNTRL_DCR_BASE+0x2)	/* chip control register 1	     */ -#define CPC0_PSR  (CNTRL_DCR_BASE+0x4)	/* chip pin strapping register	     */ +#define CPC0_PLLMR	(CNTRL_DCR_BASE + 0x0)	/* PLL mode  register */ +#define CPC0_CR0	(CNTRL_DCR_BASE + 0x1)	/* chip control register 0 */ +#define CPC0_CR1	(CNTRL_DCR_BASE + 0x2)	/* chip control register 1 */ +#define CPC0_PSR	(CNTRL_DCR_BASE + 0x4)	/* chip pin strapping reg */  /* CPC0_ECR/CPC0_EIRR: PPC405GPr only */ -#define CPC0_EIRR (CNTRL_DCR_BASE+0x6)	/* external interrupt routing register */ -#define CPC0_ECR  (0xaa)		/* edge conditioner register */ - -#define ecr	(0xaa)		      /* edge conditioner register (405gpr)  */ +#define CPC0_EIRR	(CNTRL_DCR_BASE + 0x6)	/* ext interrupt routing reg */ +#define CPC0_ECR	0xaa			/* edge conditioner register */  /* Bit definitions */  #define PLLMR_FWD_DIV_MASK	0xE0000000     /* Forward Divisor */ @@ -557,140 +532,38 @@   ******************************************************************************/  #if defined(CONFIG_405EZ)  #define	MAL_DCR_BASE	0x380 -#define	malmcr		(MAL_DCR_BASE+0x00)	/* MAL Config reg	      */ -#define	malesr		(MAL_DCR_BASE+0x01)	/* Err Status reg (Read/Clear)*/ -#define	malier		(MAL_DCR_BASE+0x02)	/* Interrupt enable reg	      */ -#define	maldbr		(MAL_DCR_BASE+0x03)	/* Mal Debug reg (Read only)  */ -#define	maltxcasr	(MAL_DCR_BASE+0x04)	/* TX Channel active reg (set)*/ -#define	maltxcarr	(MAL_DCR_BASE+0x05)	/* TX Channel active reg (Reset)     */ -#define	maltxeobisr	(MAL_DCR_BASE+0x06)	/* TX End of buffer int status reg   */ -#define	maltxdeir	(MAL_DCR_BASE+0x07)	/* TX Descr. Error Int reg    */ -/*				      0x08-0x0F	   Reserved		      */ -#define	malrxcasr	(MAL_DCR_BASE+0x10)	/* RX Channel active reg (set)*/ -#define	malrxcarr	(MAL_DCR_BASE+0x11)	/* RX Channel active reg (Reset)     */ -#define	malrxeobisr	(MAL_DCR_BASE+0x12)	/* RX End of buffer int status reg   */ -#define	malrxdeir	(MAL_DCR_BASE+0x13)	/* RX Descr. Error Int reg  */ -/*				      0x14-0x1F	   Reserved		    */ -#define	maltxctp0r	(MAL_DCR_BASE+0x20)  /* TX 0 Channel table ptr reg  */ -#define	maltxctp1r	(MAL_DCR_BASE+0x21)  /* TX 1 Channel table ptr reg  */ -#define	maltxctp2r	(MAL_DCR_BASE+0x22)  /* TX 2 Channel table ptr reg  */ -#define	maltxctp3r	(MAL_DCR_BASE+0x23)  /* TX 3 Channel table ptr reg  */ -#define	maltxctp4r	(MAL_DCR_BASE+0x24)  /* TX 4 Channel table ptr reg  */ -#define	maltxctp5r	(MAL_DCR_BASE+0x25)  /* TX 5 Channel table ptr reg  */ -#define	maltxctp6r	(MAL_DCR_BASE+0x26)  /* TX 6 Channel table ptr reg  */ -#define	maltxctp7r	(MAL_DCR_BASE+0x27)  /* TX 7 Channel table ptr reg  */ -#define	maltxctp8r	(MAL_DCR_BASE+0x28)  /* TX 8 Channel table ptr reg  */ -#define	maltxctp9r	(MAL_DCR_BASE+0x29)  /* TX 9 Channel table ptr reg  */ -#define	maltxctp10r	(MAL_DCR_BASE+0x2A)  /* TX 10 Channel table ptr reg */ -#define	maltxctp11r	(MAL_DCR_BASE+0x2B)  /* TX 11 Channel table ptr reg */ -#define	maltxctp12r	(MAL_DCR_BASE+0x2C)  /* TX 12 Channel table ptr reg */ -#define	maltxctp13r	(MAL_DCR_BASE+0x2D)  /* TX 13 Channel table ptr reg */ -#define	maltxctp14r	(MAL_DCR_BASE+0x2E)  /* TX 14 Channel table ptr reg */ -#define	maltxctp15r	(MAL_DCR_BASE+0x2F)  /* TX 15 Channel table ptr reg */ -#define	maltxctp16r	(MAL_DCR_BASE+0x30)  /* TX 16 Channel table ptr reg */ -#define	maltxctp17r	(MAL_DCR_BASE+0x31)  /* TX 17 Channel table ptr reg */ -#define	maltxctp18r	(MAL_DCR_BASE+0x32)  /* TX 18 Channel table ptr reg */ -#define	maltxctp19r	(MAL_DCR_BASE+0x33)  /* TX 19 Channel table ptr reg */ -#define	maltxctp20r	(MAL_DCR_BASE+0x34)  /* TX 20 Channel table ptr reg */ -#define	maltxctp21r	(MAL_DCR_BASE+0x35)  /* TX 21 Channel table ptr reg */ -#define	maltxctp22r	(MAL_DCR_BASE+0x36)  /* TX 22 Channel table ptr reg */ -#define	maltxctp23r	(MAL_DCR_BASE+0x37)  /* TX 23 Channel table ptr reg */ -#define	maltxctp24r	(MAL_DCR_BASE+0x38)  /* TX 24 Channel table ptr reg */ -#define	maltxctp25r	(MAL_DCR_BASE+0x39)  /* TX 25 Channel table ptr reg */ -#define	maltxctp26r	(MAL_DCR_BASE+0x3A)  /* TX 26 Channel table ptr reg */ -#define	maltxctp27r	(MAL_DCR_BASE+0x3B)  /* TX 27 Channel table ptr reg */ -#define	maltxctp28r	(MAL_DCR_BASE+0x3C)  /* TX 28 Channel table ptr reg */ -#define	maltxctp29r	(MAL_DCR_BASE+0x3D)  /* TX 29 Channel table ptr reg */ -#define	maltxctp30r	(MAL_DCR_BASE+0x3E)  /* TX 30 Channel table ptr reg */ -#define	maltxctp31r	(MAL_DCR_BASE+0x3F)  /* TX 31 Channel table ptr reg */ -#define	malrxctp0r	(MAL_DCR_BASE+0x40)  /* RX 0 Channel table ptr reg  */ -#define	malrxctp1r	(MAL_DCR_BASE+0x41)  /* RX 1 Channel table ptr reg  */ -#define	malrxctp2r	(MAL_DCR_BASE+0x42)  /* RX 2 Channel table ptr reg  */ -#define	malrxctp3r	(MAL_DCR_BASE+0x43)  /* RX 3 Channel table ptr reg  */ -#define	malrxctp4r	(MAL_DCR_BASE+0x44)  /* RX 4 Channel table ptr reg  */ -#define	malrxctp5r	(MAL_DCR_BASE+0x45)  /* RX 5 Channel table ptr reg  */ -#define	malrxctp6r	(MAL_DCR_BASE+0x46)  /* RX 6 Channel table ptr reg  */ -#define	malrxctp7r	(MAL_DCR_BASE+0x47)  /* RX 7 Channel table ptr reg  */ -#define	malrxctp8r	(MAL_DCR_BASE+0x48)  /* RX 8 Channel table ptr reg  */ -#define	malrxctp9r	(MAL_DCR_BASE+0x49)  /* RX 9 Channel table ptr reg  */ -#define	malrxctp10r	(MAL_DCR_BASE+0x4A)  /* RX 10 Channel table ptr reg */ -#define	malrxctp11r	(MAL_DCR_BASE+0x4B)  /* RX 11 Channel table ptr reg */ -#define	malrxctp12r	(MAL_DCR_BASE+0x4C)  /* RX 12 Channel table ptr reg */ -#define	malrxctp13r	(MAL_DCR_BASE+0x4D)  /* RX 13 Channel table ptr reg */ -#define	malrxctp14r	(MAL_DCR_BASE+0x4E)  /* RX 14 Channel table ptr reg */ -#define	malrxctp15r	(MAL_DCR_BASE+0x4F)  /* RX 15 Channel table ptr reg */ -#define	malrxctp16r	(MAL_DCR_BASE+0x50)  /* RX 16 Channel table ptr reg */ -#define	malrxctp17r	(MAL_DCR_BASE+0x51)  /* RX 17 Channel table ptr reg */ -#define	malrxctp18r	(MAL_DCR_BASE+0x52)  /* RX 18 Channel table ptr reg */ -#define	malrxctp19r	(MAL_DCR_BASE+0x53)  /* RX 19 Channel table ptr reg */ -#define	malrxctp20r	(MAL_DCR_BASE+0x54)  /* RX 20 Channel table ptr reg */ -#define	malrxctp21r	(MAL_DCR_BASE+0x55)  /* RX 21 Channel table ptr reg */ -#define	malrxctp22r	(MAL_DCR_BASE+0x56)  /* RX 22 Channel table ptr reg */ -#define	malrxctp23r	(MAL_DCR_BASE+0x57)  /* RX 23 Channel table ptr reg */ -#define	malrxctp24r	(MAL_DCR_BASE+0x58)  /* RX 24 Channel table ptr reg */ -#define	malrxctp25r	(MAL_DCR_BASE+0x59)  /* RX 25 Channel table ptr reg */ -#define	malrxctp26r	(MAL_DCR_BASE+0x5A)  /* RX 26 Channel table ptr reg */ -#define	malrxctp27r	(MAL_DCR_BASE+0x5B)  /* RX 27 Channel table ptr reg */ -#define	malrxctp28r	(MAL_DCR_BASE+0x5C)  /* RX 28 Channel table ptr reg */ -#define	malrxctp29r	(MAL_DCR_BASE+0x5D)  /* RX 29 Channel table ptr reg */ -#define	malrxctp30r	(MAL_DCR_BASE+0x5E)  /* RX 30 Channel table ptr reg */ -#define	malrxctp31r	(MAL_DCR_BASE+0x5F)  /* RX 31 Channel table ptr reg */ -#define	malrcbs0	(MAL_DCR_BASE+0x60)  /* RX 0 Channel buffer size reg */ -#define	malrcbs1	(MAL_DCR_BASE+0x61)  /* RX 1 Channel buffer size reg */ -#define	malrcbs2	(MAL_DCR_BASE+0x62)  /* RX 2 Channel buffer size reg */ -#define	malrcbs3	(MAL_DCR_BASE+0x63)  /* RX 3 Channel buffer size reg */ -#define	malrcbs4	(MAL_DCR_BASE+0x64)  /* RX 4 Channel buffer size reg */ -#define	malrcbs5	(MAL_DCR_BASE+0x65)  /* RX 5 Channel buffer size reg */ -#define	malrcbs6	(MAL_DCR_BASE+0x66)  /* RX 6 Channel buffer size reg */ -#define	malrcbs7	(MAL_DCR_BASE+0x67)  /* RX 7 Channel buffer size reg */ -#define	malrcbs8	(MAL_DCR_BASE+0x68)  /* RX 8 Channel buffer size reg */ -#define	malrcbs9	(MAL_DCR_BASE+0x69)  /* RX 9 Channel buffer size reg */ -#define	malrcbs10	(MAL_DCR_BASE+0x6A)  /* RX 10 Channel buffer size reg */ -#define	malrcbs11	(MAL_DCR_BASE+0x6B)  /* RX 11 Channel buffer size reg */ -#define	malrcbs12	(MAL_DCR_BASE+0x6C)  /* RX 12 Channel buffer size reg */ -#define	malrcbs13	(MAL_DCR_BASE+0x6D)  /* RX 13 Channel buffer size reg */ -#define	malrcbs14	(MAL_DCR_BASE+0x6E)  /* RX 14 Channel buffer size reg */ -#define	malrcbs15	(MAL_DCR_BASE+0x6F)  /* RX 15 Channel buffer size reg */ -#define	malrcbs16	(MAL_DCR_BASE+0x70)  /* RX 16 Channel buffer size reg */ -#define	malrcbs17	(MAL_DCR_BASE+0x71)  /* RX 17 Channel buffer size reg */ -#define	malrcbs18	(MAL_DCR_BASE+0x72)  /* RX 18 Channel buffer size reg */ -#define	malrcbs19	(MAL_DCR_BASE+0x73)  /* RX 19 Channel buffer size reg */ -#define	malrcbs20	(MAL_DCR_BASE+0x74)  /* RX 20 Channel buffer size reg */ -#define	malrcbs21	(MAL_DCR_BASE+0x75)  /* RX 21 Channel buffer size reg */ -#define	malrcbs22	(MAL_DCR_BASE+0x76)  /* RX 22 Channel buffer size reg */ -#define	malrcbs23	(MAL_DCR_BASE+0x77)  /* RX 23 Channel buffer size reg */ -#define	malrcbs24	(MAL_DCR_BASE+0x78)  /* RX 24 Channel buffer size reg */ -#define	malrcbs25	(MAL_DCR_BASE+0x79)  /* RX 25 Channel buffer size reg */ -#define	malrcbs26	(MAL_DCR_BASE+0x7A)  /* RX 26 Channel buffer size reg */ -#define	malrcbs27	(MAL_DCR_BASE+0x7B)  /* RX 27 Channel buffer size reg */ -#define	malrcbs28	(MAL_DCR_BASE+0x7C)  /* RX 28 Channel buffer size reg */ -#define	malrcbs29	(MAL_DCR_BASE+0x7D)  /* RX 29 Channel buffer size reg */ -#define	malrcbs30	(MAL_DCR_BASE+0x7E)  /* RX 30 Channel buffer size reg */ -#define	malrcbs31	(MAL_DCR_BASE+0x7F)  /* RX 31 Channel buffer size reg */ - -#else /* !defined(CONFIG_405EZ) */ - -#define MAL_DCR_BASE 0x180 -#define malmcr	(MAL_DCR_BASE+0x00)  /* MAL Config reg			     */ -#define malesr	(MAL_DCR_BASE+0x01)  /* Error Status reg (Read/Clear)	     */ -#define malier	(MAL_DCR_BASE+0x02)  /* Interrupt enable reg		     */ -#define maldbr	(MAL_DCR_BASE+0x03)  /* Mal Debug reg (Read only)	     */ -#define maltxcasr  (MAL_DCR_BASE+0x04)	/* TX Channel active reg (set)	     */ -#define maltxcarr  (MAL_DCR_BASE+0x05)	/* TX Channel active reg (Reset)     */ -#define maltxeobisr (MAL_DCR_BASE+0x06) /* TX End of buffer int status reg   */ -#define maltxdeir  (MAL_DCR_BASE+0x07)	/* TX Descr. Error Int reg	     */ -#define malrxcasr  (MAL_DCR_BASE+0x10)	/* RX Channel active reg (set)	     */ -#define malrxcarr  (MAL_DCR_BASE+0x11)	/* RX Channel active reg (Reset)     */ -#define malrxeobisr (MAL_DCR_BASE+0x12) /* RX End of buffer int status reg   */ -#define malrxdeir  (MAL_DCR_BASE+0x13)	/* RX Descr. Error Int reg	     */ -#define maltxctp0r (MAL_DCR_BASE+0x20)	/* TX 0 Channel table pointer reg    */ -#define maltxctp1r (MAL_DCR_BASE+0x21)	/* TX 1 Channel table pointer reg    */ -#define maltxctp2r (MAL_DCR_BASE+0x22)	/* TX 2 Channel table pointer reg    */ -#define malrxctp0r (MAL_DCR_BASE+0x40)	/* RX 0 Channel table pointer reg    */ -#define malrxctp1r (MAL_DCR_BASE+0x41)	/* RX 1 Channel table pointer reg    */ -#define malrcbs0   (MAL_DCR_BASE+0x60)	/* RX 0 Channel buffer size reg      */ -#define malrcbs1   (MAL_DCR_BASE+0x61)	/* RX 1 Channel buffer size reg      */ -#endif /* defined(CONFIG_405EZ) */ +#else +#define MAL_DCR_BASE	0x180 +#endif +#define	MAL0_CFG	(MAL_DCR_BASE + 0x00)	/* MAL Config reg */ +#define	MAL0_ESR	(MAL_DCR_BASE + 0x01)	/* Err Status (Read/Clear)*/ +#define	MAL0_IER	(MAL_DCR_BASE + 0x02)	/* Interrupt enable */ +#define	MAL0_TXCASR	(MAL_DCR_BASE + 0x04)	/* TX Channel active (set)*/ +#define	MAL0_TXCARR	(MAL_DCR_BASE + 0x05)	/* TX Channel active (reset)*/ +#define	MAL0_TXEOBISR	(MAL_DCR_BASE + 0x06)	/* TX End of buffer int status*/ +#define	MAL0_TXDEIR	(MAL_DCR_BASE + 0x07)	/* TX Descr. Error Int reg */ +#define	MAL0_RXCASR	(MAL_DCR_BASE + 0x10)	/* RX Channel active (set) */ +#define	MAL0_RXCARR	(MAL_DCR_BASE + 0x11)	/* RX Channel active (reset) */ +#define	MAL0_RXEOBISR	(MAL_DCR_BASE + 0x12)	/* RX End of buffer int status*/ +#define	MAL0_RXDEIR	(MAL_DCR_BASE + 0x13)	/* RX Descr. Error Int reg */ +#define	MAL0_TXCTP0R	(MAL_DCR_BASE + 0x20)	/* TX 0 Channel table ptr */ +#define	MAL0_TXCTP1R	(MAL_DCR_BASE + 0x21)	/* TX 1 Channel table ptr */ +#define	MAL0_TXCTP2R	(MAL_DCR_BASE + 0x22)	/* TX 2 Channel table ptr */ +#define	MAL0_TXCTP3R	(MAL_DCR_BASE + 0x23)	/* TX 3 Channel table ptr */ +#define	MAL0_RXCTP0R	(MAL_DCR_BASE + 0x40)	/* RX 0 Channel table ptr */ +#define	MAL0_RXCTP1R	(MAL_DCR_BASE + 0x41)	/* RX 1 Channel table ptr */ +#define	MAL0_RXCTP2R	(MAL_DCR_BASE + 0x42)	/* RX 2 Channel table ptr */ +#define	MAL0_RXCTP3R	(MAL_DCR_BASE + 0x43)	/* RX 3 Channel table ptr */ +#define	MAL0_RXCTP8R	(MAL_DCR_BASE + 0x48)	/* RX 8 Channel table ptr */ +#define	MAL0_RXCTP16R	(MAL_DCR_BASE + 0x50)	/* RX 16 Channel table ptr */ +#define	MAL0_RXCTP24R	(MAL_DCR_BASE + 0x58)	/* RX 24 Channel table ptr */ +#define	MAL0_RCBS0	(MAL_DCR_BASE + 0x60)	/* RX 0 Channel buffer size */ +#define	MAL0_RCBS1	(MAL_DCR_BASE + 0x61)	/* RX 1 Channel buffer size */ +#define	MAL0_RCBS2	(MAL_DCR_BASE + 0x62)	/* RX 2 Channel buffer size */ +#define	MAL0_RCBS3	(MAL_DCR_BASE + 0x63)	/* RX 3 Channel buffer size */ +#define	MAL0_RCBS8	(MAL_DCR_BASE + 0x68)	/* RX 8 Channel buffer size */ +#define	MAL0_RCBS16	(MAL_DCR_BASE + 0x70)	/* RX 16 Channel buffer size */ +#define	MAL0_RCBS24	(MAL_DCR_BASE + 0x78)	/* RX 24 Channel buffer size */  /*-----------------------------------------------------------------------------  | IIC Register Offsets @@ -730,27 +603,19 @@   ******************************************************************************/  #if defined(CONFIG_405EZ)  #define OCM_DCR_BASE 0x020 -#define ocmplb3cr1	(OCM_DCR_BASE+0x00)  /* OCM PLB3 Bank 1 Config Reg    */ -#define ocmplb3cr2	(OCM_DCR_BASE+0x01)  /* OCM PLB3 Bank 2 Config Reg    */ -#define ocmplb3bear	(OCM_DCR_BASE+0x02)  /* OCM PLB3 Bus Error Add Reg    */ -#define ocmplb3besr0	(OCM_DCR_BASE+0x03)  /* OCM PLB3 Bus Error Stat Reg 0 */ -#define ocmplb3besr1	(OCM_DCR_BASE+0x04)  /* OCM PLB3 Bus Error Stat Reg 1 */ -#define ocmcid		(OCM_DCR_BASE+0x05)  /* OCM Core ID		      */ -#define ocmrevid	(OCM_DCR_BASE+0x06)  /* OCM Revision ID		      */ -#define ocmplb3dpc	(OCM_DCR_BASE+0x07)  /* OCM PLB3 Data Parity Check    */ -#define ocmdscr1	(OCM_DCR_BASE+0x08)  /* OCM D-side Bank 1 Config Reg  */ -#define ocmdscr2	(OCM_DCR_BASE+0x09)  /* OCM D-side Bank 2 Config Reg  */ -#define ocmiscr1	(OCM_DCR_BASE+0x0A)  /* OCM I-side Bank 1 Config Reg  */ -#define ocmiscr2	(OCM_DCR_BASE+0x0B)  /* OCM I-side Bank 2 Config Reg  */ -#define ocmdsisdpc	(OCM_DCR_BASE+0x0C)  /* OCM D-side/I-side Data Par Chk*/ -#define ocmdsisbear	(OCM_DCR_BASE+0x0D)  /* OCM D-side/I-side Bus Err Addr*/ -#define ocmdsisbesr	(OCM_DCR_BASE+0x0E)  /* OCM D-side/I-side Bus Err Stat*/ +#define OCM0_PLBCR1	(OCM_DCR_BASE + 0x00)	/* OCM PLB3 Bank 1 Config */ +#define OCM0_PLBCR2	(OCM_DCR_BASE + 0x01)	/* OCM PLB3 Bank 2 Config */ +#define OCM0_PLBBEAR	(OCM_DCR_BASE + 0x02)	/* OCM PLB3 Bus Error Add */ +#define OCM0_DSRC1	(OCM_DCR_BASE + 0x08)	/* OCM D-side Bank 1 Config */ +#define OCM0_DSRC2	(OCM_DCR_BASE + 0x09)	/* OCM D-side Bank 2 Config */ +#define OCM0_ISRC1	(OCM_DCR_BASE + 0x0A)	/* OCM I-side Bank 1Config */ +#define OCM0_ISRC2	(OCM_DCR_BASE + 0x0B)	/* OCM I-side Bank 2 Config */ +#define OCM0_DISDPC	(OCM_DCR_BASE + 0x0C)	/* OCM D-/I-side Data Par Chk*/  #else  #define OCM_DCR_BASE 0x018 -#define ocmisarc   (OCM_DCR_BASE+0x00)	/* OCM I-side address compare reg    */ -#define ocmiscntl  (OCM_DCR_BASE+0x01)	/* OCM I-side control reg	     */ -#define ocmdsarc   (OCM_DCR_BASE+0x02)	/* OCM D-side address compare reg    */ -#define ocmdscntl  (OCM_DCR_BASE+0x03)	/* OCM D-side control reg	     */ +#define OCM0_ISCNTL	(OCM_DCR_BASE+0x01)	/* OCM I-side control reg */ +#define OCM0_DSARC	(OCM_DCR_BASE+0x02)	/* OCM D-side address compare */ +#define OCM0_DSCNTL	(OCM_DCR_BASE+0x03)	/* OCM D-side control */  #endif /* CONFIG_405EZ */  /****************************************************************************** @@ -876,9 +741,9 @@  #define SDR0_SRST_AHB		PPC_REG_VAL(30, 1)  #define SDR0_SRST_NDFC		PPC_REG_VAL(31, 1) -#define sdr_uart0	0x0120	/* UART0 Config */ -#define sdr_uart1	0x0121	/* UART1 Config */ -#define sdr_mfr		0x4300	/* SDR0_MFR reg */ +#define SDR0_UART0		0x0120	/* UART0 Config */ +#define SDR0_UART1		0x0121	/* UART1 Config */ +#define SDR0_MFR		0x4300	/* SDR0_MFR reg */  /* Defines for CPC0_EPRCSR register */  #define CPC0_EPRCSR_E0NFE	   0x80000000 @@ -890,18 +755,16 @@  #define CPC0_EPRCSR_E1PCI	   0x00000002  #define CPC0_EPRCSR_E0PCI	   0x00000001 -#define cpr0_clkupd	0x020 -#define cpr0_pllc	0x040 -#define cpr0_plld	0x060 -#define cpr0_cpud	0x080 -#define cpr0_plbd	0x0a0 -#define cpr0_opbd	0x0c0 -#define cpr0_perd	0x0e0 -#define cpr0_ahbd	0x100 -#define cpr0_icfg	0x140 +#define CPR0_CLKUPD	0x020 +#define CPR0_PLLC	0x040 +#define CPR0_PLLD	0x060 +#define CPR0_CPUD	0x080 +#define CPR0_PLBD	0x0a0 +#define CPR0_OPBD	0x0c0 +#define CPR0_PERD	0x0e0 -#define SDR_PINSTP	0x0040 -#define sdr_sdcs	0x0060 +#define SDR0_PINSTP	0x0040 +#define SDR0_SDCS0	0x0060  #define SDR0_SDCS_SDD			(0x80000000 >> 31) |