Commit 25f42b6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
  [MIPS] Make timer interrupt frequency configurable from kconfig.
  [MIPS] Correct HAL2 Kconfig description
  [MIPS] Fix R4K cache macro names
  [MIPS] Add Missing R4K Cache Macros to IP27 & IP32
  [MIPS] Support for the RM9000-based Basler eXcite smart camera platform.
  [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board
  [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.
  [MIPS] SN: include asm/sn/types.h for nasid_t.
  [MIPS] Random fixes for sb1250
  [MIPS] Fix bcm1480 compile
  [MIPS] Remove support for NEC DDB5476.
  [MIPS] Remove support for NEC DDB5074.
  [MIPS] Cleanup memory managment initialization.
  [MIPS] SN: Declare bridge_pci_ops.
  [MIPS] Remove unused function alloc_pci_controller.
  [MIPS] IP27: Extract pci_ops into separate file.
  [MIPS] IP27: Use symbolic constants instead of magic numbers.
  [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.
  [MIPS] IP27: Cleanup N/M mode configuration.
  [MIPS] IP27: Throw away old unused hacks.
  ...
parents 4c84a39c 1723b4a3

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -212,15 +212,6 @@ Who: Greg Kroah-Hartman <gregkh@suse.de> 


---------------------------



What:	Support for NEC DDB5074 and DDB5476 evaluation boards.

When:	June 2006

Why:	Board specific code doesn't build anymore since ~2.6.0 and no

	users have complained indicating there is no more need for these

	boards.  This should really be considered a last call.

Who:	Ralf Baechle <ralf@linux-mips.org>



---------------------------



What:	USB driver API moves to EXPORT_SYMBOL_GPL

When:	Febuary 2008

Files:	include/linux/usb.h, drivers/usb/core/driver.c

arch/mips/Kconfig

+202 −42
Original line number Diff line number Diff line
@@ -119,6 +119,32 @@ config MIPS_MIRAGE 
	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_LITTLE_ENDIAN



config BASLER_EXCITE

	bool "Basler eXcite smart camera support"

	select DMA_COHERENT

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_CPU_RM7K

	select IRQ_CPU_RM9K

	select SERIAL_RM9000

	select SYS_HAS_CPU_RM9000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	help

	  The eXcite is a smart camera platform manufactured by

	  Basler Vision Technologies AG



config BASLER_EXCITE_PROTOTYPE

	bool "Support for pre-release units"

	depends on BASLER_EXCITE

	default n

	help

	  Pre-series (prototype) units are different from later ones in

	  some ways. Select this option if you have one of these. Please

	  note that a kernel built with this option selected will not be

	  able to run on normal units.



config MIPS_COBALT

	bool "Cobalt Server"

	select DMA_NONCOHERENT
@@ -142,6 +168,9 @@ config MACH_DECSTATION 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_128HZ

	select SYS_SUPPORTS_256HZ

	select SYS_SUPPORTS_1024HZ

	help

	  This enables support for DEC's MIPS based workstations.  For details

	  see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the
@@ -239,6 +268,7 @@ config MACH_JAZZ 
	select SYS_HAS_CPU_R4X00

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_100HZ

	help

	 This a family of machines based on the MIPS R4030 chipset which was

	 used by several vendors to build RISC/os and Windows NT workstations.
@@ -327,6 +357,27 @@ config MIPS_SEAD 
	  This enables support for the MIPS Technologies SEAD evaluation

	  board.



config WR_PPMC

	bool "Support for Wind River PPMC board"

	select IRQ_CPU

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_GT64120

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_CPU_MIPS64_R1

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  This enables support for the Wind River MIPS32 4KC PPMC evaluation

	  board, which is based on GT64120 bridge chip.



config MIPS_SIM

	bool 'MIPS simulator (MIPSsim)'

	select DMA_NONCOHERENT
@@ -438,53 +489,16 @@ config MIPS_XXS1500 


config PNX8550_V2PCI

	bool "Philips PNX8550 based Viper2-PCI board"

	depends on BROKEN

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_JBS

	bool "Philips PNX8550 based JBS board"

	depends on BROKEN

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config DDB5074

	bool "NEC DDB Vrc-5074 (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	select DDB5XXX_COMMON

	select DMA_NONCOHERENT

	select HAVE_STD_PC_SERIAL_PORT

	select HW_HAS_PCI

	select IRQ_CPU

	select I8259

	select ISA

	select SYS_HAS_CPU_R5000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  This enables support for the VR5000-based NEC DDB Vrc-5074

	  evaluation board.



config DDB5476

	bool "NEC DDB Vrc-5476"

	select DDB5XXX_COMMON

	select DMA_NONCOHERENT

	select HAVE_STD_PC_SERIAL_PORT

	select HW_HAS_PCI

	select IRQ_CPU

	select I8259

	select ISA

	select SYS_HAS_CPU_R5432

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  This enables support for the R5432-based NEC DDB Vrc-5476

	  evaluation board.



	  Features : kernel debugging, serial terminal, NFS root fs, on-board

	  ether port USB, AC97, PCI, PCI VGA card & framebuffer console,

	  IDE controller, PS2 keyboard, PS2 mouse, etc.



config DDB5477

	bool "NEC DDB Vrc-5477"

	select DDB5XXX_COMMON
@@ -546,6 +560,20 @@ config QEMU 
	  simulate actual MIPS hardware platforms.  More information on Qemu

	  can be found at http://www.linux-mips.org/wiki/Qemu.



config MARKEINS

	bool "Support for NEC EMMA2RH Mark-eins"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_CPU_R5000

	help

	  This enables support for the R5432-based NEC Mark-eins

	  boards with R5500 CPU.



config SGI_IP22

	bool "SGI IP22 (Indy/Indigo2)"

	select ARC
@@ -555,6 +583,7 @@ config SGI_IP22 
	select HW_HAS_EISA

	select IP22_CPU_SCACHE

	select IRQ_CPU

	select NO_ISA if ISA

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R5000
@@ -577,6 +606,7 @@ config SGI_IP27 
	select SYS_HAS_CPU_R10000

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_NUMA

	help

	  This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics

	  workstations.  To compile a Linux kernel that runs on these, say Y
@@ -707,8 +737,8 @@ config SIBYTE_CRHONE 


config SNI_RM200_PCI

	bool "SNI RM200 PCI"

	select ARC

	select ARC32

	select ARC if CPU_LITTLE_ENDIAN

	select ARC32 if CPU_LITTLE_ENDIAN

	select ARCH_MAY_HAVE_PC_FDC

	select BOOT_ELF32

	select DMA_NONCOHERENT
@@ -719,10 +749,13 @@ config SNI_RM200_PCI 
	select I8253

	select I8259

	select ISA

	select SWAP_IO_SPACE if CPU_BIG_ENDIAN

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R5000

	select R5000_CPU_SCACHE

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_BIG_ENDIAN if EXPERIMENTAL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help
@@ -979,6 +1012,11 @@ config SOC_PNX8550 
config SWAP_IO_SPACE

	bool



config EMMA2RH

	bool

	depends on MARKEINS

	default y



#

# Unfortunately not all GT64120 systems run the chip at the same clock.

# As the user for the clock rate and try to minimize the available options.
@@ -1607,6 +1645,28 @@ config ARCH_FLATMEM_ENABLE 
	def_bool y

	depends on !NUMA



config ARCH_DISCONTIGMEM_ENABLE

	bool

	default y if SGI_IP27

	help

	  Say Y to upport efficient handling of discontiguous physical memory,

	  for architectures which are either NUMA (Non-Uniform Memory Access)

	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa> for more.



config NUMA

	bool "NUMA Support"

	depends on SYS_SUPPORTS_NUMA

	help

	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory

	  Access).  This option improves performance on systems with more

	  than two nodes; on two node systems it is generally better to

	  leave it disabled; on single node systems disable this option

	  disabled.



config SYS_SUPPORTS_NUMA

	bool



config NODES_SHIFT

	int

	default "6"
@@ -1651,6 +1711,77 @@ config NR_CPUS 
	  This is purely to save memory - each supported CPU adds

	  approximately eight kilobytes to the kernel image.



#

# Timer Interrupt Frequency Configuration

#



choice

	prompt "Timer frequency"

	default HZ_250

	help

	 Allows the configuration of the timer frequency.



	config HZ_48

		bool "48 HZ" if SYS_SUPPORTS_48HZ



	config HZ_100

		bool "100 HZ" if SYS_SUPPORTS_100HZ || SYS_SUPPORTS_ARBIT_HZ



	config HZ_128

		bool "128 HZ" if SYS_SUPPORTS_128HZ || SYS_SUPPORTS_ARBIT_HZ



	config HZ_250

		bool "250 HZ" if SYS_SUPPORTS_250HZ || SYS_SUPPORTS_ARBIT_HZ



	config HZ_256

		bool "256 HZ" if SYS_SUPPORTS_256HZ || SYS_SUPPORTS_ARBIT_HZ



	config HZ_1000

		bool "1000 HZ" if SYS_SUPPORTS_1000HZ || SYS_SUPPORTS_ARBIT_HZ



	config HZ_1024

		bool "1024 HZ" if SYS_SUPPORTS_1024HZ || SYS_SUPPORTS_ARBIT_HZ



endchoice



config SYS_SUPPORTS_48HZ

	bool



config SYS_SUPPORTS_100HZ

	bool



config SYS_SUPPORTS_128HZ

	bool



config SYS_SUPPORTS_250HZ

	bool



config SYS_SUPPORTS_256HZ

	bool



config SYS_SUPPORTS_1000HZ

	bool



config SYS_SUPPORTS_1024HZ

	bool



config SYS_SUPPORTS_ARBIT_HZ

	bool

	default y if !SYS_SUPPORTS_48HZ && !SYS_SUPPORTS_100HZ && \

		     !SYS_SUPPORTS_128HZ && !SYS_SUPPORTS_250HZ && \

		     !SYS_SUPPORTS_256HZ && !SYS_SUPPORTS_1000HZ && \

		     !SYS_SUPPORTS_1024HZ



config HZ

	int

	default 48 if HZ_48

	default 100 if HZ_100

	default 128 if HZ_128

	default 250 if HZ_250

	default 256 if HZ_256

	default 1000 if HZ_1000

	default 1024 if HZ_1024



source "kernel/Kconfig.preempt"



config RTC_DS1742
@@ -1710,6 +1841,9 @@ source "drivers/pci/Kconfig" 
config ISA

	bool



config NO_ISA

	bool



config EISA

	bool "EISA support"

	depends on HW_HAS_EISA
@@ -1840,6 +1974,32 @@ config PM 
	bool "Power Management support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && SOC_AU1X00



config APM

        tristate "Advanced Power Management Emulation"

	depends on PM

        ---help---

	  APM is a BIOS specification for saving power using several different

	  techniques. This is mostly useful for battery powered systems with

	  APM compliant BIOSes. If you say Y here, the system time will be

	  reset after a RESUME operation, the /proc/apm device will provide

	  battery status information, and user-space programs will receive

	  notification of APM "events" (e.g. battery status change).



	  In order to use APM, you will need supporting software. For location

	  and more information, read <file:Documentation/pm.txt> and the

	  Battery Powered Linux mini-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  This driver does not spin down disk drives (see the hdparm(8)

	  manpage ("man 8 hdparm") for that), and it doesn't turn off

	  VESA-compliant "green" monitors.



	  Generally, if you don't have a battery in your machine, there isn't

	  much point in using this driver and you should say N. If you get

	  random kernel OOPSes or reboots that don't seem to be related to

	  anything, try disabling/enabling this option (or disabling/enabling

	  APM in your BIOS).



endmenu



source "net/Kconfig"

arch/mips/Makefile

+25 −12
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ cflags-y += -msoft-float 
LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib

MODFLAGS			+= -mlong-calls



cflags-y += -ffreestanding



#

# We explicitly add the endianness specifier if needed, this allows

# to compile kernels with a toolchain for the other endianness. We
@@ -284,6 +286,13 @@ core-$(CONFIG_MIPS_EV96100) += arch/mips/galileo-boards/ev96100/ 
cflags-$(CONFIG_MIPS_EV96100)	+= -Iinclude/asm-mips/mach-ev96100

load-$(CONFIG_MIPS_EV96100)	+= 0xffffffff80100000



#

# Wind River PPMC Board (4KC + GT64120)

#

core-$(CONFIG_WR_PPMC)		+= arch/mips/gt64120/wrppmc/

cflags-$(CONFIG_WR_PPMC)		+= -Iinclude/asm-mips/mach-wrppmc

load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000



#

# Globespan IVR eval board with QED 5231 CPU

#
@@ -378,6 +387,13 @@ core-$(CONFIG_MOMENCO_OCELOT_3) += arch/mips/momentum/ocelot_3/ 
cflags-$(CONFIG_MOMENCO_OCELOT_3)	+= -Iinclude/asm-mips/mach-ocelot3

load-$(CONFIG_MOMENCO_OCELOT_3) 	+= 0xffffffff80100000



#

# Basler eXcite

#

core-$(CONFIG_BASLER_EXCITE)	+= arch/mips/basler/excite/

cflags-$(CONFIG_BASLER_EXCITE)	+= -Iinclude/asm-mips/mach-excite

load-$(CONFIG_BASLER_EXCITE)	+= 0x80100000



#

# Momentum Jaguar ATX

#
@@ -394,18 +410,6 @@ load-$(CONFIG_MOMENCO_JAGUAR_ATX) += 0xffffffff80100000 
#

core-$(CONFIG_DDB5XXX_COMMON)	+= arch/mips/ddb5xxx/common/



#

# NEC DDB Vrc-5074

#

core-$(CONFIG_DDB5074)		+= arch/mips/ddb5xxx/ddb5074/

load-$(CONFIG_DDB5074)		+= 0xffffffff80080000



#

# NEC DDB Vrc-5476

#

core-$(CONFIG_DDB5476)		+= arch/mips/ddb5xxx/ddb5476/

load-$(CONFIG_DDB5476)		+= 0xffffffff80080000



#

# NEC DDB Vrc-5477

#
@@ -468,6 +472,15 @@ libs-$(CONFIG_PNX8550_JBS) += arch/mips/philips/pnx8550/jbs/ 
#cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550

load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000



# NEC EMMA2RH boards

#

core-$(CONFIG_EMMA2RH)          += arch/mips/emma2rh/common/

cflags-$(CONFIG_EMMA2RH)        += -Iinclude/asm-mips/mach-emma2rh



# NEC EMMA2RH Mark-eins

core-$(CONFIG_MARKEINS)         += arch/mips/emma2rh/markeins/

load-$(CONFIG_MARKEINS)         += 0xffffffff88100000



#

# SGI IP22 (Indy/Indigo2)

#

arch/mips/au1000/common/au1xxx_irqmap.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
 * Careful if you change match 2 request!

 * The interrupt handler is called directly from the low level dispatch code.

 */

au1xxx_irq_map_t au1xxx_ic0_map[] = {

au1xxx_irq_map_t __initdata au1xxx_ic0_map[] = {



#if defined(CONFIG_SOC_AU1000)

	{ AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
@@ -220,5 +220,5 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = { 


};



int au1xxx_ic0_nr_irqs = sizeof(au1xxx_ic0_map)/sizeof(au1xxx_irq_map_t);

int __initdata au1xxx_ic0_nr_irqs = ARRAY_SIZE(au1xxx_ic0_map);

arch/mips/au1000/common/pci.c

+8 −8
Original line number Diff line number Diff line
@@ -40,17 +40,17 @@ 


/* TBD */

static struct resource pci_io_resource = {

	"pci IO space",

	(u32)PCI_IO_START,

	(u32)PCI_IO_END,

	IORESOURCE_IO

	.start	= PCI_IO_START,

	.end	= PCI_IO_END,

	.name	= "PCI IO space",

	.flags	= IORESOURCE_IO

};



static struct resource pci_mem_resource = {

	"pci memory space",

	(u32)PCI_MEM_START,

	(u32)PCI_MEM_END,

	IORESOURCE_MEM

	.start	= PCI_MEM_START,

	.end	= PCI_MEM_END,

	.name	= "PCI memory space",

	.flags	= IORESOURCE_MEM

};



extern struct pci_ops au1x_pci_ops;

CRA Git | Maintained and supported by SUSTech CRA and CCSE