Commit a5ef3f7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS update from Ralf Baechle:
 "Cleanups and fixes for breakage that occured earlier during this merge
  phase.  Also a few patches that didn't make the first pull request.
  Of those is the Alchemy work that merges code for many of the SOCs and
  evaluation boards thus among other code shrinkage, reduces the number
  of MIPS defconfigs by 5."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (22 commits)
  MIPS: SNI: Switch RM400 serial to SCCNXP driver
  MIPS: Remove unused empty_bad_pmd_table[] declaration.
  MIPS: MT: Remove kspd.
  MIPS: Malta: Fix section mismatch.
  MIPS: asm-offset.c: Delete unused irq_cpustat_t struct offsets.
  MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.
  MIPS: Alchemy: merge PB1550 support into DB1550 code
  MIPS: Alchemy: Single kernel for DB1200/1300/1550
  MIPS: Optimize TLB refill for RI/XI configurations.
  MIPS: proc: Cleanup printing of ASEs.
  MIPS: Hardwire detection of DSP ASE Rev 2 for systems, as required.
  MIPS: Add detection of DSP ASE Revision 2.
  MIPS: Optimize pgd_init and pmd_init
  MIPS: perf: Add perf functionality for BMIPS5000
  MIPS: perf: Split the Kconfig option CONFIG_MIPS_MT_SMP
  MIPS: perf: Remove unnecessary #ifdef
  MIPS: perf: Add cpu feature bit for PCI (performance counter interrupt)
  MIPS: perf: Change the "mips_perf_event" table unsupported indicator.
  MIPS: Align swapper_pg_dir to 64K for better TLB Refill code.
  vmlinux.lds.h: Allow architectures to add sections to the front of .bss
  ...
parents d25282d1 35bafbee

arch/mips/Kconfig

+4 −10
Original line number Diff line number Diff line
@@ -1931,6 +1931,7 @@ config MIPS_MT_SMP 
	select SYS_SUPPORTS_SCHED_SMT if SMP

	select SYS_SUPPORTS_SMP

	select SMP_UP

	select MIPS_PERF_SHARED_TC_COUNTERS

	help

	  This is a kernel model which is known a VSMP but lately has been

	  marketesed into SMVP.
@@ -2041,16 +2042,6 @@ config MIPS_VPE_APSP_API 
	depends on MIPS_VPE_LOADER

	help



config MIPS_APSP_KSPD

	bool "Enable KSPD"

	depends on MIPS_VPE_APSP_API

	default y

	help

	  KSPD is a kernel daemon that accepts syscall requests from the SP

	  side, actions them and returns the results. It also handles the

	  "exit" syscall notifying other kernel modules the SP program is

	  exiting.  You probably want to say yes here.



config MIPS_CMP

	bool "MIPS CMP framework support"

	depends on SYS_SUPPORTS_MIPS_CMP
@@ -2280,6 +2271,9 @@ config NR_CPUS 
	  performance should round up your number of processors to the next

	  power of two.



config MIPS_PERF_SHARED_TC_COUNTERS

	bool



#

# Timer Interrupt Frequency Configuration

#

arch/mips/alchemy/Kconfig

+4 −46
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ config MIPS_MTX1 
	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1000

	bool "Alchemy DB1000/DB1500/DB1100 boards"

	bool "Alchemy DB1000/DB1500/DB1100 PB1500/1100 boards"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	select HW_HAS_PCI
@@ -36,57 +36,15 @@ config MIPS_DB1000 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1200

	bool "Alchemy DB1200/PB1200 board"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_COHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1300

	bool "NetLogic DB1300 board"

	select ALCHEMY_GPIOINT_AU1300

	select DMA_COHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_DB1550

	bool "Alchemy DB1550 board"

	select ALCHEMY_GPIOINT_AU1000

config MIPS_DB1235

	bool "Alchemy DB1200/PB1200/DB1300/DB1550/PB1550 boards"

	select ARCH_REQUIRE_GPIOLIB

	select HW_HAS_PCI

	select DMA_COHERENT

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1100

	bool "Alchemy PB1100 board"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1500

	bool "Alchemy PB1500 board"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_PB1550

	bool "Alchemy PB1550 board"

	select ALCHEMY_GPIOINT_AU1000

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_DISABLE_OBSOLETE_IDE

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK



config MIPS_XXS1500

	bool "MyCable XXS1500 board"

	select DMA_NONCOHERENT

arch/mips/alchemy/Platform

+4 −18
Original line number Diff line number Diff line
@@ -30,25 +30,11 @@ cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 
load-$(CONFIG_MIPS_DB1000)	+= 0xffffffff80100000



#

# AMD Alchemy Db1550 eval board

# AMD Alchemy Db1200/Pb1200/Db1550/Db1300 eval boards

#

platform-$(CONFIG_MIPS_DB1550)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1550)	+= 0xffffffff80100000



