Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos5420.dtsi

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index e3329afbd8c4cea8131cb8cd65fe1efe1aaee0e9..c3a9a66c57678f9a5dddd75e11e55be913e3c3c0 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -17,10 +17,10 @@
 #include "exynos5.dtsi"
 #include "exynos5420-pinctrl.dtsi"
 
-#include <dt-bindings/clk/exynos-audss-clk.h>
+#include <dt-bindings/clock/exynos-audss-clk.h>
 
 / {
-       compatible = "samsung,exynos5420";
+       compatible = "samsung,exynos5420", "samsung,exynos5";
 
        aliases {
                mshc0 = &mmc_0;
@@ -723,4 +723,13 @@
                clock-names = "watchdog";
                samsung,syscon-phandle = <&pmu_system_controller>;
         };
+
+       sss@10830000 {
+               compatible = "samsung,exynos4210-secss";
+               reg = <0x10830000 0x10000>;
+               interrupts = <0 112 0>;
+               clocks = <&clock 471>;
+               clock-names = "secss";
+               samsung,power-domain = <&g2d_pd>;
+       };
 };