Correct SPL uses of CMD_CLK

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>
Reviewed-by: Sean Anderson <seanga2@gmail.com>

diff --git a/drivers/clk/clk_k210.c b/drivers/clk/clk_k210.c
index f7d36963f8536e8adfdbf781f84228b5f1c41031..c534cc07e09275f2eb96249d638ea2b5c3211b2c 100644 (file)
--- 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 b3dc138c4bb9716962296a361b3d89458230bfae..24bdab28aa453e49a2f0fa5358e5824799610c07 100644 (file)
--- 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 68ad6755e80fbc59d6ccf9ce3acf32dfd9c399bd..6e850ba26669a89185c2ae5851a6616e56d861e7 100644 (file)
--- 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 7759dc63ee1b05ae050f59903955ff62e4f07133..b874915ba6ae0b975af233171f8a50f60d326f45 100644 (file)
--- 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 ffa2fcee0b2fa86ba01d4ef58e3ce6fa89b1cef8..d580b4372217d00660fdd11d5b7cd19ce71976a0 100644 (file)
--- 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" },