#

# AMD Alchemy Db1200/Pb1200 eval boards

#

platform-$(CONFIG_MIPS_DB1200)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1200)	+= 0xffffffff80100000



#

# NetLogic DBAu1300 development platform

#

platform-$(CONFIG_MIPS_DB1300)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1300)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1300)	+= 0xffffffff80100000

platform-$(CONFIG_MIPS_DB1235)	+= alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1235)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1235)	+= 0xffffffff80100000



#

# 4G-Systems MTX-1 "MeshCube" wireless router

arch/mips/alchemy/devboards/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -4,10 +4,5 @@ 


obj-y += bcsr.o platform.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_MIPS_PB1100)	+= pb1100.o

obj-$(CONFIG_MIPS_PB1500)	+= pb1500.o

obj-$(CONFIG_MIPS_PB1550)	+= pb1550.o

obj-$(CONFIG_MIPS_DB1000)	+= db1000.o

obj-$(CONFIG_MIPS_DB1200)	+= db1200.o

obj-$(CONFIG_MIPS_DB1300)	+= db1300.o

obj-$(CONFIG_MIPS_DB1550)	+= db1550.o
 
obj-$(CONFIG_MIPS_DB1235)	+= db1235.o db1200.o db1300.o db1550.o

arch/mips/alchemy/devboards/db1000.c

+92 −28
Original line number Diff line number Diff line 
/*

 * DBAu1000/1500/1100 board support

 * DBAu1000/1500/1100 PBAu1100/1500 board support

 *

 * Copyright 2000, 2008 MontaVista Software Inc.

 * Author: MontaVista Software, Inc. <source@mvista.com>
@@ -52,6 +52,11 @@ static const char *board_type_str(void) 
		return "DB1500";

	case BCSR_WHOAMI_DB1100:

		return "DB1100";

	case BCSR_WHOAMI_PB1500:

	case BCSR_WHOAMI_PB1500R2:

		return "PB1500";

	case BCSR_WHOAMI_PB1100:

		return "PB1100";

	default:

		return "(unknown)";

	}
@@ -111,7 +116,9 @@ static struct platform_device db1500_pci_host_dev = { 


static int __init db1500_pci_init(void)

{

	if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1500)

	int id = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));

	if ((id == BCSR_WHOAMI_DB1500) || (id == BCSR_WHOAMI_PB1500) ||

	    (id == BCSR_WHOAMI_PB1500R2))

		return platform_device_register(&db1500_pci_host_dev);

	return 0;

}
@@ -199,27 +206,37 @@ static irqreturn_t db1100_mmc_cd(int irq, void *ptr) 


static int db1100_mmc_cd_setup(void *mmc_host, int en)

{

	int ret = 0;

	int ret = 0, irq;



	if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)

		irq = AU1100_GPIO19_INT;

	else

		irq = AU1100_GPIO14_INT;	/* PB1100 SD0 CD# */



	if (en) {

		irq_set_irq_type(AU1100_GPIO19_INT, IRQ_TYPE_EDGE_BOTH);

		ret = request_irq(AU1100_GPIO19_INT, db1100_mmc_cd, 0,

		irq_set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);

		ret = request_irq(irq, db1100_mmc_cd, 0,

				  "sd0_cd", mmc_host);

	} else

		free_irq(AU1100_GPIO19_INT, mmc_host);

		free_irq(irq, mmc_host);

	return ret;

}



static int db1100_mmc1_cd_setup(void *mmc_host, int en)

{

	int ret = 0;

	int ret = 0, irq;



	if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)

		irq = AU1100_GPIO20_INT;

	else

		irq = AU1100_GPIO15_INT;	/* PB1100 SD1 CD# */



	if (en) {

		irq_set_irq_type(AU1100_GPIO20_INT, IRQ_TYPE_EDGE_BOTH);

		ret = request_irq(AU1100_GPIO20_INT, db1100_mmc_cd, 0,

		irq_set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);

		ret = request_irq(irq, db1100_mmc_cd, 0,

				  "sd1_cd", mmc_host);

	} else

		free_irq(AU1100_GPIO20_INT, mmc_host);

		free_irq(irq, mmc_host);

	return ret;

}
@@ -236,11 +253,18 @@ static int db1100_mmc_card_inserted(void *mmc_host) 


static void db1100_mmc_set_power(void *mmc_host, int state)

{

	int bit;



	if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)

		bit = BCSR_BOARD_SD0PWR;

	else

		bit = BCSR_BOARD_PB1100_SD0PWR;



	if (state) {

		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD0PWR);

		bcsr_mod(BCSR_BOARD, 0, bit);

		msleep(400);	/* stabilization time */

	} else

		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD0PWR, 0);

		bcsr_mod(BCSR_BOARD, bit, 0);

}



