Commit e399835c 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: Avoid spurious make includecheck message
  MIPS: VPE: Get rid of BKL.
  MIPS: VPE: Fix build after the credential changes a while ago.
  MIPS: Excite: Get rid of BKL.
  MIPS: Sibyte: Get rid of BKL.
  MIPS: BCM63xx: Add PCMCIA & Cardbus support.
  MIPS: MSP71xx: request_irq() failure ignored in msp_pcibios_config_access()
  MIPS: Decrease size of au1xxx_dbdma_pm_regs[][]
  MIPS: SMP: Inline arch_send_call_function_{single_ipi,ipi_mask}
  MIPS: SMP: Fix build.
  MIPS: MIPSxx SC: Avoid destructive invalidation on partial L2 cachelines.
  MIPS: Sibyte: Fix compilation error.
  MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict.
  MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART.
  MIPS: Loongson2: Fix typo "enalbe" -> "enable"
  MIPS: SMTC: Remove duplicate structure field initialization
  MIPS: Remove duplicated #include
  MIPS: BCM63xx: Remove duplicated #include
parents 9abf47f1 da3a7a2b

arch/mips/alchemy/common/dbdma.c

+3 −5
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static dbdev_tab_t dbdev_tab[] = { 
#define DBDEV_TAB_SIZE	ARRAY_SIZE(dbdev_tab)



#ifdef CONFIG_PM

static u32 au1xxx_dbdma_pm_regs[NUM_DBDMA_CHANS + 1][8];

static u32 au1xxx_dbdma_pm_regs[NUM_DBDMA_CHANS + 1][6];

#endif
@@ -993,14 +993,13 @@ void au1xxx_dbdma_suspend(void) 
	au1xxx_dbdma_pm_regs[0][3] = au_readl(addr + 0x0c);



	/* save channel configurations */

	for (i = 1, addr = DDMA_CHANNEL_BASE; i < NUM_DBDMA_CHANS; i++) {

	for (i = 1, addr = DDMA_CHANNEL_BASE; i <= NUM_DBDMA_CHANS; i++) {

		au1xxx_dbdma_pm_regs[i][0] = au_readl(addr + 0x00);

		au1xxx_dbdma_pm_regs[i][1] = au_readl(addr + 0x04);

		au1xxx_dbdma_pm_regs[i][2] = au_readl(addr + 0x08);

		au1xxx_dbdma_pm_regs[i][3] = au_readl(addr + 0x0c);

		au1xxx_dbdma_pm_regs[i][4] = au_readl(addr + 0x10);

		au1xxx_dbdma_pm_regs[i][5] = au_readl(addr + 0x14);

		au1xxx_dbdma_pm_regs[i][6] = au_readl(addr + 0x18);



		/* halt channel */

		au_writel(au1xxx_dbdma_pm_regs[i][0] & ~1, addr + 0x00);
@@ -1027,14 +1026,13 @@ void au1xxx_dbdma_resume(void) 
	au_writel(au1xxx_dbdma_pm_regs[0][3], addr + 0x0c);



	/* restore channel configurations */

	for (i = 1, addr = DDMA_CHANNEL_BASE; i < NUM_DBDMA_CHANS; i++) {

	for (i = 1, addr = DDMA_CHANNEL_BASE; i <= NUM_DBDMA_CHANS; i++) {

		au_writel(au1xxx_dbdma_pm_regs[i][0], addr + 0x00);

		au_writel(au1xxx_dbdma_pm_regs[i][1], addr + 0x04);

		au_writel(au1xxx_dbdma_pm_regs[i][2], addr + 0x08);

		au_writel(au1xxx_dbdma_pm_regs[i][3], addr + 0x0c);

		au_writel(au1xxx_dbdma_pm_regs[i][4], addr + 0x10);

		au_writel(au1xxx_dbdma_pm_regs[i][5], addr + 0x14);

		au_writel(au1xxx_dbdma_pm_regs[i][6], addr + 0x18);

		au_sync();

		addr += 0x100;	/* next channel base */

	}

arch/mips/basler/excite/excite_iodev.c

+0 −2
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ static int iodev_open(struct inode *i, struct file *f) 
{

	int ret;



	lock_kernel();

	ret = request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,

			   iodev_name, &miscdev);

	unlock_kernel();



	return ret;

}

arch/mips/bcm63xx/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y		+= clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \

		   dev-dsp.o dev-enet.o

		   dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o

obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o



obj-y		+= boards/

arch/mips/bcm63xx/boards/board_bcm963xx.c

+7 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
#include <bcm63xx_cpu.h>

#include <bcm63xx_regs.h>

#include <bcm63xx_io.h>

#include <bcm63xx_board.h>

#include <bcm63xx_dev_pci.h>

#include <bcm63xx_dev_enet.h>

#include <bcm63xx_dev_dsp.h>

#include <bcm63xx_dev_pcmcia.h>

#include <bcm63xx_dev_uart.h>

#include <board_bcm963xx.h>



#define PFX	"board_bcm963xx: "
@@ -793,6 +794,11 @@ int __init board_register_devices(void) 
{

	u32 val;



	bcm63xx_uart_register();



	if (board.has_pccard)

		bcm63xx_pcmcia_register();



	if (board.has_enet0 &&

	    !board_get_mac_address(board.enet0.mac_addr))

		bcm63xx_enet_register(0, &board.enet0);

arch/mips/bcm63xx/dev-pcmcia.c

0 → 100644
+144 −0
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>

 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <asm/bootinfo.h>

#include <linux/platform_device.h>

#include <bcm63xx_cs.h>

#include <bcm63xx_cpu.h>

#include <bcm63xx_dev_pcmcia.h>

#include <bcm63xx_io.h>

#include <bcm63xx_regs.h>



static struct resource pcmcia_resources[] = {

	/* pcmcia registers */

	{

		/* start & end filled at runtime */

		.flags		= IORESOURCE_MEM,

	},



	/* pcmcia memory zone resources */

	{

		.start		= BCM_PCMCIA_COMMON_BASE_PA,

		.end		= BCM_PCMCIA_COMMON_END_PA,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= BCM_PCMCIA_ATTR_BASE_PA,

		.end		= BCM_PCMCIA_ATTR_END_PA,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= BCM_PCMCIA_IO_BASE_PA,

		.end		= BCM_PCMCIA_IO_END_PA,

		.flags		= IORESOURCE_MEM,

	},



	/* PCMCIA irq */

	{

		/* start filled at runtime */

		.flags		= IORESOURCE_IRQ,

	},



	/* declare PCMCIA IO resource also */

	{

		.start		= BCM_PCMCIA_IO_BASE_PA,

		.end		= BCM_PCMCIA_IO_END_PA,

		.flags		= IORESOURCE_IO,

	},

};



static struct bcm63xx_pcmcia_platform_data pd;



static struct platform_device bcm63xx_pcmcia_device = {

	.name		= "bcm63xx_pcmcia",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(pcmcia_resources),

	.resource	= pcmcia_resources,

	.dev		= {

		.platform_data = &pd,

	},

};



static int __init config_pcmcia_cs(unsigned int cs,

				   u32 base, unsigned int size)

{

	int ret;



	ret = bcm63xx_set_cs_status(cs, 0);

	if (!ret)

		ret = bcm63xx_set_cs_base(cs, base, size);

	if (!ret)

		ret = bcm63xx_set_cs_status(cs, 1);

	return ret;

}



static const __initdata struct {

	unsigned int	cs;

	unsigned int	base;

	unsigned int	size;

} pcmcia_cs[3] = {

	{

		.cs	= MPI_CS_PCMCIA_COMMON,

		.base	= BCM_PCMCIA_COMMON_BASE_PA,

		.size	= BCM_PCMCIA_COMMON_SIZE

	},

	{

		.cs	= MPI_CS_PCMCIA_ATTR,

		.base	= BCM_PCMCIA_ATTR_BASE_PA,

		.size	= BCM_PCMCIA_ATTR_SIZE

	},

	{

		.cs	= MPI_CS_PCMCIA_IO,

		.base	= BCM_PCMCIA_IO_BASE_PA,

		.size	= BCM_PCMCIA_IO_SIZE

	},

};



int __init bcm63xx_pcmcia_register(void)

{

	int ret, i;



	if (!BCMCPU_IS_6348() && !BCMCPU_IS_6358())

		return 0;



	/* use correct pcmcia ready gpio depending on processor */

	switch (bcm63xx_get_cpu_id()) {

	case BCM6348_CPU_ID:

		pd.ready_gpio = 22;

		break;



	case BCM6358_CPU_ID:

		pd.ready_gpio = 18;

		break;



	default:

		return -ENODEV;

	}



	pcmcia_resources[0].start = bcm63xx_regset_address(RSET_PCMCIA);

	pcmcia_resources[0].end = pcmcia_resources[0].start +

		RSET_PCMCIA_SIZE - 1;

	pcmcia_resources[4].start = bcm63xx_get_irq_number(IRQ_PCMCIA);



	/* configure pcmcia chip selects */

	for (i = 0; i < 3; i++) {

		ret = config_pcmcia_cs(pcmcia_cs[i].cs,

				       pcmcia_cs[i].base,

				       pcmcia_cs[i].size);

		if (ret)

			goto out_err;

	}



	return platform_device_register(&bcm63xx_pcmcia_device);



out_err:

	printk(KERN_ERR "unable to set pcmcia chip select\n");

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE