Commit 4964e066 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
parents 0a80939b 7bf6612e

arch/mips/Kconfig

+61 −23
Original line number Diff line number Diff line
@@ -719,7 +719,6 @@ config CAVIUM_OCTEON_SIMULATOR 
	select DMA_COHERENT

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_HAS_CPU_CAVIUM_OCTEON

	select HOLES_IN_ZONE
@@ -735,7 +734,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
	select DMA_COHERENT

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_CPU_CAVIUM_OCTEON
@@ -764,7 +762,6 @@ config NLM_XLR_BOARD 
	depends on EXPERIMENTAL

	select BOOT_ELF32

	select NLM_COMMON

	select NLM_XLR

	select SYS_HAS_CPU_XLR

	select SYS_SUPPORTS_SMP

	select HW_HAS_PCI
@@ -779,6 +776,7 @@ config NLM_XLR_BOARD 
	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select ARCH_SUPPORTS_MSI

	select ZONE_DMA if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK
@@ -786,6 +784,33 @@ config NLM_XLR_BOARD 
	  Support for systems based on Netlogic XLR and XLS processors.

	  Say Y here if you have a XLR or XLS based board.



config NLM_XLP_BOARD

	bool "Netlogic XLP based systems"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select NLM_COMMON

	select SYS_HAS_CPU_XLP

	select SYS_SUPPORTS_SMP

	select HW_HAS_PCI

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select 64BIT_PHYS_ADDR

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_32

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select ZONE_DMA if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK

	help

	  This board is based on Netlogic XLP Processor.

	  Say Y here if you have a XLP based board.



endchoice



source "arch/mips/alchemy/Kconfig"
@@ -1416,51 +1441,36 @@ config CPU_CAVIUM_OCTEON 
config CPU_BMIPS3300

	bool "BMIPS3300"

	depends on SYS_HAS_CPU_BMIPS3300

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select WEAK_ORDERING

	select CPU_BMIPS

	help

	  Broadcom BMIPS3300 processors.



config CPU_BMIPS4350

	bool "BMIPS4350"

	depends on SYS_HAS_CPU_BMIPS4350

	select CPU_SUPPORTS_32BIT_KERNEL

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select CPU_BMIPS

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select WEAK_ORDERING

	help

	  Broadcom BMIPS4350 ("VIPER") processors.



config CPU_BMIPS4380

	bool "BMIPS4380"

	depends on SYS_HAS_CPU_BMIPS4380

	select CPU_SUPPORTS_32BIT_KERNEL

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select CPU_BMIPS

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select WEAK_ORDERING

	help

	  Broadcom BMIPS4380 processors.



config CPU_BMIPS5000

	bool "BMIPS5000"

	depends on SYS_HAS_CPU_BMIPS5000

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_BMIPS

	select CPU_SUPPORTS_HIGHMEM

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select MIPS_CPU_SCACHE

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select WEAK_ORDERING

	help

	  Broadcom BMIPS5000 processors.
@@ -1475,6 +1485,19 @@ config CPU_XLR 
	select CPU_SUPPORTS_HUGEPAGES

	help

	  Netlogic Microsystems XLR/XLS processors.



config CPU_XLP

	bool "Netlogic XLP SoC"

	depends on SYS_HAS_CPU_XLP

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_HAS_LLSC

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select CPU_HAS_PREFETCH

	help

	  Netlogic Microsystems XLP processors.

endchoice



if CPU_LOONGSON2F
@@ -1521,6 +1544,15 @@ config CPU_LOONGSON2 
	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM



config CPU_BMIPS

	bool

	select CPU_MIPS32

	select CPU_SUPPORTS_32BIT_KERNEL

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select WEAK_ORDERING



config SYS_HAS_CPU_LOONGSON2E

	bool
@@ -1608,6 +1640,9 @@ config SYS_HAS_CPU_BMIPS5000 
config SYS_HAS_CPU_XLR

	bool



config SYS_HAS_CPU_XLP

	bool



#

# CPU may reorder R->R, R->W, W->R, W->W

# Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
@@ -1995,6 +2030,9 @@ config CPU_HAS_SMARTMIPS 
config CPU_HAS_WB

	bool



config XKS01

	bool



#

# Vectored interrupt mode is an R2 feature

#

arch/mips/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ ifeq (,$(findstring march=octeon, $(cflags-$(CONFIG_CPU_CAVIUM_OCTEON)))) 
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon

endif

cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1

cflags-$(CONFIG_CPU_BMIPS)	+= -march=mips32 -Wa,-mips32 -Wa,--trap



cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)	+= $(call cc-option,-mfix-r4000,)

cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)	+= $(call cc-option,-mfix-r4400,)

arch/mips/alchemy/Kconfig

+13 −47
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
config ALCHEMY_GPIOINT_AU1000

	bool



# au1300-style GPIO/INT controller

config ALCHEMY_GPIOINT_AU1300

	bool



# select this in your board config if you don't want to use the gpio

# namespace as documented in the manuals.  In this case however you need

