mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

spi/bcm63xx: move message control word description to register offsets

Browse source 
Make the message control word parameters part of the register offsets
array so we have them all in one struct.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jonas Gorski 2015-10-12 12:24:22 +02:00 committed by Mark Brown
parent 682b5280bf
commit f13a5e8a85
3 changed files with 12 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/mips/bcm63xx/dev-spi.c
View file

@ -53,19 +53,11 @@ static struct resource spi_resources[] = {
}, },
}; };
static struct bcm63xx_spi_pdata spi_pdata = {
.bus_num = 0,
.num_chipselect = 8,
};
static struct platform_device bcm63xx_spi_device = { static struct platform_device bcm63xx_spi_device = {
.name = "bcm63xx-spi", .name = "bcm63xx-spi",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(spi_resources), .num_resources = ARRAY_SIZE(spi_resources),
.resource = spi_resources, .resource = spi_resources,
.dev = {
.platform_data = &spi_pdata,
},
}; };
int __init bcm63xx_spi_register(void) int __init bcm63xx_spi_register(void)
@ -77,20 +69,12 @@ int __init bcm63xx_spi_register(void)
spi_resources[0].end = spi_resources[0].start; spi_resources[0].end = spi_resources[0].start;
spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI); spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) { if (BCMCPU_IS_6338() || BCMCPU_IS_6348())
spi_resources[0].end += BCM_6348_RSET_SPI_SIZE - 1; spi_resources[0].end += BCM_6348_RSET_SPI_SIZE - 1;
spi_pdata.fifo_size = SPI_6348_MSG_DATA_SIZE;
spi_pdata.msg_type_shift = SPI_6348_MSG_TYPE_SHIFT;
spi_pdata.msg_ctl_width = SPI_6348_MSG_CTL_WIDTH;
}
if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6362() || if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6362() ||
BCMCPU_IS_6368()) { BCMCPU_IS_6368())
spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1; spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;
spi_pdata.fifo_size = SPI_6358_MSG_DATA_SIZE;
spi_pdata.msg_type_shift = SPI_6358_MSG_TYPE_SHIFT;
spi_pdata.msg_ctl_width = SPI_6358_MSG_CTL_WIDTH;
}
bcm63xx_spi_regs_init(); bcm63xx_spi_regs_init();

16
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
View file

@ -7,14 +7,6 @@
int __init bcm63xx_spi_register(void); int __init bcm63xx_spi_register(void);
struct bcm63xx_spi_pdata {
unsigned int fifo_size;
unsigned int msg_type_shift;
unsigned int msg_ctl_width;
int bus_num;
int num_chipselect;
};
enum bcm63xx_regs_spi { enum bcm63xx_regs_spi {
SPI_CMD, SPI_CMD,
SPI_INT_STATUS, SPI_INT_STATUS,
@ -28,6 +20,9 @@ enum bcm63xx_regs_spi {
SPI_MSG_CTL, SPI_MSG_CTL,
SPI_MSG_DATA, SPI_MSG_DATA,
SPI_RX_DATA, SPI_RX_DATA,
SPI_MSG_TYPE_SHIFT,
SPI_MSG_CTL_WIDTH,
SPI_MSG_DATA_SIZE,
}; };
#define __GEN_SPI_REGS_TABLE(__cpu) \ #define __GEN_SPI_REGS_TABLE(__cpu) \
@ -42,7 +37,10 @@ enum bcm63xx_regs_spi {
[SPI_RX_TAIL] = SPI_## __cpu ##_RX_TAIL, \ [SPI_RX_TAIL] = SPI_## __cpu ##_RX_TAIL, \
[SPI_MSG_CTL] = SPI_## __cpu ##_MSG_CTL, \ [SPI_MSG_CTL] = SPI_## __cpu ##_MSG_CTL, \
[SPI_MSG_DATA] = SPI_## __cpu ##_MSG_DATA, \ [SPI_MSG_DATA] = SPI_## __cpu ##_MSG_DATA, \
[SPI_RX_DATA] = SPI_## __cpu ##_RX_DATA, [SPI_RX_DATA] = SPI_## __cpu ##_RX_DATA, \
[SPI_MSG_TYPE_SHIFT] = SPI_## __cpu ##_MSG_TYPE_SHIFT, \
[SPI_MSG_CTL_WIDTH] = SPI_## __cpu ##_MSG_CTL_WIDTH, \
[SPI_MSG_DATA_SIZE] = SPI_## __cpu ##_MSG_DATA_SIZE,
static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg) static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)
{ {

7
drivers/spi/spi-bcm63xx.c
View file

@ -329,7 +329,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
{ {
struct resource *r; struct resource *r;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct bcm63xx_spi_pdata *pdata = dev_get_platdata(&pdev->dev);
int irq; int irq;
struct spi_master *master; struct spi_master *master;
struct clk *clk; struct clk *clk;
@ -369,7 +368,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
bs->irq = irq; bs->irq = irq;
bs->clk = clk; bs->clk = clk;
bs->fifo_size = pdata->fifo_size; bs->fifo_size = bcm63xx_spireg(SPI_MSG_DATA_SIZE);
ret = devm_request_irq(&pdev->dev, irq, bcm63xx_spi_interrupt, 0, ret = devm_request_irq(&pdev->dev, irq, bcm63xx_spi_interrupt, 0,
pdev->name, master); pdev->name, master);
@ -384,8 +383,8 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
master->mode_bits = MODEBITS; master->mode_bits = MODEBITS;
master->bits_per_word_mask = SPI_BPW_MASK(8); master->bits_per_word_mask = SPI_BPW_MASK(8);
master->auto_runtime_pm = true; master->auto_runtime_pm = true;
bs->msg_type_shift = pdata->msg_type_shift; bs->msg_type_shift = bcm63xx_spireg(SPI_MSG_TYPE_SHIFT);
bs->msg_ctl_width = pdata->msg_ctl_width; bs->msg_ctl_width = bcm63xx_spireg(SPI_MSG_CTL_WIDTH);
bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA)); bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA));
bs->rx_io = (const u8 *)(bs->regs + bcm63xx_spireg(SPI_RX_DATA)); bs->rx_io = (const u8 *)(bs->regs + bcm63xx_spireg(SPI_RX_DATA));