Commit 22f5941f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.18/dt-fixes' into omap-for-v4.18/dt

parents 8dfa7552 107bc3c4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@
		regulator-max-microvolt = <3300000>;
	};

	tv0: connector {
	tv0: svideo-connector {
		compatible = "svideo-connector";
		label = "tv";

+8 −1
Original line number Diff line number Diff line
@@ -349,10 +349,17 @@
	vdda_dac-supply = <&vdac>;

	port {
		dpi_dvi_out: endpoint {
		#address-cells = <1>;
		#size-cells = <0>;
		dpi_dvi_out: endpoint@0 {
			reg = <0>;
			remote-endpoint = <&tfp410_in>;
			data-lines = <24>;
		};

		endpoint@1 {
			reg = <1>;
		};
	};
};

+4 −1
Original line number Diff line number Diff line
@@ -30,7 +30,10 @@

&dss {
	port {
		dpi_lcd_out: endpoint {
		#address-cells = <1>;
		#size-cells = <0>;
		dpi_lcd_out: endpoint@1 {
			reg = <1>;
			remote-endpoint = <&lcd_in>;
			data-lines = <24>;
		};
+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@
		};
	};

	dvi0: connector {
	dvi0: dvi-connector {
		compatible = "dvi-connector";
		label = "dvi";