# to create the necessary gpio_* functions in your board code/headers!
@@ -22,43 +26,29 @@ config MIPS_MTX1 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_BOSPORUS

	bool "Alchemy Bosporus board"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1000

	bool "Alchemy DB1000 board"

	bool "Alchemy DB1000/DB1500/DB1100 boards"

	select ALCHEMY_GPIOINT_AU1000

	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 ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1200

	bool "Alchemy DB1200 board"

	bool "Alchemy DB1200/PB1200 board"

	select ALCHEMY_GPIOINT_AU1000

	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"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	select HW_HAS_PCI

config MIPS_DB1300

	bool "NetLogic DB1300 board"

	select ALCHEMY_GPIOINT_AU1300

	select DMA_COHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK
@@ -66,27 +56,11 @@ config MIPS_DB1550 
	bool "Alchemy DB1550 board"

	select ALCHEMY_GPIOINT_AU1000

	select HW_HAS_PCI

	select DMA_NONCOHERENT

	select DMA_COHERENT

	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 ALCHEMY_GPIOINT_AU1000

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1000

	bool "Alchemy PB1000 board"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	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"

	select ALCHEMY_GPIOINT_AU1000
@@ -96,14 +70,6 @@ config MIPS_PB1100 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1200

	bool "Alchemy PB1200 board"

	select ALCHEMY_GPIOINT_AU1000

	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"

	select ALCHEMY_GPIOINT_AU1000

arch/mips/alchemy/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MIPS_GPR) += board-gpr.o

obj-$(CONFIG_MIPS_MTX1) += board-mtx1.o

obj-$(CONFIG_MIPS_XXS1500) += board-xxs1500.o

arch/mips/alchemy/Platform

+10 −48
Original line number Diff line number Diff line
@@ -4,62 +4,31 @@ 
platform-$(CONFIG_MIPS_ALCHEMY)	+= alchemy/common/





#

# AMD Alchemy Pb1000 eval board

#

platform-$(CONFIG_MIPS_PB1000)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1000)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1100 eval board

#

platform-$(CONFIG_MIPS_PB1100)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1100)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1500 eval board

#

platform-$(CONFIG_MIPS_PB1500)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1500)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1550 eval board

#

platform-$(CONFIG_MIPS_PB1550)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1550)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1200 eval board

#

platform-$(CONFIG_MIPS_PB1200)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1200)	+= 0xffffffff80100000



#

# AMD Alchemy Db1000 eval board

# AMD Alchemy Db1000/Db1500/Db1100 eval boards

#

platform-$(CONFIG_MIPS_DB1000)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1000)	+= 0xffffffff80100000



#

# AMD Alchemy Db1100 eval board

#

platform-$(CONFIG_MIPS_DB1100)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1100)	+= 0xffffffff80100000



#

# AMD Alchemy Db1500 eval board

#

platform-$(CONFIG_MIPS_DB1500)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1500)	+= 0xffffffff80100000



#

# AMD Alchemy Db1550 eval board

#
@@ -68,42 +37,35 @@ cflags-$(CONFIG_MIPS_DB1550) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 
load-$(CONFIG_MIPS_DB1550)	+= 0xffffffff80100000



#

# AMD Alchemy Db1200 eval board

# AMD Alchemy Db1200/Pb1200 eval boards

#

platform-$(CONFIG_MIPS_DB1200)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1200)	+= 0xffffffff80100000



#

# AMD Alchemy Bosporus eval board

#

platform-$(CONFIG_MIPS_BOSPORUS) += alchemy/devboards/

cflags-$(CONFIG_MIPS_BOSPORUS)	 += -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_BOSPORUS)	 += 0xffffffff80100000



#

# AMD Alchemy Mirage eval board

# NetLogic DBAu1300 development platform

#

platform-$(CONFIG_MIPS_MIRAGE)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_MIRAGE)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_MIRAGE)	+= 0xffffffff80100000

platform-$(CONFIG_MIPS_DB1300)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1300)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1300)	+= 0xffffffff80100000



#

# 4G-Systems eval board

# 4G-Systems MTX-1 "MeshCube" wireless router

#

platform-$(CONFIG_MIPS_MTX1)	+= alchemy/mtx-1/

platform-$(CONFIG_MIPS_MTX1)	+= alchemy/

load-$(CONFIG_MIPS_MTX1)	+= 0xffffffff80100000



#

# MyCable eval board

#

platform-$(CONFIG_MIPS_XXS1500)	+= alchemy/xxs1500/

platform-$(CONFIG_MIPS_XXS1500)	+= alchemy/

load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000



#

# Trapeze ITS GRP board

#

platform-$(CONFIG_MIPS_GPR)	+= alchemy/gpr/

platform-$(CONFIG_MIPS_GPR)	+= alchemy/

load-$(CONFIG_MIPS_GPR)		+= 0xffffffff80100000



# boards can specify their own <gpio.h> in one of their include dirs.

CRA Git | Maintained and supported by SUSTech CRA and CCSE