diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-05-23 04:44:37 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-07-21 00:02:18 -0400 |
commit | 02cb3221d5bb351ad9f7469453dcca7594a0fabf (patch) | |
tree | 71a98c69ec6db6c680f6909d787e898dc277228b | |
parent | 5aa7dad305594ea30d21e23b3036565042adf50c (diff) |
mmc: tmio: support caps2 flags
Allow tmio mmc glue drivers to pass mmc_host::caps2 flags down to
the mmc layer.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 1 | ||||
-rw-r--r-- | include/linux/mfd/tmio.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index b204012fe7a9..f8df02111794 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c | |||
@@ -951,6 +951,7 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host, | |||
951 | 951 | ||
952 | mmc->ops = &tmio_mmc_ops; | 952 | mmc->ops = &tmio_mmc_ops; |
953 | mmc->caps = MMC_CAP_4_BIT_DATA | pdata->capabilities; | 953 | mmc->caps = MMC_CAP_4_BIT_DATA | pdata->capabilities; |
954 | mmc->caps2 = pdata->capabilities2; | ||
954 | mmc->max_segs = 32; | 955 | mmc->max_segs = 32; |
955 | mmc->max_blk_size = 512; | 956 | mmc->max_blk_size = 512; |
956 | mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * | 957 | mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * |
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index b332c4c7857b..d83af39815ab 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h | |||
@@ -101,6 +101,7 @@ struct tmio_mmc_host; | |||
101 | struct tmio_mmc_data { | 101 | struct tmio_mmc_data { |
102 | unsigned int hclk; | 102 | unsigned int hclk; |
103 | unsigned long capabilities; | 103 | unsigned long capabilities; |
104 | unsigned long capabilities2; | ||
104 | unsigned long flags; | 105 | unsigned long flags; |
105 | u32 ocr_mask; /* available voltages */ | 106 | u32 ocr_mask; /* available voltages */ |
106 | struct tmio_mmc_dma *dma; | 107 | struct tmio_mmc_dma *dma; |