diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-28 18:50:01 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-28 18:50:01 +0100 |
| commit | 009d75ccc11d27b9a083375a88bb93cb746b4800 (patch) | |
| tree | 12abe9fcf437d58b73ee1fa8d422548560deaae5 /arch/arm/dts/exynos5250.dtsi | |
| parent | 417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (diff) | |
| parent | d53e340edf65ff253d3a7b06ebe60501045892e3 (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
drivers/spi/tegra20_sflash.c
include/fdtdec.h
lib/fdtdec.c
Diffstat (limited to 'arch/arm/dts/exynos5250.dtsi')
| -rw-r--r-- | arch/arm/dts/exynos5250.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi index ed8c8dd606..61d35a83ea 100644 --- a/arch/arm/dts/exynos5250.dtsi +++ b/arch/arm/dts/exynos5250.dtsi @@ -151,4 +151,9 @@ }; }; + tmu@10060000 { + compatible = "samsung,exynos-tmu"; + reg = <0x10060000 0x10000>; + }; + }; |