From: Maciej Purski <m.purski@samsung.com>
To: linux-samsung-soc@vger.kernel.org
Cc: Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
devicetree@vger.kernel.org, m.szyprowski@samsung.com,
b.zolnierkie@samsung.com, Maciej Purski <m.purski@samsung.com>
Subject: [PATCH v2 8/9] ARM: dts: exynos: Use labels instead of full names in exynos4412-trats2
Date: Mon, 05 Feb 2018 08:57:07 +0100 [thread overview]
Message-ID: <1517817428-7898-9-git-send-email-m.purski@samsung.com> (raw)
In-Reply-To: <1517817428-7898-1-git-send-email-m.purski@samsung.com>
Camera and i2c1_isp labels are defined in exynos4.dtsi and
exynos4412.dtsi. Use them exynos4412-trats2.
Signed-off-by: Maciej Purski <m.purski@samsung.com>
---
arch/arm/boot/dts/exynos4412-trats2.dts | 73 ++++++++++++++++-----------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index f285790..b8abc21 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -288,17 +288,6 @@
};
};
- camera: camera {
- pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>;
- pinctrl-names = "default";
- status = "okay";
- assigned-clocks = <&clock CLK_MOUT_CAM0>,
- <&clock CLK_MOUT_CAM1>;
- assigned-clock-parents = <&clock CLK_XUSBXTI>,
- <&clock CLK_XUSBXTI>;
-
-
- };
wlan_pwrseq: sdhci3-pwrseq {
compatible = "mmc-pwrseq-simple";
@@ -403,6 +392,16 @@
status = "okay";
};
+&camera {
+ pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>;
+ pinctrl-names = "default";
+ status = "okay";
+ assigned-clocks = <&clock CLK_MOUT_CAM0>,
+ <&clock CLK_MOUT_CAM1>;
+ assigned-clock-parents = <&clock CLK_XUSBXTI>,
+ <&clock CLK_XUSBXTI>;
+};
+
&cpu0 {
cpu0-supply = <&buck2_reg>;
};
@@ -527,32 +526,6 @@
pinctrl-0 = <&fimc_is_uart>;
pinctrl-names = "default";
status = "okay";
-
- i2c1_isp: i2c-isp@12140000 {
- pinctrl-0 = <&fimc_is_i2c1>;
- pinctrl-names = "default";
-
- s5k6a3@10 {
- compatible = "samsung,s5k6a3";
- reg = <0x10>;
- svdda-supply = <&cam_io_reg>;
- svddio-supply = <&ldo19_reg>;
- afvdd-supply = <&ldo19_reg>;
- clock-frequency = <24000000>;
- /* CAM_B_CLKOUT */
- clocks = <&camera 1>;
- clock-names = "extclk";
- samsung,camclk-out = <1>;
- gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;
-
- port {
- is_s5k6a3_ep: endpoint {
- remote-endpoint = <&csis1_ep>;
- data-lanes = <1>;
- };
- };
- };
- };
};
&fimc_lite_0 {
@@ -629,6 +602,32 @@
};
};
+&i2c1_isp {
+ pinctrl-0 = <&fimc_is_i2c1>;
+ pinctrl-names = "default";
+
+ s5k6a3@10 {
+ compatible = "samsung,s5k6a3";
+ reg = <0x10>;
+ svdda-supply = <&cam_io_reg>;
+ svddio-supply = <&ldo19_reg>;
+ afvdd-supply = <&ldo19_reg>;
+ clock-frequency = <24000000>;
+ /* CAM_B_CLKOUT */
+ clocks = <&camera 1>;
+ clock-names = "extclk";
+ samsung,camclk-out = <1>;
+ gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;
+
+ port {
+ is_s5k6a3_ep: endpoint {
+ remote-endpoint = <&csis1_ep>;
+ data-lanes = <1>;
+ };
+ };
+ };
+};
+
&i2c_3 {
samsung,i2c-sda-delay = <100>;
samsung,i2c-slave-addr = <0x10>;
--
2.7.4
next prev parent reply other threads:[~2018-02-05 7:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180205075723eucas1p1e14d59501a636903262aee195348d53c@eucas1p1.samsung.com>
2018-02-05 7:56 ` [PATCH v2 0/9] Exynos 4210, 4412 DTS cleanup Maciej Purski
[not found] ` <CGME20180205075727eucas1p16ae3372cf985aaabb3899f0e030eb972@eucas1p1.samsung.com>
2018-02-05 7:57 ` [PATCH v2 1/9] ARM: dts: exynos: Use pinctrl labels in exynos4210-pinctrl Maciej Purski
[not found] ` <1517817428-7898-2-git-send-email-m.purski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2018-02-12 19:15 ` Krzysztof Kozlowski
[not found] ` <CGME20180205075728eucas1p1c8999b9b16739113d28da384bdeeb6b1@eucas1p1.samsung.com>
2018-02-05 7:57 ` [PATCH v2 3/9] ARM: dts: exynos: Use labels instead of full names in exynos4210 Maciej Purski
[not found] ` <CGME20180205075728eucas1p15c9366900381a23cd8c31a1ddb724a6a@eucas1p1.samsung.com>
2018-02-05 7:57 ` [PATCH v2 4/9] ARM: dts: exynos: Use fimc labels in exynos4210-trats Maciej Purski
[not found] ` <CGME20180205075729eucas1p151ca06d3f2dad9bafef3088af61a498f@eucas1p1.samsung.com>
2018-02-05 7:57 ` [PATCH v2 6/9] ARM: dts: exynos: Use camera label in exynos4412 Maciej Purski
[not found] ` <1517817428-7898-7-git-send-email-m.purski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2018-02-13 17:44 ` Krzysztof Kozlowski
[not found] ` <CGME20180205075729eucas1p17ce438ffb3d7824a187e14b1c25fef6b@eucas1p1.samsung.com>
2018-02-05 7:57 ` [PATCH v2 7/9] ARM: dts: exynos: Use camera label in exynos4412-odroid-common Maciej Purski
[not found] ` <CGME20180205075730eucas1p196ccf9ed382aed52c2079e5c6c5c42c4@eucas1p1.samsung.com>
2018-02-05 7:57 ` Maciej Purski [this message]
[not found] ` <CGME20180205075730eucas1p172e5eb26c498dbfa23cfad0f19401b8a@eucas1p1.samsung.com>
2018-02-05 7:57 ` [PATCH v2 9/9] ARM: dts: exynos: Use camera label in exynos4412-itop-elite Maciej Purski
[not found] ` <CGME20180205075727eucas1p1162865cc75af18a3295a9c7665e93dfb@eucas1p1.samsung.com>
[not found] ` <1517817428-7898-1-git-send-email-m.purski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2018-02-05 7:57 ` [PATCH v2 2/9] ARM: dts: exynos: Use pinctrl labels in exynos4412-pinctrl Maciej Purski
2018-02-05 7:57 ` [PATCH v2 5/9] ARM: dts: exynos: Use labels instead of full names in exynos4210-universal_c210 Maciej Purski
2018-02-05 8:31 ` [PATCH v2 0/9] Exynos 4210, 4412 DTS cleanup 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=1517817428-7898-9-git-send-email-m.purski@samsung.com \
--to=m.purski@samsung.com \
--cc=b.zolnierkie@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=kgene@kernel.org \
--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 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).