Skip to content

Commit 03b3faa

Browse files
aspeedtechbebarino
authored andcommitted
clk: aspeed: Move the existing ASPEED clk drivers into aspeed subdirectory.
Prepare for long-term maintenance and future additions by introducing a dedicated drivers/clk/aspeed/ subdirectory for ASPEED clock drivers. Move the existing ASPEED clock drivers into the new drivers/clk/aspeed/ subdirectory. No functional change, file move only. Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> Reviewed-by: Brian Masney <bmasney@redhat.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 8f0b4cc commit 03b3faa

7 files changed

Lines changed: 18 additions & 14 deletions

File tree

drivers/clk/Kconfig

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -284,18 +284,6 @@ config COMMON_CLK_LAN966X
284284
LAN966X SoC. GCK generates and supplies clock to various peripherals
285285
within the SoC.
286286

287-
config COMMON_CLK_ASPEED
288-
bool "Clock driver for Aspeed BMC SoCs"
289-
depends on ARCH_ASPEED || COMPILE_TEST
290-
default ARCH_ASPEED
291-
select MFD_SYSCON
292-
select RESET_CONTROLLER
293-
help
294-
This driver supports the SoC clocks on the Aspeed BMC platforms.
295-
296-
The G4 and G5 series, including the ast2400 and ast2500, are supported
297-
by this driver.
298-
299287
config COMMON_CLK_S2MPS11
300288
tristate "Clock driver for S2MPS1X/S5M8767 MFD"
301289
depends on MFD_SEC_CORE || COMPILE_TEST
@@ -513,6 +501,7 @@ config COMMON_CLK_RPMI
513501

514502
source "drivers/clk/actions/Kconfig"
515503
source "drivers/clk/analogbits/Kconfig"
504+
source "drivers/clk/aspeed/Kconfig"
516505
source "drivers/clk/baikal-t1/Kconfig"
517506
source "drivers/clk/bcm/Kconfig"
518507
source "drivers/clk/hisilicon/Kconfig"

drivers/clk/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ obj-$(CONFIG_COMMON_CLK_FIXED_MMIO) += clk-fixed-mmio.o
6262
obj-$(CONFIG_COMMON_CLK_FSL_FLEXSPI) += clk-fsl-flexspi.o
6363
obj-$(CONFIG_COMMON_CLK_FSL_SAI) += clk-fsl-sai.o
6464
obj-$(CONFIG_COMMON_CLK_GEMINI) += clk-gemini.o
65-
obj-$(CONFIG_COMMON_CLK_ASPEED) += clk-aspeed.o
66-
obj-$(CONFIG_MACH_ASPEED_G6) += clk-ast2600.o
6765
obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o
6866
obj-$(CONFIG_CLK_HSDK) += clk-hsdk-pll.o
6967
obj-$(CONFIG_COMMON_CLK_K210) += clk-k210.o
@@ -114,6 +112,7 @@ obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o
114112
# please keep this section sorted lexicographically by directory path name
115113
obj-y += actions/
116114
obj-y += analogbits/
115+
obj-y += aspeed/
117116
obj-$(CONFIG_COMMON_CLK_AT91) += at91/
118117
obj-$(CONFIG_ARCH_ARTPEC) += axis/
119118
obj-$(CONFIG_ARC_PLAT_AXS10X) += axs10x/

drivers/clk/aspeed/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
config COMMON_CLK_ASPEED
4+
bool "Clock driver for Aspeed BMC SoCs"
5+
depends on ARCH_ASPEED || COMPILE_TEST
6+
default ARCH_ASPEED
7+
select MFD_SYSCON
8+
select RESET_CONTROLLER
9+
help
10+
This driver supports the SoC clocks on the Aspeed BMC platforms.
11+
12+
The G4 and G5 series, including the ast2400 and ast2500, are supported
13+
by this driver.

drivers/clk/aspeed/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
obj-$(CONFIG_COMMON_CLK_ASPEED) += clk-aspeed.o
3+
obj-$(CONFIG_MACH_ASPEED_G6) += clk-ast2600.o

0 commit comments

Comments
 (0)