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

Commit 91d0d294 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-4.14' of... 

Merge tag 'samsung-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DTS ARM changes for v4.13" from Krzysztof Kozłowski:

Remove deprecated and unneeded properties from Exynos boards.

* tag 'samsung-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Remove num-slots from exynos platforms
  ARM: dts: exynos: Remove the OF graph from DSI node
parents aae4e7a8 9d2770b8

arch/arm/boot/dts/exynos3250-artik5-eval.dts

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
};



&mshc_2 {

	num-slots = <1>;

	cap-sd-highspeed;

	disable-wp;

	vqmmc-supply = <&ldo3_reg>;

arch/arm/boot/dts/exynos3250-artik5.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ 
};



&mshc_0 {

	num-slots = <1>;

	non-removable;

	cap-mmc-highspeed;

	card-detect-delay = <200>;

arch/arm/boot/dts/exynos3250-monk.dts

+0 −1
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ 
&mshc_0 {

	#address-cells = <1>;

	#size-cells = <0>;

	num-slots = <1>;

	broken-cd;

	non-removable;

	cap-mmc-highspeed;

arch/arm/boot/dts/exynos3250-rinato.dts

+0 −22
Original line number Diff line number Diff line
@@ -220,21 +220,6 @@ 
	samsung,pll-clock-frequency = <24000000>;

	status = "okay";



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@1 {

			reg = <1>;



			dsi_out: endpoint {

				remote-endpoint = <&dsi_in>;

				samsung,burst-clock-frequency = <250000000>;

				samsung,esc-clock-frequency = <20000000>;

			};

		};

	};



	panel@0 {

		compatible = "samsung,s6e63j0x03";

		reg = <0>;
@@ -264,12 +249,6 @@ 
				vsync-len = <2>;

			};

		};



		port {

			dsi_in: endpoint {

				remote-endpoint = <&dsi_out>;

			};

		};

	};

};
@@ -642,7 +621,6 @@ 
&mshc_0 {

	#address-cells = <1>;

	#size-cells = <0>;

	num-slots = <1>;

	broken-cd;

	non-removable;

	cap-mmc-highspeed;

arch/arm/boot/dts/exynos4210-trats.dts

+0 −21
Original line number Diff line number Diff line
@@ -202,21 +202,6 @@ 
	samsung,pll-clock-frequency = <24000000>;

	status = "okay";



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@1 {

			reg = <1>;



			dsi_out: endpoint {

				remote-endpoint = <&dsi_in>;

				samsung,burst-clock-frequency = <500000000>;

				samsung,esc-clock-frequency = <20000000>;

			};

		};

	};



	panel@0 {

		reg = <0>;

		compatible = "samsung,s6e8aa0";
@@ -244,12 +229,6 @@ 
				vsync-len = <2>;

			};

		};



		port {

			dsi_in: endpoint {

				remote-endpoint = <&dsi_out>;

			};

		};

	};

};