diff options
| author | Sandor Yu <R01008@freescale.com> | 2015-11-09 11:39:33 +0800 |
|---|---|---|
| committer | Sandor Yu <R01008@freescale.com> | 2015-11-11 15:46:50 +0800 |
| commit | cf60ba4440fadbdb8455bf190bf7a3cc36460a15 (patch) | |
| tree | 270349eb48a73703ed50f2f68bb5f7038dae23c5 | |
| parent | 104aa819416b0fa3cbb2da7572930248a365c405 (diff) | |
MLK-11836: Revert "MLK-11746: dts: Enable mipi dsi on imx7d 19x19 ddr3 arm board"
This reverts commit dbf58f146c3f8260f078b6e6bdfd4d11204819ef.
Because mipi dsi and mipi csi share the power and reset pins
on imx7d 19x19 ddr2 arm2 board, and mipi csi and dsi can not
work together.
Signed-off-by: Sandor Yu <R01008@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-mipi.dts | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-19x19-ddr3-arm2.dts | 7 |
2 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-mipi.dts b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-mipi.dts index a2e9d082dd6f..6f3a2096f5b6 100644 --- a/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-mipi.dts +++ b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-mipi.dts @@ -8,26 +8,6 @@ #include "imx7d-19x19-ddr3-arm2.dts" -/ { - mipi_dsi_reset: mipi-dsi-reset { - compatible = "gpio-reset"; - reset-gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; - reset-delay-us = <50>; - #reset-cells = <0>; - }; -}; - -&lcdif { - disp-dev = "mipi_dsi_samsung"; -}; - -&mipi_dsi { - lcd_panel = "TRULY-WVGA"; - disp-power-on-supply = <®_mipi_dsi_pwr_on>; - resets = <&mipi_dsi_reset>; - status = "okay"; -}; - &csi1 { csi-mux-mipi = <&gpr 0x14 4>; status = "okay"; diff --git a/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2.dts b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2.dts index 82cbb1aea4f7..d1cb4a43404a 100644 --- a/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2.dts +++ b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2.dts @@ -125,13 +125,6 @@ gpio = <&gpio6 10 GPIO_ACTIVE_HIGH>; enable-active-high; }; - - reg_mipi_dsi_pwr_on: mipi_dsi_pwr_on { - compatible = "regulator-fixed"; - regulator-name = "mipi_dsi_pwr_on"; - gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; }; pxp_v4l2_out { |