[PATCH 0/3] arm64: dts: imx8mp: add audio XCVR sound card

[PATCH 0/3] arm64: dts: imx8mp: add audio XCVR sound card

[Shengjiu Wang]

Add audio XCVR sound card, which support SPDIF TX & RX,
eARC RX and ARC RX.

Shengjiu Wang (3):
  ASoC: dt-bindings: fsl,xcvr: Adjust the number of interrupts
  arm64: dts: imx8mp: Add audio XCVR device node
  arm64: dts: imx8mp-evk: Add audio XCVR sound card

 .../devicetree/bindings/sound/fsl,xcvr.yaml   |  6 +++--
 arch/arm64/boot/dts/freescale/imx8mp-evk.dts  | 27 +++++++++++++++++++
 arch/arm64/boot/dts/freescale/imx8mp.dtsi     | 26 ++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

-- 
2.34.1

[PATCH 1/3] ASoC: dt-bindings: fsl,xcvr: Adjust the number of interrupts

[Shengjiu Wang]

On i.MX8MP, there are 3 interrupts, the third interrupt is
SPDIF wakeup interrupt from PHY

Add ref: dai-common.yaml for #sound-dai-cells is needed and
XCVR is a DAI device.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 Documentation/devicetree/bindings/sound/fsl,xcvr.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
index 197ae8ba9c30..7470866e11c6 100644
--- a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
+++ b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
@@ -42,6 +42,7 @@ properties:
     items:
       - description: WAKEUPMIX Audio XCVR Interrupt 1
       - description: WAKEUPMIX Audio XCVR Interrupt 2
+      - description: SPDIF wakeup interrupt from PHY
     minItems: 1
 
   clocks:
@@ -88,6 +89,7 @@ required:
   - dma-names
 
 allOf:
+  - $ref: dai-common.yaml#
   - if:
       properties:
         compatible:
@@ -112,7 +114,7 @@ allOf:
     else:
       properties:
         interrupts:
-          maxItems: 1
+          maxItems: 3
 
   - if:
       properties:
@@ -128,7 +130,7 @@ allOf:
         clock-names:
           maxItems: 4
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
-- 
2.34.1

Re: [PATCH 1/3] ASoC: dt-bindings: fsl,xcvr: Adjust the number of interrupts

[Krzysztof Kozlowski]

On 25/06/2024 06:56, Shengjiu Wang wrote:
> On i.MX8MP, there are 3 interrupts, the third interrupt is
> SPDIF wakeup interrupt from PHY
> 
> Add ref: dai-common.yaml for #sound-dai-cells is needed and
> XCVR is a DAI device.
> 
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
>  Documentation/devicetree/bindings/sound/fsl,xcvr.yaml | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
> index 197ae8ba9c30..7470866e11c6 100644
> --- a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
> +++ b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
> @@ -42,6 +42,7 @@ properties:
>      items:
>        - description: WAKEUPMIX Audio XCVR Interrupt 1
>        - description: WAKEUPMIX Audio XCVR Interrupt 2
> +      - description: SPDIF wakeup interrupt from PHY
>      minItems: 1
>  
>    clocks:
> @@ -88,6 +89,7 @@ required:
>    - dma-names
>  
>  allOf:
> +  - $ref: dai-common.yaml#
>    - if:
>        properties:
>          compatible:
> @@ -112,7 +114,7 @@ allOf:
>      else:
>        properties:
>          interrupts:
> -          maxItems: 1
> +          maxItems: 3

I have doubts this was tested. The existing example should fail,
although I did not see any reports. Not sure why.

Best regards,
Krzysztof

Re: [PATCH 1/3] ASoC: dt-bindings: fsl,xcvr: Adjust the number of interrupts

[Shengjiu Wang]

On Wed, Jun 26, 2024 at 5:23 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On 25/06/2024 06:56, Shengjiu Wang wrote:
> > On i.MX8MP, there are 3 interrupts, the third interrupt is
> > SPDIF wakeup interrupt from PHY
> >
> > Add ref: dai-common.yaml for #sound-dai-cells is needed and
> > XCVR is a DAI device.
> >
> > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> > ---
> >  Documentation/devicetree/bindings/sound/fsl,xcvr.yaml | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
> > index 197ae8ba9c30..7470866e11c6 100644
> > --- a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
> > +++ b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
> > @@ -42,6 +42,7 @@ properties:
> >      items:
> >        - description: WAKEUPMIX Audio XCVR Interrupt 1
> >        - description: WAKEUPMIX Audio XCVR Interrupt 2
> > +      - description: SPDIF wakeup interrupt from PHY
> >      minItems: 1
> >
> >    clocks:
> > @@ -88,6 +89,7 @@ required:
> >    - dma-names
> >
> >  allOf:
> > +  - $ref: dai-common.yaml#
> >    - if:
> >        properties:
> >          compatible:
> > @@ -112,7 +114,7 @@ allOf:
> >      else:
> >        properties:
> >          interrupts:
> > -          maxItems: 1
> > +          maxItems: 3
>
> I have doubts this was tested. The existing example should fail,
> although I did not see any reports. Not sure why.

it is tested, because the minItems is 1. so the example can pass

Best regards
Shengjiu Wang
>
> Best regards,
> Krzysztof
>

Re: [PATCH 1/3] ASoC: dt-bindings: fsl,xcvr: Adjust the number of interrupts

[Krzysztof Kozlowski]

On 26/06/2024 11:25, Shengjiu Wang wrote:
> On Wed, Jun 26, 2024 at 5:23 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>>
>> On 25/06/2024 06:56, Shengjiu Wang wrote:
>>> On i.MX8MP, there are 3 interrupts, the third interrupt is
>>> SPDIF wakeup interrupt from PHY
>>>
>>> Add ref: dai-common.yaml for #sound-dai-cells is needed and
>>> XCVR is a DAI device.
>>>
>>> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
>>> ---
>>>  Documentation/devicetree/bindings/sound/fsl,xcvr.yaml | 6 ++++--
>>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
>>> index 197ae8ba9c30..7470866e11c6 100644
>>> --- a/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
>>> +++ b/Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
>>> @@ -42,6 +42,7 @@ properties:
>>>      items:
>>>        - description: WAKEUPMIX Audio XCVR Interrupt 1
>>>        - description: WAKEUPMIX Audio XCVR Interrupt 2
>>> +      - description: SPDIF wakeup interrupt from PHY
>>>      minItems: 1
>>>
>>>    clocks:
>>> @@ -88,6 +89,7 @@ required:
>>>    - dma-names
>>>
>>>  allOf:
>>> +  - $ref: dai-common.yaml#
>>>    - if:
>>>        properties:
>>>          compatible:
>>> @@ -112,7 +114,7 @@ allOf:
>>>      else:
>>>        properties:
>>>          interrupts:
>>> -          maxItems: 1
>>> +          maxItems: 3
>>
>> I have doubts this was tested. The existing example should fail,
>> although I did not see any reports. Not sure why.
> 
> it is tested, because the minItems is 1. so the example can pass
> 

That's a very unexpected change in dtschema. It indeed passes, but is
not correct. Why interrupts are flexible? This should be constrained.
Let's wait for Rob's confirmation that this is not a bug in dtschema.

Anyway, update example to be complete in next version.

Best regards,
Krzysztof

Re: [PATCH 1/3] ASoC: dt-bindings: fsl,xcvr: Adjust the number of interrupts

[Krzysztof Kozlowski]

On 26/06/2024 11:34, Krzysztof Kozlowski wrote:
>>>>      items:
>>>>        - description: WAKEUPMIX Audio XCVR Interrupt 1
>>>>        - description: WAKEUPMIX Audio XCVR Interrupt 2
>>>> +      - description: SPDIF wakeup interrupt from PHY
>>>>      minItems: 1
>>>>
>>>>    clocks:
>>>> @@ -88,6 +89,7 @@ required:
>>>>    - dma-names
>>>>
>>>>  allOf:
>>>> +  - $ref: dai-common.yaml#
>>>>    - if:
>>>>        properties:
>>>>          compatible:
>>>> @@ -112,7 +114,7 @@ allOf:
>>>>      else:
>>>>        properties:
>>>>          interrupts:
>>>> -          maxItems: 1
>>>> +          maxItems: 3
>>>
>>> I have doubts this was tested. The existing example should fail,
>>> although I did not see any reports. Not sure why.
>>
>> it is tested, because the minItems is 1. so the example can pass
>>
> 
> That's a very unexpected change in dtschema. It indeed passes, but is
> not correct. Why interrupts are flexible? This should be constrained.
> Let's wait for Rob's confirmation that this is not a bug in dtschema.

Yep we need here minItems as well, so this is strictly constrained or
please explain why this should be flexible.


Best regards,
Krzysztof

Re: [PATCH 1/3] ASoC: dt-bindings: fsl,xcvr: Adjust the number of interrupts

[Shengjiu Wang]

