Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0110642 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

arch/arm/boot/dts/exynos5250-snow-common.dtsi

+10 −3
Original line number Diff line number Diff line
@@ -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>;

				};

arch/arm/boot/dts/exynos5420-peach-pit.dts

+10 −3
Original line number Diff line number Diff line
@@ -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>;

				};