MLK-17275-14: arm64: dts: fsl-imx8qm-lpddr4-arm2: Remove dsi/lvds specific dts files

Delete the dst files specific to dsi/lvds nodes for the 8QM LPDDR4 platform.
Also, update the existing it6263 dts files accordingly.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 9273d7d..719e841 100644 (file)
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -16,17 +16,13 @@ dtb-$(CONFIG_ARCH_FSL_IMX8QM) += fsl-imx8qm-lpddr4-arm2.dtb \
                                 fsl-imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
                                 fsl-imx8qm-lpddr4-arm2-dp.dtb \
                                 fsl-imx8qm-lpddr4-arm2-8cam.dtb \
-                                fsl-imx8qm-lpddr4-arm2-it6263.dtb \
                                 fsl-imx8qm-lpddr4-arm2-it6263-dual-channel.dtb \
                                 fsl-imx8qm-lpddr4-arm2-jdi-wuxga-lvds1-panel.dtb \
                                 fsl-imx8qm-lpddr4-arm2-lpspi.dtb \
                                 fsl-imx8qm-lpddr4-arm2-spdif.dtb \
                                 fsl-imx8qm-lpddr4-arm2-mqs.dtb \
                                 fsl-imx8qm-lpddr4-arm2-usb3.dtb \
-                                fsl-imx8qm-lpddr4-arm2-dsi-adv7535.dtb \
                                 fsl-imx8qm-lpddr4-arm2-dsi-rm67191.dtb \
