tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Tony Lindgren 22f5941f 8dfa7552

+14 -4
+1 -1
arch/arm/boot/dts/omap3-cm-t3x.dtsi
··· 60 60 regulator-max-microvolt = <3300000>; 61 61 }; 62 62 63 - tv0: connector { 63 + tv0: svideo-connector { 64 64 compatible = "svideo-connector"; 65 65 label = "tv"; 66 66
+8 -1
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
··· 349 349 vdda_dac-supply = <&vdac>; 350 350 351 351 port { 352 - dpi_dvi_out: endpoint { 352 + #address-cells = <1>; 353 + #size-cells = <0>; 354 + dpi_dvi_out: endpoint@0 { 355 + reg = <0>; 353 356 remote-endpoint = <&tfp410_in>; 354 357 data-lines = <24>; 358 + }; 359 + 360 + endpoint@1 { 361 + reg = <1>; 355 362 }; 356 363 }; 357 364 };
+4 -1
arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
··· 30 30 31 31 &dss { 32 32 port { 33 - dpi_lcd_out: endpoint { 33 + #address-cells = <1>; 34 + #size-cells = <0>; 35 + dpi_lcd_out: endpoint@1 { 36 + reg = <1>; 34 37 remote-endpoint = <&lcd_in>; 35 38 data-lines = <24>; 36 39 };
+1 -1
arch/arm/boot/dts/omap3-sb-t35.dtsi
··· 34 34 }; 35 35 }; 36 36 37 - dvi0: connector { 37 + dvi0: dvi-connector { 38 38 compatible = "dvi-connector"; 39 39 label = "dvi"; 40 40