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/plat-samsung/include | |
| parent | 8fa9dd04b7f7ab1807ebcc274601dd8e2d215569 (diff) | |
| parent | 3075741417d47cccc890ed30da9ece666006553a (diff) | |
Merge branch 'for-spi' into s5p-fixes-for-linus
Diffstat (limited to 'arch/arm/plat-samsung/include')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h index 0ffe34a21554..4c16fa3621bb 100644 --- a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +++ b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | |||
| @@ -39,6 +39,7 @@ struct s3c64xx_spi_csinfo { | |||
| 39 | * @fifo_lvl_mask: All tx fifo_lvl fields start at offset-6 | 39 | * @fifo_lvl_mask: All tx fifo_lvl fields start at offset-6 |
| 40 | * @rx_lvl_offset: Depends on tx fifo_lvl field and bus number | 40 | * @rx_lvl_offset: Depends on tx fifo_lvl field and bus number |
| 41 | * @high_speed: If the controller supports HIGH_SPEED_EN bit | 41 | * @high_speed: If the controller supports HIGH_SPEED_EN bit |
| 42 | * @tx_st_done: Depends on tx fifo_lvl field | ||
| 42 | */ | 43 | */ |
| 43 | struct s3c64xx_spi_info { | 44 | struct s3c64xx_spi_info { |
| 44 | int src_clk_nr; | 45 | int src_clk_nr; |
| @@ -53,6 +54,7 @@ struct s3c64xx_spi_info { | |||
| 53 | int fifo_lvl_mask; | 54 | int fifo_lvl_mask; |
| 54 | int rx_lvl_offset; | 55 | int rx_lvl_offset; |
| 55 | int high_speed; | 56 | int high_speed; |
| 57 | int tx_st_done; | ||
| 56 | }; | 58 | }; |
| 57 | 59 | ||
| 58 | /** | 60 | /** |