| Message ID | 20221006120715.24815-1-allen-kh.cheng@mediatek.com |
|---|---|
| Headers | show |
| Series | MediaTek watchdog: Convert mtk-wdt.txt to dt-schema | expand |
Il 06/10/22 14:07, Allen-KH Cheng ha scritto: > MT7986's watchdog embeds a reset controller and needs only the > mediatek,mt7986-wdt compatible string as the MT6589 one is there > for watchdogs that don't have any reset controller capability. > > Fixes: 50137c150f5f ("arm64: dts: mediatek: add basic mt7986 support") > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Il 06/10/22 14:07, Allen-KH Cheng ha scritto: > Based on tag: next-20221006 linux-next/master, We use [1] and [2] as > references to send a new series. > For me, it's all good to go. Thanks for respinning that series. Cheers! Angelo > This series converts mtk-wdt.txt to dt-schema and contains > - Fix watchdog compatibles for MT8186, MT7986 and MT8195, > - Fix the watchdog name of mt8516 > - Add mt6795 and MT8173 watchdog compatible > - Add support for toprgu reset on the MediaTek Helio X10 MT6795 SoC. > > Changes since [1]: > - Drop "timeout-sec: true" and use unevaluatedProperties > > [1] https://lore.kernel.org/all/20221005113517.70628-1-angelogioacchino.delregno@collabora.com/ > [2] https://lore.kernel.org/all/20220422121017.23920-3-allen-kh.cheng@mediatek.com/ > > Allen-KH Cheng (3): > arm64: dts: mediatek: mt7986: Fix watchdog compatible > arm64: dts: mediatek: mt8516: Fix the watchdog node name > dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT8173 > > 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 | 80 +++++++++++++++++++ > .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 3 +- > arch/arm64/boot/dts/mediatek/mt8186.dtsi | 3 +- > arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 +- > arch/arm64/boot/dts/mediatek/mt8516.dtsi | 2 +- > drivers/watchdog/mtk_wdt.c | 6 ++ > 7 files changed, 90 insertions(+), 49 deletions(-) > create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml > delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt >
On Thu, Oct 06, 2022 at 08:07:14PM +0800, Allen-KH Cheng wrote: > From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > > Add support for the toprgu reset controller and watchdog for the > MediaTek MT6795 SoC. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Co-developed-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.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.18.0 >
Based on tag: next-20221006 linux-next/master, We use [1] and [2] as references to send a new series. This series converts mtk-wdt.txt to dt-schema and contains - Fix watchdog compatibles for MT8186, MT7986 and MT8195, - Fix the watchdog name of mt8516 - Add mt6795 and MT8173 watchdog compatible - Add support for toprgu reset on the MediaTek Helio X10 MT6795 SoC. Changes since [1]: - Drop "timeout-sec: true" and use unevaluatedProperties [1] https://lore.kernel.org/all/20221005113517.70628-1-angelogioacchino.delregno@collabora.com/ [2] https://lore.kernel.org/all/20220422121017.23920-3-allen-kh.cheng@mediatek.com/ Allen-KH Cheng (3): arm64: dts: mediatek: mt7986: Fix watchdog compatible arm64: dts: mediatek: mt8516: Fix the watchdog node name dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT8173 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 | 80 +++++++++++++++++++ .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 3 +- arch/arm64/boot/dts/mediatek/mt8186.dtsi | 3 +- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 +- arch/arm64/boot/dts/mediatek/mt8516.dtsi | 2 +- drivers/watchdog/mtk_wdt.c | 6 ++ 7 files changed, 90 insertions(+), 49 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt