October 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v4 00/11] ASoC: topology: Remaining kernel patches
by mengdong.lin＠linux.intel.com 04 Nov '16

04 Nov '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This version can support old topology ABI v4 in a backward compatible way, assuming users start to use topology from ABI v4. This series contains all remaining kernel patches of topology, including some ABI update to PCM (FrontEnds) and link (BackEnds) objects. User will be able to config existing BE DAI links, configure more for FE links. Code are verified and can cover reqeust of Intel pre-release platforms for next year, so ABI should be stable. Current kernel topology code does not really touch Codec-Codec links since there is no user requst atm. We can add support for CC links later by reusing code and data structures for BE links, and no need to revise ABI. History: v2: Add the reason for creating BE DAI & DAI links by topology to commit message. Drop support for configuring DPCM trigger ordering in topology. v3: Topology no longer creates BE DAI or BE DAI links, but only configure existing ones. The API to find a DAI link can also check the name and stream name in case a soc card doesn't use unique ID for DAI links. The user space code is also ready. v4: Support ABI udpate and be backward compatible for topology ABI v4. Code refactoring to configure physical DAIs. Mengdong Lin (11): ASoC: topology: Make manifest backward compatible from ABI v4 ASoC: topology: Make PCM backward compatible from ABI v4 ASoC: topology: Not quit on topology file of ABI version 4 ASoC: topology: ABI - Add flags and private data to PCM ASoC: topology: ABI - Define DAI physical PCM data formats ASoC: topology: ABI - Update physical DAI link configuration for version 5 ASoC: Define API to find a dai link ASoC: topology: Add support to configure existing physical DAI links ASoC: topology: Rename the function to create a FE link ASoC: topology: ABI - Rename struct and type for physical DAIs ASoC: topology: Rename functions & variables for physical links include/sound/soc-dai.h | 15 +- include/sound/soc.h | 3 + include/uapi/sound/asoc.h | 91 +++++++- sound/soc/soc-core.c | 42 ++++ sound/soc/soc-topology.c | 544 +++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 623 insertions(+), 72 deletions(-) -- 2.5.0

2 13

[alsa-devel] [PATCH v5 00/11] ASoC: topology: Remaining kernel patches
by mengdong.lin＠linux.intel.com 04 Nov '16

04 Nov '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This version can support old topology ABI v4 in a backward compatible way, assuming users start to use topology from ABI v4 with alsa-lib v1.1.0. This series contains all remaining kernel patches of topology, including some ABI update to PCM (FrontEnds) and link (BackEnds) objects. Kernel can support topology files generated by ABI v4 without these updates. User will be able to config existing physical DAI links, configure more for FE links. Code are verified and can cover reqeust of Intel pre-release platforms for next year, so ABI should be stable. Current kernel topology code does not really touch Codec-Codec links since there is no user requst atm. We can add support for CC links later by reusing code and data structures for BE links, and no need to revise ABI. History: v2: Add the reason for creating BE DAI & DAI links by topology to commit message. Drop support for configuring DPCM trigger ordering in topology. v3: Topology no longer creates BE DAI or BE DAI links, but only configure existing ones. The API to find a DAI link can also check the name and stream name in case a soc card doesn't use unique ID for DAI links. The user space code is also ready. v4: Support ABI udpate and be backward compatible for topology ABI v4. Code refactoring to configure physical DAIs. v5: Minor code refactoring and modification on commit messages. Mengdong Lin (11): ASoC: topology: Make manifest backward compatible from ABI v4 ASoC: topology: Make PCM backward compatible from ABI v4 ASoC: topology: Support topology file of ABI v4 ASoC: topology: ABI - Add flags and private data to PCM ASoC: topology: ABI - Define DAI physical PCM data formats ASoC: topology: ABI - Update physical DAI link configuration for version 5 ASoC: Define API to find a dai link ASoC: topology: Add support to configure existing physical DAI links ASoC: topology: Rename the function to create a FE link ASoC: topology: ABI - Rename struct and type for physical DAIs ASoC: topology: Rename functions & variables for physical DAIs include/sound/soc-dai.h | 15 +- include/sound/soc.h | 3 + include/uapi/sound/asoc.h | 89 +++++++- sound/soc/soc-core.c | 42 ++++ sound/soc/soc-topology.c | 551 +++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 627 insertions(+), 73 deletions(-) -- 2.5.0

