clk: imx: Add clock configuration for ARMv7 platforms

Add CONFIG_CLK_xxx for i.MX ARMv7 platforms, and use it as build option
instead of CONFIG_SOC_xxx, the CONFIG_CLK_xxx will be selected by default
according to CONFIG_SOC_xxx.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/drivers/clk/imx/Kconfig b/drivers/clk/imx/Kconfig
index ee854ac302f21b904732189585be3e9c5a103625..e96bd38ad105f8ab799657f3850681b207ead88a 100644 (file)
--- a/drivers/clk/imx/Kconfig
+++ b/drivers/clk/imx/Kconfig
@@ -2,12 +2,72 @@
 # common clock support for NXP i.MX SoC family.
 config MXC_CLK
        tristate "IMX clock"
-       depends on ARCH_MXC
+       depends on ARCH_MXC || COMPILE_TEST
 
 config MXC_CLK_SCU
        bool
        depends on IMX_SCU
 
+config CLK_IMX1
+       def_bool SOC_IMX1
+       select MXC_CLK
+
+config CLK_IMX21
+       def_bool SOC_IMX21
+       select MXC_CLK
+
+config CLK_IMX25
+       def_bool SOC_IMX25
+       select MXC_CLK
+
+config CLK_IMX27
+       def_bool SOC_IMX27
+       select MXC_CLK
+
+config CLK_IMX31
+       def_bool SOC_IMX31
+       select MXC_CLK
+
+config CLK_IMX35
+       def_bool SOC_IMX35
+       select MXC_CLK
+
+config CLK_IMX5
+       def_bool SOC_IMX5
+       select MXC_CLK
+
+config CLK_IMX6Q
+       def_bool SOC_IMX6Q
+       select MXC_CLK
+
+config CLK_IMX6SL
+       def_bool SOC_IMX6SL
+       select MXC_CLK
+
+config CLK_IMX6SLL
+       def_bool SOC_IMX6SLL
+       select MXC_CLK
+
+config CLK_IMX6SX
+       def_bool SOC_IMX6SX
+       select MXC_CLK
+
+config CLK_IMX6UL
+       def_bool SOC_IMX6UL
+       select MXC_CLK
+
+config CLK_IMX7D
+       def_bool SOC_IMX7D
+       select MXC_CLK
+
+config CLK_IMX7ULP
+       def_bool SOC_IMX7ULP
+       select MXC_CLK
+
+config CLK_VF610
+       def_bool SOC_VF610
+       select MXC_CLK
+
 config CLK_IMX8MM
        bool "IMX8MM CCM Clock Driver"
        depends on ARCH_MXC

diff --git a/drivers/clk/imx/Makefile b/drivers/clk/imx/Makefile
index 687207dd37004d6b12c803124f03db3ca0562d42..17f5d129eca37e37ac8bc4d42e1ad906f49c9c76 100644 (file)
--- a/drivers/clk/imx/Makefile
+++ b/drivers/clk/imx/Makefile
@@ -31,18 +31,18 @@ obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o
 obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
 obj-$(CONFIG_CLK_IMX8QXP) += clk-imx8qxp.o clk-imx8qxp-lpcg.o
 
-obj-$(CONFIG_SOC_IMX1)   += clk-imx1.o
-obj-$(CONFIG_SOC_IMX21)  += clk-imx21.o
-obj-$(CONFIG_SOC_IMX25)  += clk-imx25.o
-obj-$(CONFIG_SOC_IMX27)  += clk-imx27.o
-obj-$(CONFIG_SOC_IMX31)  += clk-imx31.o
-obj-$(CONFIG_SOC_IMX35)  += clk-imx35.o
-obj-$(CONFIG_SOC_IMX5)   += clk-imx5.o
-obj-$(CONFIG_SOC_IMX6Q)  += clk-imx6q.o
-obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o
-obj-$(CONFIG_SOC_IMX6SLL) += clk-imx6sll.o
-obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
-obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
-obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
-obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
-obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
+obj-$(CONFIG_CLK_IMX1)   += clk-imx1.o
+obj-$(CONFIG_CLK_IMX21)  += clk-imx21.o
+obj-$(CONFIG_CLK_IMX25)  += clk-imx25.o
+obj-$(CONFIG_CLK_IMX27)  += clk-imx27.o
+obj-$(CONFIG_CLK_IMX31)  += clk-imx31.o
+obj-$(CONFIG_CLK_IMX35)  += clk-imx35.o
+obj-$(CONFIG_CLK_IMX5)   += clk-imx5.o
+obj-$(CONFIG_CLK_IMX6Q)  += clk-imx6q.o
+obj-$(CONFIG_CLK_IMX6SL) += clk-imx6sl.o
+obj-$(CONFIG_CLK_IMX6SLL) += clk-imx6sll.o
+obj-$(CONFIG_CLK_IMX6SX) += clk-imx6sx.o
+obj-$(CONFIG_CLK_IMX6UL) += clk-imx6ul.o
+obj-$(CONFIG_CLK_IMX7D)  += clk-imx7d.o
+obj-$(CONFIG_CLK_IMX7ULP) += clk-imx7ulp.o
+obj-$(CONFIG_CLK_VF610)  += clk-vf610.o