Commit 29dd5a77 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: (25 commits)
  [MIPS] Jazz: disable PIT; cleanup R4030 clockevent
  [MIPS] Bigsur supports highmem.
  [MIPS] mtx-1: Enable -Werror.
  [MIPS] mtx-1: Remove unused mtx1_sys_btn.
  [MIPS] Pb1200: Enable -Werror.
  [MIPS] Fix and cleanup the MIPS part of the (ab)use of CLOCK_TICK_RATE.
  [MIPS] SNI: register a02r clockevent; don't use PIT timer
  [MIPS] i8253.h: Remove all i8259 related definitions.
  [MIPS] i8253: Cleanup.
  [MIPS] Cobalt: Fix IRQ comment; the Cobalt kernel uses CP0 counter now.
  [MIPS] Pb1200: Fix warning.
  [MIPS] Pb1200: Fix warning.
  [MIPS] IP27: Fix build error.
  [MIPS] Excite: Fix build error.
  [MIPS] Sibyte: Split and move clock code.
  [MIPS] Sibyte: Fixes for oneshot timer mode.
  [MIPS] Sibyte: Remove blank line.
  [MIPS] Swarm: Fix build failure
  [MIPS] time: Code cleanups
  [MIPS] time: Remove now unused local_timer_interrupt.
  ...
parents 71527bf8 3be51f70

arch/mips/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ config SIBYTE_BIGSUR 
	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN



config SNI_RM
@@ -733,15 +734,27 @@ config ARCH_MAY_HAVE_PC_FDC 
config BOOT_RAW

	bool



config CEVT_BCM1480

	bool



config CEVT_GT641XX

	bool



config CEVT_R4K

	bool



config CEVT_SB1250

	bool



config CEVT_TXX9

	bool



config CSRC_BCM1480

	bool



config CSRC_SB1250

	bool



config CFE

	bool

arch/mips/au1000/mtx-1/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ 


lib-y := init.o board_setup.o irqmap.o

obj-y := platform.o



EXTRA_CFLAGS += -Werror

arch/mips/au1000/mtx-1/platform.c

+0 −9
Original line number Diff line number Diff line
@@ -34,15 +34,6 @@ static struct resource mtx1_wdt_res[] = { 
	}

};



static struct resource mtx1_sys_btn[] = {

	[0] = {

		.start	= 7,

		.end	= 7,

		.name	= "mtx1-sys-btn-gpio",

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device mtx1_wdt = {

	.name = "mtx1-wdt",

	.id = 0,

arch/mips/au1000/pb1200/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ 
#



lib-y := init.o board_setup.o irqmap.o



EXTRA_CFLAGS += -Werror

arch/mips/au1000/pb1200/board_setup.c

+5 −1
Original line number Diff line number Diff line
@@ -68,9 +68,11 @@ void board_reset(void) 
void __init board_setup(void)

{

	char *argptr = NULL;

	u32 pin_func;



#if 0

	{

	u32 pin_func;



	/* Enable PSC1 SYNC for AC97.  Normaly done in audio driver,

	 * but it is board specific code, so put it here.

	 */
@@ -81,11 +83,13 @@ void __init board_setup(void) 


	au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */

	au_sync();

	}

#endif



#if defined(CONFIG_I2C_AU1550)

	{

	u32 freq0, clksrc;

	u32 pin_func;



	/* Select SMBUS in CPLD */

	bcsr->resets &= ~(BCSR_RESETS_PCS0MUX);

CRA Git | Maintained and supported by SUSTech CRA and CCSE