| From 2b07b253ed3c3b19d94222ff4f238224de24420e Mon Sep 17 00:00:00 2001 |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| Date: Fri, 30 Dec 2016 13:47:19 +0100 |
| Subject: [PATCH 143/255] mmc: sh_mmcif: Remove unused clk_ctrl2_present from |
| the platform data |
| |
| There are currently no users of the clk_ctrl2_present member from the |
| platform data, so let's remove it. |
| |
| Note, as some of the sh_mmcif variants may support clk_ctrl2, let's keep |
| the current code in the driver, which deals with this. For future support, |
| we should invent a DT binding instead, but let's leave that until it's |
| needed. |
| |
| Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Reviewed-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit dba4bb484e9e495478f2bcf474393d33f7e0ec27) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mmcif.c | 2 +- |
| include/linux/mmc/sh_mmcif.h | 1 - |
| 2 files changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -1428,7 +1428,7 @@ static int sh_mmcif_probe(struct platfor |
| host->addr = reg; |
| host->timeout = msecs_to_jiffies(10000); |
| host->ccs_enable = true; |
| - host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present; |
| + host->clk_ctrl2_enable = false; |
| |
| host->pd = pdev; |
| |
| --- a/include/linux/mmc/sh_mmcif.h |
| +++ b/include/linux/mmc/sh_mmcif.h |
| @@ -34,7 +34,6 @@ |
| struct sh_mmcif_plat_data { |
| unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ |
| unsigned int slave_id_rx; |
| - bool clk_ctrl2_present : 1; |
| u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ |
| unsigned long caps; |
| u32 ocr; |
