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

Commit 6cd236e0 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] Count timer interrupts correctly.
  [MIPS] SMTC and non-SMTC kernel and modules are incompatible
  [MIPS] EMMA2RH: Disable GEN_RTC, it can't possibly work.
  [MIPS] Remove a duplicated local variable in test_and_clear_bit()
  [MIPS] use compat_siginfo in rt_sigframe_n32
  [MIPS] 20K: Handle WAIT related bugs according to errata information
  [MIPS] AP/SP requires shadow registers, auto enable support.
  [MIPS] Fix pb1500 reg B access
  [MIPS] Alchemy: Fix wrong cast
  [MIPS] remove "support for" from system type entry
  [MIPS] add io_map_base to pci_controller on Cobalt
  [MIPS] __ucmpdi2 arguments are unsigned long long.
parents 2c9dbda3 8e15a0e3

arch/mips/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ config PNX8550_JBS 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_STB810

	bool "Support for Philips PNX8550 based STB810 board"

	bool "Philips PNX8550 based STB810 board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -392,7 +392,7 @@ config QEMU 
	  can be found at http://www.linux-mips.org/wiki/Qemu.



config MARKEINS

	bool "Support for NEC EMMA2RH Mark-eins"

	bool "NEC EMMA2RH Mark-eins"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU
@@ -1392,6 +1392,7 @@ config MIPS_VPE_LOADER 
	depends on SYS_SUPPORTS_MULTITHREADING

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select CPU_MIPSR2_SRS

	select MIPS_MT

	help

	  Includes a loader for loading an elf relocatable object

arch/mips/au1000/pb1100/init.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void __init prom_init(void) 


	prom_argc = fw_arg0;

	prom_argv = (char **) fw_arg1;

	prom_envp = (int *) fw_arg3;

	prom_envp = (char **) fw_arg3;



	mips_machgroup = MACH_GROUP_ALCHEMY;

	mips_machtype = MACH_PB1100;

arch/mips/au1000/pb1500/board_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ void __init board_setup(void) 
		au_writel((au_readl(0xac000028) | 0x20), 0xac000028);

	}

	/* Put the clock in BCD mode */

	if (readl(0xac00002C) & 0x4) { /* reg B */

	if (au_readl(0xac00002C) & 0x4) { /* reg B */

		au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c);

		au_sync();

	}

arch/mips/cobalt/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ static struct pci_controller cobalt_pci_controller = { 
	.mem_resource	= &cobalt_mem_resource,

	.io_resource	= &cobalt_io_resource,

	.io_offset	= 0 - GT_DEF_PCI0_IO_BASE,

	.io_map_base	= CKSEG1ADDR(GT_DEF_PCI0_IO_BASE),

};



static int __init cobalt_pci_init(void)

arch/mips/configs/emma2rh_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -951,8 +951,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

CONFIG_RTC=m

CONFIG_GEN_RTC=m

CONFIG_GEN_RTC_X=y

# CONFIG_GEN_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set