[PATCH 0/3] ASoC: Support SAI and MICFIL on i.MX95 platform
Support SAI and MICFIL on i.MX95 platform
Chancel Liu (3): ASoC: dt-bindings: fsl,sai: Add compatible string for i.MX95 platform ASoC: fsl_sai: Add support for i.MX95 platform ASoC: dt-bindings: fsl,micfil: Add compatible string for i.MX95 platform
.../devicetree/bindings/sound/fsl,micfil.yaml | 15 +++++++++++---- .../devicetree/bindings/sound/fsl,sai.yaml | 1 + sound/soc/fsl/fsl_sai.c | 13 +++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-)
-- 2.42.0
Add compatible string "fsl,imx95-sai" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com --- Documentation/devicetree/bindings/sound/fsl,sai.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml b/Documentation/devicetree/bindings/sound/fsl,sai.yaml index 088c26b001cc..f3d910aa2dc6 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -40,6 +40,7 @@ properties: - fsl,imx8ulp-sai - fsl,imx93-sai - fsl,vf610-sai + - fsl,imx95-sai
reg: maxItems: 1
On 09/01/2024 08:55, Chancel Liu wrote:
Add compatible string "fsl,imx95-sai" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
Documentation/devicetree/bindings/sound/fsl,sai.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml b/Documentation/devicetree/bindings/sound/fsl,sai.yaml index 088c26b001cc..f3d910aa2dc6 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -40,6 +40,7 @@ properties: - fsl,imx8ulp-sai - fsl,imx93-sai - fsl,vf610-sai
- fsl,imx95-sai
Don't break the order, please.
Best regards, Krzysztof
Add compatible string "fsl,imx95-sai" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
Documentation/devicetree/bindings/sound/fsl,sai.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml
b/Documentation/devicetree/bindings/sound/fsl,sai.yaml
index 088c26b001cc..f3d910aa2dc6 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -40,6 +40,7 @@ properties: - fsl,imx8ulp-sai - fsl,imx93-sai - fsl,vf610-sai
- fsl,imx95-sai
Don't break the order, please.
Best regards, Krzysztof
Sorry but I don't understand what's the "order" refer to. Could you please explain it to me?
Regards, Chancel Liu
On 11/01/2024 12:06, Chancel Liu wrote:
Add compatible string "fsl,imx95-sai" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
Documentation/devicetree/bindings/sound/fsl,sai.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml
b/Documentation/devicetree/bindings/sound/fsl,sai.yaml
index 088c26b001cc..f3d910aa2dc6 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -40,6 +40,7 @@ properties: - fsl,imx8ulp-sai - fsl,imx93-sai - fsl,vf610-sai
- fsl,imx95-sai
Don't break the order, please.
Best regards, Krzysztof
Sorry but I don't understand what's the "order" refer to. Could you please explain it to me?
Items look alphabetically ordered.
Best regards, Krzysztof
Add compatible string and specific soc data to support SAI on i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com --- sound/soc/fsl/fsl_sai.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 546bd4e333b5..0e2c31439670 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -1639,6 +1639,18 @@ static const struct fsl_sai_soc_data fsl_sai_imx93_data = { .max_burst = {8, 8}, };
+static const struct fsl_sai_soc_data fsl_sai_imx95_data = { + .use_imx_pcm = true, + .use_edma = true, + .fifo_depth = 128, + .reg_offset = 8, + .mclk0_is_mclk1 = false, + .pins = 8, + .flags = 0, + .max_register = FSL_SAI_MCTL, + .max_burst = {8, 8}, +}; + static const struct of_device_id fsl_sai_ids[] = { { .compatible = "fsl,vf610-sai", .data = &fsl_sai_vf610_data }, { .compatible = "fsl,imx6sx-sai", .data = &fsl_sai_imx6sx_data }, @@ -1651,6 +1663,7 @@ static const struct of_device_id fsl_sai_ids[] = { { .compatible = "fsl,imx8ulp-sai", .data = &fsl_sai_imx8ulp_data }, { .compatible = "fsl,imx8mn-sai", .data = &fsl_sai_imx8mn_data }, { .compatible = "fsl,imx93-sai", .data = &fsl_sai_imx93_data }, + { .compatible = "fsl,imx95-sai", .data = &fsl_sai_imx95_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, fsl_sai_ids);
Add compatible string "fsl,imx95-micfil" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com --- .../devicetree/bindings/sound/fsl,micfil.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml index b7e605835639..f0d3d11d07d2 100644 --- a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml @@ -15,10 +15,17 @@ description: |
properties: compatible: - enum: - - fsl,imx8mm-micfil - - fsl,imx8mp-micfil - - fsl,imx93-micfil + oneOf: + - items: + - enum: + - fsl,imx95-micfil + - const: fsl,imx93-micfil + + - items: + - enum: + - fsl,imx8mm-micfil + - fsl,imx8mp-micfil + - fsl,imx93-micfil
reg: maxItems: 1
On Tue, Jan 9, 2024 at 9:58 AM Chancel Liu chancel.liu@nxp.com wrote:
Add compatible string "fsl,imx95-micfil" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
.../devicetree/bindings/sound/fsl,micfil.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml index b7e605835639..f0d3d11d07d2 100644 --- a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml @@ -15,10 +15,17 @@ description: |
properties: compatible:
- enum:
- fsl,imx8mm-micfil
- fsl,imx8mp-micfil
- fsl,imx93-micfil
- oneOf:
- items:
- enum:
- fsl,imx95-micfil
- const: fsl,imx93-micfil
- items:
- enum:
- fsl,imx8mm-micfil
- fsl,imx8mp-micfil
- fsl,imx93-micfil
My yaml knowledge is very limited. Can you describe in natural language in the commit what exactly we are doing here.
Why something like this:
compatible: enum: - fsl,imx8mm-micfil - fsl,imx8mp-micfil - fsl,imx93-micfil
+ - fsl,imx95-micfil
Isn't enough?
On Tue, Jan 9, 2024 at 9:58 AM Chancel Liu chancel.liu@nxp.com wrote:
Add compatible string "fsl,imx95-micfil" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
.../devicetree/bindings/sound/fsl,micfil.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml
b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml
index b7e605835639..f0d3d11d07d2 100644 --- a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml @@ -15,10 +15,17 @@ description: |
properties: compatible:
- enum:
- fsl,imx8mm-micfil
- fsl,imx8mp-micfil
- fsl,imx93-micfil
- oneOf:
- items:
- enum:
- fsl,imx95-micfil
- const: fsl,imx93-micfil
- items:
- enum:
- fsl,imx8mm-micfil
- fsl,imx8mp-micfil
- fsl,imx93-micfil
My yaml knowledge is very limited. Can you describe in natural language in the commit what exactly we are doing here.
Why something like this:
compatible: enum: - fsl,imx8mm-micfil - fsl,imx8mp-micfil - fsl,imx93-micfil
- fsl,imx95-micfil
Isn't enough?
No. This shows MICFIL on i.MX95 is different from it on I.MX93.
However i.MX95 MICFIL is compatible with i.MX93 MICFIL. The DT node of MICFIL on i.MX95 looks like: micfil: micfil@44520000 { compatible = "fsl,imx95-micfil", "fsl,imx93-micfil"; ... };
Regards, Chancel Liu
On Tue, Jan 09, 2024 at 04:55:51PM +0900, Chancel Liu wrote:
Add compatible string "fsl,imx95-micfil" for i.MX95 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
.../devicetree/bindings/sound/fsl,micfil.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml index b7e605835639..f0d3d11d07d2 100644 --- a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml @@ -15,10 +15,17 @@ description: |
properties: compatible:
- enum:
- fsl,imx8mm-micfil
- fsl,imx8mp-micfil
- fsl,imx93-micfil
- oneOf:
- items:
- enum:
- fsl,imx95-micfil
- const: fsl,imx93-micfil
- items:
This items is not needed, as the only item in the list is the enum. You can just do properties: compatible: oneOf: - items: - enum: - fsl,imx95-micfil - const: fsl,imx93-micfil
- enum: - fsl,imx8mm-micfil - fsl,imx8mp-micfil - fsl,imx93-micfil
Cheers, Conor.
- enum:
- fsl,imx8mm-micfil
- fsl,imx8mp-micfil
- fsl,imx93-micfil
reg: maxItems: 1
-- 2.42.0
participants (4)
-
Chancel Liu
-
Conor Dooley
-
Daniel Baluta
-
Krzysztof Kozlowski