ARM: dts: exynos: Remove duplicate definitions of SSS nodes for Exynos5

Move Security Subsystem nodes common for Exynos5250 and Exynos54xx
to exynos5.dtsi to avoid duplication.

Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

3 files changed, 11 insertions, 14 deletions

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 66d22521c976..7da4a4285b24 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -204,5 +204,11 @@
                         #size-cells = <0>;
                         status = "disabled";
                 };
+
+                sss: sss@10830000 {
+                        compatible = "samsung,exynos4210-secss";
+                        reg = <0x10830000 0x300>;
+                        interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 5286084e1032..dbe81a1bfd25 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -739,14 +739,6 @@
                         status = "disabled";
                 };
 
-                sss@10830000 {
-                        compatible = "samsung,exynos4210-secss";
-                        reg = <0x10830000 0x300>;
-                        interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_SSS>;
-                        clock-names = "secss";
-                };
-
                 sysmmu_g2d: sysmmu@10A60000 {
                         compatible = "samsung,exynos-sysmmu";
                         reg = <0x10A60000 0x1000>;
@@ -1092,4 +1084,9 @@
         dma-names = "rx", "tx";
 };
 
+&sss {
+        clocks = <&clock CLK_SSS>;
+        clock-names = "secss";
+};
+
 #include "exynos5250-pinctrl.dtsi"
diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi
index a5007f182bc4..b45678212f1a 100644
--- a/arch/arm/boot/dts/exynos54xx.dtsi
+++ b/arch/arm/boot/dts/exynos54xx.dtsi
@@ -79,12 +79,6 @@
                         interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
                 };
 
-                sss: sss@10830000 {
-                        compatible = "samsung,exynos4210-secss";
-                        reg = <0x10830000 0x300>;
-                        interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-                };
-
                 /* i2c_0-3 are defined in exynos5.dtsi */
                 hsi2c_4: i2c@12ca0000 {
                         compatible = "samsung,exynos5250-hsi2c";