summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/files/arch/mips/bcm63xx
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-08 12:13:52 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-08 12:13:52 +0000
commita5c53df418e30aeb198fc8a4bbe091ef0177d8ef (patch)
treeff8aa970719baa0c0f8b30a3c8f789d4604b50de /target/linux/brcm63xx/files/arch/mips/bcm63xx
parent128eb3aeef1ae53b1a87fbc05b4e3b92f1624c5a (diff)
[brcm63xx] fix some SPI register definitions and platform-device registration code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14787 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/files/arch/mips/bcm63xx')
-rw-r--r--target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c
index 4aea088d2d..5d7d4c3a43 100644
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c
@@ -9,8 +9,10 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
+
#include <bcm63xx_cpu.h>
#include <bcm63xx_dev_spi.h>
+#include <bcm63xx_regs.h>
static struct resource spi_resources[] = {
{
@@ -35,7 +37,9 @@ static struct platform_device bcm63xx_spi_device = {
.id = 0,
.num_resources = ARRAY_SIZE(spi_resources),
.resource = spi_resources,
- .dev.pdata = &spi_pdata;
+ .dev = {
+ .platform_data = &spi_pdata,
+ },
};
int __init bcm63xx_spi_register(void)
@@ -46,12 +50,12 @@ int __init bcm63xx_spi_register(void)
spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
/* Fill in platform data */
- if (CPU_IS_BCM6338() || CPU_IS_BCM6348()) {
+ if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {
spi_pdata.msg_fifo_size = SPI_BCM_6338_SPI_MSG_DATA_SIZE;
spi_pdata.rx_fifo_size = SPI_BCM_6338_SPI_RX_DATA_SIZE;
}
- if (CPU_IS_BCM6358()) {
+ if (BCMCPU_IS_6358()) {
spi_pdata.msg_fifo_size = SPI_BCM_6358_SPI_MSG_DATA_SIZE;
spi_pdata.rx_fifo_size = SPI_BCM_6358_SPI_RX_DATA_SIZE;
}