Commit 0b9062f6 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:
  [MIPS] Rename PC speaker code
  [MIPS] Don't use genrtc.
  [MIPS] Remove unused time.c for swarm
  [MIPS] Sparse: Use NULL for pointer
  [MIPS] Fix a sparse warning in arch/mips/pci/pci.c
  [MIPS] SMTC: Interrupt mask backstop hack
  [MIPS] separate platform_device registration for VR41xx RTC
  [MIPS] Separate platform_device registration for VR41xx GPIO
  [MIPS] MIPSsim: Fix build.
  [MIPS] separate platform_device registration for VR41xx serial interface
  [MIPS] Include cacheflush.h in uncache.c
  [MIPS] Cleanup tlbdebug.h
  [MIPS] Change names of local variables to silence sparse (part 2)
  [MIPS] Workaround for a sparse warning in include/asm-mips/io.h
  [MIPS] RM: Use only phyiscal address for 82596 and 53c710
  [MIPS] Hydrogen3: Remove remaining bits of code.
  [MIPS] DEC: Fix modpost warning.
  Revert "[MIPS] DEC: Fix modpost warning."
  [MIPS] Fix resume for 64K page size on R4000 class processors.
parents 82afee68 de61b542

arch/mips/Kconfig

+17 −4
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ config MACH_JAZZ 
	select ARC32

	select ARCH_MAY_HAVE_PC_FDC

	select GENERIC_ISA_DMA

	select I8253

	select I8259

	select ISA

	select PCSPEAKER

	select SYS_HAS_CPU_R4X00

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
@@ -347,9 +347,9 @@ config QEMU 
	select DMA_COHERENT

	select GENERIC_ISA_DMA

	select HAVE_STD_PC_SERIAL_PORT

	select I8253

	select I8259

	select ISA

	select PCSPEAKER

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -562,9 +562,9 @@ config SNI_RM 
	select HW_HAS_EISA

	select HW_HAS_PCI

	select IRQ_CPU

	select I8253

	select I8259

	select ISA

	select PCSPEAKER

	select SWAP_IO_SPACE if CPU_BIG_ENDIAN

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R5000
@@ -1404,6 +1404,19 @@ config MIPS_MT_SMTC_INSTANT_REPLAY 
	  it off), but ensures that IPIs are handled promptly even under

	  heavy I/O interrupt load.



config MIPS_MT_SMTC_IM_BACKSTOP

	bool "Use per-TC register bits as backstop for inhibited IM bits"

	depends on MIPS_MT_SMTC

	default y

	help

	  To support multiple TC microthreads acting as "CPUs" within

	  a VPE, VPE-wide interrupt mask bits must be specially manipulated

	  during interrupt handling. To support legacy drivers and interrupt

	  controller management code, SMTC has a "backstop" to track and

	  if necessary restore the interrupt mask. This has some performance

	  impact on interrupt service overhead. Disable it only if you know

	  what you are doing.



config MIPS_VPE_LOADER_TOM

	bool "Load VPE program into memory hidden from linux"

	depends on MIPS_VPE_LOADER
@@ -1851,7 +1864,7 @@ config MMU 
	bool

	default y



config I8253

config PCSPEAKER

	bool



source "drivers/pcmcia/Kconfig"

arch/mips/au1000/common/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -100,9 +100,6 @@ void __init plat_mem_setup(void) 
        argptr = prom_getcmdline();

        /* default panel */

        /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/

#ifdef CONFIG_MIPS_HYDROGEN3

         strcat(argptr, " video=au1100fb:panel:Hydrogen_3_NEC_panel_320x240,nohwcursor");

#endif

    }

#endif

arch/mips/configs/jazz_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

CONFIG_ISA=y

CONFIG_MMU=y

CONFIG_I8253=y

CONFIG_PCSPEAKER=y



#

# PCCARD (PCMCIA/CardBus) support

arch/mips/configs/qemu_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ CONFIG_DEFAULT_IOSCHED="noop" 
#

CONFIG_ISA=y

CONFIG_MMU=y

CONFIG_I8253=y

CONFIG_PCSPEAKER=y



#

# PCCARD (PCMCIA/CardBus) support

arch/mips/configs/rm200_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ CONFIG_PCI=y 
CONFIG_ISA=y

# CONFIG_EISA is not set

CONFIG_MMU=y

CONFIG_I8253=y

CONFIG_PCSPEAKER=y



#

# PCCARD (PCMCIA/CardBus) support

CRA Git | Maintained and supported by SUSTech CRA and CCSE