2 16

[alsa-devel] [PATCH v3 0/8] ASoC: topology: Remaining kernel patches
by mengdong.lin＠linux.intel.com 04 Nov '16

04 Nov '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This series contains all remaining kernel patches of topology, including some ABI update to PCM (FrontEnds) and link (BackEnds) objects. User will be able to config existing BE DAI links, configure more for FE links. Code are verified and can cover reqeust of Intel pre-release platforms for next year, so ABI should be stable. Current kernel topology code does not really touch Codec-Codec links since there is no user requst atm. We can add support for CC links later by reusing code and data structures for BE links, and no need to revise ABI. History: v2: Add the reason for creating BE DAI & DAI links by topology to commit message. Drop support for configuring DPCM trigger ordering in topology. v3: Topology no longer creates BE DAI or BE DAI links, but only configure existing ones. The API to find a DAI link can also check the name and stream name in case a soc card doesn't use unique ID for DAI links. The user space code is also ready. Mengdong Lin (8): ASoC: topology: ABI - Add flags to PCM ASoC: topology: ABI - Add private data to PCM ASoC: topology: ABI - Define DAI physical PCM data formats ASoC: topology: ABI - Add HW configurations to BE DAI links ASoC: topology: ABI - Add flags and private data to BE DAI links ASoC: topology: ABI - Add name and stream name to BE DAI links ASoC: Define API to find a dai link ASoC: topology: Add support to configure existing BE DAI links include/sound/soc-dai.h | 15 +++-- include/sound/soc.h | 3 + include/uapi/sound/asoc.h | 67 +++++++++++++++++++ sound/soc/soc-core.c | 42 ++++++++++++ sound/soc/soc-topology.c | 166 ++++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 282 insertions(+), 11 deletions(-) -- 2.5.0

3 11

[alsa-devel] [PATCH] sound: soc: cygnus: add depends on HAS_DMA
by Scott Branden 03 Nov '16

03 Nov '16

add depends on HAS_DMA to Kconfig. This fixes error reported by kbuild test robot when building for ARCH=m32r: ERROR: "bad_dma_ops" [sound/soc/bcm/snd-soc-cygnus.ko] undefined! Signed-off-by: Scott Branden <scott.branden(a)broadcom.com> --- sound/soc/bcm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig index d528aac..edf3671 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -11,6 +11,7 @@ config SND_BCM2835_SOC_I2S config SND_SOC_CYGNUS tristate "SoC platform audio for Broadcom Cygnus chips" depends on ARCH_BCM_CYGNUS || COMPILE_TEST + depends on HAS_DMA help Say Y if you want to add support for ASoC audio on Broadcom Cygnus chips (bcm958300, bcm958305, bcm911360) -- 2.5.0

2 1

[alsa-devel] [PATCH] ASoC: Intel: atom: Add debug information related to FW version
by Sebastien Guiriec 03 Nov '16

03 Nov '16

This patch is adding debug information related to SST FW version. Signed-off-by: Sebastien Guiriec <sebastien.guiriec(a)intel.com> --- sound/soc/intel/atom/sst/sst_ipc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c index 8afa6fe..8cbbdcf 100644 --- a/sound/soc/intel/atom/sst/sst_ipc.c +++ b/sound/soc/intel/atom/sst/sst_ipc.c @@ -236,6 +236,11 @@ static void process_fw_init(struct intel_sst_drv *sst_drv_ctx, retval = init->result; goto ret; } + dev_info(sst_drv_ctx->dev, "FW Version %02x.%02x.%02x.%02x\n", + init->fw_version.type, init->fw_version.major, + init->fw_version.minor, init->fw_version.build); + dev_dbg(sst_drv_ctx->dev, "Build date %s Time %s\n", + init->build_info.date, init->build_info.time); ret: sst_wake_up_block(sst_drv_ctx, retval, FW_DWNL_ID, 0 , NULL, 0); -- 2.9.3 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

2 2

[alsa-devel] [PATCH v6 00/11] ASoC: topology: Remaining kernel patches
by mengdong.lin＠linux.intel.com 02 Nov '16

