Commit 2c138ee3 authored by Jerome Brunet's avatar Jerome Brunet Committed by Philipp Zabel
Browse files

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: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20240910-meson-rst-aux-v5-7-60be62635d3e@baylibre.com


Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent d623ee26

drivers/reset/Kconfig

+1 −15
Original line number Diff line number Diff line
@@ -153,21 +153,6 @@ config RESET_MCHP_SPARX5 
	help

	  This driver supports switch core reset for the Microchip Sparx5 SoC.



config RESET_MESON

	tristate "Meson Reset Driver"

	depends on ARCH_MESON || COMPILE_TEST

	default ARCH_MESON

	select REGMAP_MMIO

	help

	  This enables the reset driver for Amlogic Meson SoCs.



config RESET_MESON_AUDIO_ARB

	tristate "Meson Audio Memory Arbiter Reset Driver"

	depends on ARCH_MESON || COMPILE_TEST

	help

	  This enables the reset driver for Audio Memory Arbiter of

	  Amlogic's A113 based SoCs



config RESET_NPCM

	bool "NPCM BMC Reset Driver" if COMPILE_TEST

	default ARCH_NPCM
@@ -357,6 +342,7 @@ config RESET_ZYNQMP 
	help

	  This enables the reset controller driver for Xilinx ZynqMP SoCs.



source "drivers/reset/amlogic/Kconfig"

source "drivers/reset/starfive/Kconfig"

source "drivers/reset/sti/Kconfig"

source "drivers/reset/hisilicon/Kconfig"

drivers/reset/Makefile

+1 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y += core.o

obj-y += amlogic/

obj-y += hisilicon/

obj-y += starfive/

obj-y += sti/
@@ -21,8 +22,6 @@ obj-$(CONFIG_RESET_K210) += reset-k210.o 
obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o

obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o

obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o

obj-$(CONFIG_RESET_MESON) += reset-meson.o

obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o

obj-$(CONFIG_RESET_NPCM) += reset-npcm.o

obj-$(CONFIG_RESET_NUVOTON_MA35D1) += reset-ma35d1.o

obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o

drivers/reset/amlogic/Kconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
config RESET_MESON

	tristate "Meson Reset Driver"

	depends on ARCH_MESON || COMPILE_TEST

	default ARCH_MESON

	select REGMAP_MMIO

	help

	  This enables the reset driver for Amlogic Meson SoCs.



config RESET_MESON_AUDIO_ARB

	tristate "Meson Audio Memory Arbiter Reset Driver"

	depends on ARCH_MESON || COMPILE_TEST

	help

	  This enables the reset driver for Audio Memory Arbiter of

	  Amlogic's A113 based SoCs

drivers/reset/amlogic/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_RESET_MESON) += reset-meson.o

obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o