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

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: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index 2bfe401..fc4080d 100644 (file)
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -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 @@
                        #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>;