Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdd745c8 authored by Łukasz Stelmach's avatar Łukasz Stelmach Committed by Krzysztof Kozlowski
Browse files

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: default avatarŁukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent f77cbb9a

arch/arm/boot/dts/exynos5.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -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>;

		};

	};

};

arch/arm/boot/dts/exynos5250.dtsi

+5 −8
Original line number Diff line number Diff line
@@ -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"

arch/arm/boot/dts/exynos54xx.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -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";