diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-06-27 16:11:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-06-27 16:11:28 +0200 |
| commit | 94811b400a5d5f3c184931bff42d2a34eada8c7b (patch) | |
| tree | 24f62e673fcc739595b672a1c98f7474f447d8d0 | |
| parent | 53ed12744c4f26a3d2b90aa842c0edc4084099bc (diff) | |
| parent | ab35896730a5e8fdf885a23fa2e27f286c5f94b2 (diff) | |
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: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/reset/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/reset/hisilicon/hi6220_reset.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 7112f5932609..6bb5d9e372e4 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -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" diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c index 5c3267acd2b1..65aa5ff5ed82 100644 --- a/drivers/reset/hisilicon/hi6220_reset.c +++ b/drivers/reset/hisilicon/hi6220_reset.c @@ -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"); |