MLK-21963-3 ARM64: dts: imx8m[mn]: Define resets for LCDIF and DSIM

The dispmix-reset device can be used to control the LCDIF and
DSIM bus reset and clock enable. So define 'resets' property
for both LCDIF and DSIM for this purpose which will be used to
replace 'dispmix_gpr' usage.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
index ec12ca2..b4f278b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
@@ -18,6 +18,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/pins-imx8mm.h>
+#include <dt-bindings/reset/imx8mm-dispmix.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
@@ -634,6 +635,40 @@
                };
        };
 
+       lcdif_resets: lcdif-resets {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               #reset-cells = <0>;
+
+               lcdif-clk-enable {
+                       compatible = "lcdif,clk-enable";
+                       resets = <&dispmix_clk_en IMX8MM_LCDIF_APB_CLK_EN>,
+                                <&dispmix_clk_en IMX8MM_LCDIF_PIXEL_CLK_EN>;
+               };
+       };
+
+       mipi_dsi_resets: mipi-dsi-resets {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               #reset-cells = <0>;
+
+               dsi-soft-resetn {
+                       compatible = "dsi,soft-resetn";
+                       resets = <&dispmix_sft_rstn IMX8MM_MIPI_DSI_I_PRESET>;
+               };
+
+               dsi-clk-enable {
+                       compatible = "dsi,clk-enable";
+                       resets = <&dispmix_clk_en IMX8MM_MIPI_DSI_CLKREF_EN>,
+                                <&dispmix_clk_en IMX8MM_MIPI_DSI_PCLK_EN>;
+               };
+
+               dsi-mipi-reset {
+                       compatible = "dsi,mipi-reset";
+                       resets = <&dispmix_mipi_rst IMX8MM_MIPI_M_RESET>;
+               };
+       };
+
        usbotg1: usb@32e40000 {
                compatible = "fsl,imx8mm-usb", "fsl,imx7d-usb", "fsl,imx27-usb";
                reg = <0x0 0x32e40000 0x0 0x200>;
@@ -1035,6 +1070,7 @@
                assigned-clock-rate = <594000000>, <500000000>, <200000000>;
                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
                lcdif-gpr = <&dispmix_gpr>;
+               resets = <&lcdif_resets>;
                power-domains = <&dispmix_pd>;
                status = "disabled";
 
@@ -1062,6 +1098,7 @@
                assigned-clock-rates = <266000000>, <594000000>;
                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
                dsi-gpr = <&dispmix_gpr>;
+               resets = <&mipi_dsi_resets>;
                power-domains = <&mipi_pd>;
                status = "disabled";
 

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mn.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mn.dtsi
index 9c42863..6c21a50 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mn.dtsi
@@ -18,6 +18,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/pins-imx8mn.h>
+#include <dt-bindings/reset/imx8mn-dispmix.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
@@ -960,6 +961,7 @@
                assigned-clock-rate = <594000000>, <500000000>, <200000000>;
                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
                lcdif-gpr = <&dispmix_gpr>;
+               resets = <&lcdif_resets>;
                power-domains = <&dispmix_pd>;
                status = "disabled";
 
@@ -987,6 +989,7 @@
                assigned-clock-rates = <266000000>, <594000000>;
                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
                dsi-gpr = <&dispmix_gpr>;
+               resets = <&mipi_dsi_resets>;
                power-domains = <&mipi_pd>;
                status = "disabled";
 
@@ -1143,6 +1146,47 @@
                };
        };
 
+       lcdif_resets: lcdif-resets {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               #reset-cells = <0>;
+
+               lcdif-soft-resetn {
+                       compatible = "lcdif,soft-resetn";
+                       resets = <&dispmix_sft_rstn IMX8MN_LCDIF_APB_CLK_RESET>,
+                                <&dispmix_sft_rstn IMX8MN_LCDIF_PIXEL_CLK_RESET>;
+               };
+
+               lcdif-clk-enable {
+                       compatible = "lcdif,clk-enable";
+                       resets = <&dispmix_clk_en IMX8MN_LCDIF_APB_CLK_EN>,
+                                <&dispmix_clk_en IMX8MN_LCDIF_PIXEL_CLK_EN>;
+               };
+       };
+
+       mipi_dsi_resets: mipi-dsi-resets {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               #reset-cells = <0>;
+
+               dsi-soft-resetn {
+                       compatible = "dsi,soft-resetn";
+                       resets = <&dispmix_sft_rstn IMX8MN_MIPI_DSI_CLKREF_RESET>,
+                                <&dispmix_sft_rstn IMX8MN_MIPI_DSI_PCLK_RESET>;
+               };
+
+               dsi-clk-enable {
+                       compatible = "dsi,clk-enable";
+                       resets = <&dispmix_clk_en IMX8MN_MIPI_DSI_CLKREF_EN>,
+                                <&dispmix_clk_en IMX8MN_MIPI_DSI_PCLK_EN>;
+               };
+
+               dsi-mipi-reset {
+                       compatible = "dsi,mipi-reset";
+                       resets = <&dispmix_mipi_rst IMX8MN_MIPI_M_RESET>;
+               };
+       };
+
        usbotg1: usb@32e40000 {
                compatible = "fsl,imx8mm-usb", "fsl,imx7d-usb", "fsl,imx27-usb";
                reg = <0x0 0x32e40000 0x0 0x200>;