Merge tag 'davinci-fixes-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 4 Aug 2017 11:22:33 +0000 (13:22 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 4 Aug 2017 11:22:33 +0000 (13:22 +0200)
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

arch/arm/boot/dts/da850-evm.dts
arch/arm/boot/dts/da850-lcdk.dts

index a423e8ebfb3758057d41a4e9f77505df5dc1d783..67e72bc72e805be995b0d44fa68f74e29161b140 100644 (file)
        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>;
-               };
-       };
 };
index b837fec70eec8cb7d241d14559c8fad9c0cbb909..a0f0916156e66d83949716c4b571184695fbef3b 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&vpif_capture_pins>;
        status = "okay";
-
-       /* VPIF capture port */
-       port {
-               vpif_ch0: endpoint {
-                         bus-width = <8>;
-               };
-       };
 };