aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Sajjan <vikas.sajjan@linaro.org>2013-08-14 04:15:00 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-08-18 12:56:30 -0400
commit77899d5320eacbccaf2ff0dff2b9f02cde2e0e32 (patch)
tree420da695c6a2f9996844e70aafb6b3f367255b68
parentee3381d4621fe99ea76ac084e4f5109f27719333 (diff)
ARM: dts: Update DP controller DT Node for Exynos5 based SoCs
Moves the properties of DP controller to exynos5.dtsi which are common across exynos5 SoCs like Exynos5250 and Exynos5420. The PHY DP Node is based on Jingoo Han's <jg1.han@samsung.com> patch at https://patchwork.linuxtv.org/patch/19189/ Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/boot/dts/exynos5.dtsi10
-rw-r--r--arch/arm/boot/dts/exynos5250-arndale.dts3
-rw-r--r--arch/arm/boot/dts/exynos5250-smdk5250.dts3
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi21
4 files changed, 23 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 185aba820d5e..6afa57d2fecc 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -117,4 +117,14 @@
117 interrupts = <18 4>, <18 5>, <18 6>; 117 interrupts = <18 4>, <18 5>, <18 6>;
118 status = "disabled"; 118 status = "disabled";
119 }; 119 };
120
121 dp-controller@145B0000 {
122 compatible = "samsung,exynos5-dp";
123 reg = <0x145B0000 0x1000>;
124 interrupts = <10 3>;
125 interrupt-parent = <&combiner>;
126 #address-cells = <1>;
127 #size-cells = <0>;
128 status = "disabled";
129 };
120}; 130};
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 76825efac702..ca430206c3e8 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -509,13 +509,14 @@
509 }; 509 };
510 }; 510 };
511 511
512 dp-controller { 512 dp-controller@145B0000 {
513 samsung,color-space = <0>; 513 samsung,color-space = <0>;
514 samsung,dynamic-range = <0>; 514 samsung,dynamic-range = <0>;
515 samsung,ycbcr-coeff = <0>; 515 samsung,ycbcr-coeff = <0>;
516 samsung,color-depth = <1>; 516 samsung,color-depth = <1>;
517 samsung,link-rate = <0x0a>; 517 samsung,link-rate = <0x0a>;
518 samsung,lane-count = <4>; 518 samsung,lane-count = <4>;
519 status = "okay";
519 }; 520 };
520 521
521 fimd: fimd@14400000 { 522 fimd: fimd@14400000 {
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index d176dbb78196..2538b329f2ce 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -250,7 +250,7 @@
250 samsung,vbus-gpio = <&gpx2 6 0>; 250 samsung,vbus-gpio = <&gpx2 6 0>;
251 }; 251 };
252 252
253 dp-controller { 253 dp-controller@145B0000 {
254 samsung,color-space = <0>; 254 samsung,color-space = <0>;
255 samsung,dynamic-range = <0>; 255 samsung,dynamic-range = <0>;
256 samsung,ycbcr-coeff = <0>; 256 samsung,ycbcr-coeff = <0>;
@@ -260,6 +260,7 @@
260 260
261 pinctrl-names = "default"; 261 pinctrl-names = "default";
262 pinctrl-0 = <&dp_hpd>; 262 pinctrl-0 = <&dp_hpd>;
263 status = "okay";
263 }; 264 };
264 265
265 fimd@14400000 { 266 fimd@14400000 {
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index c6bc2bad1378..f46b06a8fdde 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -622,20 +622,17 @@
622 interrupts = <0 94 0>; 622 interrupts = <0 94 0>;
623 }; 623 };
624 624
625 dp-controller { 625 dp_phy: video-phy@10040720 {
626 compatible = "samsung,exynos5-dp"; 626 compatible = "samsung,exynos5250-dp-video-phy";
627 reg = <0x145b0000 0x1000>; 627 reg = <0x10040720 4>;
628 interrupts = <10 3>; 628 #phy-cells = <0>;
629 interrupt-parent = <&combiner>; 629 };
630
631 dp-controller@145B0000 {
630 clocks = <&clock 342>; 632 clocks = <&clock 342>;
631 clock-names = "dp"; 633 clock-names = "dp";
632 #address-cells = <1>; 634 phys = <&dp_phy>;
633 #size-cells = <0>; 635 phy-names = "dp";
634
635 dptx-phy {
636 reg = <0x10040720>;
637 samsung,enable-mask = <1>;
638 };
639 }; 636 };
640 637
641 fimd@14400000 { 638 fimd@14400000 {