Subject: [PATCH] mmc: mxs-mmc: Add support for non-removable cards

Some boards and card slots doesn't have card detect feature available.
In that case allow to mark the cards as non-removable, via devicetree.

Signed-off-by: Alexandre Pereira da Silva <[email protected]>
---
drivers/mmc/host/mxs-mmc.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 4efe302..7d2cd74 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -95,6 +95,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
struct mxs_mmc_host *host = mmc_priv(mmc);
struct mxs_ssp *ssp = &host->ssp;

+ if (mmc->caps & MMC_CAP_NONREMOVABLE)
+ return 1;
+
return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
BM_SSP_STATUS_CARD_DETECT);
}
@@ -691,6 +694,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
if (flags & OF_GPIO_ACTIVE_LOW)
host->wp_inverted = 1;

+ if (of_find_property(np, "non-removable", NULL))
+ mmc->caps |= MMC_CAP_NONREMOVABLE;
+
mmc->f_min = 400000;
mmc->f_max = 288000000;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
--
1.7.10


2013-04-05 06:37:46

by Marek Vasut

[permalink] [raw]
Subject: Re: [PATCH] mmc: mxs-mmc: Add support for non-removable cards

Dear Alexandre Pereira da Silva,

> Some boards and card slots doesn't have card detect feature available.
> In that case allow to mark the cards as non-removable, via devicetree.
>
> Signed-off-by: Alexandre Pereira da Silva <[email protected]>

Looks good,

Reviewed-by: Marek Vasut <[email protected]>

btw. did you know you can let git send-email automatically handle CC for you so
you don't have to type it into the command line by simply sticking

Cc: Us Er <[email protected]>

in the commit message? Preferably under the SoB line.

> ---
> drivers/mmc/host/mxs-mmc.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 4efe302..7d2cd74 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -95,6 +95,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
> struct mxs_mmc_host *host = mmc_priv(mmc);
> struct mxs_ssp *ssp = &host->ssp;
>
> + if (mmc->caps & MMC_CAP_NONREMOVABLE)
> + return 1;
> +
> return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
> BM_SSP_STATUS_CARD_DETECT);
> }
> @@ -691,6 +694,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
> if (flags & OF_GPIO_ACTIVE_LOW)
> host->wp_inverted = 1;
>
> + if (of_find_property(np, "non-removable", NULL))
> + mmc->caps |= MMC_CAP_NONREMOVABLE;
> +
> mmc->f_min = 400000;
> mmc->f_max = 288000000;
> mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;

Best regards,
Marek Vasut

2013-04-05 09:14:13

by Shawn Guo

[permalink] [raw]
Subject: Re: [PATCH] mmc: mxs-mmc: Add support for non-removable cards

On Fri, Apr 05, 2013 at 01:18:38AM -0300, Alexandre Pereira da Silva wrote:
> Some boards and card slots doesn't have card detect feature available.
> In that case allow to mark the cards as non-removable, via devicetree.
>
> Signed-off-by: Alexandre Pereira da Silva <[email protected]>

Marc already sent a similar patch[1] for that.

Shawn

[1] http://thread.gmane.org/gmane.linux.kernel.mmc/19823/focus=19825

> ---
> drivers/mmc/host/mxs-mmc.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 4efe302..7d2cd74 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -95,6 +95,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
> struct mxs_mmc_host *host = mmc_priv(mmc);
> struct mxs_ssp *ssp = &host->ssp;
>
> + if (mmc->caps & MMC_CAP_NONREMOVABLE)
> + return 1;
> +
> return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
> BM_SSP_STATUS_CARD_DETECT);
> }
> @@ -691,6 +694,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
> if (flags & OF_GPIO_ACTIVE_LOW)
> host->wp_inverted = 1;
>
> + if (of_find_property(np, "non-removable", NULL))
> + mmc->caps |= MMC_CAP_NONREMOVABLE;
> +
> mmc->f_min = 400000;
> mmc->f_max = 288000000;
> mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
> --
> 1.7.10
>

2013-04-05 09:57:54

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] mmc: mxs-mmc: Add support for non-removable cards

On Fri, Apr 05, 2013 at 08:37:39AM +0200, Marek Vasut wrote:

> btw. did you know you can let git send-email automatically handle CC for you so
> you don't have to type it into the command line by simply sticking

> Cc: Us Er <[email protected]>

> in the commit message? Preferably under the SoB line.

Though not everyone likes seeing things like that end up in the commit
log (or having to edit them out of commit logs).

Attachments:
(No filename) (415.00 B)
 signature.asc (836.00 B)
Digital signature Download all attachments
Subject: Re: [PATCH] mmc: mxs-mmc: Add support for non-removable cards

On Fri, Apr 5, 2013 at 6:13 AM, Shawn Guo <[email protected]> wrote:
>
> Marc already sent a similar patch[1] for that.

Thanks for pointing it out.

I will work on top of that patch.

> Shawn
>
> [1] http://thread.gmane.org/gmane.linux.kernel.mmc/19823/focus=19825
>

2013-04-05 16:07:50

by Marek Vasut

[permalink] [raw]
Subject: Re: [PATCH] mmc: mxs-mmc: Add support for non-removable cards

Dear Mark Brown,

> On Fri, Apr 05, 2013 at 08:37:39AM +0200, Marek Vasut wrote:
> > btw. did you know you can let git send-email automatically handle CC for
> > you so you don't have to type it into the command line by simply
> > sticking
> >
> > Cc: Us Er <[email protected]>
> >
> > in the commit message? Preferably under the SoB line.
>
> Though not everyone likes seeing things like that end up in the commit
> log (or having to edit them out of commit logs).

Ah, all right.

Best regards,
Marek Vasut