From 7f73e5093356081c29199e1c7540c8dbc382789d Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 23 May 2012 11:05:33 +0200 Subject: [PATCH] --- yaml --- r: 312829 b: refs/heads/master c: d7d8d500bc03891c4a86da49858c46e2db256581 h: refs/heads/master i: 312827: c728b350d165094df1dcac6a1052c60340694edf v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sh_mobile_sdhi.c | 1 + trunk/include/linux/mmc/sh_mobile_sdhi.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5d54e7ac2091..a9cd5dde3e09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02cb3221d5bb351ad9f7469453dcca7594a0fabf +refs/heads/master: d7d8d500bc03891c4a86da49858c46e2db256581 diff --git a/trunk/drivers/mmc/host/sh_mobile_sdhi.c b/trunk/drivers/mmc/host/sh_mobile_sdhi.c index 42f07fa6e043..1e7c5c46201d 100644 --- a/trunk/drivers/mmc/host/sh_mobile_sdhi.c +++ b/trunk/drivers/mmc/host/sh_mobile_sdhi.c @@ -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) { diff --git a/trunk/include/linux/mmc/sh_mobile_sdhi.h b/trunk/include/linux/mmc/sh_mobile_sdhi.h index e94e620aeddc..b65679ffa880 100644 --- a/trunk/include/linux/mmc/sh_mobile_sdhi.h +++ b/trunk/include/linux/mmc/sh_mobile_sdhi.h @@ -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;