From: Krzysztof Kozlowski <krzk@kernel.org>
To: Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Tomasz Figa <tomasz.figa@gmail.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 13/22] ARM: dts: exynos: Move common nodes to exynos5.dtsi
Date: Sun, 8 May 2016 21:05:58 +0200 [thread overview]
Message-ID: <1462734367-5619-14-git-send-email-krzk@kernel.org> (raw)
In-Reply-To: <1462734367-5619-1-git-send-email-krzk@kernel.org>
Exynos5420 and Exynos5250 share some nodes: the PWM and syscon
(sysreg_system_controller). Move them to parent DTSI to avoid
duplication.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
arch/arm/boot/dts/exynos5.dtsi | 12 ++++++++++++
arch/arm/boot/dts/exynos5250.dtsi | 19 +++++--------------
arch/arm/boot/dts/exynos5420.dtsi | 19 +++++--------------
3 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index d5c0f18a4223..fe901152f3ea 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -63,6 +63,11 @@
interrupts = <1 9 0xf04>;
};
+ sysreg_system_controller: syscon@10050000 {
+ compatible = "samsung,exynos5-sysreg", "syscon";
+ reg = <0x10050000 0x5000>;
+ };
+
serial_0: serial@12C00000 {
compatible = "samsung,exynos4210-uart";
reg = <0x12C00000 0x100>;
@@ -87,6 +92,13 @@
interrupts = <0 54 0>;
};
+ pwm: pwm@12DD0000 {
+ compatible = "samsung,exynos4210-pwm";
+ reg = <0x12DD0000 0x100>;
+ samsung,pwm-outputs = <0>, <1>, <2>, <3>;
+ #pwm-cells = <3>;
+ };
+
rtc: rtc@101E0000 {
compatible = "samsung,s3c6410-rtc";
reg = <0x101E0000 0x100>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index c7158b2fb213..6762faaf12a8 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -235,11 +235,6 @@
interrupt-parent = <&gic>;
};
- sysreg_system_controller: syscon@10050000 {
- compatible = "samsung,exynos5-sysreg", "syscon";
- reg = <0x10050000 0x5000>;
- };
-
watchdog@101D0000 {
compatible = "samsung,exynos5250-wdt";
reg = <0x101D0000 0x100>;
@@ -662,15 +657,6 @@
samsung,pmureg-phandle = <&pmu_system_controller>;
};
- pwm: pwm@12dd0000 {
- compatible = "samsung,exynos4210-pwm";
- reg = <0x12dd0000 0x100>;
- samsung,pwm-outputs = <0>, <1>, <2>, <3>;
- #pwm-cells = <3>;
- clocks = <&clock CLK_PWM>;
- clock-names = "timers";
- };
-
amba {
#address-cells = <1>;
#size-cells = <1>;
@@ -1070,6 +1056,11 @@
iommus = <&sysmmu_fimd1>;
};
+&pwm {
+ clocks = <&clock CLK_PWM>;
+ clock-names = "timers";
+};
+
&rtc {
clocks = <&clock CLK_RTC>;
clock-names = "rtc";
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 4c8523471c65..f7322d87095f 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -542,15 +542,6 @@
status = "disabled";
};
- pwm: pwm@12dd0000 {
- compatible = "samsung,exynos4210-pwm";
- reg = <0x12dd0000 0x100>;
- samsung,pwm-outputs = <0>, <1>, <2>, <3>;
- #pwm-cells = <3>;
- clocks = <&clock CLK_PWM>;
- clock-names = "timers";
- };
-
dp_phy: dp-video-phy {
compatible = "samsung,exynos5420-dp-video-phy";
samsung,pmu-syscon = <&pmu_system_controller>;
@@ -823,11 +814,6 @@
interrupt-parent = <&gic>;
};
- sysreg_system_controller: syscon@10050000 {
- compatible = "samsung,exynos5-sysreg", "syscon";
- reg = <0x10050000 0x5000>;
- };
-
tmu_cpu0: tmu@10060000 {
compatible = "samsung,exynos5420-tmu";
reg = <0x10060000 0x100>;
@@ -1207,6 +1193,11 @@
iommu-names = "m0", "m1";
};
+&pwm {
+ clocks = <&clock CLK_PWM>;
+ clock-names = "timers";
+};
+
&rtc {
clocks = <&clock CLK_RTC>;
clock-names = "rtc";
--
2.5.0
next prev parent reply other threads:[~2016-05-08 19:05 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-08 19:05 [PATCH v2 00/22] ARM: dts: exynos: Add initial support for Odroid XU Krzysztof Kozlowski
2016-05-08 19:05 ` [PATCH v2 01/22] dt-bindings: clock: Add license and reformat Exynos5410 clock IDs Krzysztof Kozlowski
2016-05-09 19:37 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 02/22] dt-bindings: clock: Add PWM and USB clock IDs to Exynos5410 Krzysztof Kozlowski
2016-05-09 19:41 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 03/22] ARM: dts: exynos: Add fin_pll node for clock driver Krzysztof Kozlowski
2016-05-09 19:53 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 04/22] clk: samsung: exynos5410: Provide fin_pll external fixed clock Krzysztof Kozlowski
2016-05-09 20:19 ` Javier Martinez Canillas
2016-05-10 5:26 ` Krzysztof Kozlowski
2016-05-08 19:05 ` [PATCH v2 05/22] ARM: dts: exynos: Switch MCT node to a new fin_pll clock Krzysztof Kozlowski
2016-05-09 20:22 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 06/22] ARM: dts: exynos: Remove old fixed-clock provider on SMDK5410 Krzysztof Kozlowski
2016-05-09 20:24 ` Javier Martinez Canillas
2016-05-10 5:27 ` Krzysztof Kozlowski
2016-05-08 19:05 ` [PATCH v2 07/22] clk: samsung: exynos5410: Rename fin_pll from temporary to regular name Krzysztof Kozlowski
[not found] ` <1462734367-5619-8-git-send-email-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-05-09 20:25 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 08/22] clk: samsung: exynos5410: Add serial3, USB and PWM clocks Krzysztof Kozlowski
2016-05-09 20:50 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 09/22] ARM: dts: exynos: Re-order alphabetically Exynos5420 SD0/SD1 pinctrl nodes Krzysztof Kozlowski
[not found] ` <1462734367-5619-10-git-send-email-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-05-09 20:52 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 10/22] ARM: dts: exynos: Use lowercase for Exynos5410 CPU node labels Krzysztof Kozlowski
2016-05-09 20:54 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 11/22] ARM: dts: exynos: Configure Exynos5410 pinctrl for eMMC and SD card Krzysztof Kozlowski
2016-05-09 20:58 ` Javier Martinez Canillas
2016-05-08 19:05 ` [PATCH v2 12/22] ARM: dts: exynos: Split Odroid XU3 LEDs to separate DTSI Krzysztof Kozlowski
2016-05-09 20:59 ` Javier Martinez Canillas
2016-05-08 19:05 ` Krzysztof Kozlowski [this message]
2016-05-09 21:25 ` [PATCH v2 13/22] ARM: dts: exynos: Move common nodes to exynos5.dtsi Javier Martinez Canillas
2016-05-10 5:30 ` Krzysztof Kozlowski
2016-05-08 19:05 ` [PATCH v2 14/22] ARM: dts: exynos: Prepare for inclusion of exynos5.dtsi in exynos5410.dtsi Krzysztof Kozlowski
2016-05-09 21:27 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 15/22] ARM: dts: exynos: Use phandle to get parent node in exynos5250-snow Krzysztof Kozlowski
[not found] ` <1462734367-5619-16-git-send-email-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-05-09 21:29 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 16/22] ARM: dts: exynos: Move Exynos5250 and Exynos5420 nodes under soc Krzysztof Kozlowski
2016-05-09 21:35 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 17/22] ARM: dts: exynos: Include common exynos5 in exynos5410.dtsi Krzysztof Kozlowski
2016-05-09 21:39 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 18/22] ARM: dts: exynos: Enable UART3 on Exynos5410 Krzysztof Kozlowski
2016-05-09 21:40 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 19/22] ARM: dts: exynos: MCT is not an interrupt controller and extend length of iomap Krzysztof Kozlowski
[not found] ` <1462734367-5619-20-git-send-email-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-05-09 21:44 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 20/22] ARM: dts: exynos: Move common Exynos5410/542x/5800 nodes to new DTSI Krzysztof Kozlowski
2016-05-09 21:53 ` Javier Martinez Canillas
2016-05-10 5:33 ` Krzysztof Kozlowski
2016-05-10 12:51 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 21/22] ARM: dts: exynos: Add USB to Exynos5410 Krzysztof Kozlowski
2016-05-09 21:55 ` Javier Martinez Canillas
2016-05-08 19:06 ` [PATCH v2 22/22] ARM: dts: exynos: Add initial support for Odroid XU board Krzysztof Kozlowski
2016-05-09 20:09 ` Rob Herring
2016-05-09 22:02 ` Javier Martinez Canillas
[not found] ` <cbcb5657-8825-83cf-688f-d565ac7ecbab-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2016-05-10 5:35 ` Krzysztof Kozlowski
2016-05-09 22:00 ` [PATCH v2 00/22] ARM: dts: exynos: Add initial support for Odroid XU Stephen Boyd
2016-05-09 22:05 ` Javier Martinez Canillas
2016-05-10 5:13 ` Krzysztof Kozlowski
2016-05-10 14:00 ` Javier Martinez Canillas
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=1462734367-5619-14-git-send-email-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=javier@osg.samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=s.nawrocki@samsung.com \
--cc=sboyd@codeaurora.org \
--cc=tomasz.figa@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).