Message ID | 20180510184751.13416-6-paul@crapouillou.net |
---|---|
State | Not Applicable, archived |
Headers | show |
Series | None | expand |
On Thu, May 10, 2018 at 08:47:49PM +0200, Paul Cercueil wrote: > - The previous node requested a memory area of 0x100 bytes, while the > driver only manipulates four registers present in the first 0x10 bytes. > > - The driver requests for the "rtc" clock, but the previous node did not > provide any. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Reviewed-by: Mathieu Malaterre <malat@debian.org> > Acked-by: James Hogan <jhogan@kernel.org> > --- > Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt | 7 ++++++- > arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 ++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > v2: No change > v3: Also fix documentation Reviewed-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" 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/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt b/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt index cb44918f01a8..ce1cb72d5345 100644 --- a/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt @@ -3,10 +3,15 @@ Ingenic Watchdog Timer (WDT) Controller for JZ4740 & JZ4780 Required properties: compatible: "ingenic,jz4740-watchdog" or "ingenic,jz4780-watchdog" reg: Register address and length for watchdog registers +clocks: phandle to the RTC clock +clock-names: should be "rtc" Example: watchdog: jz4740-watchdog@10002000 { compatible = "ingenic,jz4740-watchdog"; - reg = <0x10002000 0x100>; + reg = <0x10002000 0x10>; + + clocks = <&cgu JZ4740_CLK_RTC>; + clock-names = "rtc"; }; diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi index 9b5794667aee..a52f59bf58c7 100644 --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi @@ -221,7 +221,10 @@ watchdog: watchdog@10002000 { compatible = "ingenic,jz4780-watchdog"; - reg = <0x10002000 0x100>; + reg = <0x10002000 0x10>; + + clocks = <&cgu JZ4780_CLK_RTCLK>; + clock-names = "rtc"; }; nemc: nemc@13410000 {