Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / arch / arm / dts / exynos54xx.dtsi

diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi
index b9f8e0bd3dafe711c8cb1e2b6a374f699b51f949..c21d798a23d0b54a295d6f0a90a8f5c578f925dc 100644 (file)
--- a/arch/arm/dts/exynos54xx.dtsi
+++ b/arch/arm/dts/exynos54xx.dtsi
@@ -113,6 +113,16 @@
                status = "disabled";
        };
 
+       fimdm0_sysmmu@0x14640000 {
+               compatible = "samsung,sysmmu-v3.3";
+               reg = <0x14640000 0x100>;
+       };
+
+       fimdm1_sysmmu@0x14680000 {
+               compatible = "samsung,sysmmu-v3.3";
+               reg = <0x14680000 0x100>;
+       };
+
        fimd@14400000 {
                /* sysmmu is not used in U-Boot */
                samsung,disable-sysmmu;