[PATCH v3 7/9] reset: amlogic: move drivers to a dedicated directory
Neil Armstrong
neil.armstrong at linaro.org
Mon Aug 19 09:31:22 PDT 2024
On 08/08/2024 12:27, Jerome Brunet wrote:
> 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.
>
> Signed-off-by: Jerome Brunet <jbrunet at baylibre.com>
> ---
> drivers/reset/Kconfig | 15 +--------------
> drivers/reset/Makefile | 3 +--
> drivers/reset/amlogic/Kconfig | 13 +++++++++++++
> drivers/reset/amlogic/Makefile | 2 ++
> .../reset/{ => amlogic}/reset-meson-audio-arb.c | 0
> drivers/reset/{ => amlogic}/reset-meson.c | 0
> 6 files changed, 17 insertions(+), 16 deletions(-)
> create mode 100644 drivers/reset/amlogic/Kconfig
> create mode 100644 drivers/reset/amlogic/Makefile
> rename drivers/reset/{ => amlogic}/reset-meson-audio-arb.c (100%)
> rename drivers/reset/{ => amlogic}/reset-meson.c (100%)
>
> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
> index 67bce340a87e..0c092ae1b411 100644
> --- a/drivers/reset/Kconfig
> +++ b/drivers/reset/Kconfig
> @@ -140,20 +140,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
> - 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
> @@ -343,6 +329,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"
> diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
> index 27b0bbdfcc04..bf089176c9f4 100644
> --- a/drivers/reset/Makefile
> +++ b/drivers/reset/Makefile
> @@ -1,5 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0
> obj-y += core.o
> +obj-y += amlogic/
> obj-y += hisilicon/
> obj-y += starfive/
> obj-y += sti/
> @@ -20,8 +21,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
> diff --git a/drivers/reset/amlogic/Kconfig b/drivers/reset/amlogic/Kconfig
> new file mode 100644
> index 000000000000..7ed9cf50f038
> --- /dev/null
> +++ b/drivers/reset/amlogic/Kconfig
> @@ -0,0 +1,13 @@
> +config RESET_MESON
> + tristate "Meson Reset Driver"
> + depends on ARCH_MESON || COMPILE_TEST
> + default ARCH_MESON
> + 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
> diff --git a/drivers/reset/amlogic/Makefile b/drivers/reset/amlogic/Makefile
> new file mode 100644
> index 000000000000..55509fc78513
> --- /dev/null
> +++ b/drivers/reset/amlogic/Makefile
> @@ -0,0 +1,2 @@
> +obj-$(CONFIG_RESET_MESON) += reset-meson.o
> +obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
> diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/amlogic/reset-meson-audio-arb.c
> similarity index 100%
> rename from drivers/reset/reset-meson-audio-arb.c
> rename to drivers/reset/amlogic/reset-meson-audio-arb.c
> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/amlogic/reset-meson.c
> similarity index 100%
> rename from drivers/reset/reset-meson.c
> rename to drivers/reset/amlogic/reset-meson.c
Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>
More information about the linux-amlogic
mailing list