Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e31a94ed 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: (45 commits)
  [MIPS] Pb1200/DBAu1200: move platform code to its proper place
  [MIPS] Fix handling of trap and breakpoint instructions
  [MIPS] Pb1200: do register SMC 91C111
  [MIPS] DBAu1200: fix bad SMC 91C111 resource size
  [NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
  [MIPS] IP27: Fix build bug due to missing include
  [MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
  [MIPS] cevt-gt641xx: Kill unnecessary include
  [MIPS] DS1287: Add clockevent driver
  [MIPS] add DECstation I/O ASIC clocksource
  [MIPS] rbtx4938: minor cleanup
  [MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
  [MIPS] rbtx4938: misc cleanups
  [MIPS] jmr3927: use generic txx9 gpio
  [MIPS] rbhma4500: use generic txx9 gpio
  [MIPS] generic txx9 gpio support
  [MIPS] make fallback gpio.h gpiolib-friendly
  [MIPS] unexport null_perf_irq() and make it static
  [MIPS] unexport rtc_mips_set_time()
  [MIPS] unexport copy_from_user_page()
  ...
parents 9d9ad4b5 fcbd3b4b

arch/mips/Kconfig

+35 −3
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ config MIPS_COBALT 
config MACH_DECSTATION

	bool "DECstations"

	select BOOT_ELF32

	select CEVT_DS1287

	select CEVT_R4K

	select CSRC_IOASIC

	select CSRC_R4K

	select CPU_DADDI_WORKAROUNDS if 64BIT

	select CPU_R4000_WORKAROUNDS if 64BIT
@@ -221,6 +223,7 @@ config MIPS_MALTA 
	select DMA_NONCOHERENT

	select GENERIC_ISA_DMA

	select IRQ_CPU

	select IRQ_GIC

	select HW_HAS_PCI

	select I8253

	select I8259
@@ -309,12 +312,12 @@ config MACH_VR41XX 
	select GENERIC_HARDIRQS_NO__DO_IRQ



config PNX8550_JBS

	bool "Philips PNX8550 based JBS board"

	bool "NXP PNX8550 based JBS board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_STB810

	bool "Philips PNX8550 based STB810 board"

	bool "NXP PNX8550 based STB810 board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -612,6 +615,7 @@ config TOSHIBA_JMR3927 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select GPIO_TXX9



config TOSHIBA_RBTX4927

	bool "Toshiba RBTX49[23]7 board"
@@ -653,7 +657,7 @@ config TOSHIBA_RBTX4938 
	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select GENERIC_GPIO

	select GPIO_TXX9

	help

	  This Toshiba board is based on the TX4938 processor. Say Y here to

	  support this machine type
@@ -767,6 +771,9 @@ config BOOT_RAW 
config CEVT_BCM1480

	bool



config CEVT_DS1287

	bool



config CEVT_GT641XX

	bool
@@ -782,12 +789,20 @@ config CEVT_TXX9 
config CSRC_BCM1480

	bool



config CSRC_IOASIC

	bool



config CSRC_R4K

	bool



config CSRC_SB1250

	bool



config GPIO_TXX9

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	bool



config CFE

	bool
@@ -840,6 +855,9 @@ config MIPS_NILE4 
config MIPS_DISABLE_OBSOLETE_IDE

	bool



config SYNC_R4K

	bool



config NO_IOPORT

	def_bool n
@@ -909,6 +927,9 @@ config IRQ_TXX9 
config IRQ_GT641XX

	bool



config IRQ_GIC

	bool



config MIPS_BOARDS_GEN

	bool
@@ -1811,6 +1832,17 @@ config NR_CPUS 
	  performance should round up your number of processors to the next

	  power of two.



config MIPS_CMP

	bool "MIPS CMP framework support"

	depends on SMP

	select SYNC_R4K

	select SYS_SUPPORTS_SCHED_SMT

	select WEAK_ORDERING

	default n

	help

	  This is a placeholder option for the GCMP work. It will need to

	  be handled differently...



source "kernel/time/Kconfig"



#

arch/mips/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -73,14 +73,4 @@ config RUNTIME_DEBUG 
	  include/asm-mips/debug.h for debuging macros.

	  If unsure, say N.



config MIPS_UNCACHED

	bool "Run uncached"

	depends on DEBUG_KERNEL && !SMP && !SGI_IP27

	help

	  If you say Y here there kernel will disable all CPU caches.  This will

	  reduce the system's performance dramatically but can help finding

	  otherwise hard to track bugs.  It can also useful if you're doing

	  hardware debugging with a logic analyzer and need to see all traffic

	  on the bus.



endmenu

arch/mips/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -410,21 +410,21 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 
load-$(CONFIG_TANBAC_TB022X)	+= 0xffffffff80000000



#

# Common Philips PNX8550

# Common NXP PNX8550

#

core-$(CONFIG_SOC_PNX8550)	+= arch/mips/philips/pnx8550/common/

core-$(CONFIG_SOC_PNX8550)	+= arch/mips/nxp/pnx8550/common/

cflags-$(CONFIG_SOC_PNX8550)	+= -Iinclude/asm-mips/mach-pnx8550



#

# Philips PNX8550 JBS board

# NXP PNX8550 JBS board

#

libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/philips/pnx8550/jbs/

libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/nxp/pnx8550/jbs/

#cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550

load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000



# Philips PNX8550 STB810 board

# NXP PNX8550 STB810 board

#

libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/philips/pnx8550/stb810/

libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/nxp/pnx8550/stb810/

load-$(CONFIG_PNX8550_STB810)	+= 0xffffffff80060000



# NEC EMMA2RH boards

arch/mips/au1000/common/cputable.c

+1 −4
Original line number Diff line number Diff line
@@ -11,10 +11,7 @@ 
 *  as published by the Free Software Foundation; either version

 *  2 of the License, or (at your option) any later version.

 */

#include <linux/string.h>

#include <linux/sched.h>

#include <linux/threads.h>

#include <linux/init.h>



#include <asm/mach-au1x00/au1000.h>



struct cpu_spec* cur_cpu_spec[NR_CPUS];

arch/mips/au1000/common/dbdma.c

+0 −6
Original line number Diff line number Diff line
@@ -31,18 +31,12 @@ 
 */



#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/string.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/au1xxx_dbdma.h>

#include <asm/system.h>





#if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200)