| Message ID | 002901cf3a09$6b6520a0$422f61e0$%jun@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Acked-by: Jaehoon Chung <jh80.chung@samsung.com> Best Regards, Jaehoon Chung On 03/07/2014 10:30 PM, Seungwon Jeon wrote: > This change distinguishes DDR timing mode of current > mixed usage to clarify device type. > > Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com> > Acked-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/mmc/core/debugfs.c | 3 +++ > drivers/mmc/core/mmc.c | 2 +- > include/linux/mmc/host.h | 3 ++- > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c > index 54829c0..509229b 100644 > --- a/drivers/mmc/core/debugfs.c > +++ b/drivers/mmc/core/debugfs.c > @@ -135,6 +135,9 @@ static int mmc_ios_show(struct seq_file *s, void *data) > case MMC_TIMING_UHS_DDR50: > str = "sd uhs DDR50"; > break; > + case MMC_TIMING_MMC_DDR52: > + str = "mmc DDR52"; > + break; > case MMC_TIMING_MMC_HS200: > str = "mmc high-speed SDR200"; > break; > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > index 1ab5f3a..e22d851 100644 > --- a/drivers/mmc/core/mmc.c > +++ b/drivers/mmc/core/mmc.c > @@ -1264,7 +1264,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, > goto err; > } > mmc_card_set_ddr_mode(card); > - mmc_set_timing(card->host, MMC_TIMING_UHS_DDR50); > + mmc_set_timing(card->host, MMC_TIMING_MMC_DDR52); > mmc_set_bus_width(card->host, bus_width); > } > } > diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h > index cb61ea4..3535420 100644 > --- a/include/linux/mmc/host.h > +++ b/include/linux/mmc/host.h > @@ -58,7 +58,8 @@ struct mmc_ios { > #define MMC_TIMING_UHS_SDR50 5 > #define MMC_TIMING_UHS_SDR104 6 > #define MMC_TIMING_UHS_DDR50 7 > -#define MMC_TIMING_MMC_HS200 8 > +#define MMC_TIMING_MMC_DDR52 8 > +#define MMC_TIMING_MMC_HS200 9 > > #define MMC_SDR_MODE 0 > #define MMC_1_2V_DDR_MODE 1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c index 54829c0..509229b 100644 --- a/drivers/mmc/core/debugfs.c +++ b/drivers/mmc/core/debugfs.c @@ -135,6 +135,9 @@ static int mmc_ios_show(struct seq_file *s, void *data) case MMC_TIMING_UHS_DDR50: str = "sd uhs DDR50"; break; + case MMC_TIMING_MMC_DDR52: + str = "mmc DDR52"; + break; case MMC_TIMING_MMC_HS200: str = "mmc high-speed SDR200"; break; diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 1ab5f3a..e22d851 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1264,7 +1264,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, goto err; } mmc_card_set_ddr_mode(card); - mmc_set_timing(card->host, MMC_TIMING_UHS_DDR50); + mmc_set_timing(card->host, MMC_TIMING_MMC_DDR52); mmc_set_bus_width(card->host, bus_width); } } diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index cb61ea4..3535420 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -58,7 +58,8 @@ struct mmc_ios { #define MMC_TIMING_UHS_SDR50 5 #define MMC_TIMING_UHS_SDR104 6 #define MMC_TIMING_UHS_DDR50 7 -#define MMC_TIMING_MMC_HS200 8 +#define MMC_TIMING_MMC_DDR52 8 +#define MMC_TIMING_MMC_HS200 9 #define MMC_SDR_MODE 0 #define MMC_1_2V_DDR_MODE 1