diff options
| author | Kukjin Kim | 2011-07-06 08:46:41 +0200 |
|---|---|---|
| committer | Kukjin Kim | 2011-07-06 08:46:41 +0200 |
| commit | d60c98c26ac9824211c3a1f729be52cb179a1157 (patch) | |
| tree | dae0c3724b412c8a5262d64b14d204ba9a11e145 /arch/arm/mach-s5pc100 | |
| parent | ARM: S5PC100: Fix for compilation error (diff) | |
| parent | spi/s3c64xx: Bug fix for SPI with different FIFO level (diff) | |
| download | kernel-qcow2-linux-d60c98c26ac9824211c3a1f729be52cb179a1157.tar.gz kernel-qcow2-linux-d60c98c26ac9824211c3a1f729be52cb179a1157.tar.xz kernel-qcow2-linux-d60c98c26ac9824211c3a1f729be52cb179a1157.zip | |
Merge branch 'for-spi' into s5p-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-s5pc100')
| -rw-r--r-- | arch/arm/mach-s5pc100/dev-spi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/dev-spi.c b/arch/arm/mach-s5pc100/dev-spi.c index cd7ca47d8746..e5d6c4dceb56 100644 --- a/arch/arm/mach-s5pc100/dev-spi.c +++ b/arch/arm/mach-s5pc100/dev-spi.c @@ -91,6 +91,7 @@ static struct s3c64xx_spi_info s5pc100_spi0_pdata = { .fifo_lvl_mask = 0x7f, .rx_lvl_offset = 13, .high_speed = 1, + .tx_st_done = 21, }; static u64 spi_dmamask = DMA_BIT_MASK(32); @@ -135,6 +136,7 @@ static struct s3c64xx_spi_info s5pc100_spi1_pdata = { .fifo_lvl_mask = 0x7f, .rx_lvl_offset = 13, .high_speed = 1, + .tx_st_done = 21, }; struct platform_device s5pc100_device_spi1 = { @@ -177,6 +179,7 @@ static struct s3c64xx_spi_info s5pc100_spi2_pdata = { .fifo_lvl_mask = 0x7f, .rx_lvl_offset = 13, .high_speed = 1, + .tx_st_done = 21, }; struct platform_device s5pc100_device_spi2 = { |