static void db1100_mmcled_set(struct led_classdev *led, enum led_brightness b)
@@ -267,11 +291,18 @@ static int db1100_mmc1_card_inserted(void *mmc_host) 


static void db1100_mmc1_set_power(void *mmc_host, int state)

{

	int bit;



	if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)

		bit = BCSR_BOARD_SD1PWR;

	else

		bit = BCSR_BOARD_PB1100_SD1PWR;



	if (state) {

		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD1PWR);

		bcsr_mod(BCSR_BOARD, 0, bit);

		msleep(400);	/* stabilization time */

	} else

		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD1PWR, 0);

		bcsr_mod(BCSR_BOARD, bit, 0);

}



static void db1100_mmc1led_set(struct led_classdev *led, enum led_brightness b)
@@ -480,13 +511,12 @@ static struct platform_device *db1100_devs[] = { 
	&db1100_mmc0_dev,

	&db1100_mmc1_dev,

	&db1000_irda_dev,

	&db1100_spi_dev,

};



static int __init db1000_dev_init(void)

{

	int board = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));

	int c0, c1, d0, d1, s0, s1;

	int c0, c1, d0, d1, s0, s1, flashsize = 32,  twosocks = 1;

	unsigned long pfc;



	if (board == BCSR_WHOAMI_DB1500) {
@@ -522,6 +552,7 @@ static int __init db1000_dev_init(void) 
					ARRAY_SIZE(db1100_spi_info));



		platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));

		platform_device_register(&db1100_spi_dev);

	} else if (board == BCSR_WHOAMI_DB1000) {

		c0 = AU1000_GPIO2_INT;

		c1 = AU1000_GPIO5_INT;
@@ -530,15 +561,42 @@ static int __init db1000_dev_init(void) 
		s0 = AU1000_GPIO1_INT;

		s1 = AU1000_GPIO4_INT;

		platform_add_devices(db1000_devs, ARRAY_SIZE(db1000_devs));

	} else if ((board == BCSR_WHOAMI_PB1500) ||

		   (board == BCSR_WHOAMI_PB1500R2)) {

		c0 = AU1500_GPIO203_INT;

		d0 = AU1500_GPIO201_INT;

		s0 = AU1500_GPIO202_INT;

		twosocks = 0;

		flashsize = 64;

		/* RTC and daughtercard irqs */

		irq_set_irq_type(AU1500_GPIO204_INT, IRQ_TYPE_LEVEL_LOW);

		irq_set_irq_type(AU1500_GPIO205_INT, IRQ_TYPE_LEVEL_LOW);

		/* EPSON S1D13806 0x1b000000

		 * SRAM 1MB/2MB   0x1a000000

		 * DS1693 RTC	  0x0c000000

		 */

	} else if (board == BCSR_WHOAMI_PB1100) {

		c0 = AU1100_GPIO11_INT;

		d0 = AU1100_GPIO9_INT;

		s0 = AU1100_GPIO10_INT;

		twosocks = 0;

		flashsize = 64;

		/* pendown, rtc, daughtercard irqs */

		irq_set_irq_type(AU1100_GPIO8_INT, IRQ_TYPE_LEVEL_LOW);

		irq_set_irq_type(AU1100_GPIO12_INT, IRQ_TYPE_LEVEL_LOW);

		irq_set_irq_type(AU1100_GPIO13_INT, IRQ_TYPE_LEVEL_LOW);

		/* EPSON S1D13806 0x1b000000

		 * SRAM 1MB/2MB   0x1a000000

		 * DiskOnChip	  0x0d000000

		 * DS1693 RTC	  0x0c000000

		 */

		platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));

	} else

		return 0; /* unknown board, no further dev setup to do */



	irq_set_irq_type(d0, IRQ_TYPE_EDGE_BOTH);

	irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);

	irq_set_irq_type(c0, IRQ_TYPE_LEVEL_LOW);

	irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);

	irq_set_irq_type(s0, IRQ_TYPE_LEVEL_LOW);

	irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);



	db1x_register_pcmcia_socket(

		AU1000_PCMCIA_ATTR_PHYS_ADDR,
@@ -549,6 +607,11 @@ static int __init db1000_dev_init(void) 
		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,

		c0, d0,	/*s0*/0, 0, 0);



	if (twosocks) {

		irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);

		irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);

		irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);



		db1x_register_pcmcia_socket(

			AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,

			AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
@@ -557,9 +620,10 @@ static int __init db1000_dev_init(void) 
			AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,

			AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,

			c1, d1,	/*s1*/0, 0, 1);

	}



	platform_add_devices(db1x00_devs, ARRAY_SIZE(db1x00_devs));

	db1x_register_norflash(32 << 20, 4 /* 32bit */, F_SWAPPED);

	db1x_register_norflash(flashsize << 20, 4 /* 32bit */, F_SWAPPED);

	return 0;

}

device_initcall(db1000_dev_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE