[v1] ARM: dts: imx7: remove DSI port endpoints

Message ID 20240216104255.21052-1-francesco@dolcini.it
State New
Headers
Series [v1] ARM: dts: imx7: remove DSI port endpoints |

Commit Message

Francesco Dolcini Feb. 16, 2024, 10:42 a.m. UTC
  From: Francesco Dolcini <francesco.dolcini@toradex.com>

This fixes the display not working on colibri imx7, the driver fails to
load with the following error:

  mxsfb 30730000.lcdif: error -ENODEV: Cannot connect bridge

NXP i.MX7 LCDIF is connected to both the Parallel LCD Display and to a
MIPI DSI IP block, currently it's not possible to describe the
connection to both.

Remove the port endpoint from the SOC dtsi to prevent regressions, this
would need to be defined on the board DTS.

Reported-by: Hiago De Franco <hiagofranco@gmail.com>
Closes: https://lore.kernel.org/r/34yzygh3mbwpqr2re7nxmhyxy3s7qmqy4vhxvoyxnoguktriur@z66m7gvpqlia/
Fixes: edbbae7fba49 ("ARM: dts: imx7: add MIPI-DSI support")
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
---
 arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 26 --------------------------
 1 file changed, 26 deletions(-)
  

Comments

Francesco Dolcini Feb. 23, 2024, 5:19 p.m. UTC | #1
On Fri, Feb 16, 2024 at 11:42:55AM +0100, Francesco Dolcini wrote:
> From: Francesco Dolcini <francesco.dolcini@toradex.com>
> 
> This fixes the display not working on colibri imx7, the driver fails to
> load with the following error:
> 
>   mxsfb 30730000.lcdif: error -ENODEV: Cannot connect bridge
> 
> NXP i.MX7 LCDIF is connected to both the Parallel LCD Display and to a
> MIPI DSI IP block, currently it's not possible to describe the
> connection to both.
> 
> Remove the port endpoint from the SOC dtsi to prevent regressions, this
> would need to be defined on the board DTS.
> 
> Reported-by: Hiago De Franco <hiagofranco@gmail.com>
> Closes: https://lore.kernel.org/r/34yzygh3mbwpqr2re7nxmhyxy3s7qmqy4vhxvoyxnoguktriur@z66m7gvpqlia/
> Fixes: edbbae7fba49 ("ARM: dts: imx7: add MIPI-DSI support")
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>

Hello Shawn, what do you plan to do with this?

This fixes a regression from v6.8-rc1 and would be nice to have it into
the final v6.8.

Francesco
  
Shawn Guo Feb. 25, 2024, 3:38 a.m. UTC | #2
On Fri, Feb 23, 2024 at 06:19:01PM +0100, Francesco Dolcini wrote:
> On Fri, Feb 16, 2024 at 11:42:55AM +0100, Francesco Dolcini wrote:
> > From: Francesco Dolcini <francesco.dolcini@toradex.com>
> > 
> > This fixes the display not working on colibri imx7, the driver fails to
> > load with the following error:
> > 
> >   mxsfb 30730000.lcdif: error -ENODEV: Cannot connect bridge
> > 
> > NXP i.MX7 LCDIF is connected to both the Parallel LCD Display and to a
> > MIPI DSI IP block, currently it's not possible to describe the
> > connection to both.
> > 
> > Remove the port endpoint from the SOC dtsi to prevent regressions, this
> > would need to be defined on the board DTS.
> > 
> > Reported-by: Hiago De Franco <hiagofranco@gmail.com>
> > Closes: https://lore.kernel.org/r/34yzygh3mbwpqr2re7nxmhyxy3s7qmqy4vhxvoyxnoguktriur@z66m7gvpqlia/
> > Fixes: edbbae7fba49 ("ARM: dts: imx7: add MIPI-DSI support")
> > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
> 
> Hello Shawn, what do you plan to do with this?
> 
> This fixes a regression from v6.8-rc1 and would be nice to have it into
> the final v6.8.

Applied as a fix for 6.8, thanks!
  

Patch

diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
index ebf7befcc11e..9c81c6baa2d3 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
@@ -834,16 +834,6 @@  lcdif: lcdif@30730000 {
 					<&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;
 				clock-names = "pix", "axi";
 				status = "disabled";
-
-				port {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					lcdif_out_mipi_dsi: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&mipi_dsi_in_lcdif>;
-					};
-				};
 			};
 
 			mipi_csi: mipi-csi@30750000 {
@@ -895,22 +885,6 @@  mipi_dsi: dsi@30760000 {
 				samsung,esc-clock-frequency = <20000000>;
 				samsung,pll-clock-frequency = <24000000>;
 				status = "disabled";
-
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-						#address-cells = <1>;
-						#size-cells = <0>;
-
-						mipi_dsi_in_lcdif: endpoint@0 {
-							reg = <0>;
-							remote-endpoint = <&lcdif_out_mipi_dsi>;
-						};
-					};
-				};
 			};
 		};