mmc: tmio: add new TMIO_MMC_HAVE_HIGH_REG flags

The accessibility checking method to the higher register was added by
69d1fe18e92afb (mmc: tmio: only access registers above 0xff, if available)
But, it doesn't care 32bit register.  It is impossible to calculate it
from the resource size, since there is 16/32 bit register IP (e.g. VERSION
is located on 0xe2 if 16bit register, but it is located on 0x1c4 if 32bit
register).

This patch adds new TMIO_MMC_HAVE_HIGH_REG flags, tmio_mmc driver has it,
and sh_mobile_sdhi doesn't have it today.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 6836a8008c02..8d8abf23a611 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -161,10 +161,8 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, int new_clock)
 
 static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
 {
-        struct resource *res = platform_get_resource(host->pdev, IORESOURCE_MEM, 0);
-
         /* implicit BUG_ON(!res) */
-        if (resource_size(res) > 0x100) {
+        if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
                 sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0000);
                 msleep(10);
         }
@@ -176,14 +174,12 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
 
 static void tmio_mmc_clk_start(struct tmio_mmc_host *host)
 {
-        struct resource *res = platform_get_resource(host->pdev, IORESOURCE_MEM, 0);
-
         sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 |
                 sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
         msleep(10);
 
         /* implicit BUG_ON(!res) */
-        if (resource_size(res) > 0x100) {
+        if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
                 sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0100);
                 msleep(10);
         }
@@ -191,16 +187,14 @@ static void tmio_mmc_clk_start(struct tmio_mmc_host *host)
 
 static void tmio_mmc_reset(struct tmio_mmc_host *host)
 {
-        struct resource *res = platform_get_resource(host->pdev, IORESOURCE_MEM, 0);
-
         /* FIXME - should we set stop clock reg here */
         sd_ctrl_write16(host, CTL_RESET_SD, 0x0000);
         /* implicit BUG_ON(!res) */
-        if (resource_size(res) > 0x100)
+        if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG)
                 sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000);
         msleep(10);
         sd_ctrl_write16(host, CTL_RESET_SD, 0x0001);
-        if (resource_size(res) > 0x100)
+        if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG)
                 sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001);
         msleep(10);
 }