clk: uniphier: fix unmet direct dependencies warning

Since commit f0776a551764 ("spl: dm: Kconfig: SPL_CLK depends on
SPL_DM"), the following warning is displayed:

  $ make uniphier_v8_defconfig
  warning: (ARCH_ZYNQ && ARCH_ZYNQMP && STM32F7 && CLK_UNIPHIER) selects
  SPL_CLK which has unmet direct dependencies (CLK && SPL_DM)

While I am here, I am removing the prompt to make it user-unconfigurable
option so that "select CLK_UNIPHIER" can be omitted.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0e8dc0179bf069202afad62c8131abf485264415..53d0831935c40bf2ac4500af54b73c6dce38361a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1021,7 +1021,6 @@ config TARGET_COLIBRI_PXA270
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
        select BOARD_LATE_INIT
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
        select BOARD_LATE_INIT

-       select CLK_UNIPHIER

        select DM
        select DM_GPIO
        select DM_I2C
        select DM
        select DM_GPIO
        select DM_I2C

diff --git a/drivers/clk/uniphier/Kconfig b/drivers/clk/uniphier/Kconfig
index da3e3553895a3cba86f1dbc1d3075d4171845768..3666d8414cee7c66daba95541ad26ca2b197b1a9 100644 (file)
--- a/drivers/clk/uniphier/Kconfig
+++ b/drivers/clk/uniphier/Kconfig
@@ -1,9 +1,8 @@
 config CLK_UNIPHIER
 config CLK_UNIPHIER

-       bool "Clock driver for UniPhier SoCs"
+       def_bool y

        depends on ARCH_UNIPHIER
        select CLK
        depends on ARCH_UNIPHIER
        select CLK

-       select SPL_CLK
-       default y
+       select SPL_CLK if SPL

        help
          Support for clock controllers on UniPhier SoCs.
          Say Y if you want to control clocks provided by System Control
        help
          Support for clock controllers on UniPhier SoCs.
          Say Y if you want to control clocks provided by System Control