02 Nov '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Please overlook previous v4 and v5 of topology kernel patch series. This series can support old topology ABI v4 in a backward compatible way, assuming users start to use topology from ABI v4 with alsa-lib v1.1.0. This series contains all remaining kernel patches of topology, including some ABI update to PCM (FrontEnds) and link (BackEnds) objects. Kernel can support topology files generated by ABI v4 without these updates. User will be able to config existing physical DAI links, configure more for FE links. Code are verified and can cover reqeust of Intel pre-release platforms for next year, so ABI should be stable. Current kernel topology code does not really touch Codec-Codec links since there is no user requst atm. We can add support for CC links later by reusing code and data structures for BE links, and no need to revise ABI. History: v2: Add the reason for creating BE DAI & DAI links by topology to commit message. Drop support for configuring DPCM trigger ordering in topology. v3: Topology no longer creates BE DAI or BE DAI links, but only configure existing ones. The API to find a DAI link can also check the name and stream name in case a soc card doesn't use unique ID for DAI links. The user space code is also ready. v4: Support ABI udpate and be backward compatible for topology ABI v4. Code refactoring to configure physical DAIs. v5: Minor code refactoring and modification on commit messages. v6: Change the variable of physical DAI count in manifest from "be_dai_elems" to "dai_elems", backward compatible. Mengdong Lin (11): ASoC: topology: Make manifest backward compatible from ABI v4 ASoC: topology: Make PCM backward compatible from ABI v4 ASoC: topology: Support topology file of ABI v4 ASoC: topology: ABI - Add flags and private data to PCM ASoC: topology: ABI - Define DAI physical PCM data formats ASoC: topology: ABI - Update physical DAI link configuration for version 5 ASoC: Define API to find a dai link ASoC: topology: Add support to configure existing physical DAI links ASoC: topology: Rename the function to create a FE link ASoC: topology: ABI - Rename struct and type for physical DAIs ASoC: topology: Rename functions & variables for physical DAIs include/sound/soc-dai.h | 15 +- include/sound/soc.h | 3 + include/uapi/sound/asoc.h | 91 +++++++- sound/soc/soc-core.c | 42 ++++ sound/soc/soc-topology.c | 551 +++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 628 insertions(+), 74 deletions(-) -- 2.5.0

4 18

[alsa-devel] CREATIVE EMU 0202 driver in 192khz
by Olivier Schmitt 02 Nov '16

02 Nov '16

