| From 2075076c197cf793b193f26a87df772cfad29a10 Mon Sep 17 00:00:00 2001 |
| From: Chris Brandt <chris.brandt@renesas.com> |
| Date: Mon, 12 Sep 2016 10:15:05 -0400 |
| Subject: [PATCH 087/299] mmc: sh_mobile_sdhi: add ocr_mask option |
| |
| In moving platforms from board files to DT, there still needs to be a way |
| to set the ocr_mask setting for the tmio driver during probe. Without this |
| setting, the probe will fail because the supported voltages are not known. |
| |
| This patch will also traditional platform registration platforms to |
| migrate to DT. |
| |
| Signed-off-by: Chris Brandt <chris.brandt@renesas.com> |
| Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit f19417f38264f9a2f7b4627aa4060133c237b211) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mobile_sdhi.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/mmc/host/sh_mobile_sdhi.c |
| +++ b/drivers/mmc/host/sh_mobile_sdhi.c |
| @@ -49,6 +49,7 @@ |
| |
| struct sh_mobile_sdhi_of_data { |
| unsigned long tmio_flags; |
| + u32 tmio_ocr_mask; |
| unsigned long capabilities; |
| unsigned long capabilities2; |
| enum dma_slave_buswidth dma_buswidth; |
| @@ -364,6 +365,7 @@ static int sh_mobile_sdhi_probe(struct p |
| const struct sh_mobile_sdhi_of_data *of_data = of_id->data; |
| |
| mmc_data->flags |= of_data->tmio_flags; |
| + mmc_data->ocr_mask = of_data->tmio_ocr_mask; |
| mmc_data->capabilities |= of_data->capabilities; |
| mmc_data->capabilities2 |= of_data->capabilities2; |
| mmc_data->dma_rx_offset = of_data->dma_rx_offset; |