Merge tag 'samsung-fixes-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes

Fixes for Exynos-based Snow and Peach Pit boards for regressions introduced in
4.7-rc1 because OF graph logic expects specific names of child nodes.

* tag 'samsung-fixes-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board
  ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 20 insertions, 6 deletions

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index ddfe1f558c10..fa14f77df563 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -242,7 +242,7 @@
         hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>;
 
         ports {
-                port0 {
+                port {
                         dp_out: endpoint {
                                 remote-endpoint = <&bridge_in>;
                         };
@@ -485,13 +485,20 @@
                 edid-emulation = <5>;
 
                 ports {
-                        port0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
                                 bridge_out: endpoint {
                                         remote-endpoint = <&panel_in>;
                                 };
                         };
 
-                        port1 {
+                        port@1 {
+                                reg = <1>;
+
                                 bridge_in: endpoint {
                                         remote-endpoint = <&dp_out>;
                                 };
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f9d2e4f1a0e0..1de972d46a87 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -163,7 +163,7 @@
         hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;
 
         ports {
-                port0 {
+                port {
                         dp_out: endpoint {
                                 remote-endpoint = <&bridge_in>;
                         };
@@ -631,13 +631,20 @@
                 use-external-pwm;
 
                 ports {
-                        port0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
                                 bridge_out: endpoint {
                                         remote-endpoint = <&panel_in>;
                                 };
                         };
 
-                        port1 {
+                        port@1 {
+                                reg = <1>;
+
                                 bridge_in: endpoint {
                                         remote-endpoint = <&dp_out>;
                                 };