[PATCH 0/2] ASoC: fsl-esai: allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai

[PATCH 0/2] ASoC: fsl-esai: allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai

[Frank Li]

Update binding doc to allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai.
Update dts add fsl,imx6ull-esai fallback.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Frank Li (2):
      ASoC: dt-bindings: fsl-esai: allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai
      arm64: dts: imx8-ss-audio: add fallback compatible string fsl,imx6ull-esai for esai

 Documentation/devicetree/bindings/sound/fsl,esai.yaml | 14 +++++++++-----
 arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi      |  2 +-
 arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi    |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---
base-commit: a63797164b01a78a0b32c8b01c34cce51016a540
change-id: 20241028-esai_fix-d3bfbaea862e

Best regards,
---
Frank Li <Frank.Li@nxp.com>

[PATCH 1/2] ASoC: dt-bindings: fsl-esai: allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai

[Frank Li]

The ESAI of i.MX8QM is the same as i.MX6ULL. So allow fsl,imx8qm-esai
fallback to fsl,imx6ull-esai.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 Documentation/devicetree/bindings/sound/fsl,esai.yaml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/fsl,esai.yaml b/Documentation/devicetree/bindings/sound/fsl,esai.yaml
index d1b4e23f1c95f..27c34ce4c2e22 100644
--- a/Documentation/devicetree/bindings/sound/fsl,esai.yaml
+++ b/Documentation/devicetree/bindings/sound/fsl,esai.yaml
@@ -18,11 +18,15 @@ description:
 
 properties:
   compatible:
-    enum:
-      - fsl,imx35-esai
-      - fsl,imx6ull-esai
-      - fsl,imx8qm-esai
-      - fsl,vf610-esai
+    oneOf:
+      - enum:
+          - fsl,imx35-esai
+          - fsl,imx6ull-esai
+          - fsl,vf610-esai
+      - items:
+          - enum:
+              - fsl,imx8qm-esai
+          - const: fsl,imx6ull-esai
 
   reg:
     maxItems: 1

-- 
2.34.1

Re: [PATCH 1/2] ASoC: dt-bindings: fsl-esai: allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai

[Rob Herring]

On Mon, Oct 28, 2024 at 03:49:31PM -0400, Frank Li wrote:
> The ESAI of i.MX8QM is the same as i.MX6ULL. So allow fsl,imx8qm-esai
> fallback to fsl,imx6ull-esai.
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
>  Documentation/devicetree/bindings/sound/fsl,esai.yaml | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)

Acked-by: Rob Herring (Arm) <robh@kernel.org>

[PATCH 2/2] arm64: dts: imx8-ss-audio: add fallback compatible string fsl,imx6ull-esai for esai

[Frank Li]

The ESAI of i.MX8QM is the same as i.MX6ULL. So add fsl,imx6ull-esai for
esai.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi   | 2 +-
 arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
index ff5df0fed9e96..739be5273c51f 100644
--- a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
@@ -165,7 +165,7 @@ asrc0: asrc@59000000 {
 	};
 
 	esai0: esai@59010000 {
-		compatible = "fsl,imx8qm-esai";
+		compatible = "fsl,imx8qm-esai", "fsl,imx6ull-esai";
 		reg = <0x59010000 0x10000>;
 		interrupts = <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&esai0_lpcg IMX_LPCG_CLK_4>,
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
index e24e639b98ee7..c9b55f02497ab 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
@@ -134,7 +134,7 @@ sai5_lpcg: clock-controller@59490000 {
 	};
 
 	esai1: esai@59810000 {
-		compatible = "fsl,imx8qm-esai";
+		compatible = "fsl,imx8qm-esai", "fsl,imx6ull-esai";
 		reg = <0x59810000 0x10000>;
 		interrupts = <GIC_SPI 411 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&esai1_lpcg IMX_LPCG_CLK_0>,

-- 
2.34.1

Re: [PATCH 2/2] arm64: dts: imx8-ss-audio: add fallback compatible string fsl,imx6ull-esai for esai

[Rob Herring]

On Mon, Oct 28, 2024 at 2:49 PM Frank Li <Frank.Li@nxp.com> wrote:
>
> The ESAI of i.MX8QM is the same as i.MX6ULL. So add fsl,imx6ull-esai for
> esai.
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
>  arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi   | 2 +-
>  arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Shawn, please pick this up for 6.13. The binding change landed
introducing new warnings.

Acked-by: Rob Herring (Arm) <robh@kernel.org>

Re: [PATCH 2/2] arm64: dts: imx8-ss-audio: add fallback compatible string fsl,imx6ull-esai for esai

[Shawn Guo]

On Mon, Oct 28, 2024 at 03:49:32PM -0400, Frank Li wrote:
> The ESAI of i.MX8QM is the same as i.MX6ULL. So add fsl,imx6ull-esai for
> esai.
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>

Applied for 6.13, thanks!

Re: (subset) [PATCH 0/2] ASoC: fsl-esai: allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai

[Mark Brown]

On Mon, 28 Oct 2024 15:49:30 -0400, Frank Li wrote:
> Update binding doc to allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai.
> Update dts add fsl,imx6ull-esai fallback.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: dt-bindings: fsl-esai: allow fsl,imx8qm-esai fallback to fsl,imx6ull-esai
      commit: adf7ea48ce05a6c5c44f0f9d3f81e83e5cb70c3e

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark