Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jerome Brunet and committed by
Philipp Zabel
2c138ee3 d623ee26

+18 -17
+1 -15
drivers/reset/Kconfig
··· 153 153 help 154 154 This driver supports switch core reset for the Microchip Sparx5 SoC. 155 155 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 - 171 156 config RESET_NPCM 172 157 bool "NPCM BMC Reset Driver" if COMPILE_TEST 173 158 default ARCH_NPCM ··· 342 357 help 343 358 This enables the reset controller driver for Xilinx ZynqMP SoCs. 344 359 360 + source "drivers/reset/amlogic/Kconfig" 345 361 source "drivers/reset/starfive/Kconfig" 346 362 source "drivers/reset/sti/Kconfig" 347 363 source "drivers/reset/hisilicon/Kconfig"
+1 -2
drivers/reset/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 obj-y += core.o 3 + obj-y += amlogic/ 3 4 obj-y += hisilicon/ 4 5 obj-y += starfive/ 5 6 obj-y += sti/ ··· 22 21 obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o 23 22 obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o 24 23 obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o 25 - obj-$(CONFIG_RESET_MESON) += reset-meson.o 26 - obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o 27 24 obj-$(CONFIG_RESET_NPCM) += reset-npcm.o 28 25 obj-$(CONFIG_RESET_NUVOTON_MA35D1) += reset-ma35d1.o 29 26 obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o
+14
drivers/reset/amlogic/Kconfig
··· 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
+2
drivers/reset/amlogic/Makefile
··· 1 + obj-$(CONFIG_RESET_MESON) += reset-meson.o 2 + obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
drivers/reset/reset-meson-audio-arb.c drivers/reset/amlogic/reset-meson-audio-arb.c
drivers/reset/reset-meson.c drivers/reset/amlogic/reset-meson.c