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

Commit f10f114f 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] time: Make c0_compare_int_usable more bullet proof
  [MIPS] Kbuild: Use the new cc-cross-prefix feature.
  [MIPS] Fix include wrapper symbol to something sane.
  [MIPS] Malta: Delete dead code.
  [MIPS] time: Add GT641xx timer0 clockevent driver
  [MIPS] time: SMP-proofing of Sibyte clockevent/clocksource code.
  [MIPS] time: SMP/NUMA-proofing of IP27 HUB RT timer code.
  [MIPS] time: Fix calculation in clockevent_set_clock()
parents 0c326331 dab969c0

arch/mips/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ config BCM47XX 
config MIPS_COBALT

	bool "Cobalt Server"

	select CEVT_R4K

	select CEVT_GT641XX

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select I8253
@@ -729,6 +730,9 @@ config ARCH_MAY_HAVE_PC_FDC 
config BOOT_RAW

	bool



config CEVT_GT641XX

	bool



config CEVT_R4K

	bool

arch/mips/Kconfig.debug

+0 −12
Original line number Diff line number Diff line
@@ -6,18 +6,6 @@ config TRACE_IRQFLAGS_SUPPORT 


source "lib/Kconfig.debug"



config CROSSCOMPILE

	bool "Are you using a crosscompiler"

	help

	  Say Y here if you are compiling the kernel on a different

	  architecture than the one it is intended to run on.  This is just a

	  convenience option which will select the appropriate value for

	  the CROSS_COMPILE make variable which otherwise has to be passed on

	  the command line from mips-linux-, mipsel-linux-, mips64-linux- and

	  mips64el-linux- as appropriate for a particular kernel configuration.

	  You will have to pass the value for CROSS_COMPILE manually if the

	  name prefix for your tools is different.



config CMDLINE

	string "Default kernel command string"

	default ""

arch/mips/Makefile

+10 −8
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ cflags-y := 
# Select the object file format to substitute into the linker script.

#

ifdef CONFIG_CPU_LITTLE_ENDIAN

32bit-tool-prefix	= mipsel-linux-

64bit-tool-prefix	= mips64el-linux-

32bit-tool-archpref	= mipsel

64bit-tool-archpref	= mips64el

32bit-bfd		= elf32-tradlittlemips

64bit-bfd		= elf64-tradlittlemips

32bit-emul		= elf32ltsmip

64bit-emul		= elf64ltsmip

else

32bit-tool-prefix	= mips-linux-

64bit-tool-prefix	= mips64-linux-

32bit-tool-archpref	= mips

64bit-tool-archpref	= mips64

32bit-bfd		= elf32-tradbigmips

64bit-bfd		= elf64-tradbigmips

32bit-emul		= elf32btsmip
@@ -34,16 +34,18 @@ else 
endif



ifdef CONFIG_32BIT

tool-prefix		= $(32bit-tool-prefix)

tool-archpref		= $(32bit-tool-archpref)

UTS_MACHINE		:= mips

endif

ifdef CONFIG_64BIT

tool-prefix		= $(64bit-tool-prefix)

tool-archpref		= $(64bit-tool-archpref)

UTS_MACHINE		:= mips64

endif



ifdef CONFIG_CROSSCOMPILE

CROSS_COMPILE		:= $(tool-prefix)

ifneq ($(SUBARCH),$(ARCH))

  ifeq ($(CROSS_COMPILE),)

    CROSS_COMPILE := $(call cc-cross-prefix, $(tool-archpref)-linux-  $(tool-archpref)-gnu-linux-  $(tool-archpref)-unknown-gnu-linux-)

  endif

endif



ifdef CONFIG_32BIT

arch/mips/cobalt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the Cobalt micro systems family specific parts of the kernel

#



obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o

obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o time.o



obj-$(CONFIG_PCI)		+= pci.o

obj-$(CONFIG_EARLY_PRINTK)	+= console.o

arch/mips/cobalt/setup.c

+3 −21
Original line number Diff line number Diff line
@@ -9,19 +9,17 @@ 
 * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)

 *

 */

#include <linux/interrupt.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/pm.h>



#include <asm/bootinfo.h>

#include <asm/time.h>

#include <asm/i8253.h>

#include <asm/io.h>

#include <asm/reboot.h>

#include <asm/gt64120.h>



#include <cobalt.h>

#include <irq.h>



extern void cobalt_machine_restart(char *command);

extern void cobalt_machine_halt(void);
@@ -41,17 +39,6 @@ const char *get_system_type(void) 
	return "MIPS Cobalt";

}



void __init plat_timer_setup(struct irqaction *irq)

{

	/* Load timer value for HZ (TCLK is 50MHz) */

	GT_WRITE(GT_TC0_OFS, 50*1000*1000 / HZ);



	/* Enable timer0 */

	GT_WRITE(GT_TC_CONTROL_OFS, GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK);



	setup_irq(GT641XX_TIMER0_IRQ, irq);

}



/*

 * Cobalt doesn't have PS/2 keyboard/mouse interfaces,

 * keyboard conntroller is never used.
@@ -84,11 +71,6 @@ static struct resource cobalt_reserved_resources[] = { 
	},

};



void __init plat_time_init(void)

{

	setup_pit_timer();

}



void __init plat_mem_setup(void)

{

	int i;