* [PATCH V1] mmc: core: Add host capability check for power class
@ 2011-12-14 12:00 Girish K S
2011-12-14 15:16 ` Subhash Jadavani
0 siblings, 1 reply; 2+ messages in thread
From: Girish K S @ 2011-12-14 12:00 UTC (permalink / raw)
To: linux-mmc; +Cc: patches, linux-samsung-soc, subhashj, Girish K S, Chris Ball
This patch adds a check whether the host supports maximum current value
obtained from the device's extended csd register for a selected interface
voltage and frequency.
cc: Chris Ball <cjb@laptop.org>
Signed-off-by: Girish K S <girish.shivananjappa@linaro.org>
---
Changes in v1:
reduced the number of comparisons as per Hein's suggestion
drivers/mmc/core/mmc.c | 21 +++++++++++++++++++++
include/linux/mmc/card.h | 4 ++++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 006e932..e7f1902 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -688,6 +688,27 @@ static int mmc_select_powerclass(struct mmc_card *card,
pwrclass_val = (pwrclass_val & EXT_CSD_PWR_CL_4BIT_MASK) >>
EXT_CSD_PWR_CL_4BIT_SHIFT;
+ if (pwrclass_val >= MMC_MAX_CURRENT_800)
+ pwrclass_val = MMC_MAX_CURRENT_800;
+ else if (pwrclass_val >= MMC_MAX_CURRENT_600)
+ pwrclass_val = MMC_MAX_CURRENT_600;
+ else if (pwrclass_val >= MMC_MAX_CURRENT_400)
+ pwrclass_val = MMC_MAX_CURRENT_400;
+ else if (pwrclass_val >= MMC_MAX_CURRENT_200)
+ pwrclass_val = MMC_MAX_CURRENT_200;
+ else
+ pwrclass_val = MMC_MAX_CURRENT_200;
+
+ if ((pwrclass_val == MMC_MAX_CURRENT_800) &&
+ !(card->host->caps & MMC_CAP_MAX_CURRENT_800))
+ pwrclass_val = MMC_MAX_CURRENT_600;
+ if ((pwrclass_val == MMC_MAX_CURRENT_600) &&
+ !(card->host->caps & MMC_CAP_MAX_CURRENT_600))
+ pwrclass_val = MMC_MAX_CURRENT_400;
+ if ((pwrclass_val == MMC_MAX_CURRENT_400) &&
+ !(card->host->caps & MMC_CAP_MAX_CURRENT_400))
+ pwrclass_val = MMC_MAX_CURRENT_200;
+
/* If the power class is different from the default value */
if (pwrclass_val > 0) {
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 9478a6b..c5e031a 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -195,6 +195,10 @@ struct mmc_part {
#define MMC_BLK_DATA_AREA_GP (1<<2)
};
+#define MMC_MAX_CURRENT_200 (0)
+#define MMC_MAX_CURRENT_400 (7)
+#define MMC_MAX_CURRENT_600 (11)
+#define MMC_MAX_CURRENT_800 (13)
/*
* MMC device
*/
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* RE: [PATCH V1] mmc: core: Add host capability check for power class
2011-12-14 12:00 [PATCH V1] mmc: core: Add host capability check for power class Girish K S
@ 2011-12-14 15:16 ` Subhash Jadavani
0 siblings, 0 replies; 2+ messages in thread
From: Subhash Jadavani @ 2011-12-14 15:16 UTC (permalink / raw)
To: 'Girish K S', linux-mmc
Cc: patches, linux-samsung-soc, 'Chris Ball'
> -----Original Message-----
> From: Girish K S [mailto:girish.shivananjappa@linaro.org]
> Sent: Wednesday, December 14, 2011 5:31 PM
> To: linux-mmc@vger.kernel.org
> Cc: patches@linaro.org; linux-samsung-soc@vger.kernel.org;
> subhashj@codeaurora.org; Girish K S; Chris Ball
> Subject: [PATCH V1] mmc: core: Add host capability check for power
> class
>
> This patch adds a check whether the host supports maximum current value
> obtained from the device's extended csd register for a selected
> interface
> voltage and frequency.
>
> cc: Chris Ball <cjb@laptop.org>
> Signed-off-by: Girish K S <girish.shivananjappa@linaro.org>
> ---
> Changes in v1:
> reduced the number of comparisons as per Hein's suggestion
>
> drivers/mmc/core/mmc.c | 21 +++++++++++++++++++++
> include/linux/mmc/card.h | 4 ++++
> 2 files changed, 25 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 006e932..e7f1902 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -688,6 +688,27 @@ static int mmc_select_powerclass(struct mmc_card
> *card,
> pwrclass_val = (pwrclass_val & EXT_CSD_PWR_CL_4BIT_MASK) >>
> EXT_CSD_PWR_CL_4BIT_SHIFT;
>
> + if (pwrclass_val >= MMC_MAX_CURRENT_800)
> + pwrclass_val = MMC_MAX_CURRENT_800;
> + else if (pwrclass_val >= MMC_MAX_CURRENT_600)
> + pwrclass_val = MMC_MAX_CURRENT_600;
> + else if (pwrclass_val >= MMC_MAX_CURRENT_400)
> + pwrclass_val = MMC_MAX_CURRENT_400;
> + else if (pwrclass_val >= MMC_MAX_CURRENT_200)
> + pwrclass_val = MMC_MAX_CURRENT_200;
> + else
> + pwrclass_val = MMC_MAX_CURRENT_200;
Last else if and else can be combined as they are assigning the same value
to pwrclass_val.
> +
> + if ((pwrclass_val == MMC_MAX_CURRENT_800) &&
> + !(card->host->caps & MMC_CAP_MAX_CURRENT_800))
> + pwrclass_val = MMC_MAX_CURRENT_600;
> + if ((pwrclass_val == MMC_MAX_CURRENT_600) &&
> + !(card->host->caps & MMC_CAP_MAX_CURRENT_600))
> + pwrclass_val = MMC_MAX_CURRENT_400;
> + if ((pwrclass_val == MMC_MAX_CURRENT_400) &&
> + !(card->host->caps & MMC_CAP_MAX_CURRENT_400))
> + pwrclass_val = MMC_MAX_CURRENT_200;
> +
> /* If the power class is different from the default value */
> if (pwrclass_val > 0) {
> err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
> index 9478a6b..c5e031a 100644
> --- a/include/linux/mmc/card.h
> +++ b/include/linux/mmc/card.h
> @@ -195,6 +195,10 @@ struct mmc_part {
> #define MMC_BLK_DATA_AREA_GP (1<<2)
> };
>
> +#define MMC_MAX_CURRENT_200 (0)
> +#define MMC_MAX_CURRENT_400 (7)
> +#define MMC_MAX_CURRENT_600 (11)
> +#define MMC_MAX_CURRENT_800 (13)
> /*
> * MMC device
> */
> --
> 1.7.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-14 15:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-14 12:00 [PATCH V1] mmc: core: Add host capability check for power class Girish K S
2011-12-14 15:16 ` Subhash Jadavani
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox