* [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver
@ 2020-05-22 0:24 Alex Nemirovsky
2020-05-22 0:24 ` [PATCH v8 2/2] board: presidio-asic: update eMMC DT information Alex Nemirovsky
2020-06-17 20:25 ` [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver Alex Nemirovsky
0 siblings, 2 replies; 5+ messages in thread
From: Alex Nemirovsky @ 2020-05-22 0:24 UTC (permalink / raw)
To: u-boot
From: Arthur Li <arthur.li@cortina-access.com>
- Rename DT compatible name
- Remove uneccessary if-statement to support 8-bit buswidth
- Remove redundant error msg
- Use symbolic constants in switch statement
Signed-off-by: Arthur Li <arthur.li@cortina-access.com>
Signed-off-by: Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
CC: Peng Fan <peng.fan@nxp.com>
CC: Jaehoon Chung <jh80.chung@samsung.com>
CC: Tom Rini <trini@konsulko.com>
---
Changes in v8:
- No code change
- Split out individual driver from Cortina Package 2 patch series
to help streamline acceptence into master
Changes in v7: None
Changes in v5:
- Rebase code basis on v2020.04-rc5 which has
already incorporated CAxxxx eMMC initial baseline
Changes in v4:
- Rename DT compatible name
- Remove uneccessary if-statement to support 8-bit buswidth
- Remove redundant error msg
- Use symbolic constants in switch statement
drivers/mmc/ca_dw_mmc.c | 34 ++++++++++++----------------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index acbc850..198c41f 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -19,6 +19,7 @@
#define SD_CLK_SEL_200MHZ (0x2)
#define SD_CLK_SEL_100MHZ (0x1)
+#define SD_CLK_SEL_50MHZ (0x0)
#define IO_DRV_SD_DS_OFFSET (16)
#define IO_DRV_SD_DS_MASK (0xff << IO_DRV_SD_DS_OFFSET)
@@ -44,15 +45,11 @@ static void ca_dwmci_clksel(struct dwmci_host *host)
struct ca_dwmmc_priv_data *priv = host->priv;
u32 val = readl(priv->sd_dll_reg);
- if (host->bus_hz >= 200000000) {
- val &= ~SD_CLK_SEL_MASK;
+ val &= ~SD_CLK_SEL_MASK;
+ if (host->bus_hz >= 200000000)
val |= SD_CLK_SEL_200MHZ;
- } else if (host->bus_hz >= 100000000) {
- val &= ~SD_CLK_SEL_MASK;
+ else if (host->bus_hz >= 100000000)
val |= SD_CLK_SEL_100MHZ;
- } else {
- val &= ~SD_CLK_SEL_MASK;
- }
writel(val, priv->sd_dll_reg);
}
@@ -77,14 +74,14 @@ unsigned int ca_dwmci_get_mmc_clock(struct dwmci_host *host, uint freq)
u8 clk_div;
switch (sd_clk_sel) {
- case 2:
- clk_div = 1;
+ case SD_CLK_SEL_50MHZ:
+ clk_div = 4;
break;
- case 1:
+ case SD_CLK_SEL_100MHZ:
clk_div = 2;
break;
default:
- clk_div = 4;
+ clk_div = 1;
}
return SD_SCLK_MAX / clk_div / (host->div + 1);
@@ -100,9 +97,6 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
host->dev_index = 0;
host->buswidth = dev_read_u32_default(dev, "bus-width", 1);
- if (host->buswidth != 1 && host->buswidth != 4)
- return -EINVAL;
-
host->bus_hz = dev_read_u32_default(dev, "max-frequency", 50000000);
priv->ds = dev_read_u32_default(dev, "io_ds", 0x33);
host->fifo_mode = dev_read_bool(dev, "fifo-mode");
@@ -118,10 +112,8 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
return -EINVAL;
host->ioaddr = dev_read_addr_ptr(dev);
- if (host->ioaddr == (void *)FDT_ADDR_T_NONE) {
- printf("DWMMC: base address is invalid\n");
+ if (!host->ioaddr)
return -EINVAL;
- }
host->priv = priv;
@@ -140,10 +132,8 @@ static int ca_dwmmc_probe(struct udevice *dev)
memcpy(&ca_dwmci_dm_ops, &dm_dwmci_ops, sizeof(struct dm_mmc_ops));
dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, MIN_FREQ);
- if (host->buswidth == 1) {
- (&plat->cfg)->host_caps &= ~MMC_MODE_8BIT;
- (&plat->cfg)->host_caps &= ~MMC_MODE_4BIT;
- }
+ if (host->buswidth == 1)
+ (&plat->cfg)->host_caps &= ~(MMC_MODE_8BIT | MMC_MODE_4BIT);
host->mmc = &plat->mmc;
host->mmc->priv = &priv->host;
@@ -164,7 +154,7 @@ static int ca_dwmmc_bind(struct udevice *dev)
}
static const struct udevice_id ca_dwmmc_ids[] = {
- { .compatible = "snps,dw-cortina" },
+ { .compatible = "cortina,ca-mmc" },
{ }
};
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v8 2/2] board: presidio-asic: update eMMC DT information
2020-05-22 0:24 [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver Alex Nemirovsky
@ 2020-05-22 0:24 ` Alex Nemirovsky
2020-06-17 20:25 ` [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver Alex Nemirovsky
1 sibling, 0 replies; 5+ messages in thread
From: Alex Nemirovsky @ 2020-05-22 0:24 UTC (permalink / raw)
To: u-boot
Change DT compatibility name to match change in driver's name.
Remove unused io_ds and fifo_mode fields from DT.
Signed-off-by: Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
CC: Peng Fan <peng.fan@nxp.com>
CC: Jaehoon Chung <jh80.chung@samsung.com>
CC: Tom Rini <trini@konsulko.com>
---
Changes in v8: None
Changes in v7:
- Cleanup typos in commit subject line and description
Changes in v5:
- Rebase on codebase basis v2020.04-rc5 which already incorporated
initial baseline of eMMC DT information
Changes in v4:
- Change DT compatiblity name to match change in driver's name
- Remove unused io_ds and fifo_mode fields from DT
arch/arm/dts/ca-presidio-engboard.dts | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/dts/ca-presidio-engboard.dts b/arch/arm/dts/ca-presidio-engboard.dts
index c03dacc..40c93d7 100644
--- a/arch/arm/dts/ca-presidio-engboard.dts
+++ b/arch/arm/dts/ca-presidio-engboard.dts
@@ -10,11 +10,9 @@
#size-cells = <1>;
mmc0: mmc at f4400000 {
- compatible = "snps,dw-cortina";
+ compatible = "cortina,ca-mmc";
reg = <0x0 0xf4400000 0x1000>;
bus-width = <4>;
- io_ds = <0x77>;
- fifo-mode;
sd_dll_ctrl = <0xf43200e8>;
io_drv_ctrl = <0xf432004c>;
};
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver
2020-05-22 0:24 [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver Alex Nemirovsky
2020-05-22 0:24 ` [PATCH v8 2/2] board: presidio-asic: update eMMC DT information Alex Nemirovsky
@ 2020-06-17 20:25 ` Alex Nemirovsky
2020-06-17 22:14 ` Peng Fan
1 sibling, 1 reply; 5+ messages in thread
From: Alex Nemirovsky @ 2020-06-17 20:25 UTC (permalink / raw)
To: u-boot
Hi Peng,
this patch set seems to have stalled. There was some confusion as most of the driver
was already pushed to master and thus a new patch was created for some some misc cleanup.
Could you review?
Thanks
Alex
> On May 21, 2020, at 5:24 PM, Alex Nemirovsky <alex.nemirovsky@cortina-access.com> wrote:
>
> From: Arthur Li <arthur.li@cortina-access.com>
>
> - Rename DT compatible name
> - Remove uneccessary if-statement to support 8-bit buswidth
> - Remove redundant error msg
> - Use symbolic constants in switch statement
>
> Signed-off-by: Arthur Li <arthur.li@cortina-access.com>
> Signed-off-by: Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
> CC: Peng Fan <peng.fan@nxp.com>
> CC: Jaehoon Chung <jh80.chung@samsung.com>
> CC: Tom Rini <trini@konsulko.com>
> ---
>
> Changes in v8:
> - No code change
> - Split out individual driver from Cortina Package 2 patch series
> to help streamline acceptence into master
>
> Changes in v7: None
> Changes in v5:
> - Rebase code basis on v2020.04-rc5 which has
> already incorporated CAxxxx eMMC initial baseline
>
> Changes in v4:
> - Rename DT compatible name
> - Remove uneccessary if-statement to support 8-bit buswidth
> - Remove redundant error msg
> - Use symbolic constants in switch statement
>
> drivers/mmc/ca_dw_mmc.c | 34 ++++++++++++----------------------
> 1 file changed, 12 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
> index acbc850..198c41f 100644
> --- a/drivers/mmc/ca_dw_mmc.c
> +++ b/drivers/mmc/ca_dw_mmc.c
> @@ -19,6 +19,7 @@
>
> #define SD_CLK_SEL_200MHZ (0x2)
> #define SD_CLK_SEL_100MHZ (0x1)
> +#define SD_CLK_SEL_50MHZ (0x0)
>
> #define IO_DRV_SD_DS_OFFSET (16)
> #define IO_DRV_SD_DS_MASK (0xff << IO_DRV_SD_DS_OFFSET)
> @@ -44,15 +45,11 @@ static void ca_dwmci_clksel(struct dwmci_host *host)
> struct ca_dwmmc_priv_data *priv = host->priv;
> u32 val = readl(priv->sd_dll_reg);
>
> - if (host->bus_hz >= 200000000) {
> - val &= ~SD_CLK_SEL_MASK;
> + val &= ~SD_CLK_SEL_MASK;
> + if (host->bus_hz >= 200000000)
> val |= SD_CLK_SEL_200MHZ;
> - } else if (host->bus_hz >= 100000000) {
> - val &= ~SD_CLK_SEL_MASK;
> + else if (host->bus_hz >= 100000000)
> val |= SD_CLK_SEL_100MHZ;
> - } else {
> - val &= ~SD_CLK_SEL_MASK;
> - }
>
> writel(val, priv->sd_dll_reg);
> }
> @@ -77,14 +74,14 @@ unsigned int ca_dwmci_get_mmc_clock(struct dwmci_host *host, uint freq)
> u8 clk_div;
>
> switch (sd_clk_sel) {
> - case 2:
> - clk_div = 1;
> + case SD_CLK_SEL_50MHZ:
> + clk_div = 4;
> break;
> - case 1:
> + case SD_CLK_SEL_100MHZ:
> clk_div = 2;
> break;
> default:
> - clk_div = 4;
> + clk_div = 1;
> }
>
> return SD_SCLK_MAX / clk_div / (host->div + 1);
> @@ -100,9 +97,6 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
> host->dev_index = 0;
>
> host->buswidth = dev_read_u32_default(dev, "bus-width", 1);
> - if (host->buswidth != 1 && host->buswidth != 4)
> - return -EINVAL;
> -
> host->bus_hz = dev_read_u32_default(dev, "max-frequency", 50000000);
> priv->ds = dev_read_u32_default(dev, "io_ds", 0x33);
> host->fifo_mode = dev_read_bool(dev, "fifo-mode");
> @@ -118,10 +112,8 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
> return -EINVAL;
>
> host->ioaddr = dev_read_addr_ptr(dev);
> - if (host->ioaddr == (void *)FDT_ADDR_T_NONE) {
> - printf("DWMMC: base address is invalid\n");
> + if (!host->ioaddr)
> return -EINVAL;
> - }
>
> host->priv = priv;
>
> @@ -140,10 +132,8 @@ static int ca_dwmmc_probe(struct udevice *dev)
> memcpy(&ca_dwmci_dm_ops, &dm_dwmci_ops, sizeof(struct dm_mmc_ops));
>
> dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, MIN_FREQ);
> - if (host->buswidth == 1) {
> - (&plat->cfg)->host_caps &= ~MMC_MODE_8BIT;
> - (&plat->cfg)->host_caps &= ~MMC_MODE_4BIT;
> - }
> + if (host->buswidth == 1)
> + (&plat->cfg)->host_caps &= ~(MMC_MODE_8BIT | MMC_MODE_4BIT);
>
> host->mmc = &plat->mmc;
> host->mmc->priv = &priv->host;
> @@ -164,7 +154,7 @@ static int ca_dwmmc_bind(struct udevice *dev)
> }
>
> static const struct udevice_id ca_dwmmc_ids[] = {
> - { .compatible = "snps,dw-cortina" },
> + { .compatible = "cortina,ca-mmc" },
> { }
> };
>
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver
2020-06-17 20:25 ` [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver Alex Nemirovsky
@ 2020-06-17 22:14 ` Peng Fan
2020-06-18 19:31 ` Alex Nemirovsky
0 siblings, 1 reply; 5+ messages in thread
From: Peng Fan @ 2020-06-17 22:14 UTC (permalink / raw)
To: u-boot
It has been applied, could you check tom's master tree?
> -----Original Message-----
> From: Alex Nemirovsky [mailto:Alex.Nemirovsky at cortina-access.com]
> Sent: 2020?6?18? 4:25
> To: U-Boot-Denx <u-boot@lists.denx.de>
> Cc: ??? <arthur.li@Cortina-Access.com>; Peng Fan
> <peng.fan@nxp.com>; Jaehoon Chung <jh80.chung@samsung.com>; Tom Rini
> <trini@konsulko.com>
> Subject: Re: [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver
>
> Hi Peng,
>
> this patch set seems to have stalled. There was some confusion as most of
> the driver was already pushed to master and thus a new patch was created
> for some some misc cleanup.
> Could you review?
>
> Thanks
> Alex
> > On May 21, 2020, at 5:24 PM, Alex Nemirovsky
> <alex.nemirovsky@cortina-access.com> wrote:
> >
> > From: Arthur Li <arthur.li@cortina-access.com>
> >
> > - Rename DT compatible name
> > - Remove uneccessary if-statement to support 8-bit buswidth
> > - Remove redundant error msg
> > - Use symbolic constants in switch statement
> >
> > Signed-off-by: Arthur Li <arthur.li@cortina-access.com>
> > Signed-off-by: Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
> > CC: Peng Fan <peng.fan@nxp.com>
> > CC: Jaehoon Chung <jh80.chung@samsung.com>
> > CC: Tom Rini <trini@konsulko.com>
> > ---
> >
> > Changes in v8:
> > - No code change
> > - Split out individual driver from Cortina Package 2 patch series to
> > help streamline acceptence into master
> >
> > Changes in v7: None
> > Changes in v5:
> > - Rebase code basis on v2020.04-rc5 which has already incorporated
> > CAxxxx eMMC initial baseline
> >
> > Changes in v4:
> > - Rename DT compatible name
> > - Remove uneccessary if-statement to support 8-bit buswidth
> > - Remove redundant error msg
> > - Use symbolic constants in switch statement
> >
> > drivers/mmc/ca_dw_mmc.c | 34 ++++++++++++----------------------
> > 1 file changed, 12 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index
> > acbc850..198c41f 100644
> > --- a/drivers/mmc/ca_dw_mmc.c
> > +++ b/drivers/mmc/ca_dw_mmc.c
> > @@ -19,6 +19,7 @@
> >
> > #define SD_CLK_SEL_200MHZ (0x2)
> > #define SD_CLK_SEL_100MHZ (0x1)
> > +#define SD_CLK_SEL_50MHZ (0x0)
> >
> > #define IO_DRV_SD_DS_OFFSET (16)
> > #define IO_DRV_SD_DS_MASK (0xff << IO_DRV_SD_DS_OFFSET)
> > @@ -44,15 +45,11 @@ static void ca_dwmci_clksel(struct dwmci_host
> *host)
> > struct ca_dwmmc_priv_data *priv = host->priv;
> > u32 val = readl(priv->sd_dll_reg);
> >
> > - if (host->bus_hz >= 200000000) {
> > - val &= ~SD_CLK_SEL_MASK;
> > + val &= ~SD_CLK_SEL_MASK;
> > + if (host->bus_hz >= 200000000)
> > val |= SD_CLK_SEL_200MHZ;
> > - } else if (host->bus_hz >= 100000000) {
> > - val &= ~SD_CLK_SEL_MASK;
> > + else if (host->bus_hz >= 100000000)
> > val |= SD_CLK_SEL_100MHZ;
> > - } else {
> > - val &= ~SD_CLK_SEL_MASK;
> > - }
> >
> > writel(val, priv->sd_dll_reg);
> > }
> > @@ -77,14 +74,14 @@ unsigned int ca_dwmci_get_mmc_clock(struct
> dwmci_host *host, uint freq)
> > u8 clk_div;
> >
> > switch (sd_clk_sel) {
> > - case 2:
> > - clk_div = 1;
> > + case SD_CLK_SEL_50MHZ:
> > + clk_div = 4;
> > break;
> > - case 1:
> > + case SD_CLK_SEL_100MHZ:
> > clk_div = 2;
> > break;
> > default:
> > - clk_div = 4;
> > + clk_div = 1;
> > }
> >
> > return SD_SCLK_MAX / clk_div / (host->div + 1); @@ -100,9 +97,6 @@
> > static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
> > host->dev_index = 0;
> >
> > host->buswidth = dev_read_u32_default(dev, "bus-width", 1);
> > - if (host->buswidth != 1 && host->buswidth != 4)
> > - return -EINVAL;
> > -
> > host->bus_hz = dev_read_u32_default(dev, "max-frequency",
> 50000000);
> > priv->ds = dev_read_u32_default(dev, "io_ds", 0x33);
> > host->fifo_mode = dev_read_bool(dev, "fifo-mode"); @@ -118,10 +112,8
> > @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
> > return -EINVAL;
> >
> > host->ioaddr = dev_read_addr_ptr(dev);
> > - if (host->ioaddr == (void *)FDT_ADDR_T_NONE) {
> > - printf("DWMMC: base address is invalid\n");
> > + if (!host->ioaddr)
> > return -EINVAL;
> > - }
> >
> > host->priv = priv;
> >
> > @@ -140,10 +132,8 @@ static int ca_dwmmc_probe(struct udevice *dev)
> > memcpy(&ca_dwmci_dm_ops, &dm_dwmci_ops, sizeof(struct
> dm_mmc_ops));
> >
> > dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, MIN_FREQ);
> > - if (host->buswidth == 1) {
> > - (&plat->cfg)->host_caps &= ~MMC_MODE_8BIT;
> > - (&plat->cfg)->host_caps &= ~MMC_MODE_4BIT;
> > - }
> > + if (host->buswidth == 1)
> > + (&plat->cfg)->host_caps &= ~(MMC_MODE_8BIT |
> MMC_MODE_4BIT);
> >
> > host->mmc = &plat->mmc;
> > host->mmc->priv = &priv->host;
> > @@ -164,7 +154,7 @@ static int ca_dwmmc_bind(struct udevice *dev) }
> >
> > static const struct udevice_id ca_dwmmc_ids[] = {
> > - { .compatible = "snps,dw-cortina" },
> > + { .compatible = "cortina,ca-mmc" },
> > { }
> > };
> >
> > --
> > 2.7.4
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver
2020-06-17 22:14 ` Peng Fan
@ 2020-06-18 19:31 ` Alex Nemirovsky
0 siblings, 0 replies; 5+ messages in thread
From: Alex Nemirovsky @ 2020-06-18 19:31 UTC (permalink / raw)
To: u-boot
Thanks Peng,
Could we update the state of this patch set in the patchwork DB as done? It still at state ?New?.
> On Jun 17, 2020, at 3:14 PM, Peng Fan <peng.fan@nxp.com> wrote:
>
> It has been applied, could you check tom's master tree?
>
>> -----Original Message-----
>> From: Alex Nemirovsky [mailto:Alex.Nemirovsky at cortina-access.com]
>> Sent: 2020?6?18? 4:25
>> To: U-Boot-Denx <u-boot@lists.denx.de>
>> Cc: ??? <arthur.li@Cortina-Access.com>; Peng Fan
>> <peng.fan@nxp.com>; Jaehoon Chung <jh80.chung@samsung.com>; Tom Rini
>> <trini@konsulko.com>
>> Subject: Re: [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver
>>
>> Hi Peng,
>>
>> this patch set seems to have stalled. There was some confusion as most of
>> the driver was already pushed to master and thus a new patch was created
>> for some some misc cleanup.
>> Could you review?
>>
>> Thanks
>> Alex
>>> On May 21, 2020, at 5:24 PM, Alex Nemirovsky
>> <alex.nemirovsky@cortina-access.com> wrote:
>>>
>>> From: Arthur Li <arthur.li@cortina-access.com>
>>>
>>> - Rename DT compatible name
>>> - Remove uneccessary if-statement to support 8-bit buswidth
>>> - Remove redundant error msg
>>> - Use symbolic constants in switch statement
>>>
>>> Signed-off-by: Arthur Li <arthur.li@cortina-access.com>
>>> Signed-off-by: Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
>>> CC: Peng Fan <peng.fan@nxp.com>
>>> CC: Jaehoon Chung <jh80.chung@samsung.com>
>>> CC: Tom Rini <trini@konsulko.com>
>>> ---
>>>
>>> Changes in v8:
>>> - No code change
>>> - Split out individual driver from Cortina Package 2 patch series to
>>> help streamline acceptence into master
>>>
>>> Changes in v7: None
>>> Changes in v5:
>>> - Rebase code basis on v2020.04-rc5 which has already incorporated
>>> CAxxxx eMMC initial baseline
>>>
>>> Changes in v4:
>>> - Rename DT compatible name
>>> - Remove uneccessary if-statement to support 8-bit buswidth
>>> - Remove redundant error msg
>>> - Use symbolic constants in switch statement
>>>
>>> drivers/mmc/ca_dw_mmc.c | 34 ++++++++++++----------------------
>>> 1 file changed, 12 insertions(+), 22 deletions(-)
>>>
>>> diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index
>>> acbc850..198c41f 100644
>>> --- a/drivers/mmc/ca_dw_mmc.c
>>> +++ b/drivers/mmc/ca_dw_mmc.c
>>> @@ -19,6 +19,7 @@
>>>
>>> #define SD_CLK_SEL_200MHZ (0x2)
>>> #define SD_CLK_SEL_100MHZ (0x1)
>>> +#define SD_CLK_SEL_50MHZ (0x0)
>>>
>>> #define IO_DRV_SD_DS_OFFSET (16)
>>> #define IO_DRV_SD_DS_MASK (0xff << IO_DRV_SD_DS_OFFSET)
>>> @@ -44,15 +45,11 @@ static void ca_dwmci_clksel(struct dwmci_host
>> *host)
>>> struct ca_dwmmc_priv_data *priv = host->priv;
>>> u32 val = readl(priv->sd_dll_reg);
>>>
>>> - if (host->bus_hz >= 200000000) {
>>> - val &= ~SD_CLK_SEL_MASK;
>>> + val &= ~SD_CLK_SEL_MASK;
>>> + if (host->bus_hz >= 200000000)
>>> val |= SD_CLK_SEL_200MHZ;
>>> - } else if (host->bus_hz >= 100000000) {
>>> - val &= ~SD_CLK_SEL_MASK;
>>> + else if (host->bus_hz >= 100000000)
>>> val |= SD_CLK_SEL_100MHZ;
>>> - } else {
>>> - val &= ~SD_CLK_SEL_MASK;
>>> - }
>>>
>>> writel(val, priv->sd_dll_reg);
>>> }
>>> @@ -77,14 +74,14 @@ unsigned int ca_dwmci_get_mmc_clock(struct
>> dwmci_host *host, uint freq)
>>> u8 clk_div;
>>>
>>> switch (sd_clk_sel) {
>>> - case 2:
>>> - clk_div = 1;
>>> + case SD_CLK_SEL_50MHZ:
>>> + clk_div = 4;
>>> break;
>>> - case 1:
>>> + case SD_CLK_SEL_100MHZ:
>>> clk_div = 2;
>>> break;
>>> default:
>>> - clk_div = 4;
>>> + clk_div = 1;
>>> }
>>>
>>> return SD_SCLK_MAX / clk_div / (host->div + 1); @@ -100,9 +97,6 @@
>>> static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
>>> host->dev_index = 0;
>>>
>>> host->buswidth = dev_read_u32_default(dev, "bus-width", 1);
>>> - if (host->buswidth != 1 && host->buswidth != 4)
>>> - return -EINVAL;
>>> -
>>> host->bus_hz = dev_read_u32_default(dev, "max-frequency",
>> 50000000);
>>> priv->ds = dev_read_u32_default(dev, "io_ds", 0x33);
>>> host->fifo_mode = dev_read_bool(dev, "fifo-mode"); @@ -118,10 +112,8
>>> @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev)
>>> return -EINVAL;
>>>
>>> host->ioaddr = dev_read_addr_ptr(dev);
>>> - if (host->ioaddr == (void *)FDT_ADDR_T_NONE) {
>>> - printf("DWMMC: base address is invalid\n");
>>> + if (!host->ioaddr)
>>> return -EINVAL;
>>> - }
>>>
>>> host->priv = priv;
>>>
>>> @@ -140,10 +132,8 @@ static int ca_dwmmc_probe(struct udevice *dev)
>>> memcpy(&ca_dwmci_dm_ops, &dm_dwmci_ops, sizeof(struct
>> dm_mmc_ops));
>>>
>>> dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, MIN_FREQ);
>>> - if (host->buswidth == 1) {
>>> - (&plat->cfg)->host_caps &= ~MMC_MODE_8BIT;
>>> - (&plat->cfg)->host_caps &= ~MMC_MODE_4BIT;
>>> - }
>>> + if (host->buswidth == 1)
>>> + (&plat->cfg)->host_caps &= ~(MMC_MODE_8BIT |
>> MMC_MODE_4BIT);
>>>
>>> host->mmc = &plat->mmc;
>>> host->mmc->priv = &priv->host;
>>> @@ -164,7 +154,7 @@ static int ca_dwmmc_bind(struct udevice *dev) }
>>>
>>> static const struct udevice_id ca_dwmmc_ids[] = {
>>> - { .compatible = "snps,dw-cortina" },
>>> + { .compatible = "cortina,ca-mmc" },
>>> { }
>>> };
>>>
>>> --
>>> 2.7.4
>>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-18 19:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 0:24 [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver Alex Nemirovsky
2020-05-22 0:24 ` [PATCH v8 2/2] board: presidio-asic: update eMMC DT information Alex Nemirovsky
2020-06-17 20:25 ` [PATCH v8 1/2] mmc: ca_dw_mmc: Misc cleanup of driver Alex Nemirovsky
2020-06-17 22:14 ` Peng Fan
2020-06-18 19:31 ` Alex Nemirovsky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.