Commit a0110642 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-fixes-4.7-2' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents b046302a a7d7865f
...@@ -242,7 +242,7 @@ &dp { ...@@ -242,7 +242,7 @@ &dp {
hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>; hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>;
ports { ports {
port0 { port {
dp_out: endpoint { dp_out: endpoint {
remote-endpoint = <&bridge_in>; remote-endpoint = <&bridge_in>;
}; };
...@@ -485,13 +485,20 @@ ptn3460: lvds-bridge@20 { ...@@ -485,13 +485,20 @@ ptn3460: lvds-bridge@20 {
edid-emulation = <5>; edid-emulation = <5>;
ports { ports {
port0 { #address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
bridge_out: endpoint { bridge_out: endpoint {
remote-endpoint = <&panel_in>; remote-endpoint = <&panel_in>;
}; };
}; };
port1 { port@1 {
reg = <1>;
bridge_in: endpoint { bridge_in: endpoint {
remote-endpoint = <&dp_out>; remote-endpoint = <&dp_out>;
}; };
......
...@@ -163,7 +163,7 @@ &dp { ...@@ -163,7 +163,7 @@ &dp {
hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>; hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;
ports { ports {
port0 { port {
dp_out: endpoint { dp_out: endpoint {
remote-endpoint = <&bridge_in>; remote-endpoint = <&bridge_in>;
}; };
...@@ -631,13 +631,20 @@ ps8625: lvds-bridge@48 { ...@@ -631,13 +631,20 @@ ps8625: lvds-bridge@48 {
use-external-pwm; use-external-pwm;
ports { ports {
port0 { #address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
bridge_out: endpoint { bridge_out: endpoint {
remote-endpoint = <&panel_in>; remote-endpoint = <&panel_in>;
}; };
}; };
port1 { port@1 {
reg = <1>;
bridge_in: endpoint { bridge_in: endpoint {
remote-endpoint = <&dp_out>; remote-endpoint = <&dp_out>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment