diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-06 02:46:41 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-06 02:46:41 -0400 |
commit | d60c98c26ac9824211c3a1f729be52cb179a1157 (patch) | |
tree | dae0c3724b412c8a5262d64b14d204ba9a11e145 /arch/arm/mach-s5pc100 | |
parent | 8fa9dd04b7f7ab1807ebcc274601dd8e2d215569 (diff) | |
parent | 3075741417d47cccc890ed30da9ece666006553a (diff) |
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 = { | |||
91 | .fifo_lvl_mask = 0x7f, | 91 | .fifo_lvl_mask = 0x7f, |
92 | .rx_lvl_offset = 13, | 92 | .rx_lvl_offset = 13, |
93 | .high_speed = 1, | 93 | .high_speed = 1, |
94 | .tx_st_done = 21, | ||
94 | }; | 95 | }; |
95 | 96 | ||
96 | static u64 spi_dmamask = DMA_BIT_MASK(32); | 97 | static u64 spi_dmamask = DMA_BIT_MASK(32); |
@@ -135,6 +136,7 @@ static struct s3c64xx_spi_info s5pc100_spi1_pdata = { | |||
135 | .fifo_lvl_mask = 0x7f, | 136 | .fifo_lvl_mask = 0x7f, |
136 | .rx_lvl_offset = 13, | 137 | .rx_lvl_offset = 13, |
137 | .high_speed = 1, | 138 | .high_speed = 1, |
139 | .tx_st_done = 21, | ||
138 | }; | 140 | }; |
139 | 141 | ||
140 | struct platform_device s5pc100_device_spi1 = { | 142 | struct platform_device s5pc100_device_spi1 = { |
@@ -177,6 +179,7 @@ static struct s3c64xx_spi_info s5pc100_spi2_pdata = { | |||
177 | .fifo_lvl_mask = 0x7f, | 179 | .fifo_lvl_mask = 0x7f, |
178 | .rx_lvl_offset = 13, | 180 | .rx_lvl_offset = 13, |
179 | .high_speed = 1, | 181 | .high_speed = 1, |
182 | .tx_st_done = 21, | ||
180 | }; | 183 | }; |
181 | 184 | ||
182 | struct platform_device s5pc100_device_spi2 = { | 185 | struct platform_device s5pc100_device_spi2 = { |