Re: [PATCH 042/171] Correct SPL uses of CMD_CLK

Sean Anderson
2023-01-30T15:01:50Z

On 1/30/23 09:41, Simon Glass wrote:
> This converts 7 usages of this option to the non-SPL form, since there is
> no SPL_CMD_CLK defined in Kconfig
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> drivers/clk/clk_k210.c | 6 +++---
> drivers/clk/imx/clk-imx8.c | 2 +-
> drivers/clk/imx/clk-imx8.h | 2 +-
> drivers/clk/imx/clk-imx8qm.c | 2 +-
> drivers/clk/imx/clk-imx8qxp.c | 2 +-
> 5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/clk/clk_k210.c b/drivers/clk/clk_k210.c
> index f7d36963f85..c534cc07e09 100644
> --- a/drivers/clk/clk_k210.c
> +++ b/drivers/clk/clk_k210.c
> @@ -308,7 +308,7 @@ enum k210_clk_flags {
> * @gate: An &enum k210_gate_id of this clock's gate
> */
> struct k210_clk_params {
> -#if CONFIG_IS_ENABLED(CMD_CLK)
> +#if IS_ENABLED(CONFIG_CMD_CLK)
> const char *name;
> #endif
> u8 flags;
> @@ -326,7 +326,7 @@ struct k210_clk_params {
> };
>
> static const struct k210_clk_params k210_clks[] = {
> -#if CONFIG_IS_ENABLED(CMD_CLK)
> +#if IS_ENABLED(CONFIG_CMD_CLK)
> #define NAME(_name) .name = (_name),
> #else
> #define NAME(name)
> @@ -1284,7 +1284,7 @@ U_BOOT_DRIVER(k210_clk) = {
> .priv_auto = sizeof(struct k210_clk_priv),
> };
>
> -#if CONFIG_IS_ENABLED(CMD_CLK)
> +#if IS_ENABLED(CONFIG_CMD_CLK)
> static char show_enabled(struct k210_clk_priv *priv, int id)
> {
> bool enabled;
> diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
> index b3dc138c4bb..24bdab28aa4 100644
> --- a/drivers/clk/imx/clk-imx8.c
> +++ b/drivers/clk/imx/clk-imx8.c
> @@ -42,7 +42,7 @@ static int imx8_clk_enable(struct clk *clk)
> return __imx8_clk_enable(clk, 1);
> }
>
> -#if CONFIG_IS_ENABLED(CMD_CLK)
> +#if IS_ENABLED(CONFIG_CMD_CLK)
> int soc_clk_dump(void)
> {
> struct udevice *dev;
> diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h
> index 68ad6755e80..6e850ba2666 100644
> --- a/drivers/clk/imx/clk-imx8.h
> +++ b/drivers/clk/imx/clk-imx8.h
> @@ -9,7 +9,7 @@ struct imx8_clks {
> const char *name;
> };
>
> -#if CONFIG_IS_ENABLED(CMD_CLK)
> +#if IS_ENABLED(CONFIG_CMD_CLK)
> extern struct imx8_clks imx8_clk_names[];
> extern int num_clks;
> #endif
> diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
> index 7759dc63ee1..b874915ba6a 100644
> --- a/drivers/clk/imx/clk-imx8qm.c
> +++ b/drivers/clk/imx/clk-imx8qm.c
> @@ -16,7 +16,7 @@
>
> #include "clk-imx8.h"
>
> -#if CONFIG_IS_ENABLED(CMD_CLK)
> +#if IS_ENABLED(CONFIG_CMD_CLK)
> struct imx8_clks imx8_clk_names[] = {
> { IMX8QM_A53_DIV, "A53_DIV" },
> { IMX8QM_UART0_CLK, "UART0" },
> diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
> index ffa2fcee0b2..d580b437221 100644
> --- a/drivers/clk/imx/clk-imx8qxp.c
> +++ b/drivers/clk/imx/clk-imx8qxp.c
> @@ -16,7 +16,7 @@
>
> #include "clk-imx8.h"
>
> -#if CONFIG_IS_ENABLED(CMD_CLK)
> +#if IS_ENABLED(CONFIG_CMD_CLK)
> struct imx8_clks imx8_clk_names[] = {
> { IMX8QXP_A35_DIV, "A35_DIV" },
> { IMX8QXP_I2C0_CLK, "I2C0" },

Reviewed-by: Sean Anderson <seanga2@gmail.com>