diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-04-21 00:21:14 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-04-21 00:21:14 +0530 |
| commit | b53c7582805b10d6a32e88e22d16dc469e66a37a (patch) | |
| tree | 3775742e873f18d005fd8c2187411ead06c0049d /include/linux | |
| parent | 7d3beab16dd9eee86bb1a4dd05b51159fc7772f0 (diff) | |
| parent | 3cd44dcd35a6618df88c51561290dc02fb35b8e2 (diff) | |
| download | linux-stable-b53c7582805b10d6a32e88e22d16dc469e66a37a.tar.gz linux-stable-b53c7582805b10d6a32e88e22d16dc469e66a37a.tar.bz2 linux-stable-b53c7582805b10d6a32e88e22d16dc469e66a37a.zip | |
Merge branch 'topic/sh' into for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/tmio.h | 2 | ||||
| -rw-r--r-- | include/linux/mmc/sh_mobile_sdhi.h | 10 | ||||
| -rw-r--r-- | include/linux/shdma-base.h | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 605812820e48..24b86d538e88 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -111,6 +111,8 @@ struct dma_chan; * data for the MMC controller */ struct tmio_mmc_data { + void *chan_priv_tx; + void *chan_priv_rx; unsigned int hclk; unsigned long capabilities; unsigned long capabilities2; diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h index da77e5e2041d..95d6f0314a7d 100644 --- a/include/linux/mmc/sh_mobile_sdhi.h +++ b/include/linux/mmc/sh_mobile_sdhi.h @@ -7,14 +7,4 @@ #define SH_MOBILE_SDHI_IRQ_SDCARD "sdcard" #define SH_MOBILE_SDHI_IRQ_SDIO "sdio" -struct sh_mobile_sdhi_info { - int dma_slave_tx; - int dma_slave_rx; - unsigned long tmio_flags; - unsigned long tmio_caps; - unsigned long tmio_caps2; - u32 tmio_ocr_mask; /* available MMC voltages */ - unsigned int cd_gpio; -}; - #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */ diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h index abdf1f229dc3..dd0ba502ccb3 100644 --- a/include/linux/shdma-base.h +++ b/include/linux/shdma-base.h @@ -69,6 +69,7 @@ struct shdma_chan { int id; /* Raw id of this channel */ int irq; /* Channel IRQ */ int slave_id; /* Client ID for slave DMA */ + int real_slave_id; /* argument passed to filter function */ int hw_req; /* DMA request line for slave DMA - same * as MID/RID, used with DT */ enum shdma_pm_state pm_state; |