Message ID | 1562815997-9193-1-git-send-email-ye.li@nxp.com |
---|---|
State | Accepted |
Commit | af325e9597dfe47943f6f3b92d0b7012317f4a53 |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot] serial_lpuart: Fix config check issue when using clk driver in SPL | expand |
On Thu, Jul 11, 2019 at 11:33 AM Ye Li <ye.li@nxp.com> wrote: > > Should use CONFIG_IS_ENABLED not IS_ENABLED for CLK driver, so it will > check the CONFIG_SPL_CLK when building SPL > > Signed-off-by: Ye Li <ye.li@nxp.com> > --- > drivers/serial/serial_lpuart.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Thu, Jul 11, 2019 at 03:33:34AM +0000, Ye Li wrote: > Should use CONFIG_IS_ENABLED not IS_ENABLED for CLK driver, so it will > check the CONFIG_SPL_CLK when building SPL > > Signed-off-by: Ye Li <ye.li@nxp.com> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Applied to u-boot/master, thanks!
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index a357b00..5f6329f 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -105,7 +105,7 @@ u32 __weak get_lpuart_clk(void) return CONFIG_SYS_CLK_FREQ; } -#if IS_ENABLED(CONFIG_CLK) +#if CONFIG_IS_ENABLED(CLK) static int get_lpuart_clk_rate(struct udevice *dev, u32 *clk) { struct clk per_clk; @@ -147,7 +147,7 @@ static void _lpuart_serial_setbrg(struct udevice *dev, u16 sbr; int ret; - if (IS_ENABLED(CONFIG_CLK)) { + if (CONFIG_IS_ENABLED(CLK)) { ret = get_lpuart_clk_rate(dev, &clk); if (ret) return; @@ -236,7 +236,7 @@ static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, u32 clk; int ret; - if (IS_ENABLED(CONFIG_CLK)) { + if (CONFIG_IS_ENABLED(CLK)) { ret = get_lpuart_clk_rate(dev, &clk); if (ret) return; @@ -305,7 +305,7 @@ static void _lpuart32_serial_setbrg(struct udevice *dev, u32 sbr; int ret; - if (IS_ENABLED(CONFIG_CLK)) { + if (CONFIG_IS_ENABLED(CLK)) { ret = get_lpuart_clk_rate(dev, &clk); if (ret) return;
Should use CONFIG_IS_ENABLED not IS_ENABLED for CLK driver, so it will check the CONFIG_SPL_CLK when building SPL Signed-off-by: Ye Li <ye.li@nxp.com> --- drivers/serial/serial_lpuart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)