diff options
| author | Robin Gong <yibin.gong@nxp.com> | 2021-08-26 03:25:32 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-02 16:49:03 +0800 |
| commit | d32f2ab39abdecbe4cfcb1d3c494be14212f1ecb (patch) | |
| tree | c86c73c903c3fff1d64213ca7ed26afb7c49f028 | |
| parent | f93ab53ea029d74947d77f3b7c546c71907172d7 (diff) | |
dmaengine: imx-sdma: add back i.mx6sx compatible name
Add back i.mx6sx compatible name for mega/fast off case without
ecspi_fixed which is different with i.mx6ul.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
| -rw-r--r-- | Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 | ||||
| -rw-r--r-- | drivers/dma/imx-sdma.c | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt index ffa61264a214..e7b5f734a2d8 100644 --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt @@ -9,6 +9,7 @@ Required properties: "fsl,imx53-sdma" "fsl,imx6q-sdma" "fsl,imx7d-sdma" + "fsl,imx6sx-sdma" "fsl,imx6ul-sdma" "fsl,imx8mq-sdma" "fsl,imx8mm-sdma" diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 92ca9403c3ae..6c9579c8f31d 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -646,6 +646,12 @@ static struct sdma_driver_data sdma_imx6q = { .script_addrs = &sdma_script_imx6q, }; +static struct sdma_driver_data sdma_imx6sx = { + .chnenbl0 = SDMA_CHNENBL0_IMX35, + .num_events = 48, + .script_addrs = &sdma_script_imx6q, +}; + static struct sdma_driver_data sdma_imx6ul = { .chnenbl0 = SDMA_CHNENBL0_IMX35, .num_events = 48, @@ -696,6 +702,7 @@ static const struct of_device_id sdma_dt_ids[] = { { .compatible = "fsl,imx31-sdma", .data = &sdma_imx31, }, { .compatible = "fsl,imx25-sdma", .data = &sdma_imx25, }, { .compatible = "fsl,imx7d-sdma", .data = &sdma_imx7d, }, + { .compatible = "fsl,imx6sx-sdma", .data = &sdma_imx6sx, }, { .compatible = "fsl,imx6ul-sdma", .data = &sdma_imx6ul, }, { .compatible = "fsl,imx8mq-sdma", .data = &sdma_imx8mq, }, { .compatible = "fsl,imx8mp-sdma", .data = &sdma_imx8mp, }, @@ -2644,8 +2651,8 @@ static int sdma_suspend(struct device *dev) int i, ret = 0; /* Do nothing if not i.MX6SX/6UL or i.MX7D, i.MX8MP */ - if (sdma->drvdata != &sdma_imx7d && sdma->drvdata != &sdma_imx6ul - && sdma->drvdata != &sdma_imx8mp) + if (sdma->drvdata != &sdma_imx6sx && sdma->drvdata != &sdma_imx7d + && sdma->drvdata != &sdma_imx6ul && sdma->drvdata != &sdma_imx8mp) return 0; if (!sdma->is_on) @@ -2687,8 +2694,8 @@ static int sdma_resume(struct device *dev) int i, ret; /* Do nothing if not i.MX6SX/6UL or i.MX7D, i.MX8MP */ - if (sdma->drvdata != &sdma_imx7d && sdma->drvdata != &sdma_imx6ul - && sdma->drvdata != &sdma_imx8mp) + if (sdma->drvdata != &sdma_imx6sx && sdma->drvdata != &sdma_imx7d + && sdma->drvdata != &sdma_imx6ul && sdma->drvdata != &sdma_imx8mp) return 0; if (!sdma->is_on) |