diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:32:06 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:32:06 +0200 |
commit | 5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7 (patch) | |
tree | a8a74ef15a3622ecc3ab94a424321de8b111648b /arch/arm/mach-s5pv210/dev-spi.c | |
parent | c33d4326b60a3aea5cd070a365043f488f81a3b0 (diff) | |
parent | 89e1c3d0fffa0d610fa7292bbfafb5e87dc6be34 (diff) |
Merge branch 'next-samsung-board' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/board
Diffstat (limited to 'arch/arm/mach-s5pv210/dev-spi.c')
-rw-r--r-- | arch/arm/mach-s5pv210/dev-spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/dev-spi.c b/arch/arm/mach-s5pv210/dev-spi.c index e3249a47e3b1..eaf9a7bff7a0 100644 --- a/arch/arm/mach-s5pv210/dev-spi.c +++ b/arch/arm/mach-s5pv210/dev-spi.c @@ -85,6 +85,7 @@ static struct s3c64xx_spi_info s5pv210_spi0_pdata = { .fifo_lvl_mask = 0x1ff, .rx_lvl_offset = 15, .high_speed = 1, + .tx_st_done = 25, }; static u64 spi_dmamask = DMA_BIT_MASK(32); @@ -129,6 +130,7 @@ static struct s3c64xx_spi_info s5pv210_spi1_pdata = { .fifo_lvl_mask = 0x7f, .rx_lvl_offset = 15, .high_speed = 1, + .tx_st_done = 25, }; struct platform_device s5pv210_device_spi1 = { |