On Wed, Jun 26, 2024 at 9:35 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On 26/06/2024 11:34, Krzysztof Kozlowski wrote:
> >>>>      items:
> >>>>        - description: WAKEUPMIX Audio XCVR Interrupt 1
> >>>>        - description: WAKEUPMIX Audio XCVR Interrupt 2
> >>>> +      - description: SPDIF wakeup interrupt from PHY
> >>>>      minItems: 1
> >>>>
> >>>>    clocks:
> >>>> @@ -88,6 +89,7 @@ required:
> >>>>    - dma-names
> >>>>
> >>>>  allOf:
> >>>> +  - $ref: dai-common.yaml#
> >>>>    - if:
> >>>>        properties:
> >>>>          compatible:
> >>>> @@ -112,7 +114,7 @@ allOf:
> >>>>      else:
> >>>>        properties:
> >>>>          interrupts:
> >>>> -          maxItems: 1
> >>>> +          maxItems: 3
> >>>
> >>> I have doubts this was tested. The existing example should fail,
> >>> although I did not see any reports. Not sure why.
> >>
> >> it is tested, because the minItems is 1. so the example can pass
> >>
> >
> > That's a very unexpected change in dtschema. It indeed passes, but is
> > not correct. Why interrupts are flexible? This should be constrained.
> > Let's wait for Rob's confirmation that this is not a bug in dtschema.
>
> Yep we need here minItems as well, so this is strictly constrained or
> please explain why this should be flexible.
>
Ok, will add minitems:3 here, and update example.

Best regards
Shengjiu Wang
>
> Best regards,
> Krzysztof
>

[PATCH 2/3] arm64: dts: imx8mp: Add audio XCVR device node

[Shengjiu Wang]

XCVR (Audio Transceiver) is a on-chip functional module found
on i.MX8MP. It supports HDMI2.1 eARC, HDMI1.4 ARC and SPDIF.

The reset controller is provided by the audio block control driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index f25fc7a8358f..f0297e12ff85 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -1540,6 +1540,31 @@ aud2htx: aud2htx@30cb0000 {
 					dma-names = "tx";
 					status = "disabled";
 				};
+
+				xcvr: xcvr@30cc0000 {
+					compatible = "fsl,imx8mp-xcvr";
+					reg = <0x30cc0000 0x800>,
+					      <0x30cc0800 0x400>,
+					      <0x30cc0c00 0x080>,
+					      <0x30cc0e00 0x080>;
+					reg-names = "ram", "regs", "rxfifo",
+						    "txfifo";
+					interrupts = /* XCVR IRQ 0 */
+						     <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
+						     /* XCVR IRQ 1 */
+						     <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
+						     /* XCVR PHY - SPDIF wakeup IRQ */
+						     <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_EARC_IPG>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_EARC_PHY>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SPBA2_ROOT>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_AUDPLL_ROOT>;
+					clock-names = "ipg", "phy", "spba", "pll_ipg";
+					dmas = <&sdma2 30 2 0>, <&sdma2 31 2 0>;
+					dma-names = "rx", "tx";
+					resets = <&audio_blk_ctrl 0>;
+					status = "disabled";
+				};
 			};
 
 			sdma3: dma-controller@30e00000 {
@@ -1568,6 +1593,7 @@ audio_blk_ctrl: clock-controller@30e20000 {
 				compatible = "fsl,imx8mp-audio-blk-ctrl";
 				reg = <0x30e20000 0x10000>;
 				#clock-cells = <1>;
+				#reset-cells = <1>;
 				clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>,
 					 <&clk IMX8MP_CLK_SAI1>,
 					 <&clk IMX8MP_CLK_SAI2>,
-- 
2.34.1

[PATCH 3/3] arm64: dts: imx8mp-evk: Add audio XCVR sound card

[Shengjiu Wang]

Add audio XCVR sound card, which supports SPDIF TX & RX,
eARC RX, ARC RX functions.

HDMI_HPD is shared with the HDMI module so use pinctrl_hog.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
index c2c708c492c0..a64e8a6c830d 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
@@ -209,6 +209,19 @@ cpu {
 		};
 	};
 
+	sound-xcvr {
+		compatible = "fsl,imx-audio-card";
+		model = "imx-audio-xcvr";
+
+		pri-dai-link {
+			link-name = "XCVR PCM";
+
+			cpu {
+				sound-dai = <&xcvr>;
+			};
+		};
+	};
+
 	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;
@@ -748,7 +761,15 @@ &wdog1 {
 	status = "okay";
 };
 
+&xcvr {
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
 &iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
 	pinctrl_audio_pwr_reg: audiopwrreggrp {
 		fsl,pins = <
 			MX8MP_IOMUXC_SAI3_RXC__GPIO4_IO29		0xd6
@@ -838,6 +859,12 @@ MX8MP_IOMUXC_NAND_READY_B__GPIO3_IO16	0x140
 		>;
 	};
 
+	pinctrl_hog: hoggrp {
+		fsl,pins = <
+			MX8MP_IOMUXC_HDMI_HPD__HDMIMIX_HDMI_HPD		0x40000010
+		>;
+	};
+
 	pinctrl_i2c1: i2c1grp {
 		fsl,pins = <
 			MX8MP_IOMUXC_I2C1_SCL__I2C1_SCL		0x400001c2
-- 
2.34.1