From 77f61547834c4f127b44b13e43c59133a35880dc Mon Sep 17 00:00:00 2001 From: Fancy Fang Date: Thu, 30 Jun 2016 13:38:39 +0800 Subject: MLK-12948 ARM: dts: imx7d-sdb: change the hardware reset gpio for mipi dsi Change the hardware reset gpio to 'GPIO6_IO15' for mipi dsi to allow fec2 and mipi dsi can run at the same time. This needs some hardware rework as follows: " 1. Replace R631 with 100K resistor; 2. Remove D14, D24; 3. Solder the Cathode of the diode to R471, you can use BAT54HT1(ONSEMI) or NSR0320MW2T1G(ONSEMI); 4. Solder the wire to the Anode end of the diode; 5. Scrape the solder mask(Green oil) of the MIPI Reset via, then solder the end of the wire to the via. " Signed-off-by: Fancy Fang (cherry picked from commit 0af28564e73f006f742a9af0db4bc5b8588e3490) --- arch/arm/boot/dts/imx7d-sdb-mipi-dsi.dts | 8 ++------ arch/arm/boot/dts/imx7d-sdb.dts | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx7d-sdb-mipi-dsi.dts b/arch/arm/boot/dts/imx7d-sdb-mipi-dsi.dts index 71d6684a81d3..bbfca36d79a4 100644 --- a/arch/arm/boot/dts/imx7d-sdb-mipi-dsi.dts +++ b/arch/arm/boot/dts/imx7d-sdb-mipi-dsi.dts @@ -11,23 +11,19 @@ / { mipi_dsi_reset: mipi-dsi-reset { compatible = "gpio-reset"; - reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>; reset-delay-us = <1000>; #reset-cells = <0>; }; }; -&fec2 { - status = "disabled"; -}; - &lcdif { disp-dev = "mipi_dsi_samsung"; }; &mipi_dsi { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enet2_epdc0_en>; + pinctrl-0 = <&pinctrl_mipi_dsi_reset>; lcd_panel = "TRULY-WVGA-TFT3P5581E"; resets = <&mipi_dsi_reset>; status = "okay"; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 6d896bdd5b82..09089bbb3d23 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -562,6 +562,12 @@ >; }; + pinctrl_mipi_dsi_reset: mipi_dsi_reset_grp { + fsl,pins = < + MX7D_PAD_SAI1_TX_DATA__GPIO6_IO15 0x1b + >; + }; + pinctrl_ecspi3_cs: ecspi3_cs_grp { fsl,pins = < MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x80000000 -- cgit v1.2.3