Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / freescale / imx8mq-evk.dts

diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
index c9241ab..2418cca 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
@@ -132,13 +132,15 @@
        };
 };
 
+&dphy {
+       status = "okay";
+};
+
 &fec1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_fec1>;
        phy-mode = "rgmii-id";
        phy-handle = <&ethphy0>;
-       phy-reset-gpios = <&gpio1 9  GPIO_ACTIVE_LOW>;
-       phy-reset-duration = <10>;
        fsl,magic-packet;
        status = "okay";
 
@@ -149,6 +151,8 @@
                ethphy0: ethernet-phy@0 {
                        compatible = "ethernet-phy-ieee802.3-c22";
                        reg = <0>;
+                       reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       reset-assert-us = <10000>;
                };
        };
 };
@@ -157,7 +161,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_wifi_reset>;
 
-       wl-reg-on {
+       wl-reg-on-hog {
                gpio-hog;
                gpios = <29 GPIO_ACTIVE_HIGH>;
                output-high;
@@ -255,6 +259,40 @@
        };
 };
 
+&lcdif {
+       status = "okay";
+};
+
+&mipi_dsi {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       status = "okay";
+
+       panel@0 {
+               pinctrl-0 = <&pinctrl_mipi_dsi>;
+               pinctrl-names = "default";
+               compatible = "raydium,rm67191";
+               reg = <0>;
+               reset-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
+               dsi-lanes = <4>;
+
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&mipi_dsi_out>;
+                       };
+               };
+       };
+
+       ports {
+               port@1 {
+                       reg = <1>;
+                       mipi_dsi_out: endpoint {
+                               remote-endpoint = <&panel_in>;
+                       };
+               };
+       };
+};
+
 &pcie0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pcie0>;
@@ -388,6 +426,12 @@
                >;
        };
 
+       pinctrl_mipi_dsi: mipidsigrp {
+               fsl,pins = <
+                       MX8MQ_IOMUXC_ECSPI1_SCLK_GPIO5_IO6              0x16
+               >;
+       };
+
        pinctrl_pcie0: pcie0grp {
                fsl,pins = <
                        MX8MQ_IOMUXC_I2C4_SCL_PCIE1_CLKREQ_B            0x76
@@ -407,7 +451,7 @@
                >;
        };
 
-       pinctrl_reg_usdhc2: regusdhc2grpgpio {
+       pinctrl_reg_usdhc2: regusdhc2gpiogrp {
                fsl,pins = <
                        MX8MQ_IOMUXC_SD2_RESET_B_GPIO2_IO19             0x41
                >;