| Message ID | 20181123144541.15114-1-ccaione@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6f31ba17c83c184de658a78a8f84b8c843eb8e74 |
| Headers | show |
| Series | [v2] arm64: dts: meson-axg: Enable watchdog on Meson AXG SoCs | expand |
On 23/11/2018 15:45, Carlo Caione wrote: > Add the watchdog node also on the AXG platforms. > > Signed-off-by: Carlo Caione <ccaione@baylibre.com> > --- > V2: > - Remove amlogic,meson-axg-wdt compatible > --- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index df017dbd2e57..27d73d831a13 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -1422,6 +1422,12 @@ > status = "disabled"; > }; > > + watchdog@f0d0 { > + compatible = "amlogic,meson-gxbb-wdt"; > + reg = <0x0 0xf0d0 0x0 0x10>; > + clocks = <&xtal>; > + }; > + > pwm_ab: pwm@1b000 { > compatible = "amlogic,meson-axg-ee-pwm"; > reg = <0x0 0x1b000 0x0 0x20>; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Carlo Caione <ccaione@baylibre.com> writes: > Add the watchdog node also on the AXG platforms. > > Signed-off-by: Carlo Caione <ccaione@baylibre.com> > --- > V2: > - Remove amlogic,meson-axg-wdt compatible Queued for v4.21 with Neil's tag (branch: v4.21/dt64) Thanks, Kevin
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index df017dbd2e57..27d73d831a13 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1422,6 +1422,12 @@ status = "disabled"; }; + watchdog@f0d0 { + compatible = "amlogic,meson-gxbb-wdt"; + reg = <0x0 0xf0d0 0x0 0x10>; + clocks = <&xtal>; + }; + pwm_ab: pwm@1b000 { compatible = "amlogic,meson-axg-ee-pwm"; reg = <0x0 0x1b000 0x0 0x20>;
Add the watchdog node also on the AXG platforms. Signed-off-by: Carlo Caione <ccaione@baylibre.com> --- V2: - Remove amlogic,meson-axg-wdt compatible --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)