Hello, I am SCHMITT Olivier and I am IT manager for a Radio Ham Club. Let me explain quickly, I search to use ADC (line in) from an Creative Creative EMU 0202 in 192K but it was detected by alsa on 48k sample rate only. I have a computer that I need to update. It runs on 32-bit version 17 LinuxMint (it seems to be the version of ubuntu 14). The card works in EMU0202 192k on this machine before. I test all 32 and 64 bit version of Ubuntu Ubuntu 12.04 to Ubuntu 16.04 and LinuxMint 13 to 18 and this card was only detected on 48k max and not 192k... USB2.0 for sure! Here is the extract from alsa Repport: Current new PC with fresh installation: http://www.alsa-project.org/db/?f=d2aa133b78df9a25b9840fa274e7ab8485f89e30 old PC under linuxmint 17: http://www.alsa-project.org/db/?f=5b1b56fc64d982a7f72e00aa6f907e28e0eb2353 How I did you observe that? I use the utility "alsacap" to see all the features available. I also use to arecord verified the information. I can only use 48kHz bandwidth under the new installation of Ubuntu. The old person now deceased was installed on LinuxMint and we could use in 192khz. But I do not know how. he probably made the snd-usb-audio driver with a patch. But I'm not sure. It seems this is the only lead I have. This seems normal because in compatible sound card matrix of ALSA-project website, it seems that the driver by alsa only allows maximum 48khz. I would like to have your opinion to perhaps find a suitable track. If you see this return of alsacap utility, you see that in the older computer this will allow to use this sound card under 192khz. *** *Scanning for recording devices* *** Card 0, ID `PCH', name `HDA Intel PCH' Device 0, ID `ALC662 rev1 Analog', name `ALC662 rev1 Analog', 1 subdevices (1 available) 2 channels, sampling rate 44100..96000 Hz Sample formats: S16_LE, S32_LE Subdevice 0, name `subdevice #0' Device 2, ID `ALC662 rev1 Alt Analog', name `ALC662 rev1 Alt Analog', 1 subdevices (1 available) 2 channels, sampling rate 44100..96000 Hz Sample formats: S16_LE, S32_LE Subdevice 0, name `subdevice #0' Card 1, ID `USB', name `E-MU 0202 | USB' * Device 0, ID `USB Audio', name `USB Audio', 1 subdevices (1 available) 2 channels, sampling rate 44100..192000 Hz Sample formats: S24_3LE Subdevice 0, name `subdevice #0'* Card 10, ID `loop1', name `Loopback' Device 0, ID `Loopback PCM', name `Loopback PCM', 2 subdevices (2 available) 1..32 channels, sampling rate 8000..192000 Hz Sample formats: S16_LE, S16_BE, S32_LE, S32_BE, FLOAT_LE, FLOAT_BE Subdevice 0, name `subdevice #0' Subdevice 1, name `subdevice #1' Device 1, ID `Loopback PCM', name `Loopback PCM', 2 subdevices (2 available) 1..32 channels, sampling rate 8000..192000 Hz Sample formats: S16_LE, S16_BE, S32_LE, S32_BE, FLOAT_LE, FLOAT_BE Subdevice 0, name `subdevice #0' Subdevice 1, name `subdevice #1' Card 11, ID `loop2', name `Loopback' Device 0, ID `Loopback PCM', name `Loopback PCM', 2 subdevices (2 available) 1..32 channels, sampling rate 8000..192000 Hz Sample formats: S16_LE, S16_BE, S32_LE, S32_BE, FLOAT_LE, FLOAT_BE Subdevice 0, name `subdevice #0' Subdevice 1, name `subdevice #1' Device 1, ID `Loopback PCM', name `Loopback PCM', 2 subdevices (2 available) 1..32 channels, sampling rate 8000..192000 Hz Sample formats: S16_LE, S16_BE, S32_LE, S32_BE, FLOAT_LE, FLOAT_BE Subdevice 0, name `subdevice #0' Subdevice 1, name `subdevice #1' I test every version of linux mint from the 13 to the 18 and Ubuntu 12.04 to 16.06 (32 and 64 bit) and they are all the card 48khz. Also, I try to make the latest version of ALSA driver without success. Alsacap return: **** Scanning for recording devices* *** Card 0, ID `Intel', name `HDA Intel' Device 0, ID `AD198x Analog', name `AD198x Analog', 1 subdevices (1 available) 2 channels, sampling rate 8000..48000 Hz Sample formats: S16_LE, S32_LE Subdevice 0, name `subdevice #0' *Card 1, ID `USB', name `E-MU 0202 | USB' Device 0, ID `USB Audio', name `USB Audio', 1 subdevices (1 available) 2 channels, sampling rate 44100..48000 Hz Sample formats: S16_LE, S24_3LE Subdevice 0, name `subdevice #0* Always the same in all linux version that i have tested.... The only thing that lets the driver current ALSA is to manage the frequency of the internal clock of the card (clock sample rate) but ALSA does not provide the functionality available for software. I know this may sound ambiguous but the alsamixer "clock rate" is only used to manage the clock rate of the sound card chipset. When the clock Rate is to 5, we see on our watterfall that the sample rate will change on the hardware but alsa dont let somme software to use 192khz. I have already search on somme forums for this, i find that Alsa-Project as devellop this function to be sure that when you use at 48khz or 44,1khz, you can adjust manualy the same hardware clock rate. The only track that I have is this, but I do not have enough knowledge to develloper a specific driver ... https://lab.nexedi.cn/kirr/linux/commit/89e1e66d6be8a520cdcd26043cda2cc870a… I saw there for 0404, it appears that the hardware is the same. Perhaps is it possible to use it for 0202? Thanks for your reply.

2 1

Re: [alsa-devel] M-audio Audiophile Firewire
by Takashi Sakamoto 01 Nov '16

01 Nov '16

On Oct 22 2016 18:35, Peti Pap wrote: > My current Windows driver details; > (M-audio Firewire control panel) > > Panel: 5.10.0.5058 > Driver: 5.10.0.5058 > Bootloader: 2003/10/06 10:00:41 > Firmware: 2007/05/04 10:22:12 > Hardware: model: D version: 1 > GUID: 000D-6C03-00D9-5B38 You can use firmware version 5061, too. Anyway, ALSA bebob driver can drive your unit. On Oct 23 2016 01:33, Peti Pap wrote: > I installed: > Linux Mint 18 64 bit > Low Latency Kernel 4.8 > Tracktion T5 Aha. You use Tracktion for Linux. I like it. > In Tracktion -> Settings -> Audio Decives menü I can select between ALSA > and JACK audio device types > When I select ALSA I can choose 2 FW audiophile stuff; > 1. "FW Audiophile, FW Audiophile PCM; direct sample mixing device" > 2. ""FW Audiophile, FW Audiophile PCM; direct hardware device without any > conversions" Good. You can see ALSA PCM nodes for your unit. > I can enable/disable the channels too (I enabled 1+2 channel) and I set the > Default wave output > The sample rate 48kHz > > But still no green light (only the blue LED lighting by the power button), > and no any sound... :\ When the power LED turns at green color instead blinking, ALSA bebob driver successfully makes the unit to load firmware. The rest is to configure routing of internal DSP. Just after loading firmware, no DSP sources are connected to outputs. For this purpose, you can use ffado-dbus-server/ffado-mixer (GUI), or hinawa-maudio-bebob-normal-cui in hinawa-utils (CUI). https://github.com/takaswie/hinawa-utils The hinawa-utils is an application of libhinawa. https://launchpad.net/ubuntu/+source/libhinawa For example: $ ./hinawa-maudio-bebob-normal-cui 1 mixer-routing Arguments for mixer-routing command: mixer-routing sink source [value] mixer-1/2 [analog-1/2, digital-1/2, stream-1/2, stream-3/4, stream-5/6] [0, 1] mixer-3/4 [analog-1/2, digital-1/2, stream-1/2, stream-3/4, stream-5/6] [0, 1] mixer-5/6 [analog-1/2, digital-1/2, stream-1/2, stream-3/4, stream-5/6] [0, 1] $ ./hinawa-maudio-bebob-normal-cui 1 mixer-routing mixer-1/2 stream-1/2 1 Regards Takashi Sakamoto

4 12

[alsa-devel] [PATCH][resend] drm: bridge: add DesignWare HDMI I2S audio support
by Kuninori Morimoto 01 Nov '16

