| From 4606a421dbb16e10a8018dff56b77b1542de61d7 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Thu, 19 Jan 2017 21:07:17 +0100 |
| Subject: [PATCH 156/255] mmc: host: tmio: SDIO_STATUS_QUIRK is rather |
| SDIO_STATUS_SETBITS |
| |
| QUIRK sounds like there is something wrong, but actually there are just |
| some bits which need to be 1. Rename it to be more clear. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit 20dd03734cac41a0545dd24f5e81d8ff0c80874b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mobile_sdhi.c | 6 ++---- |
| drivers/mmc/host/tmio_mmc_pio.c | 2 +- |
| include/linux/mfd/tmio.h | 6 ++---- |
| 3 files changed, 5 insertions(+), 9 deletions(-) |
| |
| --- a/drivers/mmc/host/sh_mobile_sdhi.c |
| +++ b/drivers/mmc/host/sh_mobile_sdhi.c |
| @@ -641,10 +641,8 @@ static int sh_mobile_sdhi_probe(struct p |
| */ |
| mmc_data->flags |= TMIO_MMC_HAVE_CMD12_CTRL; |
| |
| - /* |
| - * All SDHI need SDIO_INFO1 reserved bit |
| - */ |
| - mmc_data->flags |= TMIO_MMC_SDIO_STATUS_QUIRK; |
| + /* All SDHI have SDIO status bits which must be 1 */ |
| + mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS; |
| |
| ret = tmio_mmc_host_probe(host, mmc_data); |
| if (ret < 0) |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -723,7 +723,7 @@ static void __tmio_mmc_sdio_irq(struct t |
| ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask; |
| |
| sdio_status = status & ~TMIO_SDIO_MASK_ALL; |
| - if (pdata->flags & TMIO_MMC_SDIO_STATUS_QUIRK) |
| + if (pdata->flags & TMIO_MMC_SDIO_STATUS_SETBITS) |
| sdio_status |= 6; |
| |
| sd_ctrl_write16(host, CTL_SDIO_STATUS, sdio_status); |
| --- a/include/linux/mfd/tmio.h |
| +++ b/include/linux/mfd/tmio.h |
| @@ -94,10 +94,8 @@ |
| */ |
| #define TMIO_MMC_HAVE_CMD12_CTRL (1 << 7) |
| |
| -/* |
| - * Some controllers needs to set 1 on SDIO status reserved bits |
| - */ |
| -#define TMIO_MMC_SDIO_STATUS_QUIRK (1 << 8) |
| +/* Controller has some SDIO status bits which must be 1 */ |
| +#define TMIO_MMC_SDIO_STATUS_SETBITS (1 << 8) |
| |
| /* |
| * Some controllers have a 32-bit wide data port register |
