clk: k210: Move k210 clock out of its own subdirectory

Now that we have only one clock driver, we don't need to have our own
subdirectory. Move the driver back with the rest of the clock drivers.

The MAINTAINERS for kendryte pinctrl is also fixed since it has always been
wrong.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 86ff5e04a62b432ae543a307d1a6c84e7bdb9bd2..effcf5469d5e733b781be8725345d54a95a36a20 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -999,8 +999,8 @@ M:  Sean Anderson <seanga2@gmail.com>
 S:     Maintained
 F:     doc/device-tree-bindings/mfd/kendryte,k210-sysctl.txt
 F:     doc/device-tree-bindings/pinctrl/kendryte,k210-fpioa.txt
-F:     drivers/clk/kendryte/
-F:     drivers/pinctrl/kendryte/
+F:     drivers/clk/clk_kendryte.c
+F:     drivers/pinctrl/pinctrl-kendryte.c
 F:     include/kendryte/
 
 RNG

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 40a5a5dd88351addd265332df6fa1dcb38acd1fc..4bc66801215fc762de75ca4764d9d193de812a21 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -159,11 +159,23 @@ config CLK_SCMI
          by a SCMI agent based on SCMI clock protocol communication
          with a SCMI server.
 
+config CLK_K210
+       bool "Clock support for Kendryte K210"
+       depends on CLK
+       help
+         This enables support clock driver for Kendryte K210 platforms.
+
+config CLK_K210_SET_RATE
+       bool "Enable setting the Kendryte K210 PLL rate"
+       depends on CLK_K210
+       help
+         Add functionality to calculate new rates for K210 PLLs. Enabling this
+         feature adds around 1K to U-Boot's final size.
+
 source "drivers/clk/analogbits/Kconfig"
 source "drivers/clk/at91/Kconfig"
 source "drivers/clk/exynos/Kconfig"
 source "drivers/clk/imx/Kconfig"
-source "drivers/clk/kendryte/Kconfig"
 source "drivers/clk/meson/Kconfig"
 source "drivers/clk/microchip/Kconfig"
 source "drivers/clk/mvebu/Kconfig"

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 645709b855e639a93b5fafc7ed826287491569af..f06164bb49d2f3c02900b484791e05f2960c0cbc 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_CLK_BOSTON) += clk_boston.o
 obj-$(CONFIG_CLK_EXYNOS) += exynos/
 obj-$(CONFIG_$(SPL_TPL_)CLK_INTEL) += intel/
 obj-$(CONFIG_CLK_HSDK) += clk-hsdk-cgu.o
-obj-$(CONFIG_CLK_K210) += kendryte/
+obj-$(CONFIG_CLK_K210) += clk_kendryte.o
 obj-$(CONFIG_CLK_MPC83XX) += mpc83xx_clk.o
 obj-$(CONFIG_CLK_MPFS) += microchip/
 obj-$(CONFIG_CLK_OCTEON) += clk_octeon.o

diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/clk_kendryte.c
similarity index 100%
rename from drivers/clk/kendryte/clk.c
rename to drivers/clk/clk_kendryte.c

diff --git a/drivers/clk/kendryte/Kconfig b/drivers/clk/kendryte/Kconfig
deleted file mode 100644 (file)
index 0dc8e3f..0000000
--- a/drivers/clk/kendryte/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-config CLK_K210
-       bool "Clock support for Kendryte K210"
-       depends on CLK
-       help
-         This enables support clock driver for Kendryte K210 platforms.
-
-config CLK_K210_SET_RATE
-       bool "Enable setting the Kendryte K210 PLL rate"
-       depends on CLK_K210
-       help
-         Add functionality to calculate new rates for K210 PLLs. Enabling this
-         feature adds around 1K to U-Boot's final size.

diff --git a/drivers/clk/kendryte/Makefile b/drivers/clk/kendryte/Makefile
deleted file mode 100644 (file)
index 0303c0b..0000000
--- a/drivers/clk/kendryte/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += clk.o