01 Nov '16

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current dw-hdmi is supporting sound via AHB bus, but it has I2S audio feature too. This patch adds I2S audio support to dw-hdmi. This HDMI I2S is supported by using ALSA SoC common HDMI encoder driver. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- drivers/gpu/drm/bridge/Kconfig | 8 ++ drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/dw-hdmi-audio.h | 7 ++ drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c | 130 +++++++++++++++++++++++++++++ drivers/gpu/drm/bridge/dw-hdmi.c | 22 ++++- drivers/gpu/drm/bridge/dw-hdmi.h | 21 +++++ 6 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index b590e67..4ed891e 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -32,6 +32,14 @@ config DRM_DW_HDMI_AHB_AUDIO Designware HDMI block. This is used in conjunction with the i.MX6 HDMI driver. +config DRM_DW_HDMI_I2S_AUDIO + tristate "Synopsis Designware I2S Audio interface" + depends on DRM_DW_HDMI + select SND_SOC_HDMI_CODEC + help + Support the I2S Audio interface which is part of the Synopsis + Designware HDMI block. + config DRM_NXP_PTN3460 tristate "NXP PTN3460 DP/LVDS bridge" depends on OF diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index efdb07e..720e53e 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -3,6 +3,7 @@ ccflags-y := -Iinclude/drm obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o +obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o obj-$(CONFIG_DRM_SII902X) += sii902x.o diff --git a/drivers/gpu/drm/bridge/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/dw-hdmi-audio.h index 91f631b..fd1f745 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi-audio.h +++ b/drivers/gpu/drm/bridge/dw-hdmi-audio.h @@ -11,4 +11,11 @@ struct dw_hdmi_audio_data { u8 *eld; }; +struct dw_hdmi_i2s_audio_data { + struct dw_hdmi *hdmi; + + void (*write)(struct dw_hdmi *hdmi, u8 val, int offset); + u8 (*read)(struct dw_hdmi *hdmi, int offset); +}; + #endif diff --git a/drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c new file mode 100644 index 0000000..7dd2091 --- /dev/null +++ b/drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c @@ -0,0 +1,130 @@ +/* + * dw-hdmi-i2s-audio.c + * + * Copyright (c) 2016 Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include <drm/bridge/dw_hdmi.h> + +#include <sound/hdmi-codec.h> + +#include "dw-hdmi.h" +#include "dw-hdmi-audio.h" + +#define DRIVER_NAME "dw-hdmi-i2s-audio" + +static inline void hdmi_write(struct dw_hdmi_i2s_audio_data *audio, + u8 val, int offset) +{ + struct dw_hdmi *hdmi = audio->hdmi; + + audio->write(hdmi, val, offset); +} + +static inline u8 hdmi_read(struct dw_hdmi_i2s_audio_data *audio, int offset) +{ + struct dw_hdmi *hdmi = audio->hdmi; + + return audio->read(hdmi, offset); +} + +static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, + struct hdmi_codec_daifmt *fmt, + struct hdmi_codec_params *hparms) +{ + struct dw_hdmi_i2s_audio_data *audio = data; + struct dw_hdmi *hdmi = audio->hdmi; + u8 conf0 = 0; + u8 conf1 = 0; + u8 inputclkfs = 0; + + /* it cares I2S only */ + if ((fmt->fmt != HDMI_I2S) || + (fmt->bit_clk_master | fmt->frame_clk_master)) { + dev_err(dev, "unsupported format/settings\n"); + return -EINVAL; + } + + inputclkfs = HDMI_AUD_INPUTCLKFS_64FS; + conf0 = HDMI_AUD_CONF0_I2S_ALL_ENABLE; + + switch (hparms->sample_width) { + case 16: + conf1 = HDMI_AUD_CONF1_WIDTH_16; + break; + case 24: + case 32: + conf1 = HDMI_AUD_CONF1_WIDTH_24; + break; + } + + dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate); + + hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS); + hdmi_write(audio, conf0, HDMI_AUD_CONF0); + hdmi_write(audio, conf1, HDMI_AUD_CONF1); + + dw_hdmi_audio_enable(hdmi); + + return 0; +} + +static void dw_hdmi_i2s_audio_shutdown(struct device *dev, void *data) +{ + struct dw_hdmi_i2s_audio_data *audio = data; + struct dw_hdmi *hdmi = audio->hdmi; + + dw_hdmi_audio_disable(hdmi); + + hdmi_write(audio, HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); +} + +static struct hdmi_codec_ops dw_hdmi_i2s_ops = { + .hw_params = dw_hdmi_i2s_hw_params, + .audio_shutdown = dw_hdmi_i2s_audio_shutdown, +}; + +static int snd_dw_hdmi_probe(struct platform_device *pdev) +{ + struct dw_hdmi_i2s_audio_data *audio = pdev->dev.platform_data; + struct platform_device_info pdevinfo; + struct hdmi_codec_pdata pdata; + struct platform_device *platform; + + + pdata.ops = &dw_hdmi_i2s_ops; + pdata.i2s = 1; + pdata.max_i2s_channels = 6; + pdata.data = audio; + + memset(&pdevinfo, 0, sizeof(pdevinfo)); + pdevinfo.parent = pdev->dev.parent; + pdevinfo.id = PLATFORM_DEVID_AUTO; + pdevinfo.name = HDMI_CODEC_DRV_NAME; + pdevinfo.data = &pdata; + pdevinfo.size_data = sizeof(pdata); + pdevinfo.dma_mask = DMA_BIT_MASK(32); + + platform = platform_device_register_full(&pdevinfo); + if (IS_ERR_OR_NULL(platform)) + return PTR_ERR(platform); + + return 0; +} + +static struct platform_driver snd_dw_hdmi_driver = { + .probe = snd_dw_hdmi_probe, + .driver = { + .name = DRIVER_NAME, + .owner = THIS_MODULE, + }, +}; +module_platform_driver(snd_dw_hdmi_driver); + +MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>"); +MODULE_DESCRIPTION("Synopsis Designware HDMI I2S ALSA SoC interface"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 51f45ad..84e7e7c 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1921,10 +1921,11 @@ int dw_hdmi_bind(struct device *dev, struct device *master, struct device_node *np = dev->of_node; struct platform_device_info pdevinfo; struct device_node *ddc_node; - struct dw_hdmi_audio_data audio; struct dw_hdmi *hdmi; int ret; u32 val = 1; + u8 config0; + u8 config1; hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL); if (!hdmi) @@ -2093,7 +2094,12 @@ int dw_hdmi_bind(struct device *dev, struct device *master, pdevinfo.parent = dev; pdevinfo.id = PLATFORM_DEVID_AUTO; - if (hdmi_readb(hdmi, HDMI_CONFIG1_ID) & HDMI_CONFIG1_AHB) { + config0 = hdmi_readb(hdmi, HDMI_CONFIG0_ID); + config1 = hdmi_readb(hdmi, HDMI_CONFIG1_ID); + + if (config1 & HDMI_CONFIG1_AHB) { + struct dw_hdmi_audio_data audio; + audio.phys = iores->start; audio.base = hdmi->regs; audio.irq = irq; @@ -2105,6 +2111,18 @@ int dw_hdmi_bind(struct device *dev, struct device *master, pdevinfo.size_data = sizeof(audio); pdevinfo.dma_mask = DMA_BIT_MASK(32); hdmi->audio = platform_device_register_full(&pdevinfo); + } else if (config0 & HDMI_CONFIG0_I2S) { + struct dw_hdmi_i2s_audio_data audio; + + audio.hdmi = hdmi; + audio.write = hdmi_writeb; + audio.read = hdmi_readb; + + pdevinfo.name = "dw-hdmi-i2s-audio"; + pdevinfo.data = &audio; + pdevinfo.size_data = sizeof(audio); + pdevinfo.dma_mask = DMA_BIT_MASK(32); + hdmi->audio = platform_device_register_full(&pdevinfo); } /* Reset HDMI DDC I2C master controller and mute I2CM interrupts */ diff --git a/drivers/gpu/drm/bridge/dw-hdmi.h b/drivers/gpu/drm/bridge/dw-hdmi.h index 6aadc84..0336b91 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/dw-hdmi.h @@ -545,6 +545,10 @@ #define HDMI_I2CM_FS_SCL_LCNT_0_ADDR 0x7E12 enum { + +/* CONFIG0_ID field values */ + HDMI_CONFIG0_I2S = 0x10, + /* CONFIG1_ID field values */ HDMI_CONFIG1_AHB = 0x01, @@ -891,6 +895,17 @@ enum { HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL = 0x08, HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_MASK = 0x04, +/* AUD_CONF0 field values */ + HDMI_AUD_CONF0_SW_RESET = 0x80, + HDMI_AUD_CONF0_I2S_ALL_ENABLE = 0x2F, + +/* AUD_CONF1 field values */ + HDMI_AUD_CONF1_MODE_I2S = 0x00, + HDMI_AUD_CONF1_MODE_RIGHT_J = 0x02, + HDMI_AUD_CONF1_MODE_LEFT_J = 0x04, + HDMI_AUD_CONF1_WIDTH_16 = 0x10, + HDMI_AUD_CONF1_WIDTH_24 = 0x18, + /* AUD_CTS3 field values */ HDMI_AUD_CTS3_N_SHIFT_OFFSET = 5, HDMI_AUD_CTS3_N_SHIFT_MASK = 0xe0, @@ -905,6 +920,12 @@ enum { HDMI_AUD_CTS3_CTS_MANUAL = 0x10, HDMI_AUD_CTS3_AUDCTS19_16_MASK = 0x0f, +/* HDMI_AUD_INPUTCLKFS field values */ + HDMI_AUD_INPUTCLKFS_128FS = 0, + HDMI_AUD_INPUTCLKFS_256FS = 1, + HDMI_AUD_INPUTCLKFS_512FS = 2, + HDMI_AUD_INPUTCLKFS_64FS = 4, + /* AHB_DMA_CONF0 field values */ HDMI_AHB_DMA_CONF0_SW_FIFO_RST_OFFSET = 7, HDMI_AHB_DMA_CONF0_SW_FIFO_RST_MASK = 0x80, -- 1.9.1

2 4

[alsa-devel] MOTU Midi Express XT
by holger＠dehnhardt.org 31 Oct '16

31 Oct '16

I own a MOTU Midi Express XT 8x8 interface which is connected through the parallel port. Recently I upgraded my system and the new motherboard does not have an ISA parallel port anymore... So I bought a PCI parallel port extension card - hoping that it will work with the ALSA driver (mtpav). So I changed the interrupt an port address in modules.conf but the driver is no longer recognized as an ALSA driver even though it loads without errors. As the device still perfectly fits my needs I would like to modify the driver to get it working again. Can anyone give me advice what should be changed in the drivers code to make it work on a pci port? Thanks Holger

2 11