X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/fb16d85a72f5412298d96123b22018e86807ff44..07537ed74301efdc7c26faf1acb4aa175c463696:/target/linux/brcm63xx/files/drivers/spi/bcm63xx_spi.c?ds=sidebyside

diff --git a/target/linux/brcm63xx/files/drivers/spi/bcm63xx_spi.c b/target/linux/brcm63xx/files/drivers/spi/bcm63xx_spi.c
index 1a83a7412..a20de302d 100644
--- a/target/linux/brcm63xx/files/drivers/spi/bcm63xx_spi.c
+++ b/target/linux/brcm63xx/files/drivers/spi/bcm63xx_spi.c
@@ -237,7 +237,7 @@ static irqreturn_t bcm63xx_spi_interrupt(int irq, void *dev_id)
 
 	/* Read interupts and clear them immediately */
 	intr = bcm_spi_readb(bs->regs, SPI_INT_STATUS);
-	bcm_spi_writeb(SPI_INTR_CLEAR_ALL, bs->regs, SPI_INT_STATUS);
+	bcm_spi_writeb(SPI_INTR_CLEAR_ALL, bs->regs, SPI_INT_MASK);
 
 	/* A tansfer completed */
 	if (intr & SPI_INTR_CMD_DONE) {
@@ -335,7 +335,7 @@ static int __init bcm63xx_spi_probe(struct platform_device *pdev)
 	bs->fifo_size = pdata->fifo_size;
 
 	ret = request_irq(irq, bcm63xx_spi_interrupt, 0,
-				pdev->dev.bus_id, master);
+				pdev->name, master);
 	if (ret) {
 		printk(KERN_ERR PFX " unable to request irq\n");
 		goto out_unmap;
@@ -347,7 +347,6 @@ static int __init bcm63xx_spi_probe(struct platform_device *pdev)
 	
 	/* Initialize hardware */
 	clk_enable(bs->clk);
-	bcm_spi_writew(SPI_CMD_HARD_RESET, bs->regs, SPI_CMD);
 	bcm_spi_writeb(SPI_INTR_CLEAR_ALL, bs->regs, SPI_INT_MASK);
 	
 	dev_info(&pdev->dev, " at 0x%08x (irq %d, FIFOs size %d) v%s\n",