Commit 00d624dc authored by Olof Johansson's avatar Olof Johansson

Merge tag 'amlogic-dt' of...

Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Amlogic DT changes for v4.8
- add reset driver for meson8b

* tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2a4a2aad cad059c6
......@@ -46,6 +46,7 @@
#include <dt-bindings/clock/meson8b-clkc.h>
#include <dt-bindings/gpio/meson8b-gpio.h>
#include <dt-bindings/reset/amlogic,meson8b-reset.h>
#include "skeleton.dtsi"
/ {
......@@ -105,6 +106,12 @@ gic: interrupt-controller@c4301000 {
#interrupt-cells = <3>;
};
reset: reset-controller@c1104404 {
compatible = "amlogic,meson8b-reset";
reg = <0xc1104404 0x20>;
#reset-cells = <1>;
};
wdt: watchdog@c1109900 {
compatible = "amlogic,meson8b-wdt";
reg = <0xc1109900 0x8>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment