Commit 0e2d3725 authored by Jerome Brunet's avatar Jerome Brunet
Browse files

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
parents 0b2732ba 5f79c4b6

drivers/reset/Kconfig

+1 −14
Original line number Diff line number Diff line
@@ -153,20 +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

	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
@@ -356,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
+27 −0
Original line number Diff line number Diff line 
config RESET_MESON_COMMON

	tristate

	select REGMAP



config RESET_MESON

	tristate "Meson Reset Driver"

	depends on ARCH_MESON || COMPILE_TEST

	default ARCH_MESON

	select REGMAP_MMIO

	select RESET_MESON_COMMON

	help

	  This enables the reset driver for Amlogic SoCs.



config RESET_MESON_AUX

	tristate "Meson Reset Auxiliary Driver"

	depends on ARCH_MESON || COMPILE_TEST

	select AUXILIARY_BUS

	select RESET_MESON_COMMON

	help

	  This enables the reset auxiliary driver for Amlogic 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
+4 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_RESET_MESON) += reset-meson.o

obj-$(CONFIG_RESET_MESON_AUX) += reset-meson-aux.o

obj-$(CONFIG_RESET_MESON_COMMON) += reset-meson-common.o

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