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

Commit 6fd4ce88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (31 commits)
  MIPS: Close races in TLB modify handlers.
  MIPS: Add uasm UASM_i_SRL_SAFE macro.
  MIPS: RB532: Use hex_to_bin()
  MIPS: Enable cpu_has_clo_clz for MIPS Technologies' platforms
  MIPS: PowerTV: Provide cpu-feature-overrides.h
  MIPS: Remove pointless return statement from empty void functions.
  MIPS: Limit fixrange_init() to the FIXMAP region
  MIPS: Install handlers for software IRQs
  MIPS: Move FIXADDR_TOP into spaces.h
  MIPS: Add SYNC after cacheflush
  MIPS: pfn_valid() is broken on low memory HIGHMEM systems
  MIPS: HIGHMEM DMA on noncoherent MIPS32 processors
  MIPS: topdown mmap support
  MIPS: Remove redundant addr_limit assignment on exec.
  MIPS: AR7: Replace __attribute__((__packed__)) with __packed
  MIPS: AR7: Remove 'space before tabs' in platform.c
  MIPS: Lantiq: Add missing clk_enable and clk_disable functions.
  MIPS: AR7: Fix trailing semicolon bug in clock.c
  MAINTAINERS: Update MIPS entry.
  MIPS: BCM63xx: Remove duplicate PERF_IRQSTAT_REG definition
  ...
parents ba5b56cb bf28607f

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -4217,9 +4217,10 @@ F: drivers/usb/image/microtek.* 


MIPS

M:	Ralf Baechle <ralf@linux-mips.org>

W:	http://www.linux-mips.org/

L:	linux-mips@linux-mips.org

W:	http://www.linux-mips.org/

T:	git git://git.linux-mips.org/pub/scm/linux.git

Q:	http://patchwork.linux-mips.org/project/linux-mips/list/

S:	Supported

F:	Documentation/mips/

F:	arch/mips/

arch/mips/Kbuild.platforms

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ platforms += lasat 
platforms += loongson

platforms += mipssim

platforms += mti-malta

platforms += netlogic

platforms += pmc-sierra

platforms += pnx833x

platforms += pnx8550

arch/mips/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -191,18 +191,6 @@ endif 
#

include $(srctree)/arch/mips/Kbuild.platforms



#

# NETLOGIC SOC Common (common)

#

cflags-$(CONFIG_NLM_COMMON)		+= -I$(srctree)/arch/mips/include/asm/mach-netlogic

cflags-$(CONFIG_NLM_COMMON)		+= -I$(srctree)/arch/mips/include/asm/netlogic



#

# NETLOGIC XLR/XLS SoC, Simulator and boards

#

core-$(CONFIG_NLM_XLR)      		+= arch/mips/netlogic/xlr/

load-$(CONFIG_NLM_XLR_BOARD)		+= 0xffffffff84000000



cflags-y			+= -I$(srctree)/arch/mips/include/asm/mach-generic

drivers-$(CONFIG_PCI)		+= arch/mips/pci/

arch/mips/ar7/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ struct clk *clk_get(struct device *dev, const char *id) 
		return &vbus_clk;

	if (!strcmp(id, "cpu"))

		return &cpu_clk;

	if (!strcmp(id, "dsp"));

	if (!strcmp(id, "dsp"))

		return &dsp_clk;

	if (!strcmp(id, "vbus"))

		return &vbus_clk;

arch/mips/ar7/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct psp_env_chunk { 
	u16	csum;

	u8	len;

	char	data[11];

} __attribute__ ((packed));

} __packed;



struct psp_var_map_entry {

	u8	num;