* [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC
@ 2013-07-19 8:44 Jaehoon Chung
2013-08-13 8:52 ` Jaehoon Chung
2013-09-05 18:09 ` Pantelis Antoniou
0 siblings, 2 replies; 5+ messages in thread
From: Jaehoon Chung @ 2013-07-19 8:44 UTC (permalink / raw)
To: u-boot
Samsung SoC is supported the WIDE8, even if Controller version is v2.0.
So add the SDHCI_QUIRK_USE_WIDE8 for Samsung-SoC.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/mmc/s5p_sdhci.c | 4 +++-
drivers/mmc/sdhci.c | 13 +++++++------
include/sdhci.h | 3 +++
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index e50ff92..97e153e 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -84,7 +84,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
- SDHCI_QUIRK_WAIT_SEND_CMD;
+ SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8;
host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
@@ -93,6 +93,8 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
host->index = index;
host->host_caps = MMC_MODE_HC;
+ if (bus_width == 8)
+ host->host_caps |= MMC_MODE_8BIT;
return add_sdhci(host, 52000000, 400000);
}
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index c5631bf..9bf3052 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -270,7 +270,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
if (clock == 0)
return 0;
- if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
+ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
/* Version 3.00 divisors must be a multiple of 2. */
if (mmc->f_max <= clock)
div = 1;
@@ -363,10 +363,11 @@ void sdhci_set_ios(struct mmc *mmc)
ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
if (mmc->bus_width == 8) {
ctrl &= ~SDHCI_CTRL_4BITBUS;
- if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
+ if ((SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) ||
+ (host->quirks & SDHCI_QUIRK_USE_WIDE8))
ctrl |= SDHCI_CTRL_8BITBUS;
} else {
- if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
+ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
ctrl &= ~SDHCI_CTRL_8BITBUS;
if (mmc->bus_width == 4)
ctrl |= SDHCI_CTRL_4BITBUS;
@@ -453,7 +454,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
if (max_clk)
mmc->f_max = max_clk;
else {
- if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
+ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
mmc->f_max = (caps & SDHCI_CLOCK_V3_BASE_MASK)
>> SDHCI_CLOCK_BASE_SHIFT;
else
@@ -468,7 +469,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
if (min_clk)
mmc->f_min = min_clk;
else {
- if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
+ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_300;
else
mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_200;
@@ -486,7 +487,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
mmc->voltages |= host->voltages;
mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT;
- if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
+ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
if (caps & SDHCI_CAN_DO_8BIT)
mmc->host_caps |= MMC_MODE_8BIT;
}
diff --git a/include/sdhci.h b/include/sdhci.h
index cffbe53..f3f8219 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -208,6 +208,8 @@
#define SDHCI_SPEC_200 1
#define SDHCI_SPEC_300 2
+#define SDHCI_GET_VERSION(x) (x->version & SDHCI_SPEC_VER_MASK)
+
/*
* End of controller registers.
*/
@@ -226,6 +228,7 @@
#define SDHCI_QUIRK_NO_CD (1 << 5)
#define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1 << 7)
+#define SDHCI_QUIRK_USE_WIDE8 (1 << 8)
/* to make gcc happy */
struct sdhci_host;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC
2013-07-19 8:44 [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC Jaehoon Chung
@ 2013-08-13 8:52 ` Jaehoon Chung
2013-08-13 9:01 ` Pantelis Antoniou
2013-09-05 18:09 ` Pantelis Antoniou
1 sibling, 1 reply; 5+ messages in thread
From: Jaehoon Chung @ 2013-08-13 8:52 UTC (permalink / raw)
To: u-boot
Dear Pantelis,
Welcome to take care of u-boot-mmc.
Could you merge this patch?
Best Regards,
Jaehoon Chung
On 07/19/2013 05:44 PM, Jaehoon Chung wrote:
> Samsung SoC is supported the WIDE8, even if Controller version is v2.0.
> So add the SDHCI_QUIRK_USE_WIDE8 for Samsung-SoC.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> drivers/mmc/s5p_sdhci.c | 4 +++-
> drivers/mmc/sdhci.c | 13 +++++++------
> include/sdhci.h | 3 +++
> 3 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
> index e50ff92..97e153e 100644
> --- a/drivers/mmc/s5p_sdhci.c
> +++ b/drivers/mmc/s5p_sdhci.c
> @@ -84,7 +84,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
>
> host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
> SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
> - SDHCI_QUIRK_WAIT_SEND_CMD;
> + SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8;
> host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
> host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
>
> @@ -93,6 +93,8 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
> host->index = index;
>
> host->host_caps = MMC_MODE_HC;
> + if (bus_width == 8)
> + host->host_caps |= MMC_MODE_8BIT;
>
> return add_sdhci(host, 52000000, 400000);
> }
> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
> index c5631bf..9bf3052 100644
> --- a/drivers/mmc/sdhci.c
> +++ b/drivers/mmc/sdhci.c
> @@ -270,7 +270,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
> if (clock == 0)
> return 0;
>
> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
> /* Version 3.00 divisors must be a multiple of 2. */
> if (mmc->f_max <= clock)
> div = 1;
> @@ -363,10 +363,11 @@ void sdhci_set_ios(struct mmc *mmc)
> ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
> if (mmc->bus_width == 8) {
> ctrl &= ~SDHCI_CTRL_4BITBUS;
> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
> + if ((SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) ||
> + (host->quirks & SDHCI_QUIRK_USE_WIDE8))
> ctrl |= SDHCI_CTRL_8BITBUS;
> } else {
> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
> ctrl &= ~SDHCI_CTRL_8BITBUS;
> if (mmc->bus_width == 4)
> ctrl |= SDHCI_CTRL_4BITBUS;
> @@ -453,7 +454,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
> if (max_clk)
> mmc->f_max = max_clk;
> else {
> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
> mmc->f_max = (caps & SDHCI_CLOCK_V3_BASE_MASK)
> >> SDHCI_CLOCK_BASE_SHIFT;
> else
> @@ -468,7 +469,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
> if (min_clk)
> mmc->f_min = min_clk;
> else {
> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
> mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_300;
> else
> mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_200;
> @@ -486,7 +487,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
> mmc->voltages |= host->voltages;
>
> mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT;
> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
> if (caps & SDHCI_CAN_DO_8BIT)
> mmc->host_caps |= MMC_MODE_8BIT;
> }
> diff --git a/include/sdhci.h b/include/sdhci.h
> index cffbe53..f3f8219 100644
> --- a/include/sdhci.h
> +++ b/include/sdhci.h
> @@ -208,6 +208,8 @@
> #define SDHCI_SPEC_200 1
> #define SDHCI_SPEC_300 2
>
> +#define SDHCI_GET_VERSION(x) (x->version & SDHCI_SPEC_VER_MASK)
> +
> /*
> * End of controller registers.
> */
> @@ -226,6 +228,7 @@
> #define SDHCI_QUIRK_NO_CD (1 << 5)
> #define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
> #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1 << 7)
> +#define SDHCI_QUIRK_USE_WIDE8 (1 << 8)
>
> /* to make gcc happy */
> struct sdhci_host;
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC
2013-08-13 8:52 ` Jaehoon Chung
@ 2013-08-13 9:01 ` Pantelis Antoniou
2013-08-13 11:37 ` Jaehoon Chung
0 siblings, 1 reply; 5+ messages in thread
From: Pantelis Antoniou @ 2013-08-13 9:01 UTC (permalink / raw)
To: u-boot
Hi Jaehoon,
On Aug 13, 2013, at 11:52 AM, Jaehoon Chung wrote:
> Dear Pantelis,
>
> Welcome to take care of u-boot-mmc.
>
Thanks
> Could you merge this patch?
>
Please hold on a bit; we're still in the process of passing over the (mmc) torch.
That patch looks good.
> Best Regards,
> Jaehoon Chung
>
Regards
-- Pantelis
> On 07/19/2013 05:44 PM, Jaehoon Chung wrote:
>> Samsung SoC is supported the WIDE8, even if Controller version is v2.0.
>> So add the SDHCI_QUIRK_USE_WIDE8 for Samsung-SoC.
>>
>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> ---
>> drivers/mmc/s5p_sdhci.c | 4 +++-
>> drivers/mmc/sdhci.c | 13 +++++++------
>> include/sdhci.h | 3 +++
>> 3 files changed, 13 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
>> index e50ff92..97e153e 100644
>> --- a/drivers/mmc/s5p_sdhci.c
>> +++ b/drivers/mmc/s5p_sdhci.c
>> @@ -84,7 +84,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
>>
>> host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
>> SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
>> - SDHCI_QUIRK_WAIT_SEND_CMD;
>> + SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8;
>> host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
>> host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
>>
>> @@ -93,6 +93,8 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
>> host->index = index;
>>
>> host->host_caps = MMC_MODE_HC;
>> + if (bus_width == 8)
>> + host->host_caps |= MMC_MODE_8BIT;
>>
>> return add_sdhci(host, 52000000, 400000);
>> }
>> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
>> index c5631bf..9bf3052 100644
>> --- a/drivers/mmc/sdhci.c
>> +++ b/drivers/mmc/sdhci.c
>> @@ -270,7 +270,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
>> if (clock == 0)
>> return 0;
>>
>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
>> /* Version 3.00 divisors must be a multiple of 2. */
>> if (mmc->f_max <= clock)
>> div = 1;
>> @@ -363,10 +363,11 @@ void sdhci_set_ios(struct mmc *mmc)
>> ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
>> if (mmc->bus_width == 8) {
>> ctrl &= ~SDHCI_CTRL_4BITBUS;
>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>> + if ((SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) ||
>> + (host->quirks & SDHCI_QUIRK_USE_WIDE8))
>> ctrl |= SDHCI_CTRL_8BITBUS;
>> } else {
>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
>> ctrl &= ~SDHCI_CTRL_8BITBUS;
>> if (mmc->bus_width == 4)
>> ctrl |= SDHCI_CTRL_4BITBUS;
>> @@ -453,7 +454,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
>> if (max_clk)
>> mmc->f_max = max_clk;
>> else {
>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
>> mmc->f_max = (caps & SDHCI_CLOCK_V3_BASE_MASK)
>> >> SDHCI_CLOCK_BASE_SHIFT;
>> else
>> @@ -468,7 +469,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
>> if (min_clk)
>> mmc->f_min = min_clk;
>> else {
>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
>> mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_300;
>> else
>> mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_200;
>> @@ -486,7 +487,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
>> mmc->voltages |= host->voltages;
>>
>> mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT;
>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
>> if (caps & SDHCI_CAN_DO_8BIT)
>> mmc->host_caps |= MMC_MODE_8BIT;
>> }
>> diff --git a/include/sdhci.h b/include/sdhci.h
>> index cffbe53..f3f8219 100644
>> --- a/include/sdhci.h
>> +++ b/include/sdhci.h
>> @@ -208,6 +208,8 @@
>> #define SDHCI_SPEC_200 1
>> #define SDHCI_SPEC_300 2
>>
>> +#define SDHCI_GET_VERSION(x) (x->version & SDHCI_SPEC_VER_MASK)
>> +
>> /*
>> * End of controller registers.
>> */
>> @@ -226,6 +228,7 @@
>> #define SDHCI_QUIRK_NO_CD (1 << 5)
>> #define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
>> #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1 << 7)
>> +#define SDHCI_QUIRK_USE_WIDE8 (1 << 8)
>>
>> /* to make gcc happy */
>> struct sdhci_host;
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC
2013-08-13 9:01 ` Pantelis Antoniou
@ 2013-08-13 11:37 ` Jaehoon Chung
0 siblings, 0 replies; 5+ messages in thread
From: Jaehoon Chung @ 2013-08-13 11:37 UTC (permalink / raw)
To: u-boot
On 08/13/2013 06:01 PM, Pantelis Antoniou wrote:
> Hi Jaehoon,
>
> On Aug 13, 2013, at 11:52 AM, Jaehoon Chung wrote:
>
>> Dear Pantelis,
>>
>> Welcome to take care of u-boot-mmc.
>>
>
> Thanks
>
>> Could you merge this patch?
>>
>
> Please hold on a bit; we're still in the process of passing over the (mmc) torch.
Sure..Thank you.:)
Best Regards,
Jaehoon Chung
>
> That patch looks good.
>
>> Best Regards,
>> Jaehoon Chung
>>
>
> Regards
>
> -- Pantelis
>
>> On 07/19/2013 05:44 PM, Jaehoon Chung wrote:
>>> Samsung SoC is supported the WIDE8, even if Controller version is v2.0.
>>> So add the SDHCI_QUIRK_USE_WIDE8 for Samsung-SoC.
>>>
>>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
>>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>>> ---
>>> drivers/mmc/s5p_sdhci.c | 4 +++-
>>> drivers/mmc/sdhci.c | 13 +++++++------
>>> include/sdhci.h | 3 +++
>>> 3 files changed, 13 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
>>> index e50ff92..97e153e 100644
>>> --- a/drivers/mmc/s5p_sdhci.c
>>> +++ b/drivers/mmc/s5p_sdhci.c
>>> @@ -84,7 +84,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
>>>
>>> host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
>>> SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
>>> - SDHCI_QUIRK_WAIT_SEND_CMD;
>>> + SDHCI_QUIRK_WAIT_SEND_CMD | SDHCI_QUIRK_USE_WIDE8;
>>> host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
>>> host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
>>>
>>> @@ -93,6 +93,8 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
>>> host->index = index;
>>>
>>> host->host_caps = MMC_MODE_HC;
>>> + if (bus_width == 8)
>>> + host->host_caps |= MMC_MODE_8BIT;
>>>
>>> return add_sdhci(host, 52000000, 400000);
>>> }
>>> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
>>> index c5631bf..9bf3052 100644
>>> --- a/drivers/mmc/sdhci.c
>>> +++ b/drivers/mmc/sdhci.c
>>> @@ -270,7 +270,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
>>> if (clock == 0)
>>> return 0;
>>>
>>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
>>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
>>> /* Version 3.00 divisors must be a multiple of 2. */
>>> if (mmc->f_max <= clock)
>>> div = 1;
>>> @@ -363,10 +363,11 @@ void sdhci_set_ios(struct mmc *mmc)
>>> ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
>>> if (mmc->bus_width == 8) {
>>> ctrl &= ~SDHCI_CTRL_4BITBUS;
>>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>>> + if ((SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) ||
>>> + (host->quirks & SDHCI_QUIRK_USE_WIDE8))
>>> ctrl |= SDHCI_CTRL_8BITBUS;
>>> } else {
>>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
>>> ctrl &= ~SDHCI_CTRL_8BITBUS;
>>> if (mmc->bus_width == 4)
>>> ctrl |= SDHCI_CTRL_4BITBUS;
>>> @@ -453,7 +454,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
>>> if (max_clk)
>>> mmc->f_max = max_clk;
>>> else {
>>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
>>> mmc->f_max = (caps & SDHCI_CLOCK_V3_BASE_MASK)
>>> >> SDHCI_CLOCK_BASE_SHIFT;
>>> else
>>> @@ -468,7 +469,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
>>> if (min_clk)
>>> mmc->f_min = min_clk;
>>> else {
>>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300)
>>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
>>> mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_300;
>>> else
>>> mmc->f_min = mmc->f_max / SDHCI_MAX_DIV_SPEC_200;
>>> @@ -486,7 +487,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
>>> mmc->voltages |= host->voltages;
>>>
>>> mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT;
>>> - if ((host->version & SDHCI_SPEC_VER_MASK) >= SDHCI_SPEC_300) {
>>> + if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
>>> if (caps & SDHCI_CAN_DO_8BIT)
>>> mmc->host_caps |= MMC_MODE_8BIT;
>>> }
>>> diff --git a/include/sdhci.h b/include/sdhci.h
>>> index cffbe53..f3f8219 100644
>>> --- a/include/sdhci.h
>>> +++ b/include/sdhci.h
>>> @@ -208,6 +208,8 @@
>>> #define SDHCI_SPEC_200 1
>>> #define SDHCI_SPEC_300 2
>>>
>>> +#define SDHCI_GET_VERSION(x) (x->version & SDHCI_SPEC_VER_MASK)
>>> +
>>> /*
>>> * End of controller registers.
>>> */
>>> @@ -226,6 +228,7 @@
>>> #define SDHCI_QUIRK_NO_CD (1 << 5)
>>> #define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
>>> #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1 << 7)
>>> +#define SDHCI_QUIRK_USE_WIDE8 (1 << 8)
>>>
>>> /* to make gcc happy */
>>> struct sdhci_host;
>>>
>>
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC
2013-07-19 8:44 [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC Jaehoon Chung
2013-08-13 8:52 ` Jaehoon Chung
@ 2013-09-05 18:09 ` Pantelis Antoniou
1 sibling, 0 replies; 5+ messages in thread
From: Pantelis Antoniou @ 2013-09-05 18:09 UTC (permalink / raw)
To: u-boot
On Jul 19, 2013, at 11:44 AM, Jaehoon Chung wrote:
> Samsung SoC is supported the WIDE8, even if Controller version is v2.0.
> So add the SDHCI_QUIRK_USE_WIDE8 for Samsung-SoC.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-09-05 18:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-19 8:44 [U-Boot] [PATCH] mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC Jaehoon Chung
2013-08-13 8:52 ` Jaehoon Chung
2013-08-13 9:01 ` Pantelis Antoniou
2013-08-13 11:37 ` Jaehoon Chung
2013-09-05 18:09 ` Pantelis Antoniou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox