September 2023 - Alsa-devel - mailman.alsa-project.org

[PATCH 1/2] ASoC: pcm512x: Adds bindings for TAS575x devices
by Joerg Schambacher 21 Sep '23

21 Sep '23

The TAS5754/6 power amplifiers use the same pcm512x driver with only minor restictions described in the bindings document. Signed-off-by: Joerg Schambacher <joerg.hifiberry(a)gmail.com> --- .../devicetree/bindings/sound/pcm512x.txt | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/pcm512x.txt b/Documentation/devicetree/bindings/sound/pcm512x.txt index 3aae3b41bd8e..b16cd0463695 100644 --- a/Documentation/devicetree/bindings/sound/pcm512x.txt +++ b/Documentation/devicetree/bindings/sound/pcm512x.txt @@ -1,12 +1,12 @@ -PCM512x audio CODECs +PCM512x and TAS575x audio CODECs/amplifiers These devices support both I2C and SPI (configured with pin strapping -on the board). +on the board). The TAS575x devices only support I2C. Required properties: - - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141" or - "ti,pcm5142" + - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141", + "ti,pcm5142", "ti,tas5754" or "ti,tas5756" - reg : the I2C address of the device for I2C, the chip select number for SPI. @@ -25,6 +25,7 @@ Optional properties: through <6>. The device will be configured for clock input on the given pll-in pin and PLL output on the given pll-out pin. An external connection from the pll-out pin to the SCLK pin is assumed. + Caution: the TAS-desvices only support gpios 1,2 and 3 Examples: @@ -50,3 +51,16 @@ Examples: pll-in = <3>; pll-out = <6>; }; + + tas5756: tas5756@4f { + compatible = "ti,tas5756"; + reg = <0x4f>; + + AVDD-supply = <&reg_3v3_analog>; + DVDD-supply = <&reg_1v8>; + CPVDD-supply = <&reg_3v3>; + + clocks = <&sck>; + pll-in = <1>; + pll-out = <2>; + }; -- 2.34.1

2 2

[PATCH] soundwire: qcom: Log clk_get("iface") failures
by Bjorn Andersson 21 Sep '23

21 Sep '23

Failing to acquire the iface clock makes probing of the Qualcomm SoundWire driver fail without providing any indication to the user. Make the driver log the error to aid debugging system configuration issues. Signed-off-by: Bjorn Andersson <quic_bjorande(a)quicinc.com> --- drivers/soundwire/qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 55be9f4b8d59..e51b1dfce82d 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1550,7 +1550,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) ctrl->hclk = devm_clk_get(dev, "iface"); if (IS_ERR(ctrl->hclk)) { - ret = PTR_ERR(ctrl->hclk); + ret = dev_err_probe(dev, PTR_ERR(ctrl->hclk), "unable to get iface clock\n"); goto err_init; } -- 2.25.1

3 2

[PATCH 1/2] soundwire: qcom: use newer link status tregister on v2.0.0
by Krzysztof Kozlowski 21 Sep '23

21 Sep '23

Soundwire v2.0.0 comes with a new register LINK_STATUS for the FRAME_GEN_ENABLED field (bit indicating that an active frame is running). The old register COMP_STATUS is still there and still works, although the new one is preferred in downstream sources. Probably because it allows to choose Soundwire instance per CPU. Most of the code allowing to use new register for Soundwire v2.0.0 was already there as part of commit 312355a6a9f6 ("soundwire: qcom: add support for v2.0.0 controller"), so switch to it in swrm_wait_for_frame_gen_enabled() function. This should not have functional impact, because the old register still behaves correctly. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- drivers/soundwire/qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index f8fd2eb4a2bb..3ae3e5896308 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -817,8 +817,8 @@ static bool swrm_wait_for_frame_gen_enabled(struct qcom_swrm_ctrl *ctrl) int comp_sts; do { - ctrl->reg_read(ctrl, SWRM_COMP_STATUS, &comp_sts); - + ctrl->reg_read(ctrl, ctrl->reg_layout[SWRM_REG_FRAME_GEN_ENABLED], + &comp_sts); if (comp_sts & SWRM_FRM_GEN_ENABLED) return true; -- 2.34.1

2 2

[PATCH 00/11] add missing of_node_put
by Julia Lawall 21 Sep '23

21 Sep '23

Add of_node_put on a break out of an of_node loop. --- arch/powerpc/kexec/file_load_64.c | 8 ++++++-- arch/powerpc/platforms/powermac/low_i2c.c | 4 +++- arch/powerpc/platforms/powermac/smp.c | 4 +++- drivers/bus/arm-cci.c | 4 +++- drivers/genpd/ti/ti_sci_pm_domains.c | 8 ++++++-- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 4 +++- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +++- drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 1 + drivers/mmc/host/atmel-mci.c | 8 ++++++-- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 1 + drivers/soc/dove/pmu.c | 5 ++++- drivers/thermal/thermal_of.c | 8 ++++++-- sound/soc/sh/rcar/core.c | 1 + 13 files changed, 46 insertions(+), 14 deletions(-)

5 7

[PATCH v5 00/31] Add support for QMC HDLC, framer infrastructure and PEF2256 framer
by Herve Codina 21 Sep '23

21 Sep '23

Hi, I have a system where I need to handle an HDLC interface and some audio data. The HDLC data are transferred using a TDM bus on which a PEF2256 (E1/T1 framer) is present. The PEF2256 transfers data from/to the TDM bus to/from the E1 line. This PEF2256 is connected to a PowerQUICC SoC for the control path and the TDM is connected to the SoC (QMC component) for the data path. From the QMC HDLC driver, I need to handle HDLC data using the QMC, carrier detection using the PEF2256 (E1 line carrier) and set/get some PEF2256 configuration. The QMC HDLC driver considers the PEF2256 as a generic framer. It performs operations that involve the PEF2256 through the generic framer API. The audio data are exchanged with the PEF2256 using a CPU DAI connected to the TDM bus through the QMC and the PEF2256 needs to be seen as a codec in order to be linked to the CPU DAI. The codec handles the carrier detection using the PEF2256 and reports the carrier state to the ALSA subsystem using the ASoC jack detection. The codec, even if instantiated by the PEF2256 driver, considers the PEF2256 as a generic framer. The generic framer has: - 2 consumers (QMC HDLC drv and codec) - 1 provider (PEF2256) So, the design is the following: +------------------+ +---------+ | QMC | <- TDM -> | PEF2256 | <-> E1 +---------+ | +-------------+ | | | | CPU DAI | <-data--> | QMC channel | | | | +---------+ | +-------------+ | | | +--------------+ | +-------------+ | | | | QMC HDLC drv | <-data--> | QMC channel | | | | +--------------+ | +-------------+ | | | ^ +------------------+ | | | +--------+ +-------------+ | | +-> | framer | <-> | PEF2256 drv | <- local bus ->| | | | | | +---------+ +-> | | | | | +--------+ | +-------+ | +-------------------> | codec | | | +-------+ | +-------------+ Further more, the TDM timeslots used by the QMC HDLC driver need to be configured at runtime (QMC dynamic timeslots). Several weeks ago, I sent two series related to this topic: - Add the Lantiq PEF2256 audio support [1] - RFC Add support for QMC HDLC and PHY [2] This current series is a rework of these two series taking into account feedbacks previously received. In order to implement all of this, I do the following: 1) Perform some fixes (patches 1, 2, 3, 4, 5, 6, 7) 2) Introduce the QMC HDLC driver (patches 8, 9, 10, 11) 3) Add QMC dynamic timeslot support (patches 12 - 22) 4) Add timeslots change support in QMC HDLC (patch 23) 5) Introduce framer infrastructure (patch 24) 6) Add PEF2256 framer provider (patches 25, 26, 27, 28, 29) 7) Add framer codec as a framer consumer (patch 30) 8) Add framer support as a framer consumer in QMC HDLC (patch 31) The series contains the full story and detailed modifications. If needed, the series can be split and/or commits can be squashed. Let me know. Compare to the previous iteration https://lore.kernel.org/linux-kernel/cover.1692376360.git.christophe.leroy@… This v5 series mainly: - Fixes the DT bindings - Adds QMC child devices support - Fixes typos and documentation Best regards, Hervé [1]: https://lore.kernel.org/all/20230417171601.74656-1-herve.codina@bootlin.com/ [2]: https://lore.kernel.org/all/20230323103154.264546-1-herve.codina@bootlin.co… Changes v4 -> v5 - Patches 1 to 5 No changes - Patch 6 (new in v5) Fix QMC binding example - Patch 7 (new in v5) Add missing 'additionalProperties: false' - Patch 8 (new in v5, replace v4 patch 6) Add QMC HDLC properties in the QMC channel node Renamed the 'framer' property to 'fsl,framer' - Patch 9 (new in v5) Add support for QMC child devices - Patch 10 (patch 7 in v4) No changes - Patch 11 (patch 8 in v4) Remove fsl,qmc-hdlc.yaml (no more existing file) - Patches 12 to 22 (patches 9 to 19 in v4) No changes - Patch 23 (patch 20 in v4) Remove unused variable initializations Remove extra space - Patch 24 (patch 21 in v4) Improve Kconfig help text Fix variable declaration (reverse xmas tree) Fix typos and extra spaces Fix documentation issues raised by 'kernel-doc -none' Move of_node_put() and kfree() out of the mutex Replace ida_simple_{get,remove}() by ida_{alloc,free}() Support framer device-tree nodes without '#framer-cells' property - Patch 25 (patch 22 in v4) Fix $ref in the pinctrl subnode Remove '#framer-cells' property Add needed '|' - Patch 26 (patch 23 in v4) Fix a typo in the commit subject - Patches 27, 28, 29 (patch 24, 25, 26 in v4) No changes - Patch 30 (patch 27 in v4) Fix a typo in the commit log - Patch 31 (patch 28 in v4) Used 'fsl,framer' property name instead of 'framer' Changes v3 -> v4 - Patch 21 Fixes build failure with CONFIG_MODULES Changes v2 -> v3 - Patches 1, 2, 3, 4 Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - New patch Remove inline keyword from the existing registers accessors helpers - Patch 6 (patches 5, 27 in v2) Update the binding title Squash patch 27 - Patch 7 (patch 6 in v2) Remove the cast in netdev_to_qmc_hdlc() Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 8 (patch 7 in v2): No change - Patches 9, 10 (patches 8, 9 in v2) Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 11 (patch 10 in v2) Remove inline keyword from the introduced qmc_clrsetbits16() helper Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patches 12, 13, 14, 15, 16, 17, 18, 19, 20 Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 21 (patch 20 in v2) Remove unneeded framer NULL pointer check Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 22 (patch 21 in v2) Change sclkr and sclkx clocks description Remove the framer phandle property from the framer subnodes (ie. from framer-codec nodes) - Patch 23 (patch 22 in v2) Initialize 'disabled' variable at declaration Fix commit log Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 24 (patch 23 in v2) Remove inline keyword from the existing registers accessors helpers Use dev_warn_ratelimited() in default interrupt handler Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 25 (patch 24 in v2) Replace #include "linux/bitfield.h" by #include <linux/bitfield.h> Fold the pinctrl anonymous struct into the struct pef2256_pinctrl Update commit log Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 26 (patch 25 in v2) Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 27 (patch 26 in v2) Fix error message Changed the ch.max computation in framer_dai_hw_rule_channels_by_format() Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' - Patch 28 Add 'Reviewed-by: Christophe Leroy <christophe.leroy(a)csgroup.eu>' Changes v1 -> v2 - Patches 1, 2 (New in v2) Fix __iomem addresses declaration - Patch 19 (17 in v1) Fix a compilation warning - Patch 26 (24 in v1) Fix a typo in Kconfig file Fix issues raised by sparse (make C=1) Herve Codina (31): soc: fsl: cpm1: tsa: Fix __iomem addresses declaration soc: fsl: cpm1: qmc: Fix __iomem addresses declaration soc: fsl: cpm1: qmc: Fix rx channel reset soc: fsl: cpm1: qmc: Extend the API to provide Rx status soc: fsl: cpm1: qmc: Remove inline function specifiers dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Fix example property name dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Add 'additionalProperties: false' in child nodes dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Add support for QMC HDLC soc: fsl: cpm1: qmc: Add support for child devices net: wan: Add support for QMC HDLC MAINTAINERS: Add the Freescale QMC HDLC driver entry soc: fsl: cpm1: qmc: Introduce available timeslots masks soc: fsl: cpm1: qmc: Rename qmc_setup_tsa* to qmc_init_tsa* soc: fsl: cpm1: qmc: Introduce qmc_chan_setup_tsa* soc: fsl: cpm1: qmc: Remove no more needed checks from qmc_check_chans() soc: fsl: cpm1: qmc: Check available timeslots in qmc_check_chans() soc: fsl: cpm1: qmc: Add support for disabling channel TSA entries soc: fsl: cpm1: qmc: Split Tx and Rx TSA entries setup soc: fsl: cpm1: qmc: Introduce is_tsa_64rxtx flag soc: fsl: cpm1: qmc: Handle timeslot entries at channel start() and stop() soc: fsl: cpm1: qmc: Remove timeslots handling from setup_chan() soc: fsl: cpm1: qmc: Introduce functions to change timeslots at runtime wan: qmc_hdlc: Add runtime timeslots changes support net: wan: Add framer framework support dt-bindings: net: Add the Lantiq PEF2256 E1/T1/J1 framer mfd: core: Ensure disabled devices are skipped without aborting net: wan: framer: Add support for the Lantiq PEF2256 framer pinctrl: Add support for the Lantic PEF2256 pinmux MAINTAINERS: Add the Lantiq PEF2256 driver entry ASoC: codecs: Add support for the framer codec net: wan: fsl_qmc_hdlc: Add framer support .../bindings/net/lantiq,pef2256.yaml | 214 +++++ .../soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml | 20 +- MAINTAINERS | 16 + drivers/mfd/mfd-core.c | 17 +- drivers/net/wan/Kconfig | 14 + drivers/net/wan/Makefile | 3 + drivers/net/wan/framer/Kconfig | 39 + drivers/net/wan/framer/Makefile | 7 + drivers/net/wan/framer/framer-core.c | 887 ++++++++++++++++++ drivers/net/wan/framer/pef2256/Makefile | 8 + drivers/net/wan/framer/pef2256/pef2256-regs.h | 250 +++++ drivers/net/wan/framer/pef2256/pef2256.c | 880 +++++++++++++++++ drivers/net/wan/fsl_qmc_hdlc.c | 820 ++++++++++++++++ drivers/pinctrl/Kconfig | 14 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-pef2256-regs.h | 65 ++ drivers/pinctrl/pinctrl-pef2256.c | 308 ++++++ drivers/soc/fsl/qe/qmc.c | 592 +++++++++--- drivers/soc/fsl/qe/tsa.c | 22 +- include/linux/framer/framer-provider.h | 194 ++++ include/linux/framer/framer.h | 205 ++++ include/linux/framer/pef2256.h | 31 + include/soc/fsl/qe/qmc.h | 27 +- sound/soc/codecs/Kconfig | 15 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/framer-codec.c | 413 ++++++++ sound/soc/fsl/fsl_qmc_audio.c | 2 +- 27 files changed, 4921 insertions(+), 145 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/lantiq,pef2256.yaml create mode 100644 drivers/net/wan/framer/Kconfig create mode 100644 drivers/net/wan/framer/Makefile create mode 100644 drivers/net/wan/framer/framer-core.c create mode 100644 drivers/net/wan/framer/pef2256/Makefile create mode 100644 drivers/net/wan/framer/pef2256/pef2256-regs.h create mode 100644 drivers/net/wan/framer/pef2256/pef2256.c create mode 100644 drivers/net/wan/fsl_qmc_hdlc.c create mode 100644 drivers/pinctrl/pinctrl-pef2256-regs.h create mode 100644 drivers/pinctrl/pinctrl-pef2256.c create mode 100644 include/linux/framer/framer-provider.h create mode 100644 include/linux/framer/framer.h create mode 100644 include/linux/framer/pef2256.h create mode 100644 sound/soc/codecs/framer-codec.c -- 2.41.0

6 57

[PATCHv3] ALSA: hda/realtek: Add quirk for ASUS ROG G533Q
by Abelardo Ricart 21 Sep '23

21 Sep '23

The same quirk applied to the ASUS G533Z is also applicable to the ASUS G533Q (of which I am an owner and have thus tested). Signed-off-by: Abelardo Ricart <aricart(a)gmail.com> --- diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index dc7b7a407638..fdc3560ad951 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9649,6 +9649,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1493, "ASUS GV601V", ALC285_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301V", ALC285_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x1602, "ASUS ROG Strix G15 (G533Q)", ALC285_FIXUP_ASUS_G533Z_PINS), SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),

1 0

[PATCHv2] ALSA: hda/realtek: Add quirk for ASUS ROG G533Q
by Abelardo Ricart 21 Sep '23

21 Sep '23

The same quirk applied to the ASUS G533Z is also applicable to the ASUS G533Q (of which I am an owner and have thus tested). Resubmitted for e-mail formatting issue. Signed-off-by: Abelardo Ricart <aricart(a)gmail.com> --- diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b7e78bfcffd8..7bb3c1e05bf2 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9781,6 +9781,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1493, "ASUS GV601V", ALC285_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A",ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301V", ALC285_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x1602, "ASUS ROG Strix G15 (G533Q)",ALC285_FIXUP_ASUS_G533Z_PINS), SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),

