From: "Łukasz Stelmach" <l.stelmach@samsung.com>
To: krzk@kernel.org, linux-samsung-soc@vger.kernel.org
Cc: "Łukasz Stelmach" <l.stelmach@samsung.com>,
m.szyprowski@samsung.com, b.zolnierkie@samsung.com
Subject: [PATCH v2] ARM: dts: exynos: Remove duplicate definitions of SSS nodes for Exynos5
Date: Mon, 27 Nov 2017 13:37:11 +0100 [thread overview]
Message-ID: <20171127123711.12081-1-l.stelmach@samsung.com> (raw)
In-Reply-To: CGME20171127123722eucas1p209c2fd2b0f8bedec45b135348e5573cd@eucas1p2.samsung.com
Move Security Subsystem nodes common for Exynos 5250 and Exynos 54xx
to exynos5.dtsi to avoid duplication.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
arch/arm/boot/dts/exynos5.dtsi | 6 ++++++
arch/arm/boot/dts/exynos5250.dtsi | 13 +++++--------
arch/arm/boot/dts/exynos54xx.dtsi | 6 ------
3 files changed, 11 insertions(+), 14 deletions(-)
Changes in v2:
- Rephrased commit message
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 8dbeb873e99c..8032d7e567fc 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -731,14 +731,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>;
@@ -1084,4 +1076,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 0389e8a10d0b..d0124f45b66a 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";
--
2.11.0
next parent reply other threads:[~2017-11-27 12:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20171127123722eucas1p209c2fd2b0f8bedec45b135348e5573cd@eucas1p2.samsung.com>
2017-11-27 12:37 ` Łukasz Stelmach [this message]
2017-11-27 18:23 ` [PATCH v2] ARM: dts: exynos: Remove duplicate definitions of SSS nodes for Exynos5 Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171127123711.12081-1-l.stelmach@samsung.com \
--to=l.stelmach@samsung.com \
--cc=b.zolnierkie@samsung.com \
--cc=krzk@kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.