mmc: fsl_esdhc: clean up driver
cover mmc: fsl_esdhc: clean up driver
This patch-set is to clean up driver. There is still a lot of work to clean up the driver, and patches will be sent in the future.
Yangbo Lu (3):
mmc: fsl_esdhc: make BLK as hard requirement of DM_MMC
mmc: fsl_esdhc: remove redundant DM_MMC checking
mmc: fsl_esdhc: drop i.MX DDR support code
drivers/mmc/fsl_esdhc.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 mmc: fsl_esdhc: make BLK as hard requirement of DM_MMC
U-boot prefers DM_MMC + BLK for MMC. Now eSDHC driver has already support it, so let's force to use it.
- Drop non-BLK support for DM_MMC introduced by below patch. 66fa035 mmc: fsl_esdhc: fix probe issue without CONFIG_BLK enabled
- Support only DM_MMC + BLK (assuming BLK is always enabled for DM_MMC).
- Use DM_MMC instead of BLK for conditional compile.
--- drivers/mmc/fsl_esdhc.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-)
drivers/mmc/fsl_esdhc.c +1 -32
@@ -23,10 +23,6 @@#include <asm/io.h> #include <dm.h> -#if !CONFIG_IS_ENABLED (BLK ) -#include "mmc_private.h" -#endif -DECLARE_GLOBAL_DATA_PTR ;#define SDHCI_IRQ_EN_BITS (IRQSTATEN_CC | IRQSTATEN_TC | \
@@ -35,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR; IRQSTATEN_CIE | IRQSTATEN_DTOE | IRQSTATEN_DCE | \ IRQSTATEN_DEBE | IRQSTATEN_BRR | IRQSTATEN_BWR | \ IRQSTATEN_DINT) -#define ESDHC_DRIVER_STAGE_VALUE 0xffffffff struct fsl_esdhc { uint dsaddr; /* SDMA system address register */
@@ -98,7 +93,7 @@ struct fsl_esdhc_priv {struct clk per_clk;unsigned int clock;unsigned int bus_width; -#if !CONFIG_IS_ENABLED (BLK ) +#if !CONFIG_IS_ENABLED (DM_MMC )struct mmc *mmc;#endif struct udevice *dev;
@@ -960,9 +955,6 @@ static int fsl_esdhc_probe(struct udevice *dev)fdt_addr_t addr;unsigned int val;struct mmc *mmc; -#if !CONFIG_IS_ENABLED (BLK ) -struct blk_desc *bdesc; -#endif int ret; addr =dev_read_addr (dev);
@@ -1028,25 +1020,6 @@ static int fsl_esdhc_probe(struct udevice *dev) mmc = &plat->mmc; mmc->cfg = &plat->cfg; mmc->dev = dev; -#if !CONFIG_IS_ENABLED (BLK ) - mmc->priv = priv; - -/* Setup dsr related values */ - mmc->dsr_imp =0 ; - mmc->dsr =ESDHC_DRIVER_STAGE_VALUE ; -/* Setup the universal parts of the block interface just once */ - bdesc =mmc_get_blk_desc (mmc); - bdesc->if_type =IF_TYPE_MMC ; - bdesc->removable =1 ; - bdesc->devnum =mmc_get_next_devnum (); - bdesc->block_read = mmc_bread; - bdesc->block_write = mmc_bwrite; - bdesc->block_erase = mmc_berase; - -/* setup initial part type */ - bdesc->part_type = mmc->cfg->part_type; -mmc_list_add (mmc); -#endif upriv->mmc = mmc;
@@ -1093,23 +1066,19 @@ static const struct udevice_id fsl_esdhc_ids[] = { {/* sentinel */ } }; -#if CONFIG_IS_ENABLED (BLK )static int fsl_esdhc_bind (struct udevice *dev) {struct fsl_esdhc_plat *plat =dev_get_platdata (dev);return mmc_bind (dev, &plat->mmc, &plat->cfg); } -#endif U_BOOT_DRIVER (fsl_esdhc) = { .name ="fsl-esdhc-mmc" , .id =UCLASS_MMC , .of_match = fsl_esdhc_ids, .ops = &fsl_esdhc_ops, -#if CONFIG_IS_ENABLED(BLK) .bind = fsl_esdhc_bind, -#endif .probe = fsl_esdhc_probe, .platdata_auto_alloc_size =sizeof (struct fsl_esdhc_plat ), .priv_auto_alloc_size =sizeof (struct fsl_esdhc_priv ),
Signature · 1 line
2.7.4
PATCH 2/3 mmc: fsl_esdhc: remove redundant DM_MMC checking
In reply to Yangbo LuRemove redundant DM_MMC checking which is already in DM_MMC conditional compile block.
--- drivers/mmc/fsl_esdhc.c | 2 -- 1 file changed, 2 deletions(-)
drivers/mmc/fsl_esdhc.c +0 -2
@@ -1026,7 +1026,6 @@ static int fsl_esdhc_probe(struct udevice *dev)return esdhc_init_common (priv, mmc); } -#if CONFIG_IS_ENABLED (DM_MMC )static int fsl_esdhc_get_cd (struct udevice *dev) {struct fsl_esdhc_priv *priv =dev_get_priv (dev);
@@ -1059,7 +1058,6 @@ static const struct dm_mmc_ops fsl_esdhc_ops = { .execute_tuning = fsl_esdhc_execute_tuning,#endif }; -#endifstatic const struct udevice_id fsl_esdhc_ids[] = { { .compatible ="fsl,esdhc" , },
Signature · 1 line
2.7.4
PATCH 3/3 mmc: fsl_esdhc: drop i.MX DDR support code
In reply to Yangbo LuA previous patch below adding DDR mode support was actually for i.MX platforms. Now i.MX eSDHC driver is fsl_esdhc_imx.c. For QorIQ eSDHC, it uses different process for DDR mode, and hasn't been supported. Let's drop DDR support code for i.MX in fsl_esdhc driver.
0e1bf61 mmc: fsl_esdhc: Add support for DDR mode
--- drivers/mmc/fsl_esdhc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/mmc/fsl_esdhc.c +2 -6
@@ -501,7 +501,6 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)struct fsl_esdhc *regs = priv->esdhc_regs;int div =1 ;int pre_div =2 ; -int ddr_pre_div = mmc->ddr_mode ?2 :1 ;unsigned int sdhc_clk = priv->sdhc_clk;u32 time_out;u32 value;
@@ -510,10 +509,10 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min; -while (sdhc_clk / (16 * pre_div * ddr_pre_div) > clock && pre_div <256 ) +while (sdhc_clk / (16 * pre_div) > clock && pre_div <256 ) pre_div *=2 ; -while (sdhc_clk / (div * pre_div * ddr_pre_div) > clock && div <16 ) +while (sdhc_clk / (div * pre_div) > clock && div <16 ) div++; pre_div >>=1 ;
@@ -773,9 +772,6 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, cfg->host_caps =MMC_MODE_4BIT ; cfg->host_caps =MMC_MODE_4BIT |MMC_MODE_8BIT ; -#ifdef CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE - cfg->host_caps |= MMC_MODE_DDR_52MHz; -#endif if (priv->bus_width >0 ) {if (priv->bus_width <8 )
Signature · 1 line
2.7.4
cover mmc: fsl_esdhc: clean up driver
In reply to Yangbo LuAny comments?
Thanks a lot.
Best regards,
Yangbo Lu
Quoted 20 lines
-----Original Message-----
From: Yangbo Lu <[email protected]>
Sent: Monday, October 21, 2019 6:09 PM
To: u-boot at lists.denx.de; Peng Fan <[email protected]>
Cc: Y.b. Lu <[email protected]>
Subject: [PATCH 0/3] mmc:fsl_esdhc: clean up driverThis patch-set is to clean up driver. There is still a lot of work to clean up the driver, and patches will be sent in the future.
Yangbo Lu (3):
mmc:fsl_esdhc: make BLK as hard requirement ofDM_MMC
mmc:fsl_esdhc: remove redundantDM_MMCchecking
mmc:fsl_esdhc: drop i.MX DDR support codedrivers/mmc/fsl_esdhc.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-)--
2.7.4
cover mmc: fsl_esdhc: clean up driver
Quoted 3 lines
Subject: RE: [PATCH 0/3] mmc:
fsl_esdhc: clean up driverAny comments?
Under ci build, if things go smoothly, pull request will be sent to tom Tomorrow.
Regards,
Peng.
Quoted 26 lines
Thanks a lot.
Best regards,
Yangbo LuQuoted 21 lines
-----Original Message-----
From: Yangbo Lu <[email protected]>
Sent: Monday, October 21, 2019 6:09 PM
To: u-boot at lists.denx.de; Peng Fan <[email protected]>
Cc: Y.b. Lu <[email protected]>
Subject: [PATCH 0/3] mmc:fsl_esdhc: clean up driverThis patch-set is to clean up driver. There is still a lot of work to clean up the driver, and patches will be sent in the future.
Yangbo Lu (3):
mmc:fsl_esdhc: make BLK as hard requirement ofDM_MMC
mmc:fsl_esdhc: remove redundantDM_MMCchecking
mmc:fsl_esdhc: drop i.MX DDR support codedrivers/mmc/fsl_esdhc.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-)--
2.7.4