From: Ralf Baechle Minor updates for the evaluation boards made by Galileo Technologies. Signed-off-by: Andrew Morton --- 25-akpm/arch/mips/Kconfig | 1 25-akpm/arch/mips/configs/ev64120_defconfig | 51 +++++++++++++++++-- 25-akpm/arch/mips/configs/ev96100_defconfig | 50 +++++++++++++++++- 25-akpm/arch/mips/galileo-boards/ev96100/time.c | 1 25-akpm/arch/mips/gt64120/ev64120/irq.c | 2 25-akpm/include/asm-mips/mach-ev64120/mach-gt64120.h | 20 +++---- 25-akpm/include/asm-mips/mach-ev96100/mach-gt64120.h | 22 ++++---- 7 files changed, 117 insertions(+), 30 deletions(-) diff -puN arch/mips/configs/ev64120_defconfig~mips-galileo-updates arch/mips/configs/ev64120_defconfig --- 25/arch/mips/configs/ev64120_defconfig~mips-galileo-updates 2005-01-29 11:26:13.114754176 -0800 +++ 25-akpm/arch/mips/configs/ev64120_defconfig 2005-01-29 11:26:13.129751896 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc2 -# Sun Nov 21 14:11:59 2004 +# Linux kernel version: 2.6.11-rc2 +# Wed Jan 26 02:49:03 2005 # CONFIG_MIPS=y # CONFIG_MIPS64 is not set @@ -86,6 +86,7 @@ CONFIG_MIPS_EV64120=y # CONFIG_SNI_RM200_PCI is not set # CONFIG_TOSHIBA_RBTX4927 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_HAVE_DEC_LOCK=y CONFIG_DMA_NONCOHERENT=y # CONFIG_CPU_LITTLE_ENDIAN is not set @@ -94,7 +95,6 @@ CONFIG_MIPS_GT64120=y # CONFIG_SYSCLK_83 is not set CONFIG_SYSCLK_100=y CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_FB is not set # # CPU selection @@ -137,6 +137,20 @@ CONFIG_PCI_NAMES=y CONFIG_MMU=y # +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PC-card bridges +# + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set + +# # Executable file formats # CONFIG_BINFMT_ELF=y @@ -152,6 +166,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set # # Memory Technology Devices (MTD) @@ -175,10 +190,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_INITRAMFS_SOURCE="" # CONFIG_LBD is not set CONFIG_CDROM_PKTCDVD=m @@ -192,6 +209,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support @@ -400,6 +418,7 @@ CONFIG_SERIO=y CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set # CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_LIBPS2 is not set CONFIG_SERIO_RAW=m # @@ -454,7 +473,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Ftape, the floppy tape device driver # -# CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set @@ -485,12 +503,14 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Graphics support # +# CONFIG_FB is not set # # Console display driver support # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound @@ -505,11 +525,25 @@ CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# + +# # USB Gadget Support # # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -601,6 +635,11 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS is not set # +# Profiling support +# +# CONFIG_PROFILING is not set + +# # Kernel hacking # # CONFIG_DEBUG_KERNEL is not set @@ -620,6 +659,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_CRYPTO is not set # +# Hardware crypto devices +# + +# # Library routines # CONFIG_CRC_CCITT=y diff -puN arch/mips/configs/ev96100_defconfig~mips-galileo-updates arch/mips/configs/ev96100_defconfig --- 25/arch/mips/configs/ev96100_defconfig~mips-galileo-updates 2005-01-29 11:26:13.115754024 -0800 +++ 25-akpm/arch/mips/configs/ev96100_defconfig 2005-01-29 11:26:13.128752048 -0800 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10-rc2 -# Sun Nov 21 14:11:59 2004 +# Linux kernel version: 2.6.11-rc2 +# Wed Jan 26 02:49:03 2005 # CONFIG_MIPS=y # CONFIG_MIPS64 is not set @@ -85,6 +85,7 @@ CONFIG_MIPS_EV96100=y # CONFIG_SNI_RM200_PCI is not set # CONFIG_TOSHIBA_RBTX4927 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_HAVE_DEC_LOCK=y CONFIG_DMA_NONCOHERENT=y # CONFIG_CPU_LITTLE_ENDIAN is not set @@ -93,7 +94,6 @@ CONFIG_MIPS_GT64120=y CONFIG_SWAP_IO_SPACE=y CONFIG_MIPS_GT96100=y CONFIG_MIPS_L1_CACHE_SHIFT=5 -# CONFIG_FB is not set # # CPU selection @@ -137,6 +137,19 @@ CONFIG_HW_HAS_PCI=y CONFIG_MMU=y # +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PC-card bridges +# + +# +# PCI Hotplug Support +# + +# # Executable file formats # CONFIG_BINFMT_ELF=y @@ -152,6 +165,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set # # Memory Technology Devices (MTD) @@ -171,9 +185,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Block devices # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_INITRAMFS_SOURCE="" # CONFIG_LBD is not set CONFIG_CDROM_PKTCDVD=m @@ -187,6 +203,7 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support @@ -357,6 +374,7 @@ CONFIG_SERIO=y # CONFIG_SERIO_I8042 is not set CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_LIBPS2 is not set CONFIG_SERIO_RAW=m # @@ -410,7 +428,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Ftape, the floppy tape device driver # -# CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set @@ -441,12 +458,14 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Graphics support # +# CONFIG_FB is not set # # Console display driver support # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound @@ -460,11 +479,25 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_ARCH_HAS_OHCI is not set # +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# + +# # USB Gadget Support # # CONFIG_USB_GADGET is not set # +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -556,6 +589,11 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS is not set # +# Profiling support +# +# CONFIG_PROFILING is not set + +# # Kernel hacking # # CONFIG_DEBUG_KERNEL is not set @@ -575,6 +613,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_CRYPTO is not set # +# Hardware crypto devices +# + +# # Library routines # # CONFIG_CRC_CCITT is not set diff -puN arch/mips/galileo-boards/ev96100/time.c~mips-galileo-updates arch/mips/galileo-boards/ev96100/time.c --- 25/arch/mips/galileo-boards/ev96100/time.c~mips-galileo-updates 2005-01-29 11:26:13.116753872 -0800 +++ 25-akpm/arch/mips/galileo-boards/ev96100/time.c 2005-01-29 11:26:13.125752504 -0800 @@ -32,6 +32,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include #include #include diff -puN arch/mips/gt64120/ev64120/irq.c~mips-galileo-updates arch/mips/gt64120/ev64120/irq.c --- 25/arch/mips/gt64120/ev64120/irq.c~mips-galileo-updates 2005-01-29 11:26:13.118753568 -0800 +++ 25-akpm/arch/mips/gt64120/ev64120/irq.c 2005-01-29 11:26:13.130751744 -0800 @@ -119,7 +119,7 @@ void gt64120_irq_setup(void) /* Sets the exception_handler array. */ set_except_vector(0, galileo_handle_int); - cli(); + local_irq_disable(); /* * Enable timer. Other interrupts will be enabled as they are diff -puN arch/mips/Kconfig~mips-galileo-updates arch/mips/Kconfig --- 25/arch/mips/Kconfig~mips-galileo-updates 2005-01-29 11:26:13.119753416 -0800 +++ 25-akpm/arch/mips/Kconfig 2005-01-29 11:26:13.127752200 -0800 @@ -197,6 +197,7 @@ config MIPS_EV64120 depends on EXPERIMENTAL select DMA_NONCOHERENT select HW_HAS_PCI + select MIPS_GT64120 help This is an evaluation board based on the Galileo GT-64120 single-chip system controller that contains a MIPS R5000 compatible diff -puN include/asm-mips/mach-ev64120/mach-gt64120.h~mips-galileo-updates include/asm-mips/mach-ev64120/mach-gt64120.h --- 25/include/asm-mips/mach-ev64120/mach-gt64120.h~mips-galileo-updates 2005-01-29 11:26:13.121753112 -0800 +++ 25-akpm/include/asm-mips/mach-ev64120/mach-gt64120.h 2005-01-29 11:26:13.129751896 -0800 @@ -18,29 +18,29 @@ extern unsigned long gt64120_base; /* * PCI Bus allocation */ -#define GT_PCI_MEM_BASE 0x12000000UL -#define GT_PCI_MEM_SIZE 0x02000000UL -#define GT_PCI_IO_BASE 0x10000000UL -#define GT_PCI_IO_SIZE 0x02000000UL -#define GT_ISA_IO_BASE PCI_IO_BASE +#define GT_PCI_MEM_BASE 0x12000000UL +#define GT_PCI_MEM_SIZE 0x02000000UL +#define GT_PCI_IO_BASE 0x10000000UL +#define GT_PCI_IO_SIZE 0x02000000UL +#define GT_ISA_IO_BASE PCI_IO_BASE /* * Duart I/O ports. */ -#define EV64120_COM1_BASE_ADDR (0x1d000000 + 0x20) -#define EV64120_COM2_BASE_ADDR (0x1d000000 + 0x00) +#define EV64120_COM1_BASE_ADDR (0x1d000000 + 0x20) +#define EV64120_COM2_BASE_ADDR (0x1d000000 + 0x00) /* * EV64120 interrupt controller register base. */ -#define EV64120_ICTRL_REGS_BASE (KSEG1ADDR(0x1f000000)) +#define EV64120_ICTRL_REGS_BASE (KSEG1ADDR(0x1f000000)) /* * EV64120 UART register base. */ -#define EV64120_UART0_REGS_BASE (KSEG1ADDR(EV64120_COM1_BASE_ADDR)) -#define EV64120_UART1_REGS_BASE (KSEG1ADDR(EV64120_COM2_BASE_ADDR)) +#define EV64120_UART0_REGS_BASE (KSEG1ADDR(EV64120_COM1_BASE_ADDR)) +#define EV64120_UART1_REGS_BASE (KSEG1ADDR(EV64120_COM2_BASE_ADDR)) #define EV64120_BASE_BAUD ( 3686400 / 16 ) /* diff -puN include/asm-mips/mach-ev96100/mach-gt64120.h~mips-galileo-updates include/asm-mips/mach-ev96100/mach-gt64120.h --- 25/include/asm-mips/mach-ev96100/mach-gt64120.h~mips-galileo-updates 2005-01-29 11:26:13.122752960 -0800 +++ 25-akpm/include/asm-mips/mach-ev96100/mach-gt64120.h 2005-01-29 11:26:13.130751744 -0800 @@ -18,29 +18,29 @@ * * (Guessing ...) */ -#define GT_PCI_MEM_BASE 0x12000000UL -#define GT_PCI_MEM_SIZE 0x02000000UL -#define GT_PCI_IO_BASE 0x10000000UL -#define GT_PCI_IO_SIZE 0x02000000UL -#define GT_ISA_IO_BASE PCI_IO_BASE +#define GT_PCI_MEM_BASE 0x12000000UL +#define GT_PCI_MEM_SIZE 0x02000000UL +#define GT_PCI_IO_BASE 0x10000000UL +#define GT_PCI_IO_SIZE 0x02000000UL +#define GT_ISA_IO_BASE PCI_IO_BASE /* * Duart I/O ports. */ -#define EV96100_COM1_BASE_ADDR (0xBD000000 + 0x20) -#define EV96100_COM2_BASE_ADDR (0xBD000000 + 0x00) +#define EV96100_COM1_BASE_ADDR (0xBD000000 + 0x20) +#define EV96100_COM2_BASE_ADDR (0xBD000000 + 0x00) /* * EV96100 interrupt controller register base. */ -#define EV96100_ICTRL_REGS_BASE (KSEG1ADDR(0x1f000000)) +#define EV96100_ICTRL_REGS_BASE (KSEG1ADDR(0x1f000000)) /* * EV96100 UART register base. */ -#define EV96100_UART0_REGS_BASE EV96100_COM1_BASE_ADDR -#define EV96100_UART1_REGS_BASE EV96100_COM2_BASE_ADDR -#define EV96100_BASE_BAUD ( 3686400 / 16 ) +#define EV96100_UART0_REGS_BASE EV96100_COM1_BASE_ADDR +#define EV96100_UART1_REGS_BASE EV96100_COM2_BASE_ADDR +#define EV96100_BASE_BAUD ( 3686400 / 16 ) #endif /* _ASM_GT64120_EV96100_GT64120_DEP_H */ _