| Message ID | 20221005113517.70628-1-angelogioacchino.delregno@collabora.com |
|---|---|
| Headers | show |
| Series | MediaTek watchdog: MT6795 support and YAML conversion | expand |
On Wed, Oct 05, 2022 at 01:35:17PM +0200, AngeloGioacchino Del Regno wrote: > Add support for the toprgu reset controller and watchdog for the > MediaTek MT6795 SoC. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/mtk_wdt.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c > index e97787536792..5fa42b7d4b4d 100644 > --- a/drivers/watchdog/mtk_wdt.c > +++ b/drivers/watchdog/mtk_wdt.c > @@ -10,6 +10,7 @@ > */ > > #include <dt-bindings/reset/mt2712-resets.h> > +#include <dt-bindings/reset/mediatek,mt6795-resets.h> > #include <dt-bindings/reset/mt7986-resets.h> > #include <dt-bindings/reset/mt8183-resets.h> > #include <dt-bindings/reset/mt8186-resets.h> > @@ -78,6 +79,10 @@ static const struct mtk_wdt_data mt2712_data = { > .toprgu_sw_rst_num = MT2712_TOPRGU_SW_RST_NUM, > }; > > +static const struct mtk_wdt_data mt6795_data = { > + .toprgu_sw_rst_num = MT6795_TOPRGU_SW_RST_NUM, > +}; > + > static const struct mtk_wdt_data mt7986_data = { > .toprgu_sw_rst_num = MT7986_TOPRGU_SW_RST_NUM, > }; > @@ -426,6 +431,7 @@ static int mtk_wdt_resume(struct device *dev) > static const struct of_device_id mtk_wdt_dt_ids[] = { > { .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data }, > { .compatible = "mediatek,mt6589-wdt" }, > + { .compatible = "mediatek,mt6795-wdt", .data = &mt6795_data }, > { .compatible = "mediatek,mt7986-wdt", .data = &mt7986_data }, > { .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data }, > { .compatible = "mediatek,mt8186-wdt", .data = &mt8186_data }, > -- > 2.37.2 >
This series converts mtk-wdt.txt to dt-schema, fixes watchdog compatibles for MT8186 and MT8195, and adds support for the watchdog and toprgu reset found on the MediaTek Helio X10 MT6795 SoC. AngeloGioacchino Del Regno (5): arm64: dts: mediatek: mt8186: Fix watchdog compatible arm64: dts: mediatek: mt8195: Fix watchdog compatible dt-bindings: watchdog: mediatek: Convert mtk-wdt to json-schema dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT6795 watchdog: mtk_wdt: Add support for MT6795 Helio X10 watchdog and toprgu .../bindings/watchdog/mediatek,mtk-wdt.yaml | 81 +++++++++++++++++++ .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- arch/arm64/boot/dts/mediatek/mt8186.dtsi | 3 +- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 +- drivers/watchdog/mtk_wdt.c | 6 ++ 5 files changed, 89 insertions(+), 46 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt