[RESEND 1/3] ASoC: ics43432: add CMM-4030D-261 support
Despite minimal datasheet differences, the driver seems perfectly compatible with CMM-4030D-261.
Tested CMM-4030D-261 to work with this changes:
/ { cmm4030d: cmm4030d { #sound-dai-cells = <0>; compatible = "cui,cmm-4030d-261"; };
sound_mic { compatible = "simple-audio-card"; simple-audio-card,name = "i2s mem mic"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound_master>; simple-audio-card,frame-master = <&sound_master>; sound_master: simple-audio-card,cpu { sound-dai = <&ssi2>; system-clock-frequency = <2822400>; }; simple-audio-card,codec { sound-dai = <&cmm4030d>; }; }; };
Audio has been captured and tested successfully by:
arecord -D "hw:1,0" -f S24_LE > test.wav aplay test.wav
Signed-off-by: Angelo Dureghello angelo.dureghello@timesys.com --- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/ics43432.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index db16071205ba..cd1976aae328 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -847,7 +847,7 @@ config SND_SOC_HDAC_HDA select SND_HDA
config SND_SOC_ICS43432 - tristate + tristate "ICS43423 and compatible i2s microphones"
config SND_SOC_INNO_RK3036 tristate "Inno codec driver for RK3036 SoC" diff --git a/sound/soc/codecs/ics43432.c b/sound/soc/codecs/ics43432.c index 47e749f03940..de4c8460ab3d 100644 --- a/sound/soc/codecs/ics43432.c +++ b/sound/soc/codecs/ics43432.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * I2S MEMS microphone driver for InvenSense ICS-43432 + * I2S MEMS microphone driver for InvenSense ICS-43432 and similar + * MEMS-based microphones. * * - Non configurable. * - I2S interface, 64 BCLs per frame, 32 bits per channel, 24 bit data @@ -53,6 +54,7 @@ static int ics43432_probe(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id ics43432_ids[] = { { .compatible = "invensense,ics43432", }, + { .compatible = "cui,cmm-4030d-261", }, { } }; MODULE_DEVICE_TABLE(of, ics43432_ids);
Add vendor prefix for CUI Devices.
Signed-off-by: Angelo Dureghello angelo.dureghello@timesys.com --- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 07fb0d25fc15..ed4f66ec9a65 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -271,6 +271,8 @@ patternProperties: description: Shenzen Chuangsiqi Technology Co.,Ltd. "^cubietech,.*": description: Cubietech, Ltd. + "^cui,.*": + description: CUI Devices "^cypress,.*": description: Cypress Semiconductor Corporation "^cznic,.*":
On Sat, Aug 21, 2021 at 10:26:57AM +0200, Angelo Dureghello wrote:
Add vendor prefix for CUI Devices.
Signed-off-by: Angelo Dureghello angelo.dureghello@timesys.com
Ah, this patch should've been before the patch adding the use.
Add compatible for CUI Devices CMM-4030D-261-I2S-TR.
Signed-off-by: Angelo Dureghello angelo.dureghello@timesys.com --- Documentation/devicetree/bindings/sound/ics43432.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/ics43432.txt b/Documentation/devicetree/bindings/sound/ics43432.txt index b02e3a6c0fef..e6f05f2f6c4e 100644 --- a/Documentation/devicetree/bindings/sound/ics43432.txt +++ b/Documentation/devicetree/bindings/sound/ics43432.txt @@ -1,4 +1,4 @@ -Invensense ICS-43432 MEMS microphone with I2S output. +Invensense ICS-43432-compatible MEMS microphone with I2S output.
There are no software configuration options for this device, indeed, the only host connection is the I2S interface. Apart from requirements on clock @@ -8,7 +8,9 @@ contain audio data. A hardware pin determines if the device outputs data on the left or right channel of the I2S frame.
Required properties: - - compatible : Must be "invensense,ics43432" + - compatible: should be one of the following. + "invensense,ics43432": For the Invensense ICS43432 + "cui,cmm-4030d-261": For the CUI CMM-4030D-261-I2S-TR
Example:
On Sat, Aug 21, 2021 at 10:26:56AM +0200, Angelo Dureghello wrote:
config SND_SOC_ICS43432
- tristate
- tristate "ICS43423 and compatible i2s microphones"
This is an unrelated change not identified in the changelog, it should have been submitted as a separate patch.
#ifdef CONFIG_OF static const struct of_device_id ics43432_ids[] = { { .compatible = "invensense,ics43432", },
- { .compatible = "cui,cmm-4030d-261", }, { }
cui isn't a know vendor prefix, you should also update the list of vendors in vendor-prefixes.yaml.
On Sat, 21 Aug 2021 10:26:56 +0200, Angelo Dureghello wrote:
Despite minimal datasheet differences, the driver seems perfectly compatible with CMM-4030D-261.
Tested CMM-4030D-261 to work with this changes:
/ { cmm4030d: cmm4030d { #sound-dai-cells = <0>; compatible = "cui,cmm-4030d-261"; };
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: ics43432: add CMM-4030D-261 support commit: 43d2c4982fcc6ed0adfea1275bc6df28bc48c1ea [2/3] dt-bindings: add compatible vendor prefix for CUI Devices commit: 0f28b69e4b5959ee4ae1363b5f6d5dfe76faf36e [3/3] ASoC: ics43432: add compatible for CUI Devices commit: c7bd58940bcb38fc506786fccdf51abeac40383e
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
participants (2)
-
Angelo Dureghello -
Mark Brown