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

Commit 626a16c1 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] Au1200: MMC resource size off by one
  [MIPS] TANBAC: Update defconfig
  [MIPS] Vr41xx: Initialize PCI io_map_base
  [MIPS] Malta: Always compile MTD platform device registration code.
  [MIPS] Malta: Fix build errors for 64-bit kernels
  [MIPS] Lasat: sysctl fixup
  [MIPS] Fix buggy use of kmap_coherent.
  [MIPS] Lasat: bring back from the dead
  [MIPS] vpe_id is required for VSMP and SMTC builds
  [MIPS] Export smp_call_function and smp_call_function_single.
  [MIPS] Bring the SWARM defconfig up to date
  [MIPS] Sibyte: Build RTC support as an object
  [MIPS] Fix the fix for divide by zero error in build_{clear,copy}_page
  [MIPS] Fix build for PNX platforms.
  [MIPS] Add RM200 with R5000 CPU to known ARC machines
  [MIPS] Better load address for big endian SNI RM
  [MIPS] SB1250: Initialize io_map_base
  [MIPS] Alchemy: Add au1500 reserved interrupt
  [MIPS] Export empty_zero_page for sake of the ext4 module.
parents e53d6a15 dab8c6de

arch/mips/Makefile

+11 −7
Original line number Diff line number Diff line
@@ -538,19 +538,19 @@ cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \ 
# Sibyte SWARM board

# Sibyte BCM91x80 (BigSur) board

#

libs-$(CONFIG_SIBYTE_CARMEL)	+= arch/mips/sibyte/swarm/

core-$(CONFIG_SIBYTE_CARMEL)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_CARMEL)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_CRHINE)	+= arch/mips/sibyte/swarm/

core-$(CONFIG_SIBYTE_CRHINE)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_CRHINE)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_CRHONE)	+= arch/mips/sibyte/swarm/

core-$(CONFIG_SIBYTE_CRHONE)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_CRHONE)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_RHONE)	+= arch/mips/sibyte/swarm/

core-$(CONFIG_SIBYTE_RHONE)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_RHONE)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_SENTOSA)	+= arch/mips/sibyte/swarm/

core-$(CONFIG_SIBYTE_SENTOSA)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_SENTOSA)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_SWARM)	+= arch/mips/sibyte/swarm/

core-$(CONFIG_SIBYTE_SWARM)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_SWARM)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_BIGSUR)	+= arch/mips/sibyte/swarm/

core-$(CONFIG_SIBYTE_BIGSUR)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000



#
@@ -565,7 +565,11 @@ load-$(CONFIG_BCM47XX) := 0xffffffff80001000 
#

core-$(CONFIG_SNI_RM)		+= arch/mips/sni/

cflags-$(CONFIG_SNI_RM)		+= -Iinclude/asm-mips/mach-rm

ifdef CONFIG_CPU_LITTLE_ENDIAN

load-$(CONFIG_SNI_RM)		+= 0xffffffff80600000

else

load-$(CONFIG_SNI_RM)		+= 0xffffffff80030000

endif

all-$(CONFIG_SNI_RM)		:= vmlinux.ecoff



#

arch/mips/au1000/common/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -165,12 +165,12 @@ static struct resource au1xxx_usb_gdt_resources[] = { 
static struct resource au1xxx_mmc_resources[] = {

	[0] = {

		.start          = SD0_PHYS_ADDR,

		.end            = SD0_PHYS_ADDR + 0x40,

		.end            = SD0_PHYS_ADDR + 0x7ffff,

		.flags          = IORESOURCE_MEM,

	},

	[1] = {

		.start		= SD1_PHYS_ADDR,

		.end 		= SD1_PHYS_ADDR + 0x40,

		.end 		= SD1_PHYS_ADDR + 0x7ffff,

		.flags		= IORESOURCE_MEM,

	},

	[2] = {