diff options
| author |   Kukjin Kim <kgene.kim@samsung.com> | 2011-07-06 15:46:41 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-06 15:46:41 +0900 |
| commit | d60c98c26ac9824211c3a1f729be52cb179a1157 (patch) | |
| tree | dae0c3724b412c8a5262d64b14d204ba9a11e145 /arch/arm/plat-samsung | |
| parent | ARM: S5PC100: Fix for compilation error (diff) | |
| parent | spi/s3c64xx: Bug fix for SPI with different FIFO level (diff) | |
| download | linux-dev-d60c98c26ac9824211c3a1f729be52cb179a1157.tar.xz linux-dev-d60c98c26ac9824211c3a1f729be52cb179a1157.zip | |
Merge branch 'for-spi' into s5p-fixes-for-linus
Diffstat (limited to 'arch/arm/plat-samsung')
| -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 { * @fifo_lvl_mask: All tx fifo_lvl fields start at offset-6 * @rx_lvl_offset: Depends on tx fifo_lvl field and bus number * @high_speed: If the controller supports HIGH_SPEED_EN bit + * @tx_st_done: Depends on tx fifo_lvl field */ struct s3c64xx_spi_info { int src_clk_nr; @@ -53,6 +54,7 @@ struct s3c64xx_spi_info { int fifo_lvl_mask; int rx_lvl_offset; int high_speed; + int tx_st_done; }; /** |