Message ID | 1503993518-24428-2-git-send-email-leo.yan@linaro.org (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On 08/29, Leo Yan wrote: > From: Dmitry Shmidt <dimitrysh@google.com> > > This patch is to add watchdog binding for Hi6220 on Hikey board. > > Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> > --- This will go through arm-soc?
Hi Stephen, On 2017/9/1 2:32, Stephen Boyd wrote: > On 08/29, Leo Yan wrote: >> From: Dmitry Shmidt <dimitrysh@google.com> >> >> This patch is to add watchdog binding for Hi6220 on Hikey board. >> >> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> >> --- > > This will go through arm-soc? > Can you pick up it for v4.14? Otherwise I am fine to pick up it and queue for v4.15. Thanks! Best Regards, Wei -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/01, Wei Xu wrote: > Hi Stephen, > > On 2017/9/1 2:32, Stephen Boyd wrote: > > On 08/29, Leo Yan wrote: > >> From: Dmitry Shmidt <dimitrysh@google.com> > >> > >> This patch is to add watchdog binding for Hi6220 on Hikey board. > >> > >> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> > >> --- > > > > This will go through arm-soc? > > > > Can you pick up it for v4.14? > Otherwise I am fine to pick up it and queue for v4.15. Sounds like it will go for v4.15. Otherwise, you can send it to arm-soc with the raw number instead of #define number and then fix it up to use the #define later.
Hi Stephen, On 2017/9/1 21:28, Stephen Boyd wrote: > On 09/01, Wei Xu wrote: >> Hi Stephen, >> >> On 2017/9/1 2:32, Stephen Boyd wrote: >>> On 08/29, Leo Yan wrote: >>>> From: Dmitry Shmidt <dimitrysh@google.com> >>>> >>>> This patch is to add watchdog binding for Hi6220 on Hikey board. >>>> >>>> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> >>>> --- >>> >>> This will go through arm-soc? >>> >> >> Can you pick up it for v4.14? >> Otherwise I am fine to pick up it and queue for v4.15. > > Sounds like it will go for v4.15. Otherwise, you can send it to > arm-soc with the raw number instead of #define number and then > fix it up to use the #define later. > I did not get your meaning. Do you mean the "HI6220_WDT0/1/2_PCLK" in the patch 1 that we need to replace with raw number? They are already in the mainline. Best Regards, Wei -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index eacbe0d..77dc28f 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -809,6 +809,14 @@ pinctrl-1 = <&sdio_pmx_idle &sdio_clk_cfg_idle &sdio_cfg_idle>; }; + watchdog0: watchdog@f8005000 { + compatible = "arm,sp805-wdt", "arm,primecell"; + reg = <0x0 0xf8005000 0x0 0x1000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ao_ctrl HI6220_WDT0_PCLK>; + clock-names = "apb_pclk"; + }; + tsensor: tsensor@0,f7030700 { compatible = "hisilicon,tsensor"; reg = <0x0 0xf7030700 0x0 0x1000>;