aboutsummaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2019-02-10 14:54:30 +0100
committerNeil Armstrong <narmstrong@baylibre.com>2019-04-23 11:19:09 +0200
commitf5abfed8e916b9dd7a1b1187935e834acd5c9710 (patch)
treee6d65a6b33839e348791f55a55feadc16ccfe88f /drivers/clk
parentf91121c7942a8ae96991d4519349f5e98a486854 (diff)
downloadu-boot-f5abfed8e916b9dd7a1b1187935e834acd5c9710.zip
u-boot-f5abfed8e916b9dd7a1b1187935e834acd5c9710.tar.gz
u-boot-f5abfed8e916b9dd7a1b1187935e834acd5c9710.tar.bz2
clk: create meson directory and move related drivers
In order to support the Amlogic G12A clock controller, re-architect the clock files into a meson directory. No functionnal changes. MAINTAINERS entry is also updated. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/Kconfig1
-rw-r--r--drivers/clk/Makefile2
-rw-r--r--drivers/clk/meson/Kconfig15
-rw-r--r--drivers/clk/meson/Makefile8
-rw-r--r--drivers/clk/meson/axg.c (renamed from drivers/clk/clk_meson_axg.c)0
-rw-r--r--drivers/clk/meson/clk_meson.h (renamed from drivers/clk/clk_meson.h)0
-rw-r--r--drivers/clk/meson/gxbb.c (renamed from drivers/clk/clk_meson.c)0
7 files changed, 25 insertions, 1 deletions
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index ff60fc5..96969b9 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -101,6 +101,7 @@ config CLK_STM32MP1
source "drivers/clk/at91/Kconfig"
source "drivers/clk/exynos/Kconfig"
source "drivers/clk/imx/Kconfig"
+source "drivers/clk/meson/Kconfig"
source "drivers/clk/mvebu/Kconfig"
source "drivers/clk/owl/Kconfig"
source "drivers/clk/renesas/Kconfig"
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 1d9d725..719b9b8 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -12,7 +12,7 @@ obj-y += imx/
obj-y += tegra/
obj-$(CONFIG_ARCH_ASPEED) += aspeed/
obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/
-obj-$(CONFIG_ARCH_MESON) += clk_meson.o clk_meson_axg.o
+obj-$(CONFIG_ARCH_MESON) += meson/
obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
obj-$(CONFIG_ARCH_SOCFPGA) += altera/
obj-$(CONFIG_CLK_AT91) += at91/
diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig
new file mode 100644
index 0000000..2419a30
--- /dev/null
+++ b/drivers/clk/meson/Kconfig
@@ -0,0 +1,15 @@
+config CLK_MESON_GX
+ bool "Enable clock support for Amlogic GX"
+ depends on CLK && ARCH_MESON
+ default MESON_GX
+ help
+ Enable clock support for the Amlogic GX SoC family, such as
+ the S905, S905X/D and S912.
+
+config CLK_MESON_AXG
+ bool "Enable clock support for Amlogic AXG"
+ depends on CLK && ARCH_MESON
+ default MESON_AXG
+ help
+ Enable clock support for the Amlogic AXG SoC family, such as
+ the A113X/D
diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile
new file mode 100644
index 0000000..47a5ad5
--- /dev/null
+++ b/drivers/clk/meson/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (c) 2019 Baylibre, SAS
+# Jerome Brunet <jbrunet@baylibre.com>
+
+obj-$(CONFIG_CLK_MESON_GX) += gxbb.o
+obj-$(CONFIG_CLK_MESON_AXG) += axg.o
+
diff --git a/drivers/clk/clk_meson_axg.c b/drivers/clk/meson/axg.c
index 32cbf75..32cbf75 100644
--- a/drivers/clk/clk_meson_axg.c
+++ b/drivers/clk/meson/axg.c
diff --git a/drivers/clk/clk_meson.h b/drivers/clk/meson/clk_meson.h
index 7adc55a..7adc55a 100644
--- a/drivers/clk/clk_meson.h
+++ b/drivers/clk/meson/clk_meson.h
diff --git a/drivers/clk/clk_meson.c b/drivers/clk/meson/gxbb.c
index 2cb53fb..2cb53fb 100644
--- a/drivers/clk/clk_meson.c
+++ b/drivers/clk/meson/gxbb.c