diff options
| author | Olof Johansson <[email protected]> | 2016-06-19 22:29:47 -0700 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2016-06-19 22:29:47 -0700 |
| commit | 00d624dcb97e33898e24aeb5b521bac009986f6d (patch) | |
| tree | 8e38c45833ac5d5dbb54b0092e8b11eba04e67af | |
| parent | 2a4a2aadbaad9dffdb564a2895348f3d8e825416 (diff) | |
| parent | cad059c6e6b2185a068453608f155e9e8a64af39 (diff) | |
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: Olof Johansson <[email protected]>
| -rw-r--r-- | arch/arm/boot/dts/meson8b.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 2bfe401a4da9..fc4080de4b7b 100644 --- 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>; |