Commit f1dd6ad5 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: (141 commits)
  MIPS: Alchemy: defconfig updates
  MIPS: Alchemy: Fix Au1100 ethernet build failure
  MIPS: Alchemy: Repair db1500/bosporus builds
  MIPS: ARC: Cleanup unused definitions from sgialib.h
  MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses
  MIPS: Alchemy: use 36bit addresses for PCMCIA resources.
  MIPS: Cobalt: Fix theoretical port aliasing issue
  MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)
  MIPS: Crazy spinlock speed test.
  MIPS: Optimize spinlocks.
  MIPS: Alchemy: devboard PM needs to save CPLD registers.
  MIPS: PowerTV: Eliminate duplicate opcode definition macros
  MIPS: Lemote 2F: Move printks out of port_access_lock.
  MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.
  MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.
  MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.
  MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
  MIPS: Loongson: Remove pointless sample_lock from oprofile code.
  MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
  MIPS: i8259: Convert IRQ controller lock to raw spinlock.
  ...
parents 8d37a371 e10b234b

arch/mips/Kconfig

+5 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ config AR7 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_ZBOOT_UART16550

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GCD

	select VLYNQ

	help
@@ -180,7 +180,7 @@ config LASAT 


config MACH_LOONGSON

	bool "Loongson family of machines"

	select SYS_SUPPORTS_ZBOOT_UART16550

	select SYS_SUPPORTS_ZBOOT

	help

	  This enables the support of Loongson family of machines.
@@ -1295,7 +1295,6 @@ config CPU_CAVIUM_OCTEON 
	select SYS_SUPPORTS_SMP

	select NR_CPUS_DEFAULT_16

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HUGEPAGES

	help
@@ -1726,6 +1725,9 @@ config SB1_PASS_2_1_WORKAROUNDS 
config 64BIT_PHYS_ADDR

	bool



config ARCH_PHYS_ADDR_T_64BIT

       def_bool 64BIT_PHYS_ADDR



config CPU_HAS_SMARTMIPS

	depends on SYS_SUPPORTS_SMARTMIPS

	bool "Support for the SmartMIPS ASE"

arch/mips/Kconfig.debug

+26 −0
Original line number Diff line number Diff line
@@ -102,4 +102,30 @@ config RUNTIME_DEBUG 
	  arch/mips/include/asm/debug.h for debugging macros.

	  If unsure, say N.



config DEBUG_ZBOOT

	bool "Enable compressed kernel support debugging"

	depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT

	default n

	help

	  If you want to add compressed kernel support to a new board, and the

	  board supports uart16550 compatible serial port, please select

	  SYS_SUPPORTS_ZBOOT_UART16550 for your board and enable this option to

	  debug it.



	  If your board doesn't support uart16550 compatible serial port, you

	  can try to select SYS_SUPPORTS_ZBOOT and use the other methods to

	  debug it. for example, add a new serial port support just as

	  arch/mips/boot/compressed/uart-16550.c does.



	  After the compressed kernel support works, please disable this option

	  to reduce the kernel image size and speed up the booting procedure a

	  little.



config SPINLOCK_TEST

	bool "Enable spinlock timing tests in debugfs"

	depends on DEBUG_FS

	default n

	help

	  Add several files to the debugfs to test spinlock speed.



endmenu

arch/mips/Makefile

+14 −5
Original line number Diff line number Diff line
@@ -184,6 +184,15 @@ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ 
libs-$(CONFIG_SNIPROM)		+= arch/mips/fw/sni/

libs-y				+= arch/mips/fw/lib/



#

# Kernel compression

#

ifdef SYS_SUPPORTS_ZBOOT

COMPRESSION_FNAME		= vmlinuz

else

COMPRESSION_FNAME		= vmlinux

endif



#

# Board-dependent options and extra files

#
@@ -344,7 +353,7 @@ load-$(CONFIG_LEMOTE_MACH2F) +=0xffffffff80200000 
core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mti-malta/

