diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2024-10-08 09:22:44 +0200 |
|---|---|---|
| committer | Jerome Brunet <jbrunet@baylibre.com> | 2024-10-08 09:22:44 +0200 |
| commit | 0e2d37252dd525b117bda4e4e0e6fac178ba569d (patch) | |
| tree | a2b19ab201d86eb3f2404e832e66e7918aa4da23 /drivers/reset/Makefile | |
| parent | 0b2732baa3d24484b87b8f47dc1b836e7d7a6568 (diff) | |
| parent | 5f79c4b659b50e332ba31ed2c322376e38453bb0 (diff) | |
Merge tag 'reset-amlogic-aux' into clk-meson-next
Pull amlogic auxiliary reset support to continue removing
reset drivers from amlogic clocks
* tag 'reset-amlogic-aux':
reset: amlogic: Fix small whitespace issue
reset: amlogic: add auxiliary reset driver support
reset: amlogic: split the device core and platform probe
reset: amlogic: move drivers to a dedicated directory
reset: amlogic: add reset status support
reset: amlogic: use reset number instead of register count
reset: amlogic: add driver parameters
reset: amlogic: make parameters unsigned
reset: amlogic: use generic data matching function
reset: amlogic: convert driver to regmap
Diffstat (limited to 'drivers/reset/Makefile')
| -rw-r--r-- | drivers/reset/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 4411a2a124d7..677c4d1e2632 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/ @@ -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 |