Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

watchdog: mediatek: mt7988: add wdt support

Add support for watchdog and reset generator unit of the MediaTek
MT7988 SoC.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/c0cf5f701801cce60470853fa15f1d9dced78c4f.1700504385.git.daniel@makrotopia.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

authored by

Daniel Golle and committed by
Wim Van Sebroeck
137c9e08 a4d2116e

+42
+42
drivers/watchdog/mtk_wdt.c
··· 58 58 #define WDT_SWSYSRST 0x18U 59 59 #define WDT_SWSYS_RST_KEY 0x88000000 60 60 61 + #define WDT_SWSYSRST_EN 0xfc 62 + 61 63 #define DRV_NAME "mtk-wdt" 62 64 #define DRV_VERSION "1.0" 65 + 66 + #define MT7988_TOPRGU_SW_RST_NUM 24 63 67 64 68 static bool nowayout = WATCHDOG_NOWAYOUT; 65 69 static unsigned int timeout; ··· 75 71 struct reset_controller_dev rcdev; 76 72 bool disable_wdt_extrst; 77 73 bool reset_by_toprgu; 74 + bool has_swsysrst_en; 78 75 }; 79 76 80 77 struct mtk_wdt_data { 81 78 int toprgu_sw_rst_num; 79 + bool has_swsysrst_en; 82 80 }; 83 81 84 82 static const struct mtk_wdt_data mt2712_data = { ··· 93 87 94 88 static const struct mtk_wdt_data mt7986_data = { 95 89 .toprgu_sw_rst_num = MT7986_TOPRGU_SW_RST_NUM, 90 + }; 91 + 92 + static const struct mtk_wdt_data mt7988_data = { 93 + .toprgu_sw_rst_num = MT7988_TOPRGU_SW_RST_NUM, 94 + .has_swsysrst_en = true, 96 95 }; 97 96 98 97 static const struct mtk_wdt_data mt8183_data = { ··· 120 109 .toprgu_sw_rst_num = MT8195_TOPRGU_SW_RST_NUM, 121 110 }; 122 111 112 + /** 113 + * toprgu_reset_sw_en_unlocked() - enable/disable software control for reset bit 114 + * @data: Pointer to instance of driver data. 115 + * @id: Bit number identifying the reset to be enabled or disabled. 116 + * @enable: If true, enable software control for that bit, disable otherwise. 117 + * 118 + * Context: The caller must hold lock of struct mtk_wdt_dev. 119 + */ 120 + static void toprgu_reset_sw_en_unlocked(struct mtk_wdt_dev *data, 121 + unsigned long id, bool enable) 122 + { 123 + u32 tmp; 124 + 125 + tmp = readl(data->wdt_base + WDT_SWSYSRST_EN); 126 + if (enable) 127 + tmp |= BIT(id); 128 + else 129 + tmp &= ~BIT(id); 130 + 131 + writel(tmp, data->wdt_base + WDT_SWSYSRST_EN); 132 + } 133 + 123 134 static int toprgu_reset_update(struct reset_controller_dev *rcdev, 124 135 unsigned long id, bool assert) 125 136 { ··· 152 119 153 120 spin_lock_irqsave(&data->lock, flags); 154 121 122 + if (assert && data->has_swsysrst_en) 123 + toprgu_reset_sw_en_unlocked(data, id, true); 124 + 155 125 tmp = readl(data->wdt_base + WDT_SWSYSRST); 156 126 if (assert) 157 127 tmp |= BIT(id); ··· 162 126 tmp &= ~BIT(id); 163 127 tmp |= WDT_SWSYS_RST_KEY; 164 128 writel(tmp, data->wdt_base + WDT_SWSYSRST); 129 + 130 + if (!assert && data->has_swsysrst_en) 131 + toprgu_reset_sw_en_unlocked(data, id, false); 165 132 166 133 spin_unlock_irqrestore(&data->lock, flags); 167 134 ··· 445 406 wdt_data->toprgu_sw_rst_num); 446 407 if (err) 447 408 return err; 409 + 410 + mtk_wdt->has_swsysrst_en = wdt_data->has_swsysrst_en; 448 411 } 449 412 450 413 mtk_wdt->disable_wdt_extrst = ··· 485 444 { .compatible = "mediatek,mt6589-wdt" }, 486 445 { .compatible = "mediatek,mt6795-wdt", .data = &mt6795_data }, 487 446 { .compatible = "mediatek,mt7986-wdt", .data = &mt7986_data }, 447 + { .compatible = "mediatek,mt7988-wdt", .data = &mt7988_data }, 488 448 { .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data }, 489 449 { .compatible = "mediatek,mt8186-wdt", .data = &mt8186_data }, 490 450 { .compatible = "mediatek,mt8188-wdt", .data = &mt8188_data },