Unverified Commit 94811b40 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'reset-fixes-for-v6.10' of git://git.pengutronix.de/pza/linux into arm/fixes 

Reset controller fixes for v6.10

Fix a missing GPIOLIB dependency for the GPIO reset controller and add
a missing MODULE_DESCRIPTION for the hi6220 reset driver to fix some
build warnings.

* tag 'reset-fixes-for-v6.10' of git://git.pengutronix.de/pza/linux:
  reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro
  reset: gpio: Fix missing gpiolib dependency for GPIO reset controller

Link: https://lore.kernel.org/r/20240626163443.61384-1-p.zabel@pengutronix.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 53ed1274 ab358967

drivers/reset/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ config RESET_BRCMSTB_RESCAL 


config RESET_GPIO

	tristate "GPIO reset controller"

	depends on GPIOLIB

	help

	  This enables a generic reset controller for resets attached via

	  GPIOs.  Typically for OF platforms this driver expects "reset-gpios"

drivers/reset/hisilicon/hi6220_reset.c

+1 −0
Original line number Diff line number Diff line
@@ -219,4 +219,5 @@ static int __init hi6220_reset_init(void) 


postcore_initcall(hi6220_reset_init);



MODULE_DESCRIPTION("Hisilicon Hi6220 reset controller driver");

MODULE_LICENSE("GPL v2");