Message ID | 20191227141405.3396-2-yong.liang@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Add watchdog node and dt-binding | expand |
minor nit, s/amr64/arm64/ in the commit title. On Fri, Dec 27, 2019 at 10:15 PM Yong Liang <yong.liang@mediatek.com> wrote: > > From: "yong.liang" <yong.liang@mediatek.com> > > 1. Include mt8183-reset.h and add reset-cells in infracfg > in dtsi file > 2. Add watchdog device node > > Signed-off-by: yong.liang <yong.liang@mediatek.com> Tested-by: Nicolas Boichat <drinkcat@chromium.org> > --- > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 8 ++++++++ > 1 file changed, 8 insertions(+) > [snip]
On Wed, Jan 8, 2020 at 4:56 PM Nicolas Boichat <drinkcat@chromium.org> wrote: > > minor nit, s/amr64/arm64/ in the commit title. > > On Fri, Dec 27, 2019 at 10:15 PM Yong Liang <yong.liang@mediatek.com> wrote: > > > > From: "yong.liang" <yong.liang@mediatek.com> > > > > 1. Include mt8183-reset.h and add reset-cells in infracfg > > in dtsi file Err, wait, doesn't this depend on http://lists.infradead.org/pipermail/linux-mediatek/2020-January/026170.html ? > > 2. Add watchdog device node Can we have a patch with just this change instead, since you're sending the binding with it. > > > > Signed-off-by: yong.liang <yong.liang@mediatek.com> > > Tested-by: Nicolas Boichat <drinkcat@chromium.org> > > > --- > > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > [snip]
On Wed, 2020-01-08 at 17:14 +0800, Nicolas Boichat wrote: > On Wed, Jan 8, 2020 at 4:56 PM Nicolas Boichat <drinkcat@chromium.org> wrote: > > > > minor nit, s/amr64/arm64/ in the commit title. > > > > On Fri, Dec 27, 2019 at 10:15 PM Yong Liang <yong.liang@mediatek.com> wrote: > > > > > > From: "yong.liang" <yong.liang@mediatek.com> > > > > > > 1. Include mt8183-reset.h and add reset-cells in infracfg > > > in dtsi file > > Err, wait, doesn't this depend on > http://lists.infradead.org/pipermail/linux-mediatek/2020-January/026170.html > ? > Yes, but this patch can be delay a while, We will ensure jiaxin's patch be send out prioritly. Yong.Liang > > > 2. Add watchdog device node > > Can we have a patch with just this change instead, since you're > sending the binding with it. I will remove binding txt file from this patch. And we will ensure jiaxin's patch be send out prioritly. > > > > > > > Signed-off-by: yong.liang <yong.liang@mediatek.com> > > > > Tested-by: Nicolas Boichat <drinkcat@chromium.org> > > > > > --- > > > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 8 ++++++++ > > > 1 file changed, 8 insertions(+) > > > [snip] > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
On 08/01/2020 10:14, Nicolas Boichat wrote: > On Wed, Jan 8, 2020 at 4:56 PM Nicolas Boichat <drinkcat@chromium.org> wrote: >> >> minor nit, s/amr64/arm64/ in the commit title. >> >> On Fri, Dec 27, 2019 at 10:15 PM Yong Liang <yong.liang@mediatek.com> wrote: >>> >>> From: "yong.liang" <yong.liang@mediatek.com> >>> >>> 1. Include mt8183-reset.h and add reset-cells in infracfg >>> in dtsi file > > Err, wait, doesn't this depend on > http://lists.infradead.org/pipermail/linux-mediatek/2020-January/026170.html > ? > That's all a bit confusing, I thought we are fine to add the reset cells to infracfg as we have the resets defined in 64ebb57a3df6 ("clk: reset: Modify reset-controller driver") That's why I took this part from: https://lore.kernel.org/linux-mediatek/20191226093930.22413-1-yong.liang@mediatek.com/ Please let me know if I'm wrong and I'll drop it. Regards, Matthias >>> 2. Add watchdog device node > > Can we have a patch with just this change instead, since you're > sending the binding with it. > >>> >>> Signed-off-by: yong.liang <yong.liang@mediatek.com> >> >> Tested-by: Nicolas Boichat <drinkcat@chromium.org> >> >>> --- >>> arch/arm64/boot/dts/mediatek/mt8183.dtsi | 8 ++++++++ >>> 1 file changed, 8 insertions(+) >>> [snip]
On Fri, Jan 10, 2020 at 6:09 PM Matthias Brugger <matthias.bgg@gmail.com> wrote: > > > > On 08/01/2020 10:14, Nicolas Boichat wrote: > > On Wed, Jan 8, 2020 at 4:56 PM Nicolas Boichat <drinkcat@chromium.org> wrote: > >> > >> minor nit, s/amr64/arm64/ in the commit title. > >> > >> On Fri, Dec 27, 2019 at 10:15 PM Yong Liang <yong.liang@mediatek.com> wrote: > >>> > >>> From: "yong.liang" <yong.liang@mediatek.com> > >>> > >>> 1. Include mt8183-reset.h and add reset-cells in infracfg > >>> in dtsi file > > > > Err, wait, doesn't this depend on > > http://lists.infradead.org/pipermail/linux-mediatek/2020-January/026170.html > > ? > > > > That's all a bit confusing, I thought we are fine to add the reset cells to > infracfg as we have the resets defined in > 64ebb57a3df6 ("clk: reset: Modify reset-controller driver") You're right, we're fine. But at least in theory, we should still have the binding documentation that I linked above. I will try to pick up all the required patches, split them across 8183/2712 and resend as one series. > That's why I took this part from: > https://lore.kernel.org/linux-mediatek/20191226093930.22413-1-yong.liang@mediatek.com/ > > Please let me know if I'm wrong and I'll drop it. > > Regards, > Matthias > > >>> 2. Add watchdog device node > > > > Can we have a patch with just this change instead, since you're > > sending the binding with it. > > > >>> > >>> Signed-off-by: yong.liang <yong.liang@mediatek.com> > >> > >> Tested-by: Nicolas Boichat <drinkcat@chromium.org> > >> > >>> --- > >>> arch/arm64/boot/dts/mediatek/mt8183.dtsi | 8 ++++++++ > >>> 1 file changed, 8 insertions(+) > >>> [snip]
+Jiaxin +Sj Huang On Mon, Jan 13, 2020 at 12:44 PM Nicolas Boichat <drinkcat@chromium.org> wrote: > > On Fri, Jan 10, 2020 at 6:09 PM Matthias Brugger <matthias.bgg@gmail.com> wrote: > > [snip] > > That's all a bit confusing, I thought we are fine to add the reset cells to > > infracfg as we have the resets defined in > > 64ebb57a3df6 ("clk: reset: Modify reset-controller driver") > > You're right, we're fine. But at least in theory, we should still have > the binding documentation that I linked above. > > I will try to pick up all the required patches, split them across > 8183/2712 and resend as one series. Okay, summary of the patches, there are 2 series: https://patchwork.kernel.org/patch/11311237/ [1.1] [v3,1/2] amr64: dts: modify mt8183.dtsi => Partially applied to Matthias' v5.5-next/dts64 => Other part depend on [1.2], needs to be applied https://patchwork.kernel.org/patch/11311241/ [1.2] [v3,2/2] dt-bindings: mt8183: Add watchdog dt-binding => Pending Guenter/Wim https://patchwork.kernel.org/cover/11326757/ [2.0] [PATCH v11 0/3] ASoC: mt8183: fix audio playback slowly after playback [2.1] [PATCH v11 1/3] dt-bindings: mediatek: mt8183: Add #reset-cells => IMHO adding mt2712 compatible should be another patch => Depends on [1.2] => Tags should be all dropped [2.2] [PATCH v11 2/3] watchdog: mtk_wdt: mt8183: Add reset controller => Issues about tags [2.3] [PATCH v11 3/3] watchdog: mtk_wdt: mt2712: Add reset controller => Issues about tags Jiaxin/Yong Liang/Matthias: Please let me know, I'm happy to pick up the patches, clean them up and resend them, if you think that helps. > > That's why I took this part from: > > https://lore.kernel.org/linux-mediatek/20191226093930.22413-1-yong.liang@mediatek.com/ > > > > Please let me know if I'm wrong and I'll drop it. > > > > Regards, > > Matthias > > > > >>> 2. Add watchdog device node > > > > > > Can we have a patch with just this change instead, since you're > > > sending the binding with it. > > > > > >>> > > >>> Signed-off-by: yong.liang <yong.liang@mediatek.com> > > >> > > >> Tested-by: Nicolas Boichat <drinkcat@chromium.org> > > >> > > >>> --- > > >>> arch/arm64/boot/dts/mediatek/mt8183.dtsi | 8 ++++++++ > > >>> 1 file changed, 8 insertions(+) > > >>> [snip]
On Mon, 2020-01-13 at 14:27 +0800, Nicolas Boichat wrote: > +Jiaxin +Sj Huang > > On Mon, Jan 13, 2020 at 12:44 PM Nicolas Boichat <drinkcat@chromium.org> wrote: > > > > On Fri, Jan 10, 2020 at 6:09 PM Matthias Brugger <matthias.bgg@gmail.com> wrote: > > > [snip] > > > That's all a bit confusing, I thought we are fine to add the reset cells to > > > infracfg as we have the resets defined in > > > 64ebb57a3df6 ("clk: reset: Modify reset-controller driver") > > > > You're right, we're fine. But at least in theory, we should still have > > the binding documentation that I linked above. > > > > I will try to pick up all the required patches, split them across > > 8183/2712 and resend as one series. > > Okay, summary of the patches, there are 2 series: > > https://patchwork.kernel.org/patch/11311237/ > [1.1] [v3,1/2] amr64: dts: modify mt8183.dtsi > => Partially applied to Matthias' v5.5-next/dts64 > => Other part depend on [1.2], needs to be applied > https://patchwork.kernel.org/patch/11311241/ > [1.2] [v3,2/2] dt-bindings: mt8183: Add watchdog dt-binding > => Pending Guenter/Wim > > https://patchwork.kernel.org/cover/11326757/ > [2.0] [PATCH v11 0/3] ASoC: mt8183: fix audio playback slowly after playback > [2.1] [PATCH v11 1/3] dt-bindings: mediatek: mt8183: Add #reset-cells > => IMHO adding mt2712 compatible should be another patch > => Depends on [1.2] > => Tags should be all dropped > [2.2] [PATCH v11 2/3] watchdog: mtk_wdt: mt8183: Add reset controller > => Issues about tags > [2.3] [PATCH v11 3/3] watchdog: mtk_wdt: mt2712: Add reset controller > => Issues about tags > > Jiaxin/Yong Liang/Matthias: Please let me know, I'm happy to pick up > the patches, clean them up and resend them, if you think that helps. > [1.2] [v3,2/2] dt-bindings: mt8183: Add watchdog dt-binding -> It is no use, I will send 8183 in jiaxin's patch We want to send jiaxin's patch prioritily. So you can merge jiaxin's patch firstly. > > > > That's why I took this part from: > > > https://lore.kernel.org/linux-mediatek/20191226093930.22413-1-yong.liang@mediatek.com/ > > > > > > Please let me know if I'm wrong and I'll drop it. > > > > > > Regards, > > > Matthias > > > > > > >>> 2. Add watchdog device node > > > > > > > > Can we have a patch with just this change instead, since you're > > > > sending the binding with it. > > > > > > > >>> > > > >>> Signed-off-by: yong.liang <yong.liang@mediatek.com> > > > >> > > > >> Tested-by: Nicolas Boichat <drinkcat@chromium.org> > > > >> > > > >>> --- > > > >>> arch/arm64/boot/dts/mediatek/mt8183.dtsi | 8 ++++++++ > > > >>> 1 file changed, 8 insertions(+) > > > >>> [snip]
diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi index 10b32471bc7b..c86f5684d502 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -8,6 +8,7 @@ #include <dt-bindings/clock/mt8183-clk.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/reset-controller/mt8183-resets.h> #include "mt8183-pinfunc.h" / { @@ -227,6 +228,7 @@ compatible = "mediatek,mt8183-infracfg", "syscon"; reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>; + #reset-cells = <1>; }; pio: pinctrl@10005000 { @@ -253,6 +255,12 @@ #interrupt-cells = <2>; }; + watchdog: watchdog@10007000 { + compatible = "mediatek,mt8183-wdt", + "mediatek,mt6589-wdt"; + reg = <0 0x10007000 0 0x100>; + }; + apmixedsys: syscon@1000c000 { compatible = "mediatek,mt8183-apmixedsys", "syscon"; reg = <0 0x1000c000 0 0x1000>;