diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-13 09:34:11 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-13 09:34:11 +0400 |
| commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df (patch) | |
| tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 /arch/mips/bcm63xx/dev-spi.c | |
| parent | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (diff) | |
| parent | 7f744b17140af1a9c8804a1c81c9dae6bb52a7fb (diff) | |
| download | linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.tar.xz | |
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
* 'clk' of git://github.com/hzhuang1/linux:
ARM: mmp: remove unused definition in APBC and APMU
ARM: mmp: move mmp2 clock definition to separated file
arm: mmp: move pxa910 clock definition to separated file
arm: mmp: move pxa168 clock definition to separated file
arm: mmp: make private clock definition exclude from common clock
+ Linux 3.6-rc4
Diffstat (limited to 'arch/mips/bcm63xx/dev-spi.c')
| -rw-r--r-- | arch/mips/bcm63xx/dev-spi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c index e39f73048d4f..f1c9c3e2f678 100644 --- a/arch/mips/bcm63xx/dev-spi.c +++ b/arch/mips/bcm63xx/dev-spi.c @@ -106,11 +106,15 @@ int __init bcm63xx_spi_register(void) if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) { spi_resources[0].end += BCM_6338_RSET_SPI_SIZE - 1; spi_pdata.fifo_size = SPI_6338_MSG_DATA_SIZE; + spi_pdata.msg_type_shift = SPI_6338_MSG_TYPE_SHIFT; + spi_pdata.msg_ctl_width = SPI_6338_MSG_CTL_WIDTH; } if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) { 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(); |