Commit 7e2225d8 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: (54 commits)
  [MIPS] Remove mips_machtype for LASAT machines
  [MIPS] Remove mips_machtype from EMMA2RH machines
  [MIPS] Remove mips_machtype from ARC based machines
  [MIPS] MTX-1 flash partition setup move to platform devices registration
  [MIPS] TXx9: cleanup and fix some sparse warnings
  [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx
  [MIPS] remove machtype for group Toshiba
  [MIPS] separate rbtx4927_time_init() and rbtx4937_time_init()
  [MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
  [MIPS] txx9_cpu_clock setup move to rbtx4927_time_init()
  [MIPS] txx9_board_vec set directly without mips_machtype
  [MIPS] IP22: Add platform device for Indy volume buttons
  [MIPS] cmbvr4133: Remove support
  [MIPS] remove wrppmc_machine_power_off()
  [MIPS] replace inline assembler to cpu_wait()
  [MIPS] IP22/28: Add platform devices for HAL2
  [MIPS] TXx9: Update and merge defconfigs
  [MIPS] TXx9: Make single kernel can support multiple boards
  [MIPS] TXx9: Update defconfigs
  [MIPS] TXx9: Reorganize PCI code
  ...
parents 3a628b0f b27418aa

arch/mips/Kconfig

+10 −120
Original line number Diff line number Diff line
@@ -181,38 +181,6 @@ config LEMOTE_FULONG 
	  Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and

	  an FPGA northbridge



config MIPS_ATLAS

	bool "MIPS Atlas board"

	select BOOT_ELF32

	select BOOT_RAW

	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select IRQ_CPU

	select HW_HAS_PCI

	select MIPS_BOARDS_GEN

	select MIPS_BONITO64

	select PCI_GT64XXX_PCI0

	select MIPS_MSC

	select RM7000_CPU_SCACHE

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_CPU_MIPS64_R1

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL

	select SYS_SUPPORTS_SMARTMIPS

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help

	  This enables support for the MIPS Technologies Atlas evaluation

	  board.



config MIPS_MALTA

	bool "MIPS Malta board"

	select ARCH_MAY_HAVE_PC_FDC
@@ -249,26 +217,6 @@ config MIPS_MALTA 
	  This enables support for the MIPS Technologies Malta evaluation

	  board.



config MIPS_SEAD

	bool "MIPS SEAD board"

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select MIPS_BOARDS_GEN

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_CPU_MIPS64_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_SMARTMIPS

	help

	  This enables support for the MIPS Technologies SEAD evaluation

	  board.



config MIPS_SIM

	bool 'MIPS simulator (MIPSsim)'

	select CEVT_R4K
@@ -437,6 +385,8 @@ config SGI_IP28 
	select SGI_HAS_DS1286

	select SGI_HAS_I8042

	select SGI_HAS_INDYDOG

	select SGI_HAS_HAL2

	select SGI_HAS_HAL2

	select SGI_HAS_SEEQ

	select SGI_HAS_WD93

	select SGI_HAS_ZILOG
@@ -602,65 +552,11 @@ config SNI_RM 
	  Technology and now in turn merged with Fujitsu.  Say Y here to

	  support this machine type.



config TOSHIBA_JMR3927

	bool "Toshiba JMR-TX3927 board"

	select CEVT_TXX9

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_TX3927

	select IRQ_TXX9

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX39XX

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select GPIO_TXX9

config MACH_TX39XX

	bool "Toshiba TX39 series based machines"



config TOSHIBA_RBTX4927

	bool "Toshiba RBTX49[23]7 board"

	select CEVT_R4K

	select CSRC_R4K

	select CEVT_TXX9

	select DMA_NONCOHERENT

	select HAS_TXX9_SERIAL

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_TXX9

	select I8259 if TOSHIBA_FPCIB0

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX49XX

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help

	  This Toshiba board is based on the TX4927 processor. Say Y here to

	  support this machine type



config TOSHIBA_RBTX4938

	bool "Toshiba RBTX4938 board"

	select CEVT_R4K

	select CSRC_R4K

	select CEVT_TXX9

	select DMA_NONCOHERENT

	select HAS_TXX9_SERIAL

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_TXX9

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX49XX

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_KGDB

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select GPIO_TXX9

	help

	  This Toshiba board is based on the TX4938 processor. Say Y here to

	  support this machine type

config MACH_TX49XX

	bool "Toshiba TX49 series based machines"



config WR_PPMC

	bool "Wind River PPMC board"
@@ -694,8 +590,7 @@ source "arch/mips/lasat/Kconfig" 
source "arch/mips/pmc-sierra/Kconfig"

source "arch/mips/sgi-ip27/Kconfig"

source "arch/mips/sibyte/Kconfig"

source "arch/mips/tx4927/Kconfig"

source "arch/mips/tx4938/Kconfig"

source "arch/mips/txx9/Kconfig"

source "arch/mips/vr41xx/Kconfig"



endmenu
@@ -939,10 +834,6 @@ config PCI_GT64XXX_PCI0 
config NO_EXCEPT_FILL

	bool



config MIPS_TX3927

	bool

	select HAS_TXX9_SERIAL



config MIPS_RM9122

	bool

	select SERIAL_RM9000
@@ -979,6 +870,9 @@ config SGI_HAS_DS1286 
config SGI_HAS_INDYDOG

	bool



config SGI_HAS_HAL2

	bool



config SGI_HAS_SEEQ

	bool
@@ -2065,10 +1959,6 @@ source "fs/Kconfig.binfmt" 
config TRAD_SIGNALS

	bool



config BINFMT_IRIX

	bool "Include IRIX binary compatibility"

	depends on CPU_BIG_ENDIAN && 32BIT && BROKEN



config MIPS32_COMPAT

	bool "Kernel support for Linux/MIPS 32-bit binary compatibility"

	depends on 64BIT

arch/mips/Makefile

+16 −43
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


KBUILD_DEFCONFIG := ip22_defconfig



cflags-y :=

cflags-y := -ffunction-sections



#

# Select the object file format to substitute into the linker script.
@@ -304,36 +304,14 @@ core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/ 
load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000

cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote



#

# For all MIPS, Inc. eval boards

#

core-$(CONFIG_MIPS_BOARDS_GEN)	+= arch/mips/mips-boards/generic/



#

# MIPS Atlas board

#

core-$(CONFIG_MIPS_ATLAS)	+= arch/mips/mips-boards/atlas/

cflags-$(CONFIG_MIPS_ATLAS)	+= -Iinclude/asm-mips/mach-atlas

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

load-$(CONFIG_MIPS_ATLAS)	+= 0xffffffff80100000

all-$(CONFIG_MIPS_ATLAS)	:= vmlinux.bin



#

# MIPS Malta board

#

core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mips-boards/malta/

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

core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mti-malta/

cflags-$(CONFIG_MIPS_MALTA)	+= -Iinclude/asm-mips/mach-malta

load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000

all-$(CONFIG_MIPS_MALTA)	:= vmlinux.bin



#

# MIPS SEAD board

#

core-$(CONFIG_MIPS_SEAD)	+= arch/mips/mips-boards/sead/

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

load-$(CONFIG_MIPS_SEAD)	+= 0xffffffff80100000

all-$(CONFIG_MIPS_SEAD)		:= vmlinux.srec



#

# MIPS SIM

#
@@ -376,12 +354,6 @@ load-$(CONFIG_LASAT) += 0xffffffff80000000 
core-$(CONFIG_MACH_VR41XX)	+= arch/mips/vr41xx/common/

cflags-$(CONFIG_MACH_VR41XX)	+= -Iinclude/asm-mips/mach-vr41xx



#

# NEC VR4133

#

core-$(CONFIG_NEC_CMBVR4133)	+= arch/mips/vr41xx/nec-cmbvr4133/

load-$(CONFIG_NEC_CMBVR4133)	+= 0xffffffff80100000



#

# ZAO Networks Capcella (VR4131)

#
@@ -572,30 +544,31 @@ load-$(CONFIG_SNI_RM) += 0xffffffff80030000 
endif

all-$(CONFIG_SNI_RM)		:= vmlinux.ecoff



#

# Common TXx9

#

core-$(CONFIG_MACH_TX39XX)	+= arch/mips/txx9/generic/

cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx

load-$(CONFIG_MACH_TX39XX)	+= 0xffffffff80050000

core-$(CONFIG_MACH_TX49XX)	+= arch/mips/txx9/generic/

cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx

load-$(CONFIG_MACH_TX49XX)	+= 0xffffffff80100000



#

# Toshiba JMR-TX3927 board

#

core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/jmr3927/rbhma3100/ \

				   arch/mips/jmr3927/common/

cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927

load-$(CONFIG_TOSHIBA_JMR3927)	+= 0xffffffff80050000

core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/txx9/jmr3927/



#

# Toshiba RBTX4927 board or

# Toshiba RBTX4937 board

#

core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/toshiba_rbtx4927/

core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/common/

cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx

load-$(CONFIG_TOSHIBA_RBTX4927)	+= 0xffffffff80020000

core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/txx9/rbtx4927/



#

# Toshiba RBTX4938 board

#

core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/

core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/

cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx

load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000

core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/



cflags-y			+= -Iinclude/asm-mips/mach-generic

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

arch/mips/au1000/common/platform.c

+15 −14
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * warranty of any kind, whether express or implied.

 */



#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/init.h>
@@ -77,14 +78,14 @@ static struct resource au1xxx_usb_ohci_resources[] = { 
};



/* The dmamask must be set for OHCI to work */

static u64 ohci_dmamask = ~(u32)0;

static u64 ohci_dmamask = DMA_32BIT_MASK;



static struct platform_device au1xxx_usb_ohci_device = {

	.name		= "au1xxx-ohci",

	.id		= 0,

	.dev = {

		.dma_mask		= &ohci_dmamask,

		.coherent_dma_mask	= 0xffffffff,

		.coherent_dma_mask	= DMA_32BIT_MASK,

	},

	.num_resources	= ARRAY_SIZE(au1xxx_usb_ohci_resources),

	.resource	= au1xxx_usb_ohci_resources,
@@ -106,14 +107,14 @@ static struct resource au1100_lcd_resources[] = { 
	}

};



static u64 au1100_lcd_dmamask = ~(u32)0;

static u64 au1100_lcd_dmamask = DMA_32BIT_MASK;



static struct platform_device au1100_lcd_device = {

	.name           = "au1100-lcd",

	.id             = 0,

	.dev = {

		.dma_mask               = &au1100_lcd_dmamask,

		.coherent_dma_mask      = 0xffffffff,

		.coherent_dma_mask      = DMA_32BIT_MASK,

	},

	.num_resources  = ARRAY_SIZE(au1100_lcd_resources),

	.resource       = au1100_lcd_resources,
@@ -135,14 +136,14 @@ static struct resource au1xxx_usb_ehci_resources[] = { 
	},

};



static u64 ehci_dmamask = ~(u32)0;

static u64 ehci_dmamask = DMA_32BIT_MASK;



static struct platform_device au1xxx_usb_ehci_device = {

	.name		= "au1xxx-ehci",

	.id		= 0,

	.dev = {

		.dma_mask		= &ehci_dmamask,

		.coherent_dma_mask	= 0xffffffff,

		.coherent_dma_mask	= DMA_32BIT_MASK,

	},

	.num_resources	= ARRAY_SIZE(au1xxx_usb_ehci_resources),

	.resource	= au1xxx_usb_ehci_resources,
@@ -180,14 +181,14 @@ static struct resource au1xxx_mmc_resources[] = { 
	}

};



static u64 udc_dmamask = ~(u32)0;

static u64 udc_dmamask = DMA_32BIT_MASK;



static struct platform_device au1xxx_usb_gdt_device = {

	.name		= "au1xxx-udc",

	.id		= 0,

	.dev = {

		.dma_mask		= &udc_dmamask,

		.coherent_dma_mask	= 0xffffffff,

		.coherent_dma_mask	= DMA_32BIT_MASK,

	},

	.num_resources	= ARRAY_SIZE(au1xxx_usb_gdt_resources),

	.resource	= au1xxx_usb_gdt_resources,
@@ -207,14 +208,14 @@ static struct resource au1xxx_usb_otg_resources[] = { 
	},

};



static u64 uoc_dmamask = ~(u32)0;

static u64 uoc_dmamask = DMA_32BIT_MASK;



static struct platform_device au1xxx_usb_otg_device = {

	.name		= "au1xxx-uoc",

	.id		= 0,

	.dev = {

		.dma_mask		= &uoc_dmamask,

		.coherent_dma_mask	= 0xffffffff,

		.coherent_dma_mask	= DMA_32BIT_MASK,

	},

	.num_resources	= ARRAY_SIZE(au1xxx_usb_otg_resources),

	.resource	= au1xxx_usb_otg_resources,
@@ -233,27 +234,27 @@ static struct resource au1200_lcd_resources[] = { 
	}

};



static u64 au1200_lcd_dmamask = ~(u32)0;

static u64 au1200_lcd_dmamask = DMA_32BIT_MASK;



static struct platform_device au1200_lcd_device = {

	.name           = "au1200-lcd",

	.id             = 0,

	.dev = {

		.dma_mask               = &au1200_lcd_dmamask,

		.coherent_dma_mask      = 0xffffffff,

		.coherent_dma_mask      = DMA_32BIT_MASK,

	},

	.num_resources  = ARRAY_SIZE(au1200_lcd_resources),

	.resource       = au1200_lcd_resources,

};



static u64 au1xxx_mmc_dmamask =  ~(u32)0;

static u64 au1xxx_mmc_dmamask =  DMA_32BIT_MASK;



static struct platform_device au1xxx_mmc_device = {

	.name = "au1xxx-mmc",

	.id = 0,

	.dev = {

		.dma_mask               = &au1xxx_mmc_dmamask,

		.coherent_dma_mask      = 0xffffffff,

		.coherent_dma_mask      = DMA_32BIT_MASK,

	},

	.num_resources  = ARRAY_SIZE(au1xxx_mmc_resources),

	.resource       = au1xxx_mmc_resources,

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

+50 −1
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <mtd/mtd-abi.h>



static struct gpio_keys_button mtx1_gpio_button[] = {

	{
@@ -85,10 +88,56 @@ static struct platform_device mtx1_gpio_leds = { 
	}

};



static struct mtd_partition mtx1_mtd_partitions[] = {

	{

		.name	= "filesystem",

		.size	= 0x01C00000,

		.offset	= 0,

	},

	{

		.name	= "yamon",

		.size	= 0x00100000,

		.offset	= MTDPART_OFS_APPEND,

		.mask_flags = MTD_WRITEABLE,

	},

	{

		.name	= "kernel",

		.size	= 0x002c0000,

		.offset	= MTDPART_OFS_APPEND,

	},

	{

		.name	= "yamon env",

		.size	= 0x00040000,

		.offset	= MTDPART_OFS_APPEND,

	},

};



static struct physmap_flash_data mtx1_flash_data = {

	.width		= 4,

	.nr_parts	= 4,

	.parts		= mtx1_mtd_partitions,

};



static struct resource mtx1_mtd_resource = {

	.start	= 0x1e000000,

	.end	= 0x1fffffff,

	.flags	= IORESOURCE_MEM,

};



static struct platform_device mtx1_mtd = {

	.name		= "physmap-flash",

	.dev		= {

		.platform_data	= &mtx1_flash_data,

	},

	.num_resources	= 1,

	.resource	= &mtx1_mtd_resource,

};



static struct __initdata platform_device * mtx1_devs[] = {

	&mtx1_gpio_leds,

	&mtx1_wdt,

	&mtx1_button

	&mtx1_button,

	&mtx1_mtd,

};



static int __init mtx1_register_devices(void)

arch/mips/au1000/pb1200/platform.c

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/platform_device.h>
@@ -36,14 +37,14 @@ static struct resource ide_resources[] = { 
	}

};



static u64 ide_dmamask = ~(u32)0;

static u64 ide_dmamask = DMA_32BIT_MASK;



static struct platform_device ide_device = {

	.name		= "au1200-ide",

	.id		= 0,

	.dev = {

		.dma_mask 		= &ide_dmamask,

		.coherent_dma_mask	= 0xffffffff,

		.coherent_dma_mask	= DMA_32BIT_MASK,

	},

	.num_resources	= ARRAY_SIZE(ide_resources),

	.resource	= ide_resources

CRA Git | Maintained and supported by SUSTech CRA and CCSE