diff options
Diffstat (limited to 'target')
4 files changed, 26 insertions, 20 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 4aea088d2..5d7d4c3a4 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; } diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h index be9da2eee..1e1b124d7 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h @@ -396,7 +396,7 @@ switch (reg) { case SPI_MSG_DATA: return SPI_BCM_6358_SPI_MSG_DATA; case SPI_RX_DATA: - return SPI_BCM_6358_SPI_RX_FIFO; + return SPI_BCM_6358_SPI_RX_DATA; } #endif #endif diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_spi.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_spi.h index bd47676a4..879580fc9 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_spi.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_spi.h @@ -3,7 +3,7 @@ #include <linux/types.h> -int bcm63xx_spi_register(void); +int __init bcm63xx_spi_register(void); struct bcm63xx_spi_pdata { unsigned int msg_fifo_size; diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h index f3a5d0a7c..6323e45dd 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h @@ -794,8 +794,8 @@ #define SPI_BCM_6358_SPI_MSG_DATA 0x02 #define SPI_BCM_6358_SPI_MSG_DATA_SIZE 0x21e -#define SPI_BCM_6358_SPI_RX_FIFO 0x400 -#define SPI_BCM_6358_SPI_RX_FIFO_SIZE 0x220 +#define SPI_BCM_6358_SPI_RX_DATA 0x400 +#define SPI_BCM_6358_SPI_RX_DATA_SIZE 0x220 #define SPI_BCM_6358_SPI_CMD 0x700 /* 16-bits register */ @@ -815,17 +815,17 @@ /* Shared SPI definitions */ /* Message configuration */ -#define SPI_FD_RW 0 -#define SPI_HD_W 1 -#define SPI_HD_R 2 +#define SPI_FD_RW 0x00 +#define SPI_HD_W 0x01 +#define SPI_HD_R 0x02 #define SPI_BYTE_CNT_SHIFT 0 #define SPI_MSG_TYPE_SHIFT 14 /* Command */ -#define SPI_CMD_NOOP 0 -#define SPI_CMD_SOFT_RESET 1 -#define SPI_CMD_HARD_RESET 2 -#define SPI_CMD_START_IMMEDIATE 3 +#define SPI_CMD_NOOP 0x01 +#define SPI_CMD_SOFT_RESET 0x02 +#define SPI_CMD_HARD_RESET 0x04 +#define SPI_CMD_START_IMMEDIATE 0x08 #define SPI_CMD_COMMAND_SHIFT 0 #define SPI_CMD_COMMAND_MASK 0x000f #define SPI_CMD_DEVICE_ID_SHIFT 4 @@ -851,12 +851,14 @@ #define SPI_SERIAL_BUSY 0x08 /* Clock configuration */ -#define SPI_CLK_0_391MHZ 1 -#define SPI_CLK_0_781MHZ 2 /* default */ -#define SPI_CLK_1_563MHZ 3 -#define SPI_CLK_3_125MHZ 4 -#define SPI_CLK_6_250MHZ 5 -#define SPI_CLK_12_50MHZ 6 +#define SPI_CLK_20MHZ 0x00 +#define SPI_CLK_0_391MHZ 0x01 +#define SPI_CLK_0_781MHZ 0x02 /* default */ +#define SPI_CLK_1_563MHZ 0x03 +#define SPI_CLK_3_125MHZ 0x04 +#define SPI_CLK_6_250MHZ 0x05 +#define SPI_CLK_12_50MHZ 0x06 +#define SPI_CLK_25MHZ 0x07 #define SPI_CLK_MASK 0x07 #define SPI_SSOFFTIME_MASK 0x38 #define SPI_SSOFFTIME_SHIFT 3 |