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

Commit ab6cf0d0 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: (53 commits)
  [MIPS] sparsemem: fix crash in show_mem
  [MIPS] vr41xx: Update workpad setup function
  [MIPS] vr41xx: Update e55 setup function
  [MIPS] vr41xx: Removed old v2.4 VRC4173 driver
  [MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h
  [MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup.
  [MIPS] Remove unused code.
  [MIPS] IP22 Fix brown paper bag in RTC code.
  [MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().
  [MIPS] Replace board_timer_setup function pointer by plat_timer_setup.
  [MIPS] Nuke redeclarations of board_time_init.
  [MIPS] Remove redeclarations of setup_irq().
  [MIPS] Nuke redeclarations of board_timer_setup.
  [MIPS] Print out TLB handler assembly for debugging.
  [MIPS] SMTC: Reformat to Linux style.
  [MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt.
  [MIPS] IP27: Reformatting.
  [MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown.
  [MIPS] IP27: irq_chip startup method returns unsigned int.
  [MIPS] IP27: struct irq_desc member handler was renamed to chip.
  ...
parents 0d10e47f f4dee85e

Documentation/mips/time.README

+4 −6
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ the following functions or values: 
	1. (optional) set up RTC routines

	2. (optional) calibrate and set the mips_counter_frequency



  b) board_timer_setup - a function pointer.  Invoked at the end of time_init()

  b) plat_timer_setup - a function pointer.  Invoked at the end of time_init()

	1. (optional) over-ride any decisions made in time_init()

	2. set up the irqaction for timer interrupt.

	3. enable the timer interrupt
@@ -116,10 +116,8 @@ Step 2: the machine setup() function 


  If you supply board_time_init(), set the function poointer.



  Set the function pointer board_timer_setup() (mandatory)





Step 3: implement rtc routines, board_time_init() and board_timer_setup()

Step 3: implement rtc routines, board_time_init() and plat_timer_setup()

  if needed.



  board_time_init() -
@@ -128,7 +126,7 @@ Step 3: implement rtc routines, board_time_init() and board_timer_setup() 
 	    (only needed if you intended to use fixed_rate_gettimeoffset

 	     or use cpu counter as timer interrupt source)



  board_timer_setup() - 

  plat_timer_setup() -

 	a) (optional) over-write any choices made above by time_init().

 	b) machine specific code should setup the timer irqaction.

 	c) enable the timer interrupt

arch/mips/Kconfig

+9 −1
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ config MOMENCO_OCELOT_G 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select ARCH_SPARSEMEM_ENABLE

	help

	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by

	  Momentum Computer <http://www.momenco.com/>.
@@ -556,6 +557,7 @@ config QEMU 
	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select ARCH_SPARSEMEM_ENABLE

	help

	  Qemu is a software emulator which among other architectures also

	  can simulate a MIPS32 4Kc system.  This patch adds support for the
@@ -594,7 +596,6 @@ config SGI_IP22 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_SMP

	help

	  This are the SGI Indy, Challenge S and Indigo2, as well as certain

	  OEM variants like the Tandem CMN B006S. To compile a Linux kernel
@@ -1688,6 +1689,13 @@ config ARCH_DISCONTIGMEM_ENABLE 
	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa> for more.



config ARCH_SPARSEMEM_ENABLE

	bool



config ARCH_SPARSEMEM_ENABLE

	bool

	select SPARSEMEM_STATIC



config NUMA

	bool "NUMA Support"

	depends on SYS_SUPPORTS_NUMA

arch/mips/Kconfig.debug

+4 −0
Original line number Diff line number Diff line 
menu "Kernel hacking"



config TRACE_IRQFLAGS_SUPPORT

	bool

	default y



source "lib/Kconfig.debug"



config CROSSCOMPILE

arch/mips/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -712,16 +712,14 @@ endif 
vmlinux.bin: $(vmlinux-32)

	+@$(call makeboot,$@)



vmlinux.ecoff vmlinux.rm200: $(vmlinux-32)

vmlinux.ecoff: $(vmlinux-32)

	+@$(call makeboot,$@)



vmlinux.srec: $(vmlinux-32)

	+@$(call makeboot,$@)



CLEAN_FILES += vmlinux.ecoff \

	       vmlinux.srec \

	       vmlinux.rm200.tmp \

	       vmlinux.rm200

	       vmlinux.srec



archclean:

	@$(MAKE) $(clean)=arch/mips/boot

arch/mips/au1000/common/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ void restore_local_and_enable(int controller, unsigned long mask) 
}





static struct hw_interrupt_type rise_edge_irq_type = {

static struct irq_chip rise_edge_irq_type = {

	.typename = "Au1000 Rise Edge",

	.startup = startup_irq,

	.shutdown = shutdown_irq,
@@ -261,7 +261,7 @@ static struct hw_interrupt_type rise_edge_irq_type = { 
	.end = end_irq,

};



static struct hw_interrupt_type fall_edge_irq_type = {

static struct irq_chip fall_edge_irq_type = {

	.typename = "Au1000 Fall Edge",

	.startup = startup_irq,

	.shutdown = shutdown_irq,
@@ -271,7 +271,7 @@ static struct hw_interrupt_type fall_edge_irq_type = { 
	.end = end_irq,

};



static struct hw_interrupt_type either_edge_irq_type = {

static struct irq_chip either_edge_irq_type = {

	.typename = "Au1000 Rise or Fall Edge",

	.startup = startup_irq,

	.shutdown = shutdown_irq,
@@ -281,7 +281,7 @@ static struct hw_interrupt_type either_edge_irq_type = { 
	.end = end_irq,

};



static struct hw_interrupt_type level_irq_type = {

static struct irq_chip level_irq_type = {

	.typename = "Au1000 Level",

	.startup = startup_irq,

	.shutdown = shutdown_irq,