summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFancy Fang <chen.fang@nxp.com>2019-05-28 12:02:38 +0800
committerFancy Fang <chen.fang@nxp.com>2019-05-28 16:29:48 +0800
commit4c3a39fe036ed569d565be63def8ff900c4a629b (patch)
tree697e1b6124e237a2a044a2a62b5664ae3026ae78
parentf22589c76eef08f0a4a307e3320f6559fb84af3b (diff)
MLK-21880-2 drm/imx: add IMX8MN compatible for LCDIF and DSIM
Add a compatible string which includes 'imx8mn' for both LCDIF and DSIM drivers. Signed-off-by: Fancy Fang <chen.fang@nxp.com>
-rw-r--r--Documentation/devicetree/bindings/display/bridge/sec_dsim.txt2
-rw-r--r--Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt2
-rw-r--r--drivers/gpu/drm/imx/sec_mipi_dsim-imx.c4
-rw-r--r--drivers/gpu/imx/lcdif/lcdif-common.c1
4 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/display/bridge/sec_dsim.txt b/Documentation/devicetree/bindings/display/bridge/sec_dsim.txt
index fd4246136d37..dfca6387e1ab 100644
--- a/Documentation/devicetree/bindings/display/bridge/sec_dsim.txt
+++ b/Documentation/devicetree/bindings/display/bridge/sec_dsim.txt
@@ -7,7 +7,7 @@ an encoder or bridge must be implemented to manage the platform
specific initializations.
Required properties:
-- compatible: "fsl,imx8mm-mipi-dsim"
+- compatible: "fsl,imx8mm-mipi-dsim" or "fsl,imx8mn-mipi-dsim"
- reg: the register range of the MIPI DSIM controller
- interrupts: the interrupt number for this module
- clock, clock-names: phandles to the MIPI-DSI clocks described in
diff --git a/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt b/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt
index a7b35da0a100..8e25c4e0bd46 100644
--- a/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt
+++ b/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt
@@ -256,7 +256,7 @@ dcss_drm: dcss@0x32e00000 {
NXP i.MX eLCDIF (Enhanced LCD Interface)
========================================
Required properties:
-- compatible: should be "fsl,imx8mm-lcdif"
+- compatible: should be "fsl,imx8mm-lcdif" or "fsl,imx8mn-lcdif"
- reg: should be register base and length as documented in the
datasheet.
- interrupts, interrupt-names: Should contain interrupts and names as
diff --git a/drivers/gpu/drm/imx/sec_mipi_dsim-imx.c b/drivers/gpu/drm/imx/sec_mipi_dsim-imx.c
index 560323301a6a..dcdd021a2203 100644
--- a/drivers/gpu/drm/imx/sec_mipi_dsim-imx.c
+++ b/drivers/gpu/drm/imx/sec_mipi_dsim-imx.c
@@ -210,6 +210,10 @@ static const struct of_device_id imx_sec_dsim_dt_ids[] = {
.compatible = "fsl,imx8mm-mipi-dsim",
.data = &imx8mm_mipi_dsim_plat_data,
},
+ {
+ .compatible = "fsl,imx8mn-mipi-dsim",
+ .data = &imx8mm_mipi_dsim_plat_data,
+ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, imx_sec_dsim_dt_ids);
diff --git a/drivers/gpu/imx/lcdif/lcdif-common.c b/drivers/gpu/imx/lcdif/lcdif-common.c
index 86b106956e65..3d5a411c2a1d 100644
--- a/drivers/gpu/imx/lcdif/lcdif-common.c
+++ b/drivers/gpu/imx/lcdif/lcdif-common.c
@@ -83,6 +83,7 @@ struct lcdif_soc_pdata imx8mm_pdata = {
static const struct of_device_id imx_lcdif_dt_ids[] = {
{ .compatible = "fsl,imx8mm-lcdif", .data = &imx8mm_pdata, },
+ { .compatible = "fsl,imx8mn-lcdif", .data = &imx8mm_pdata, },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, lcdif_dt_ids);