diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /include/asm-mips/mach-pb1x00/pb1500.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'include/asm-mips/mach-pb1x00/pb1500.h')
| -rw-r--r-- | include/asm-mips/mach-pb1x00/pb1500.h | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/include/asm-mips/mach-pb1x00/pb1500.h b/include/asm-mips/mach-pb1x00/pb1500.h index ff6d40c87a25..da51a2eb7b82 100644 --- a/include/asm-mips/mach-pb1x00/pb1500.h +++ b/include/asm-mips/mach-pb1x00/pb1500.h | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Alchemy Semi PB1500 Referrence Board | 2 | * Alchemy Semi Pb1500 Referrence Board |
| 3 | * | 3 | * |
| 4 | * Copyright 2001 MontaVista Software Inc. | 4 | * Copyright 2001, 2008 MontaVista Software Inc. |
| 5 | * Author: MontaVista Software, Inc. | 5 | * Author: MontaVista Software, Inc. <source@mvista.com> |
| 6 | * ppopov@mvista.com or source@mvista.com | ||
| 7 | * | 6 | * |
| 8 | * ######################################################################## | 7 | * ######################################################################## |
| 9 | * | 8 | * |
| @@ -27,25 +26,24 @@ | |||
| 27 | #ifndef __ASM_PB1500_H | 26 | #ifndef __ASM_PB1500_H |
| 28 | #define __ASM_PB1500_H | 27 | #define __ASM_PB1500_H |
| 29 | 28 | ||
| 29 | #define IDENT_BOARD_REG 0xAE000000 | ||
| 30 | #define BOARD_STATUS_REG 0xAE000004 | ||
| 31 | #define PCI_BOARD_REG 0xAE000010 | ||
| 32 | #define PCMCIA_BOARD_REG 0xAE000010 | ||
| 33 | # define PC_DEASSERT_RST 0x80 | ||
| 34 | # define PC_DRV_EN 0x10 | ||
| 35 | #define PB1500_G_CONTROL 0xAE000014 | ||
| 36 | #define PB1500_RST_VDDI 0xAE00001C | ||
| 37 | #define PB1500_LEDS 0xAE000018 | ||
| 30 | 38 | ||
| 31 | #define IDENT_BOARD_REG 0xAE000000 | 39 | #define PB1500_HEX_LED 0xAF000004 |
| 32 | #define BOARD_STATUS_REG 0xAE000004 | 40 | #define PB1500_HEX_LED_BLANK 0xAF000008 |
| 33 | #define PCI_BOARD_REG 0xAE000010 | ||
| 34 | #define PCMCIA_BOARD_REG 0xAE000010 | ||
| 35 | #define PC_DEASSERT_RST 0x80 | ||
| 36 | #define PC_DRV_EN 0x10 | ||
| 37 | #define PB1500_G_CONTROL 0xAE000014 | ||
| 38 | #define PB1500_RST_VDDI 0xAE00001C | ||
| 39 | #define PB1500_LEDS 0xAE000018 | ||
| 40 | 41 | ||
| 41 | #define PB1500_HEX_LED 0xAF000004 | 42 | /* PCMCIA Pb1500 specific defines */ |
| 42 | #define PB1500_HEX_LED_BLANK 0xAF000008 | 43 | #define PCMCIA_MAX_SOCK 0 |
| 43 | 44 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1) | |
| 44 | /* PCMCIA PB1500 specific defines */ | ||
| 45 | #define PCMCIA_MAX_SOCK 0 | ||
| 46 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1) | ||
| 47 | 45 | ||
| 48 | /* VPP/VCC */ | 46 | /* VPP/VCC */ |
| 49 | #define SET_VCC_VPP(VCC, VPP) (((VCC)<<2) | ((VPP)<<0)) | 47 | #define SET_VCC_VPP(VCC, VPP) (((VCC) << 2) | ((VPP) << 0)) |
| 50 | 48 | ||
| 51 | #endif /* __ASM_PB1500_H */ | 49 | #endif /* __ASM_PB1500_H */ |