cflags-$(CONFIG_MIPS_MALTA)	+= -I$(srctree)/arch/mips/include/asm/mach-malta

load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000

all-$(CONFIG_MIPS_MALTA)	:= vmlinuz.bin

all-$(CONFIG_MIPS_MALTA)	:= $(COMPRESSION_FNAME).bin



#

# MIPS SIM
@@ -594,7 +603,7 @@ load-$(CONFIG_SNI_RM) += 0xffffffff80600000 
else

load-$(CONFIG_SNI_RM)		+= 0xffffffff80030000

endif

all-$(CONFIG_SNI_RM)		:= vmlinuz.ecoff

all-$(CONFIG_SNI_RM)		:= $(COMPRESSION_FNAME).ecoff



#

# Common TXx9

arch/mips/alchemy/Kconfig

+21 −7
Original line number Diff line number Diff line 
# au1000-style gpio

config ALCHEMY_GPIO_AU1000

# au1000-style gpio and interrupt controllers

config ALCHEMY_GPIOINT_AU1000

	bool



# select this in your board config if you don't want to use the gpio
@@ -20,12 +20,14 @@ config MIPS_MTX1 
	select HW_HAS_PCI

	select SOC_AU1500

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_BOSPORUS

	bool "Alchemy Bosporus board"

	select SOC_AU1500

	select DMA_NONCOHERENT

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1000

	bool "Alchemy DB1000 board"
@@ -33,12 +35,14 @@ config MIPS_DB1000 
	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1100

	bool "Alchemy DB1100 board"

	select SOC_AU1100

	select DMA_NONCOHERENT

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1200

	bool "Alchemy DB1200 board"
@@ -46,6 +50,7 @@ config MIPS_DB1200 
	select DMA_COHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1500

	bool "Alchemy DB1500 board"
@@ -55,6 +60,7 @@ config MIPS_DB1500 
	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1550

	bool "Alchemy DB1550 board"
@@ -63,12 +69,14 @@ config MIPS_DB1550 
	select DMA_NONCOHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_MIRAGE

	bool "Alchemy Mirage board"

	select DMA_NONCOHERENT

	select SOC_AU1500

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1000

	bool "Alchemy PB1000 board"
@@ -77,6 +85,7 @@ config MIPS_PB1000 
	select HW_HAS_PCI

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1100

	bool "Alchemy PB1100 board"
@@ -85,6 +94,7 @@ config MIPS_PB1100 
	select HW_HAS_PCI

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1200

	bool "Alchemy PB1200 board"
@@ -92,6 +102,7 @@ config MIPS_PB1200 
	select DMA_NONCOHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1500

	bool "Alchemy PB1500 board"
@@ -99,6 +110,7 @@ config MIPS_PB1500 
	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1550

	bool "Alchemy PB1550 board"
@@ -107,39 +119,41 @@ config MIPS_PB1550 
	select HW_HAS_PCI

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_XXS1500

	bool "MyCable XXS1500 board"

	select DMA_NONCOHERENT

	select SOC_AU1500

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



endchoice



config SOC_AU1000

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIO_AU1000

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1100

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIO_AU1000

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1500

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIO_AU1000

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1550

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIO_AU1000

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1200

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIO_AU1000

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1X00

	bool

arch/mips/alchemy/common/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -5,14 +5,15 @@ 
# Makefile for the Alchemy Au1xx0 CPUs, generic files.

#



obj-y += prom.o irq.o puts.o time.o reset.o \

	clocks.o platform.o power.o setup.o \

obj-y += prom.o time.o clocks.o platform.o power.o setup.o \

	sleeper.o dma.o dbdma.o



obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += irq.o



# optional gpiolib support

ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),)

 ifeq ($(CONFIG_GPIOLIB),y)

  obj-$(CONFIG_ALCHEMY_GPIO_AU1000) += gpiolib-au1000.o

  obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += gpiolib-au1000.o

 endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE