diff options
| author | jianlong.huang <jianlong.huang@starfivetech.com> | 2022-04-26 12:54:04 +0300 |
|---|---|---|
| committer | jianlong.huang <jianlong.huang@starfivetech.com> | 2022-04-26 12:54:04 +0300 |
| commit | fd6f56903b35318b2a1b79d14ad092a57d08149a (patch) | |
| tree | 94c1f6e6bb2b7a2b1b407120e4640ca501723e2d | |
| parent | 04a732fa71f959edeb35d37b115b2b404b39b7ee (diff) | |
| download | linux-fd6f56903b35318b2a1b79d14ad092a57d08149a.tar.xz | |
delete hwmon unless config and modify reset control interface
Signed-off-by: jianlong.huang <jianlong.huang@starfivetech.com>
| -rw-r--r-- | drivers/hwmon/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/watchdog/starfive-wdt.c | 21 |
2 files changed, 10 insertions, 19 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 92b9fcc1c08d..d04a22a59180 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1882,14 +1882,6 @@ config SENSORS_TMP513 This driver can also be built as a module. If so, the module will be called tmp513. -config SENSORS_SFCTMP - tristate "SFC temperature sensor and compatible" - help - If you say yes here you get support for SFC tmperature sensor. - - This driver can also be built as a module. If so, the module - will be called sfc_temp. - config SENSORS_VEXPRESS tristate "Versatile Express" depends on VEXPRESS_CONFIG diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c index e397690656d7..3939a87c9e59 100644 --- a/drivers/watchdog/starfive-wdt.c +++ b/drivers/watchdog/starfive-wdt.c @@ -174,20 +174,19 @@ static int si5wdt_get_clock_rate(struct stf_si5_wdt *wdt) static int si5wdt_enable_clock(struct stf_si5_wdt *wdt) { - struct reset_control_bulk_data resets[] = { - { .id = "wdtimer_apb" }, - { .id = "wdt" }, - }; int ret; - ret = devm_reset_control_bulk_get_exclusive(wdt->dev, ARRAY_SIZE(resets), resets); - if (ret) { - printk(KERN_INFO "faied to get watchdog reset controls\n"); - return ret; + wdt->rst_wdtimer_apb = devm_reset_control_get_exclusive(wdt->dev, "wdtimer_apb"); + if (IS_ERR(wdt->rst_wdtimer_apb)) { + dev_err(wdt->dev, "Failed to get wdtimer_apb reset control\n"); + return PTR_ERR(wdt->rst_wdtimer_apb); + } + + wdt->rst_wdt = devm_reset_control_get_exclusive(wdt->dev, "wdt"); + if (IS_ERR(wdt->rst_wdt)) { + dev_err(wdt->dev, "Failed to get wd reset control\n"); + return PTR_ERR(wdt->rst_wdt); } - - wdt->rst_wdtimer_apb = resets[0].rstc; - wdt->rst_wdt = resets[1].rstc; wdt->apb_clk = devm_clk_get(wdt->dev, "wdtimer_apb"); if (!IS_ERR(wdt->apb_clk)) { |