Use panel-dpi driver instead of the deprecated tilcdc-panel driver in preparation for removing the tilcdc-panel driver and binding.
Signed-off-by: Kory Maincent (TI.com) <[email protected]> --- This patch is not tested. It would be nice if someone with one of this board could test and validate it. --- arch/arm/boot/dts/ti/davinci/da850-evm.dts | 26 +++++++++++++------------- arch/arm/boot/dts/ti/omap/am335x-guardian.dts | 25 +++++++++---------------- arch/arm/boot/dts/ti/omap/am335x-pdu001.dts | 21 ++++++++++----------- arch/arm/boot/dts/ti/omap/am335x-pepper.dts | 22 +++++++++++----------- arch/arm/boot/dts/ti/omap/am335x-sbc-t335.dts | 25 +++++++++++++------------ arch/arm/boot/dts/ti/omap/am335x-sl50.dts | 25 ++++++++++++------------- 6 files changed, 68 insertions(+), 76 deletions(-) diff --git a/arch/arm/boot/dts/ti/davinci/da850-evm.dts b/arch/arm/boot/dts/ti/davinci/da850-evm.dts index 38a191fb04149..79cca1f6205ef 100644 --- a/arch/arm/boot/dts/ti/davinci/da850-evm.dts +++ b/arch/arm/boot/dts/ti/davinci/da850-evm.dts @@ -40,7 +40,7 @@ backlight: backlight-pwm { }; panel { - compatible = "ti,tilcdc,panel"; + compatible = "panel-dpi"; pinctrl-names = "default"; pinctrl-0 = <&lcd_pins>; /* @@ -50,17 +50,10 @@ panel { */ status = "okay"; enable-gpios = <&gpio 40 GPIO_ACTIVE_HIGH>; /* lcd_panel_pwr */ - - panel-info { - ac-bias = <255>; - ac-bias-intrpt = <0>; - dma-burst-sz = <16>; - bpp = <16>; - fdd = <0x80>; - sync-edge = <0>; - sync-ctrl = <1>; - raster-order = <0>; - fifo-th = <1>; + port { + panel_in: endpoint { + remote-endpoint = <&lcdc_out>; + }; }; display-timings { @@ -222,6 +215,13 @@ &rtc0 { }; &lcdc { + fifo-threshold = <16>; + + port { + lcdc_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; status = "okay"; }; @@ -459,7 +459,7 @@ &vpif { pinctrl-0 = <&vpif_capture_pins>, <&vpif_display_pins>; /* * The vpif and the LCD are mutually exclusive. - * To enable VPIF, disable the ti,tilcdc,panel then + * To enable VPIF, disable the panel-dpi then * change the status below to 'okay' */ status = "disabled"; diff --git a/arch/arm/boot/dts/ti/omap/am335x-guardian.dts b/arch/arm/boot/dts/ti/omap/am335x-guardian.dts index 4b070e634b281..f38ce9be2c106 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-guardian.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-guardian.dts @@ -68,10 +68,15 @@ gpio-poweroff { }; panel { - compatible = "ti,tilcdc,panel"; + compatible = "panel-dpi"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&lcd_pins_default &lcd_disen_pins>; pinctrl-1 = <&lcd_pins_sleep>; + port { + panel_in: endpoint { + remote-endpoint = <&lcdc_out>; + }; + }; display-timings { timing-320x240 { @@ -86,21 +91,9 @@ timing-320x240 { clock-frequency = <9000000>; hsync-active = <0>; vsync-active = <0>; + pixelclk-active = <1>; }; }; - panel-info { - ac-bias = <255>; - ac-bias-intrpt = <0>; - dma-burst-sz = <16>; - bpp = <24>; - bus-width = <16>; - fdd = <0x80>; - sync-edge = <0>; - sync-ctrl = <1>; - raster-order = <0>; - fifo-th = <0>; - }; - }; guardian_beeper: pwm-7 { @@ -265,8 +258,8 @@ &lcdc { blue-and-red-wiring = "crossed"; status = "okay"; port { - lcdc_0: endpoint@0 { - remote-endpoint = <0>; + lcdc_out: endpoint@0 { + remote-endpoint = <&panel_in>; }; }; }; diff --git a/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts b/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts index c9ccb9de21ad7..2c5229d05ade7 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-pdu001.dts @@ -50,20 +50,14 @@ lis3_reg: fixedregulator@1 { }; panel { - compatible = "ti,tilcdc,panel"; + compatible = "panel-dpi"; status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&lcd_pins_s0>; - panel-info { - ac-bias = <255>; - ac-bias-intrpt = <0>; - dma-burst-sz = <16>; - bpp = <16>; - fdd = <0x80>; - sync-edge = <0>; - sync-ctrl = <1>; - raster-order = <0>; - fifo-th = <0>; + port { + panel_in: endpoint { + remote-endpoint = <&lcdc_out>; + }; }; display-timings { @@ -395,6 +389,11 @@ &rtc { &lcdc { status = "okay"; + port { + lcdc_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; }; &elm { diff --git a/arch/arm/boot/dts/ti/omap/am335x-pepper.dts b/arch/arm/boot/dts/ti/omap/am335x-pepper.dts index e7d561a527fdd..2760c0eab50c2 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-pepper.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-pepper.dts @@ -31,7 +31,7 @@ leds: user-leds-pins { }; panel: lcd_panel { - compatible = "ti,tilcdc,panel"; + compatible = "panel-dpi"; }; sound: sound_iface { @@ -189,16 +189,10 @@ &panel { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&lcd_pins>; - panel-info { - ac-bias = <255>; - ac-bias-intrpt = <0>; - dma-burst-sz = <16>; - bpp = <32>; - fdd = <0x80>; - sync-edge = <0>; - sync-ctrl = <1>; - raster-order = <0>; - fifo-th = <0>; + port { + panel_in: endpoint { + remote-endpoint = <&lcdc_out>; + }; }; display-timings { native-mode = <&timing0>; @@ -214,12 +208,18 @@ timing0: timing-480x272 { vsync-len = <10>; hsync-active = <1>; vsync-active = <1>; + pixelclk-active = <1>; }; }; }; &lcdc { status = "okay"; + port { + lcdc_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; }; &am33xx_pinmux { diff --git a/arch/arm/boot/dts/ti/omap/am335x-sbc-t335.dts b/arch/arm/boot/dts/ti/omap/am335x-sbc-t335.dts index 2841e95d9a094..25ee855dd21a7 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-sbc-t335.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-sbc-t335.dts @@ -13,23 +13,17 @@ / { /* DRM display driver */ panel { - compatible = "ti,tilcdc,panel"; + compatible = "panel-dpi"; status = "okay"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&lcd_pins_default>; pinctrl-1 = <&lcd_pins_sleep>; - - panel-info { - ac-bias = <255>; - ac-bias-intrpt = <0>; - dma-burst-sz = <16>; - bpp = <32>; - fdd = <0x80>; - sync-edge = <0>; - sync-ctrl = <1>; - raster-order = <0>; - fifo-th = <0>; + port { + panel_in: endpoint { + remote-endpoint = <&lcdc_out>; + }; }; + display-timings { /* Timing selection performed by U-Boot */ timing0: lcd {/* 800x480p62 */ @@ -44,6 +38,7 @@ timing0: lcd {/* 800x480p62 */ vsync-len = <2>; hsync-active = <1>; vsync-active = <1>; + pixelclk-active = <1>; }; timing1: dvi { /* 1024x768p60 */ clock-frequency = <65000000>; @@ -57,6 +52,7 @@ timing1: dvi { /* 1024x768p60 */ vsync-len = <6>; hsync-active = <0>; vsync-active = <0>; + pixelclk-active = <1>; }; }; }; @@ -173,4 +169,9 @@ lcd-ena-hog { /* Display */ &lcdc { status = "okay"; + port { + lcdc_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; }; diff --git a/arch/arm/boot/dts/ti/omap/am335x-sl50.dts b/arch/arm/boot/dts/ti/omap/am335x-sl50.dts index f3524e5ee43e2..b4b2b6d18d646 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-sl50.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-sl50.dts @@ -123,22 +123,14 @@ audio_mclk: audio_mclk_gate@0 { }; panel: lcd_panel { - compatible = "ti,tilcdc,panel"; + compatible = "panel-dpi"; pinctrl-names = "default"; pinctrl-0 = <&lcd_pins>; - panel-info { - ac-bias = <255>; - ac-bias-intrpt = <0>; - dma-burst-sz = <16>; - bpp = <16>; - fdd = <0x80>; - tft-alt-mode = <0>; - mono-8bit-mode = <0>; - sync-edge = <0>; - sync-ctrl = <1>; - raster-order = <0>; - fifo-th = <0>; + port { + panel_in: endpoint { + remote-endpoint = <&lcdc_out>; + }; }; display-timings { @@ -157,6 +149,8 @@ timing0: 960x128 { vfront-porch = <8>; vsync-len = <4>; vsync-active = <0>; + + pixelclk-active = <1>; }; }; }; @@ -711,6 +705,11 @@ &ehrpwm1 { &lcdc { status = "okay"; + port { + lcdc_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; }; &tscadc { -- 2.43.0
