Commit 41c454fa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-fixes-for-v4.13' of...

Merge tag 'davinci-fixes-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

Pull "DaVinci fixes for v4.13" from Sekhar Nori:

Drop unused VPIF endpoints from device-tree.
They should be used only when an actual
remote-endpoint is connected.

* tag 'davinci-fixes-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850-lcdk: drop unused VPIF endpoints
  ARM: dts: da850-evm: drop unused VPIF endpoints
parents ae119859 6ea57ad6
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
@@ -301,25 +301,4 @@
	pinctrl-names = "default";
	pinctrl-0 = <&vpif_capture_pins>, <&vpif_display_pins>;
	status = "okay";

	/* VPIF capture port */
	port@0 {
		vpif_input_ch0: endpoint@0 {
			reg = <0>;
			bus-width = <8>;
		};

		vpif_input_ch1: endpoint@1 {
			reg = <1>;
			bus-width = <8>;
			data-shift = <8>;
		};
	};

	/* VPIF display port */
	port@1 {
		vpif_output_ch0: endpoint {
			bus-width = <8>;
		};
	};
};
+0 −7
Original line number Diff line number Diff line
@@ -318,11 +318,4 @@
	pinctrl-names = "default";
	pinctrl-0 = <&vpif_capture_pins>;
	status = "okay";

	/* VPIF capture port */
	port {
		vpif_ch0: endpoint {
			  bus-width = <8>;
		};
	};
};