1 0

[PATCH] ALSA: hda/realtek: Add quirk for ASUS ROG G533Q
by Abby Ricart 21 Sep '23

21 Sep '23

The same quirk applied to the ASUS G533Z is also applicable to the ASUS G533Q (of which I am an owner and have thus tested). Signed-off-by: Abelardo Ricart <aricart(a)gmail.com> --- diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b7e78bfcffd8..7bb3c1e05bf2 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9781,6 +9781,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1493, "ASUS GV601V", ALC285_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301V", ALC285_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x1602, "ASUS ROG Strix G15 (G533Q)", ALC285_FIXUP_ASUS_G533Z_PINS), SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),

1 0

[PATCH v3 1/2] ALSA: docs: Add MARIAN M2 driver documentation
by Ivan Orlov 21 Sep '23

21 Sep '23

Add documentation for the new MARIAN Seraph M2 driver. MARIAN Seraph M2 is a fully digital PCI soundcard with 2 MADI inputs and outputs. This patch introduces the documentation for the card driver. It covers current development status, overview of the card, available controls and information about the integrated loopback. Signed-off-by: Ivan Orlov <ivan.orlov0322(a)gmail.com> --- V1 -> V2: - Remove redundant documentation fix V2 -> V3: - Make the documentation to follow 80-column rule - Use literal blocks for markup - Update the documentation correspondingly with the latest driver changes: remove mHz and detune controls descriptions, remove 'speedmode' control. - Extend the documentation to cover the card overview. Documentation/sound/cards/index.rst | 1 + Documentation/sound/cards/marian-m2.rst | 140 ++++++++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 Documentation/sound/cards/marian-m2.rst diff --git a/Documentation/sound/cards/index.rst b/Documentation/sound/cards/index.rst index e68bbb13c384..e873592d8d00 100644 --- a/Documentation/sound/cards/index.rst +++ b/Documentation/sound/cards/index.rst @@ -19,3 +19,4 @@ Card-Specific Information serial-u16550 img-spdif-in pcmtest + marian-m2 diff --git a/Documentation/sound/cards/marian-m2.rst b/Documentation/sound/cards/marian-m2.rst new file mode 100644 index 000000000000..3c12fe024e37 --- /dev/null +++ b/Documentation/sound/cards/marian-m2.rst @@ -0,0 +1,140 @@ +.. SPDX-License-Identifier: GPL-2.0 + +======================= +MARIAN Seraph M2 Driver +======================= + +Sep 18, 2023 + +Ivan Orlov <ivan.orlov0322(a)gmail.com> + +STATE OF DEVELOPMENT +==================== + +This driver is based on the driver written by Florian Faber in 2012, which +seemed to work fine. However, the initial code contained multiple issues, which +had to be solved before sending the driver upstream. + +The vendor lost the full documentation, so what we have here was recovered from +drafts and found after experiments with the card. + +What seems to be working fine: + + * Playback and capture for all supported rates + * MADI output frame mode changing + * Input frequency/frame mode measurement + * Integrated loopback (with some exceptions, see below) + +CARD INFORMATION +================ + +The card is fully digital and contains two MADI Inputs and two MADI outputs. +It has internal clocks, but could be synchronized with clocks on any of its +inputs. Also it could be synchronized with other MARIAN M2 sound card via +SyncBus cable. + +Outputs support two modes: 56 channel mode and 64 channel mode. The number of +audio channels will be halved automatically to 28 or 32 depending on the +sample rate. + +The driver currently supports 48 and 96 kHz MADI frame formats for output. + +MEMORY MODEL +============ + +The hardware requires one huge contiguous DMA space to be allocated. After +allocation, the bus address of this buffer should be written to the hardware +register. + +We can split this space into two parts: the first one contains samples for +capture, another one contains play samples:: + + CAP_CH_0, CAP_CH_1, ..., CAP_CH_127 | PLAY_CH_0, PLAY_CH_1, ..., PLAY_CH_127 + +The card supports the non-interleaved access mode only, so samples for each +channel lay together:: + + C0, ..., C0, C1, ..., C1, ..., C127 | C0, ..., C0, C1, ..., C1, ..., C127 + +The count of samples per each channel buffer needs to be set explicitly, so the +address of the first byte of the playback data depends on this value. +The playback buffer starts where the capture buffer ends. It makes the arbitrary +period count/buffer size feature impossible to implement, and the driver +supports only 2 periods per buffer. + +Controls +======== + + * Input 1 Sync + + - 0 - No signal, 1 - valid MADI signal found, 2 - Synced with MADI signal + + * Input 2 Sync + + - 0 - No signal, 1 - valid MADI signal found, 2 - Synced with MADI signal + + * Input 1 Channel Mode + + - 0 - 56 channels, 1 - 64 channels + + * Input 2 Channel Mode + + - 0 - 56 channels, 1 - 64 channels + + * Input 1 Frame Mode + + - 0 - 48 kHz, 1 - 96 kHz + + * Input 2 Frame Mode + + - 0 - 48 kHz, 1 - 96 kHz + + * Input 1 Frequency + + - Measured frequency on Input 1 + + * Input 2 Frequency + + - Measured frequency on Input 2 + + * Output 1 Channel Mode + + - 0 - 56 channels, 1 - 64 channels + + * Output 2 Channel Mode + + - 0 - 56 channels, 1 - 64 channels + + * Output 1 Frame Mode + + - 0 - 48 kHz, 1 - 96 kHz + + * Output 2 Frame Mode + + - 0 - 48 kHz, 1 - 96 kHz + + * Clock Source + + - Internal/Sync Bus, Input Port 1, Input Port 2 + + * DCO Frequency (Hz) + + * Loopback + + - Enable/Disable integrated loopback + + +Loopback +======== + +The card contains integrated loopback. When it is enabled, it sets +the hardware’s DAW-in memory pointer to the hardware’s DAW-out memory. So, what +you play is what you record. + +You will not observe the effect of channel halving when using the integrated +loopback, as the data bypasses all DSP functionality in such case. + +You can enable the integrated loopback using the corresponding control. + +The loopback seems to work well on lower rates (like 28000). However, when the +rate goes higher, the count of mistakes in recorded byte ordering increases. -- 2.34.1

2 3

how to connect a midi client to non midi hardware sound card
by Randy Li 20 Sep '23

20 Sep '23

Hello All I am trying to refresh the ttymidi project, I have sent the merge request to support the midi baudrate. The problem is the sound card in my PC is too new that it doesn't have a midi input(I think the old hardware does). amidi -l would report: "cannot determine device number: Inappropriate ioctl for device" I think it is SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE won't work here. Could I still use snd_seq_open() to create a midi client to the system's sound card. Or I should try something different to make midi input work? Yours Randy

2 2