Skip to content

Commit 2c138ee

Browse files
jbrun3tpH5
authored andcommitted
reset: amlogic: move drivers to a dedicated directory
The meson reset driver will be split in two part, one implemeting the ops, the other providing the platform driver support. This will be done to facilitate the addition of the auxiliary bus support. To avoid making a mess in drivers/reset/ while doing so, move the amlogic reset drivers to a dedicated directory. Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Link: https://lore.kernel.org/r/20240910-meson-rst-aux-v5-7-60be62635d3e@baylibre.com Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 parent d623ee2 commit 2c138ee

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

drivers/reset/Kconfig

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -153,21 +153,6 @@ config RESET_MCHP_SPARX5
153153
help
154154
This driver supports switch core reset for the Microchip Sparx5 SoC.
155155

156-
config RESET_MESON
157-
tristate "Meson Reset Driver"
158-
depends on ARCH_MESON || COMPILE_TEST
159-
default ARCH_MESON
160-
select REGMAP_MMIO
161-
help
162-
This enables the reset driver for Amlogic Meson SoCs.
163-
164-
config RESET_MESON_AUDIO_ARB
165-
tristate "Meson Audio Memory Arbiter Reset Driver"
166-
depends on ARCH_MESON || COMPILE_TEST
167-
help
168-
This enables the reset driver for Audio Memory Arbiter of
169-
Amlogic's A113 based SoCs
170-
171156
config RESET_NPCM
172157
bool "NPCM BMC Reset Driver" if COMPILE_TEST
173158
default ARCH_NPCM
@@ -357,6 +342,7 @@ config RESET_ZYNQMP
357342
help
358343
This enables the reset controller driver for Xilinx ZynqMP SoCs.
359344

345+
source "drivers/reset/amlogic/Kconfig"
360346
source "drivers/reset/starfive/Kconfig"
361347
source "drivers/reset/sti/Kconfig"
362348
source "drivers/reset/hisilicon/Kconfig"

drivers/reset/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-y += core.o
3+
obj-y += amlogic/
34
obj-y += hisilicon/
45
obj-y += starfive/
56
obj-y += sti/
@@ -21,8 +22,6 @@ obj-$(CONFIG_RESET_K210) += reset-k210.o
2122
obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o
2223
obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o
2324
obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o
24-
obj-$(CONFIG_RESET_MESON) += reset-meson.o
25-
obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
2625
obj-$(CONFIG_RESET_NPCM) += reset-npcm.o
2726
obj-$(CONFIG_RESET_NUVOTON_MA35D1) += reset-ma35d1.o
2827
obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o

drivers/reset/amlogic/Kconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
config RESET_MESON
2+
tristate "Meson Reset Driver"
3+
depends on ARCH_MESON || COMPILE_TEST
4+
default ARCH_MESON
5+
select REGMAP_MMIO
6+
help
7+
This enables the reset driver for Amlogic Meson SoCs.
8+
9+
config RESET_MESON_AUDIO_ARB
10+
tristate "Meson Audio Memory Arbiter Reset Driver"
11+
depends on ARCH_MESON || COMPILE_TEST
12+
help
13+
This enables the reset driver for Audio Memory Arbiter of
14+
Amlogic's A113 based SoCs

drivers/reset/amlogic/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
obj-$(CONFIG_RESET_MESON) += reset-meson.o
2+
obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
File renamed without changes.

0 commit comments

Comments
 (0)