Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28abbba3 authored by Bruno Thomsen's avatar Bruno Thomsen Committed by Alexandre Belloni
Browse files

rtc: pcf2127: bugfix: watchdog build dependency 



Disable watchdog registation when kernel is build without
watchdog functionality, and enable watchdog core otherwise.
This removes compile errors like the one below:

drivers/rtc/rtc-pcf2127.o: in function `pcf2127_probe.constprop.3':
rtc-pcf2127.c:(.text.unlikely+0x2c8): undefined reference to
`devm_watchdog_register_device'

Watchdog feature in chip will always be configured as
this is safe to do in both cases and minimize code churn.

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Reported-by: default avatarYueHaibing <yuehaibing@huawei.com>
Fixes: bbc597561ce1 ("rtc: pcf2127: add watchdog feature support")
Signed-off-by: default avatarBruno Thomsen <bruno.thomsen@gmail.com>
Link: https://lore.kernel.org/r/20190827143656.4734-1-bruno.thomsen@gmail.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 03623b4b

drivers/rtc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -886,6 +886,7 @@ config RTC_DRV_DS3232_HWMON 
config RTC_DRV_PCF2127

	tristate "NXP PCF2127"

	depends on RTC_I2C_AND_SPI

	select WATCHDOG_CORE if WATCHDOG

	help

	  If you say yes here you get support for the NXP PCF2127/29 RTC

	  chips with integrated quartz crystal for industrial applications.

drivers/rtc/rtc-pcf2127.c

+2 −0
Original line number Diff line number Diff line
@@ -475,9 +475,11 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, 
		return ret;

	}



#ifdef CONFIG_WATCHDOG

	ret = devm_watchdog_register_device(dev, &pcf2127->wdd);

	if (ret)

		return ret;

#endif /* CONFIG_WATCHDOG */



	/*

	 * Disable battery low/switch-over timestamp and interrupts.