]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mmc: sh_mobile_sdhi: support caps2 flags
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Wed, 23 May 2012 09:05:33 +0000 (11:05 +0200)
committerChris Ball <cjb@laptop.org>
Sat, 21 Jul 2012 04:02:19 +0000 (00:02 -0400)
Let SDHI platforms specify mmc_host::caps2 flags in their platform data.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sh_mobile_sdhi.c
include/linux/mmc/sh_mobile_sdhi.h

index 42f07fa6e043c0acb145c79a9df50d27e1ec4084..1e7c5c46201df5e6d107ed2c529bf3ed991650e6 100644 (file)
@@ -162,6 +162,7 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
                        mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
                mmc_data->ocr_mask = p->tmio_ocr_mask;
                mmc_data->capabilities |= p->tmio_caps;
+               mmc_data->capabilities2 |= p->tmio_caps2;
                mmc_data->cd_gpio = p->cd_gpio;
 
                if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
index e94e620aeddc01a49b4f6073f54400ff343e66e2..b65679ffa880a3fae58ae49fa574aedeb9dfd333 100644 (file)
@@ -23,6 +23,7 @@ struct sh_mobile_sdhi_info {
        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;
        struct tmio_mmc_data *pdata;