diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-05-15 11:13:24 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-05-15 11:13:24 -0700 |
| commit | 22f5941fd24d91e0a1d8dfd0a8f1558cd97757c4 (patch) | |
| tree | 0b5d7987aca12bff109603a24bba5c7370f50fe7 | |
| parent | 8dfa75524a0e0e2b4eaf2a3dc178f6b4d8db85d9 (diff) | |
| parent | 107bc3c42c0edaa7e91a0d7693994f371d806b38 (diff) | |
Merge branch 'omap-for-v4.18/dt-fixes' into omap-for-v4.18/dt
| -rw-r--r-- | arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3-sb-t35.dtsi | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 9dcb18d22cde..cdb632df152a 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -60,7 +60,7 @@ regulator-max-microvolt = <3300000>; }; - tv0: connector { + tv0: svideo-connector { compatible = "svideo-connector"; label = "tv"; diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi index 0c0bb1b01b0b..746a658e84b6 100644 --- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi +++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi @@ -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>; + }; }; }; diff --git a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi index 2d64bcffaaa8..1093387259e2 100644 --- a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi +++ b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi @@ -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>; }; diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi index 22b4c8bdcc65..fb9842fa922c 100644 --- a/arch/arm/boot/dts/omap3-sb-t35.dtsi +++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi @@ -34,7 +34,7 @@ }; }; - dvi0: connector { + dvi0: dvi-connector { compatible = "dvi-connector"; label = "dvi"; |