| Message ID | 1562815728-8806-1-git-send-email-ye.li@nxp.com |
|---|---|
| State | Accepted |
| Commit | 8277171663084e20c0eca7c0b9681019f1a2a353 |
| Delegated to: | Peng Fan |
| Headers | show |
| Series | [U-Boot] mmc: fsl_esdhc_imx: fix config check issue when building in SPL | expand |
On Thu, Jul 11, 2019 at 11:29 AM Ye Li <ye.li@nxp.com> wrote: > > Should use CONFIG_IS_ENABLED not IS_ENABLED for clock and regulator drivers, > CONFIG_IS_ENABLED will check the CONFIG_SPL_CLK and CONFIG_SPL_DM_REGULATOR > when building SPL. > > Signed-off-by: Ye Li <ye.li@nxp.com> > --- > drivers/mmc/fsl_esdhc_imx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Subject: [PATCH] mmc: fsl_esdhc_imx: fix config check issue when building in > SPL > > Should use CONFIG_IS_ENABLED not IS_ENABLED for clock and regulator > drivers, CONFIG_IS_ENABLED will check the CONFIG_SPL_CLK and > CONFIG_SPL_DM_REGULATOR when building SPL. > > Signed-off-by: Ye Li <ye.li@nxp.com> > --- > drivers/mmc/fsl_esdhc_imx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c > index c0d47ba..4938202 100644 > --- a/drivers/mmc/fsl_esdhc_imx.c > +++ b/drivers/mmc/fsl_esdhc_imx.c > @@ -146,7 +146,7 @@ struct fsl_esdhc_priv { > u32 tuning_start_tap; > u32 strobe_dll_delay_target; > u32 signal_voltage; > -#if IS_ENABLED(CONFIG_DM_REGULATOR) > +#if CONFIG_IS_ENABLED(DM_REGULATOR) > struct udevice *vqmmc_dev; > struct udevice *vmmc_dev; > #endif > @@ -1515,7 +1515,7 @@ static int fsl_esdhc_probe(struct udevice *dev) > > init_clk_usdhc(dev->seq); > > - if (IS_ENABLED(CONFIG_CLK)) { > + if (CONFIG_IS_ENABLED(CLK)) { > /* Assigned clock already set clock */ > ret = clk_get_by_name(dev, "per", &priv->per_clk); > if (ret) { Applied to mmc/master. Thanks, Peng. > -- > 2.7.4
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index c0d47ba..4938202 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -146,7 +146,7 @@ struct fsl_esdhc_priv { u32 tuning_start_tap; u32 strobe_dll_delay_target; u32 signal_voltage; -#if IS_ENABLED(CONFIG_DM_REGULATOR) +#if CONFIG_IS_ENABLED(DM_REGULATOR) struct udevice *vqmmc_dev; struct udevice *vmmc_dev; #endif @@ -1515,7 +1515,7 @@ static int fsl_esdhc_probe(struct udevice *dev) init_clk_usdhc(dev->seq); - if (IS_ENABLED(CONFIG_CLK)) { + if (CONFIG_IS_ENABLED(CLK)) { /* Assigned clock already set clock */ ret = clk_get_by_name(dev, "per", &priv->per_clk); if (ret) {
Should use CONFIG_IS_ENABLED not IS_ENABLED for clock and regulator drivers, CONFIG_IS_ENABLED will check the CONFIG_SPL_CLK and CONFIG_SPL_DM_REGULATOR when building SPL. Signed-off-by: Ye Li <ye.li@nxp.com> --- drivers/mmc/fsl_esdhc_imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)