diff options
| author | Tom Rini <trini@ti.com> | 2014-10-22 13:51:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-22 13:51:45 -0400 |
| commit | 68e80fdda1336068f40915388bbdacfd2b75233a (patch) | |
| tree | deb28e65fdd601e47bf5564f67da3035a840e284 /arch/arm/dts/exynos4.dtsi | |
| parent | 35d4fed320d577a4446531d7b9350ce40065c4b0 (diff) | |
| parent | 8a9cd5ad6f89ab721a352cbb9264bea5ede68789 (diff) | |
| download | talos-obmc-uboot-68e80fdda1336068f40915388bbdacfd2b75233a.tar.gz talos-obmc-uboot-68e80fdda1336068f40915388bbdacfd2b75233a.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/dts/exynos4.dtsi')
| -rw-r--r-- | arch/arm/dts/exynos4.dtsi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/dts/exynos4.dtsi b/arch/arm/dts/exynos4.dtsi index 110eb43a2f..77fad48fb4 100644 --- a/arch/arm/dts/exynos4.dtsi +++ b/arch/arm/dts/exynos4.dtsi @@ -7,9 +7,16 @@ * SPDX-License-Identifier: GPL-2.0+ */ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { + combiner: interrupt-controller@10440000 { + compatible = "samsung,exynos4210-combiner"; + #interrupt-cells = <2>; + interrupt-controller; + reg = <0x10440000 0x1000>; + }; + serial@13800000 { compatible = "samsung,exynos4210-uart"; reg = <0x13800000 0x3c>; |