-                                fsl-imx8qm-lpddr4-arm2-it6263-adv7535.dtb \
-                                fsl-imx8qm-lpddr4-arm2-it6263-rm67191.dtb \
                                 fsl-imx8qm-lpddr4-arm2-hsic.dtb
 dtb-$(CONFIG_ARCH_FSL_IMX8QXP) += fsl-imx8qxp-lpddr4-arm2.dtb \
                                  fsl-imx8qxp-mek.dtb \

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-dsi-adv7535.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-dsi-adv7535.dts
deleted file mode 100644 (file)
index 3ef6a51..0000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-dsi-adv7535.dts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2017 NXP
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "fsl-imx8qm-lpddr4-arm2.dts"
-
-&ldb1_phy {
-       status = "disabled";
-};
-
-&ldb1 {
-       status = "disabled";
-};
-
-&i2c0_mipi_dsi0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_mipi0_lpi2c0>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       adv_bridge1: adv7535@3d {
-               compatible = "adi,adv7535", "adi,adv7533";
-               reg = <0x3d>;
-               adi,dsi-lanes = <4>;
-               status = "okay";
-
-               port {
-                       adv7535_1_in: endpoint {
-                               remote-endpoint = <&mipi_dsi_bridge1_adv>;
-                       };
-               };
-       };
-};
-
-&mipi_dsi_phy1 {
-       status = "okay";
-};
-
-&mipi_dsi1 {
-       status = "okay";
-};
-
-&mipi_dsi_bridge1 {
-       status = "okay";
-
-       port@1 {
-               mipi_dsi_bridge1_adv: endpoint {
-                       remote-endpoint = <&adv7535_1_in>;
-               };
-       };
-};
-
-&i2c0_mipi_dsi1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_mipi1_lpi2c0>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       adv_bridge2: adv7535@3d {
-               compatible = "adi,adv7535", "adi,adv7533";
-               reg = <0x3d>;
-               adi,dsi-lanes = <4>;
-               status = "okay";
-
-               port {
-                       adv7535_2_in: endpoint {
-                               remote-endpoint = <&mipi_dsi_bridge2_adv>;
-                       };
-               };
-       };
-};
-
-&mipi_dsi_phy2 {
-       status = "okay";
-};
-
-&mipi_dsi2 {
-       status = "okay";
-};
-
-&mipi_dsi_bridge2 {
-       status = "okay";
-
-       port@1 {
-               mipi_dsi_bridge2_adv: endpoint {
-                       remote-endpoint = <&adv7535_2_in>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-adv7535.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-adv7535.dts
deleted file mode 100644 (file)
index 8c7c39b..0000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-adv7535.dts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2017 NXP
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "fsl-imx8qm-lpddr4-arm2.dts"
-
-&hdmi {
-       status = "disabled";
-};
-
-&ldb1_phy {
-       status = "okay";
-};
-
-&ldb1 {
-       status = "okay";
-
-       lvds-channel@0 {
-               fsl,data-mapping = "jeida";
-               fsl,data-width = <24>;
-               status = "okay";
-
-               port@1 {
-                       reg = <1>;
-
-                       lvds0_out: endpoint {
-                               remote-endpoint = <&it6263_0_in>;
-                       };
-               };
-       };
-};
-
-&i2c1_lvds0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lvds0_lpi2c1>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       lvds-to-hdmi-bridge@4c {
-               compatible = "ite,it6263";
-               reg = <0x4c>;
-
-               port {
-                       it6263_0_in: endpoint {
-                               clock-lanes = <3>;
-                               data-lanes = <0 1 2 4>;
-                               remote-endpoint = <&lvds0_out>;
-                       };
-               };
-       };
-};
-
-&ldb2_phy {
-       status = "okay";
-};
-
-&ldb2 {
-       status = "okay";
-
-       lvds-channel@0 {
-               fsl,data-mapping = "jeida";
-               fsl,data-width = <24>;
-               status = "okay";
-
-               port@1 {
-                       reg = <1>;
-
-                       lvds1_out: endpoint {
-                               remote-endpoint = <&it6263_1_in>;
-                       };
-               };
-       };
-};
-
-&i2c1_lvds1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lvds1_lpi2c1>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       lvds-to-hdmi-bridge@4c {
-               compatible = "ite,it6263";
-               reg = <0x4c>;
-
-               port {
-                       it6263_1_in: endpoint {
-                               clock-lanes = <3>;
-                               data-lanes = <0 1 2 4>;
-                               remote-endpoint = <&lvds1_out>;
-                       };
-               };
-       };
-};
-
-&i2c0_mipi_dsi0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_mipi0_lpi2c0>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       adv_bridge1: adv7535@3d {
-               compatible = "adi,adv7535", "adi,adv7533";
-               reg = <0x3d>;
-               adi,dsi-lanes = <4>;
-               status = "okay";
-
-               port {
-                       adv7535_1_in: endpoint {
-                               remote-endpoint = <&mipi_dsi_bridge1_adv>;
-                       };
-               };
-       };
-};
-
-&mipi_dsi_phy1 {
-       status = "okay";
-};
-
-&mipi_dsi1 {
-       status = "okay";
-};
-
-&mipi_dsi_bridge1 {
-       status = "okay";
-
-       port@1 {
-               mipi_dsi_bridge1_adv: endpoint {
-                       remote-endpoint = <&adv7535_1_in>;
-               };
-       };
-};
-
-&i2c0_mipi_dsi1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_mipi1_lpi2c0>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       adv_bridge2: adv7535@3d {
-               compatible = "adi,adv7535", "adi,adv7533";
-               reg = <0x3d>;
-               adi,dsi-lanes = <4>;
-               status = "okay";
-
-               port {
-                       adv7535_2_in: endpoint {
-                               remote-endpoint = <&mipi_dsi_bridge2_adv>;
-                       };
-               };
-       };
-};
-
-&mipi_dsi_phy2 {
-       status = "okay";
-};
-
-&mipi_dsi2 {
-       status = "okay";
-};
-
-&mipi_dsi_bridge2 {
-       status = "okay";
-
-       port@1 {
-               mipi_dsi_bridge2_adv: endpoint {
-                       remote-endpoint = <&adv7535_2_in>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-dual-channel.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-dual-channel.dts
index 82bf0b5..2e9572b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-dual-channel.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-dual-channel.dts
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#include "fsl-imx8qm-lpddr4-arm2-it6263.dts"
+#include "fsl-imx8qm-lpddr4-arm2.dts"
 
 &ldb1 {
        fsl,dual-channel;

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-rm67191.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-rm67191.dts
deleted file mode 100644 (file)
index 2564f5b..0000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263-rm67191.dts
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2017 NXP
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "fsl-imx8qm-lpddr4-arm2.dts"
-
-&hdmi {
-       status = "disabled";
-};
-
-&ldb1_phy {
-       status = "okay";
-};
-
-&ldb1 {
-       status = "okay";
-
-       lvds-channel@0 {
-               fsl,data-mapping = "jeida";
-               fsl,data-width = <24>;
-               status = "okay";
-
-               port@1 {
-                       reg = <1>;
-
-                       lvds0_out: endpoint {
-                               remote-endpoint = <&it6263_0_in>;
-                       };
-               };
-       };
-};
-
-&i2c1_lvds0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lvds0_lpi2c1>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       lvds-to-hdmi-bridge@4c {
-               compatible = "ite,it6263";
-               reg = <0x4c>;
-
-               port {
-                       it6263_0_in: endpoint {
-                               clock-lanes = <3>;
-                               data-lanes = <0 1 2 4>;
-                               remote-endpoint = <&lvds0_out>;
-                       };
-               };
-       };
-};
-
-&ldb2_phy {
-       status = "okay";
-};
-
-&ldb2 {
-       status = "okay";
-
-       lvds-channel@0 {
-               fsl,data-mapping = "jeida";
-               fsl,data-width = <24>;
-               status = "okay";
-
-               port@1 {
-                       reg = <1>;
-
-                       lvds1_out: endpoint {
-                               remote-endpoint = <&it6263_1_in>;
-                       };
-               };
-       };
-};
-
-&i2c1_lvds1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lvds1_lpi2c1>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       lvds-to-hdmi-bridge@4c {
-               compatible = "ite,it6263";
-               reg = <0x4c>;
-
-               port {
-                       it6263_1_in: endpoint {
-                               clock-lanes = <3>;
-                               data-lanes = <0 1 2 4>;
-                               remote-endpoint = <&lvds1_out>;
-                       };
-               };
-       };
-};
-
-&mipi_dsi_phy1 {
-       status = "okay";
-};
-
-&mipi_dsi1 {
-       status = "okay";
-};
-
-&mipi_dsi_bridge1 {
-       status = "okay";
-
-       panel@0 {
-               compatible = "raydium,rm67191";
-               reg = <0>;
-               pinctrl-0 = <&pinctrl_mipi_dsi_0_1_en>;
-               reset-gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-               dsi-lanes = <4>;
-               panel-width-mm = <68>;
-               panel-height-mm = <121>;
-               port {
-                       panel1_in: endpoint {
-                               remote-endpoint = <&mipi_bridge1_out>;
-                       };
-               };
-       };
-
-       port@1 {
-               mipi_bridge1_out: endpoint {
-                       remote-endpoint = <&panel1_in>;
-               };
-       };
-};
-
-&mipi_dsi_phy2 {
-       status = "okay";
-};
-
-&mipi_dsi2 {
-       status = "okay";
-};
-
-&mipi_dsi_bridge2 {
-       status = "okay";
-
-       panel@0 {
-               compatible = "raydium,rm67191";
-               reg = <0>;
-               pinctrl-0 = <&pinctrl_mipi_dsi_0_1_en>;
-               reset-gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-               dsi-lanes = <4>;
-               panel-width-mm = <68>;
-               panel-height-mm = <121>;
-               port {
-                       panel2_in: endpoint {
-                               remote-endpoint = <&mipi_bridge2_out>;
-                       };
-               };
-       };
-
-       port@1 {
-               mipi_bridge2_out: endpoint {
-                       remote-endpoint = <&panel2_in>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263.dts
deleted file mode 100644 (file)
index d444d17..0000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-it6263.dts
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2017 NXP
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "fsl-imx8qm-lpddr4-arm2.dts"
-
-&ldb1_phy {
-       status = "okay";
-};
-
-&ldb1 {
-       status = "okay";
-
-       lvds-channel@0 {
-               fsl,data-mapping = "jeida";
-               fsl,data-width = <24>;
-               status = "okay";
-
-               port@1 {
-                       reg = <1>;
-
-                       lvds0_out: endpoint {
-                               remote-endpoint = <&it6263_0_in>;
-                       };
-               };
-       };
-};
-
-&i2c1_lvds0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lvds0_lpi2c1>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       lvds-to-hdmi-bridge@4c {
-               compatible = "ite,it6263";
-               reg = <0x4c>;
-
-               port {
-                       it6263_0_in: endpoint {
-                               clock-lanes = <3>;
-                               data-lanes = <0 1 2 4>;
-                               remote-endpoint = <&lvds0_out>;
-                       };
-               };
-       };
-};
-
-&ldb2_phy {
-       status = "okay";
-};
-
-&ldb2 {
-       status = "okay";
-
-       lvds-channel@0 {
-               fsl,data-mapping = "jeida";
-               fsl,data-width = <24>;
-               status = "okay";
-
-               port@1 {
-                       reg = <1>;
-
-                       lvds1_out: endpoint {
-                               remote-endpoint = <&it6263_1_in>;
-                       };
-               };
-       };
-};
-
-&i2c1_lvds1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lvds1_lpi2c1>;
-       clock-frequency = <100000>;
-       status = "okay";
-
-       lvds-to-hdmi-bridge@4c {
-               compatible = "ite,it6263";
-               reg = <0x4c>;
-
-               port {
-                       it6263_1_in: endpoint {
-                               clock-lanes = <3>;
-                               data-lanes = <0 1 2 4>;
-                               remote-endpoint = <&lvds1_out>;
-                       };
-               };
-       };
-};
-
-&hdmi {
-       status = "disabled";
-};

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-jdi-wuxga-lvds1-panel.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-jdi-wuxga-lvds1-panel.dts
index 0ee41a6..e219c07 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-jdi-wuxga-lvds1-panel.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2-jdi-wuxga-lvds1-panel.dts
@@ -27,18 +27,6 @@
        };
 };
 
-&ldb1_phy {
-       status = "disabled";
-};
-
-&ldb1 {
-       status = "disabled";
-};
-
-&ldb2_phy {
-       status = "okay";
-};
-
 &ldb2 {
        status = "okay";
        fsl,dual-channel;