diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-11 16:20:30 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-11 16:20:30 +0100 |
| commit | 665c775895b66e8109fdda1acb1f75fef63f9383 (patch) | |
| tree | 1cff48d76439a56897210399f9446df204dfeba4 /dts/src/arm/meson.dtsi | |
| parent | c29cddb8315ffbb77e935d91859a7c59f17b57bc (diff) | |
| download | barebox-665c775895b66e8109fdda1acb1f75fef63f9383.tar.gz barebox-665c775895b66e8109fdda1acb1f75fef63f9383.tar.xz | |
dts: update to v4.15-rc3
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/meson.dtsi')
| -rw-r--r-- | dts/src/arm/meson.dtsi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dts/src/arm/meson.dtsi b/dts/src/arm/meson.dtsi index 4926133077..0d9faf1a51 100644 --- a/dts/src/arm/meson.dtsi +++ b/dts/src/arm/meson.dtsi @@ -85,15 +85,6 @@ reg = <0x7c00 0x200>; }; - gpio_intc: interrupt-controller@9880 { - compatible = "amlogic,meson-gpio-intc"; - reg = <0xc1109880 0x10>; - interrupt-controller; - #interrupt-cells = <2>; - amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>; - status = "disabled"; - }; - hwrng: rng@8100 { compatible = "amlogic,meson-rng"; reg = <0x8100 0x8>; @@ -191,6 +182,15 @@ status = "disabled"; }; + gpio_intc: interrupt-controller@9880 { + compatible = "amlogic,meson-gpio-intc"; + reg = <0x9880 0x10>; + interrupt-controller; + #interrupt-cells = <2>; + amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>; + status = "disabled"; + }; + wdt: watchdog@9900 { compatible = "amlogic,meson6-wdt"; reg = <0x9900 0x8>; |