summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Serban <mihai.serban@nxp.com>2017-07-07 16:13:48 +0300
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit15016dbc0f81d95f33badbf776bc263ffdd68c3c (patch)
tree5846e0221c2e41410b790b70f96eaccf8b218ecd
parenta87e9c98c3013321e2c40a4caa4d52afd275f7d2 (diff)
MLK-15927-2: ARM64: dts: iMX8QM and iMX8QXP use specific SAI compatibility string
For iMX8QM and iMX8QXP the SAI device driver must to add a constraint on the period size because of EDMA requirements. Signed-off-by: Mihai Serban <mihai.serban@nxp.com> Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
-rw-r--r--Documentation/devicetree/bindings/sound/fsl-sai.txt3
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi4
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi4
3 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 740b467adf7d..13528e46d05b 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -8,7 +8,8 @@ codec/DSP interfaces.
Required properties:
- compatible : Compatible list, contains "fsl,vf610-sai",
- "fsl,imx6sx-sai" or "fsl,imx6ul-sai"
+ "fsl,imx6sx-sai", "fsl,imx6ul-sai",
+ "fsl,imx8qm-sai" or "fsl,imx8mq-sai"
- reg : Offset and length of the register set for the device.
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
index 075d1358e37b..3919dd1d6dfc 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
@@ -2197,7 +2197,7 @@
};
sai1: sai@59050000 {
- compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai";
+ compatible = "fsl,imx8qm-sai";
reg = <0x0 0x59050000 0x0 0x10000>;
interrupts = <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk IMX8QM_AUD_SAI_1_IPG>,
@@ -2214,7 +2214,7 @@
sai0: sai@59040000 {
- compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai";
+ compatible = "fsl,imx8qm-sai";
reg = <0x0 0x59040000 0x0 0x10000>;
interrupts = <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk IMX8QM_AUD_SAI_0_IPG>,
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
index 1e1aa0a5ae26..bd3aa1232fca 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
@@ -1409,7 +1409,7 @@
};
sai0: sai@59040000 {
- compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai";
+ compatible = "fsl,imx8qm-sai";
reg = <0x0 0x59040000 0x0 0x10000>;
interrupts = <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk IMX8QXP_AUD_SAI_0_IPG>,
@@ -1425,7 +1425,7 @@
};
sai1: sai@59050000 {
- compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai";
+ compatible = "fsl,imx8qm-sai";
reg = <0x0 0x59050000 0x0 0x10000>;
interrupts = <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk IMX8QXP_AUD_SAI_0_IPG>,