ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings
Subsystems (2)
PATCH 1/3 ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings
Describe existing used combinations of compatible strings on MX6UL and MX7D, which are backward compatible with MX6SX. Add the missing imx7d-sai compatible string which is used on i.MX7 .
---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]
--- .../devicetree/bindings/sound/fsl,sai.yaml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/sound/fsl,sai.yaml +15 -9
@@ -18,15 +18,12 @@ description: | properties: compatible: oneOf: - - enum: - - fsl,vf610-sai - - fsl,imx6sx-sai - - fsl,imx6ul-sai - - fsl,imx7ulp-sai - - fsl,imx8mq-sai - - fsl,imx8qm-sai - - fsl,imx8ulp-sai - - fsl,imx93-sai + - items: + - enum: + - fsl,imx6ul-sai + - fsl,imx7d-sai + - const: fsl,imx6sx-sai + - items: - enum: - fsl,imx8mm-sai
@@ -34,6 +31,15 @@ properties: - fsl,imx8mp-sai - const: fsl,imx8mq-sai + - items: + - enum: + - fsl,imx6sx-sai + - fsl,imx7ulp-sai + - fsl,imx8mq-sai + - fsl,imx8qm-sai + - fsl,imx8ulp-sai + - fsl,vf610-sai + reg: maxItems: 1
Signature · 1 line
2.35.1
PATCH 2/3 ASoC: dt-bindings: fsl-sai: Use minItems 5 for i.MX8MN clock and similar
The i.MX8MN currently uses "bus", "mclk0", "mclk1", "mclk2", "mclk3" clock, which adds up to 5 clock total. Use minItems 5 for this setup.
---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]
--- Documentation/devicetree/bindings/sound/fsl,sai.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/fsl,sai.yaml +1 -1
@@ -74,7 +74,7 @@ properties: - const: mclk3 - const: pll8k - const: pll11k - minItems: 4 + minItems: 5 - items: - const: bus - const: mclk1
Signature · 1 line
2.35.1
Re: [PATCH 2/3] ASoC: dt-bindings: fsl-sai: Use minItems 5 for i.MX8MN clock and similar
Quoted 17 lines · Marek Vasut
The i.MX8MN currently uses "bus", "mclk0", "mclk1", "mclk2", "mclk3" clock, which adds up to 5 clock total. Use minItems 5 for this setup.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]
Quoted 4 lines
--- Documentation/devicetree/bindings/sound/fsl,sai.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 3/3 ASoC: dt-bindings: fsl-sai: Sort main section properties
In reply to Marek VasutSort main section properties, no functional change.
---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]
--- .../devicetree/bindings/sound/fsl,sai.yaml | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-)
Documentation/devicetree/bindings/sound/fsl,sai.yaml +36 -36
@@ -43,16 +43,6 @@ properties: reg: maxItems: 1 - interrupts: - items: - - description: receive and transmit interrupt - - dmas: - maxItems: 2 - - dma-names: - maxItems: 2 - clocks: items: - description: The ipg clock for register access
@@ -84,19 +74,37 @@ properties: - const: pll11k minItems: 4 - lsb-first: - description: | - Configures whether the LSB or the MSB is transmitted - first for the fifo data. If this property is absent, - the MSB is transmitted first as default, or the LSB - is transmitted first. - type: boolean + dmas: + maxItems: 2 + + dma-names: + maxItems: 2 + + interrupts: + items: + - description: receive and transmit interrupt big-endian: description: | required if all the SAI registers are big-endian rather than little-endian. type: boolean + fsl,dataline: + $ref: /schemas/types.yaml#/definitions/uint32-matrix + description: | + Configure the dataline. It has 3 value for each configuration + maxItems: 16 + items: + items: + - description: format Default(0), I2S(1) or PDM(2) + enum: [0, 1, 2] + - description: dataline mask for 'rx' + - description: dataline mask for 'tx' + + fsl,sai-mclk-direction-output: + description: SAI will output the SAI MCLK clock. + type: boolean + fsl,sai-synchronous-rx: description: | SAI will work in the synchronous mode (sync Tx with Rx) which means
@@ -115,26 +123,18 @@ properties: of transmitter. type: boolean - fsl,dataline: - $ref: /schemas/types.yaml#/definitions/uint32-matrix - description: | - Configure the dataline. It has 3 value for each configuration - maxItems: 16 - items: - items: - - description: format Default(0), I2S(1) or PDM(2) - enum: [0, 1, 2] - - description: dataline mask for 'rx' - - description: dataline mask for 'tx' - - fsl,sai-mclk-direction-output: - description: SAI will output the SAI MCLK clock. - type: boolean - fsl,shared-interrupt: description: Interrupt is shared with other modules. type: boolean + lsb-first: + description: | + Configures whether the LSB or the MSB is transmitted + first for the fifo data. If this property is absent, + the MSB is transmitted first as default, or the LSB + is transmitted first. + type: boolean + "#sound-dai-cells": const: 0 description: optional, some dts node didn't add it.
@@ -175,11 +175,11 @@ allOf: required: - compatible - reg - - interrupts - - dmas - - dma-names - clocks - clock-names + - dmas + - dma-names + - interrupts additionalProperties: false
Signature · 1 line
2.35.1
Re: [PATCH 3/3] ASoC: dt-bindings: fsl-sai: Sort main section properties
Quoted 16 lines · Marek Vasut
Sort main section properties, no functional change.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]
Quoted 4 lines
--- .../devicetree/bindings/sound/fsl,sai.yaml | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-)
Quoted 18 lines · Marek Vasut
Describe existing used combinations of compatible strings on MX6UL and MX7D, which are backward compatible with MX6SX. Add the missing imx7d-sai compatible string which is used on i.MX7 .
Signed-off-by Marek Vasut <[email protected]>---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]
Quoted 4 lines
--- .../devicetree/bindings/sound/fsl,sai.yaml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-)
Mark Brown
maintainerQuoted 5 lines · Marek Vasut
Describe existing used combinations of compatible strings on MX6UL and MX7D, which are backward compatible with MX6SX. Add the missing imx7d-sai compatible string which is used on i.MX7 .
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings
commit: 81b6c043e7ba41e5a585f0d33213a32308d484ca
[2/3] ASoC: dt-bindings: fsl-sai: Use minItems 5 for i.MX8MN clock and similar
commit: ef55595548e13a5d61695bdf92e03df88c45994f
[3/3] ASoC: dt-bindings: fsl-sai: Sort main section properties
commit: 3e4f964ddd1a9ab962cb524cbea750030de6acd0All 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
Rob Herring
maintainerQuoted 29 lines · Marek Vasut
Describe existing used combinations of compatible strings on MX6UL and MX7D, which are backward compatible with MX6SX. Add the missing imx7d-sai compatible string which is used on i.MX7 .
Signed-off-by Marek Vasut <[email protected]>---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]--- .../devicetree/bindings/sound/fsl,sai.yaml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-)Documentation/devicetree/bindings/sound/fsl,sai.yaml +0
-0@@ -18,15 +18,12 @@ description: | properties: compatible:
Documentation/devicetree/bindings/sound/fsl,sai.yaml description: | · line 29
Quoted 10 lines
Documentation/devicetree/bindings/sound/fsl,sai.yaml +0
-9oneOf: - - enum: - - fsl,vf610-sai - - fsl,imx6sx-sai - - fsl,imx6ul-sai - - fsl,imx7ulp-sai - - fsl,imx8mq-sai - - fsl,imx8qm-sai - - fsl,imx8ulp-sai - - fsl,imx93-sai
fsl,imx93-sai got lost in this patch.
(found checking for new undocumented compatibles in next with scripts/dtc/dt-extract-compatibles)
Quoted 29 lines
Documentation/devicetree/bindings/sound/fsl,sai.yaml +15
-0+ - items: + - enum: + - fsl,imx6ul-sai + - fsl,imx7d-sai + - const: fsl,imx6sx-sai + - items: - enum: - fsl,imx8mm-sai@@ -34,6 +31,15 @@ properties: - fsl,imx8mp-sai - const: fsl,imx8mq-sai + - items: + - enum: + - fsl,imx6sx-sai + - fsl,imx7ulp-sai + - fsl,imx8mq-sai + - fsl,imx8qm-sai + - fsl,imx8ulp-sai + - fsl,vf610-sai + reg: maxItems: 1Signature · 1 line
2.35.1
Quoted 43 lines · Rob Herring
Quoted 29 lines · Marek Vasut
Describe existing used combinations of compatible strings on MX6UL and MX7D, which are backward compatible with MX6SX. Add the missing imx7d-sai compatible string which is used on i.MX7 .
Signed-off-by Marek Vasut <[email protected]>---
Cc: Fabio Estevam <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Shengjiu Wang <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: [email protected]
To: [email protected]--- .../devicetree/bindings/sound/fsl,sai.yaml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-)Documentation/devicetree/bindings/sound/fsl,sai.yaml +0
-0@@ -18,15 +18,12 @@ description: | properties: compatible:Documentation/devicetree/bindings/sound/fsl,sai.yaml description: | · line 29
Quoted 10 lines
Documentation/devicetree/bindings/sound/fsl,sai.yaml +0
-9oneOf: - - enum: - - fsl,vf610-sai - - fsl,imx6sx-sai - - fsl,imx6ul-sai - - fsl,imx7ulp-sai - - fsl,imx8mq-sai - - fsl,imx8qm-sai - - fsl,imx8ulp-sai - - fsl,imx93-saifsl,imx93-sai got lost in this patch.
Quoted 2 lines
(found checking for new undocumented compatibles in next with
scripts/dtc/dt-extract-compatibles)
Fix sent, thanks.