Commit ad5da3cf 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: (22 commits)
  [MIPS] Don't force frame pointers for lockdep on MIPS
  [MIPS] update vr41xx Kconfig
  [MIPS] remove 2 select entries for VR41xx
  [MIPS] rename VR41XX to VR4100 series
  [MIPS] Use DEFINE_SPINLOCK instead of SPIN_LOCK_UNLOCKED.
  [MIPS] Replace old fashioned "__typeof" with "__typeof__".
  [MIPS] Remove unused _THREAD_SIZE_ORDER from asm-offset.c.
  [MIPS] Change PCI host bridge setup/resources
  [MIPS] Register PCI host bridge resource earlier
  [MIPS] Remove pnx8550-v2pci_defconfig
  [MIPS] Add bcm1480 ZBus trace support, fix wait related bugs
  [MIPS] Updated Sibyte headers
  [MIPS] Remove unused argument from kunmap_coherent().
  [MIPS] Malta: Delete unused prototype of mips_timer_interrupt.
  [MIPS] Select ZONE_DMA only if GENERIC_ISA_DMA selected
  [MIPS] MIPS Tech: Get rid of volatile in core code.
  [MIPS] IP22: Get rid of volatile in IP22 core code.
  [MIPS] JMR3927 cleanup
  [MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines
  [MIPS] Cobalt: Split PCI codes from setup.c
  ...
parents da8ac5e0 14cf232a

arch/mips/Kconfig

+12 −15
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ menu "Machine selection" 


config ZONE_DMA

	bool

	default y



choice

	prompt "System type"
@@ -165,7 +164,7 @@ config MIPS_COBALT 
	select HW_HAS_PCI

	select I8259

	select IRQ_CPU

	select MIPS_GT64111

	select PCI_GT64XXX_PCI0

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -207,7 +206,7 @@ config MIPS_EV64120 
	depends on EXPERIMENTAL

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select SYS_HAS_CPU_R5000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL
@@ -245,7 +244,7 @@ config LASAT 
	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select HW_HAS_PCI

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select MIPS_NILE4

	select R5000_CPU_SCACHE

	select SYS_HAS_CPU_R5000
@@ -263,7 +262,7 @@ config MIPS_ATLAS 
	select HW_HAS_PCI

	select MIPS_BOARDS_GEN

	select MIPS_BONITO64

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select MIPS_MSC

	select RM7000_CPU_SCACHE

	select SWAP_IO_SPACE
@@ -296,7 +295,7 @@ config MIPS_MALTA 
	select MIPS_BOARDS_GEN

	select MIPS_BONITO64

	select MIPS_CPU_SCACHE

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select MIPS_MSC

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1
@@ -340,7 +339,7 @@ config WR_PPMC 
	select BOOT_ELF32

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2
@@ -398,7 +397,7 @@ config MOMENCO_OCELOT 
	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_CPU_RM7K

	select MIPS_GT64120

	select PCI_GT64XXX_PCI0

	select RM7000_CPU_SCACHE

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM7000
@@ -501,10 +500,8 @@ config DDB5477 
	  ether port USB, AC97, PCI, etc.



config MACH_VR41XX

	bool "NEC VR41XX-based machines"

	bool "NEC VR4100 series based machines"

	select SYS_HAS_CPU_VR41XX

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select GENERIC_HARDIRQS_NO__DO_IRQ



config PMC_YOSEMITE
@@ -779,6 +776,7 @@ config TOSHIBA_JMR3927 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select TOSHIBA_BOARDS

	select GENERIC_HARDIRQS_NO__DO_IRQ



config TOSHIBA_RBTX4927

	bool "Toshiba TBTX49[23]7 board"
@@ -922,6 +920,7 @@ config SYS_HAS_EARLY_PRINTK 


config GENERIC_ISA_DMA

	bool

	select ZONE_DMA



config I8259

	bool
@@ -945,6 +944,7 @@ config MIPS_DISABLE_OBSOLETE_IDE 


config GENERIC_ISA_DMA_SUPPORT_BROKEN

	bool

	select ZONE_DMA



#

# Endianess selection.  Sufficiently obscure so many users don't know what to
@@ -999,10 +999,7 @@ config DDB5XXX_COMMON 
config MIPS_BOARDS_GEN

	bool



config MIPS_GT64111

	bool



config MIPS_GT64120

config PCI_GT64XXX_PCI0

	bool



config MIPS_TX3927

arch/mips/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -530,25 +530,29 @@ cflags-$(CONFIG_SGI_IP32) += -Iinclude/asm-mips/mach-ip32 
load-$(CONFIG_SGI_IP32)		+= 0xffffffff80004000



#

# Sibyte SB1250 SOC

# Sibyte SB1250/BCM1480 SOC

#

# This is a LIB so that it links at the end, and initcalls are later

# the sequence; but it is built as an object so that modules don't get

# removed (as happens, even if they have __initcall/module_init)

#

core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/sb1250/

core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_BCM112X)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL



core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/sb1250/

core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_SB1250)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL



core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/bcm1480/

core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_BCM1x55)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL



core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/bcm1480/

core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL

arch/mips/basler/excite/excite_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ volatile void __iomem * const ocd_base = (void *) (EXCITE_ADDR_OCD); 
volatile void __iomem * const titan_base = (void *) (EXCITE_ADDR_TITAN);



/* Protect access to shared GPI registers */

spinlock_t titan_lock = SPIN_LOCK_UNLOCKED;

DEFINE_SPINLOCK(titan_lock);

int titan_irqflags;

arch/mips/cobalt/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ 


obj-y	 := irq.o reset.o setup.o



obj-$(CONFIG_PCI)		+= pci.o

obj-$(CONFIG_EARLY_PRINTK)	+= console.o

obj-$(CONFIG_MTD_PHYSMAP)	+= mtd.o

arch/mips/cobalt/console.c

+3 −5
Original line number Diff line number Diff line 
/*

 * (C) P. Horton 2006

 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/console.h>

#include <linux/serial_reg.h>



#include <asm/addrspace.h>

#include <asm/mach-cobalt/cobalt.h>



#include <cobalt.h>



void prom_putchar(char c)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE