August 2015 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] probe issue for Dice/OXFW drivers
by Clemens Ladisch 17 Aug '15

17 Aug '15

Takashi Sakamoto wrote: > Recently, I received an issue from a user of Mackie Onyx-i series. > According to the user, snd-dice is not applied to his Dice model. > [...] According to the log, I cannot find the first > transaction which snd-dice performs. Additionally, no error messages in > syslog. There are some checks performed before the first actual transaction. The kernel loads the driver if an entry in dice_id_table[] matches, i.e., if version==1. This values indeed is in the unit directory: > ROM header and bus information block > ----------------------------------------------------------------- > 400 0404f507 bus_info_length 4, crc_length 4, crc 62727 > 404 31333934 bus_name "1394" > 408 e0008102 irmc 1, cmc 1, isc 1, bmc 0, cyc_clk_acc 0, max_rec 8 (512) > 40c 000ff210 company_id 000ff2 | > 410 01800af7 device_id 1001800af7 | EUI-64 000ff21001800af7 > > root directory > ----------------------------------------------------------------- > 414 000639d3 directory_length 6, crc 14803 > 418 03000ff2 vendor > 41c 8100000a --> descriptor leaf at 444 > 420 17000006 model > 424 8100000d --> descriptor leaf at 458 > 428 0c0087c0 node capabilities per IEEE 1394 > 42c d1000001 --> unit directory at 430 > > unit directory at 430 > ----------------------------------------------------------------- > 430 00045246 directory_length 4, crc 21062 > 434 12000ff2 specifier id > 438 13000001 version > 43c 17000006 model > 440 8100000b --> descriptor leaf at 46c The dice_interface_check() function then makes other checks: /* * Check that GUID and unit directory are constructed according to DICE * rules, i.e., that the specifier ID is the GUID's OUI, and that the * GUID chip ID consists of the 8-bit category ID, the 10-bit product * ID, and a 22-bit serial number. */ These values are correct, except for the category ID. The driver already has an category ID exception for Weiss devices. It would be possible to add another exception, but given that firmware writers apparently like to change this value without good reason, it might be a better idea to just remove the category ID check. Regards, Clemens

2 1

[alsa-devel] [PATCH 00/25] ALSA: support AMDTP variants
by Takashi Sakamoto 17 Aug '15

17 Aug '15

This patchset updates my previous RFC, excluding control/status message for TASCAM FireWire series and a MOTU driver, [alsa-devel] [RFC][PATCH 00/37] ALSA: firewire: support AMDTP variants http://mailman.alsa-project.org/pipermail/alsa-devel/2015-July/094789.html Unfortunately, I've got no dedicated testers to this patchset. While, the supported models have little time to live. I think it's time to merge them. This patchset supports playbacking/capturing PCM samples/MIDI messages. Model specific functionalities such as MIDI mapping to physical controls should be done in userspace, with propper asynchronous transactions. I hope users to remind that my work is done by reasoning and assuming with a result of investigating packets on IEEE 1394 bus. There's no published specification, thus these drivers cannot fully satisfies users' expectation which comes from Windows or OS X. Changes: * Fix minor bugs, mainly for asynchronous transaction helper for MIDI port. * Regain PCM hardware constraint (I missed it). * Fix TASCAM quirk for MIDI transactions, as much as possible. Rest of work (but may not be done in this developing period): * Handling control/status messages for TASCAM driver. * Supporting MIDI exclusive message for outgoing packets. * Researching a reason to de-synchronize for Digi00x family. * Improving MIDI throttle for asynchronous transaction helper Takashi Sakamoto (25): ALSA: firewire-lib: rename 'amdtp' to 'amdtp-stream' for functional separation ALSA: firewire-lib: functional separation for packet transmission layer and data processing layer ALSA: firewire-lib: add helper functions for asynchronous MIDI port ALSA: firewire-lib: add a restriction for a transaction at once ALSA: firewire-lib: schedule tasklet again when MIDI substream has rest of MIDI messages ALSA: firewire-lib: add throttle for MIDI data rate ALSA: firewire-lib: avoid endless loop to transfer MIDI messages at fatal error ALSA: firewire-digi00x: add skeleton for Digi 002/003 family ALSA: firewire-digi00x: add data processing layer ALSA: firewire-digi00x: add stream functionality ALSA: firewire-digi00x: add proc node to show clock status ALSA: firewire-digi00x: add PCM functionality ALSA: firewire-digi00x: add MIDI functionality ALSA: firewire-digi00x: add hwdep interface ALSA: firewire-digi00x: add support for asynchronous messaging ALSA: firewire-digi00x: add support for MIDI ports for machine control ALSA: firewire-tascam: add skeleton for TASCAM FireWire series ALSA: firewire-tascam: add a structure for model-dependent parameters. ALSA: firewire-tascam: add proc node to show firmware information ALSA: firewire-tascam: add data processing layer ALSA: firewire-tascam: add streaming functionality ALSA: firewire-tascam: add PCM functionality ALSA: firewire-tascam: add transaction functionality ALSA: firewire-tascam: add MIDI functionality ALSA: firewire-tascam: add hwdep interface include/uapi/sound/asound.h | 4 +- include/uapi/sound/firewire.h | 9 + sound/firewire/Kconfig | 27 ++ sound/firewire/Makefile | 4 +- sound/firewire/amdtp-am824.c | 451 ++++++++++++++++++++++++ sound/firewire/amdtp-am824.h | 47 +++ sound/firewire/{amdtp.c => amdtp-stream.c} | 375 ++++---------------- sound/firewire/{amdtp.h => amdtp-stream.h} | 113 ++---- sound/firewire/bebob/bebob.h | 2 +- sound/firewire/bebob/bebob_midi.c | 16 +- sound/firewire/bebob/bebob_pcm.c | 12 +- sound/firewire/bebob/bebob_stream.c | 34 +- sound/firewire/dice/dice-midi.c | 16 +- sound/firewire/dice/dice-pcm.c | 12 +- sound/firewire/dice/dice-stream.c | 41 ++- sound/firewire/dice/dice.h | 2 +- sound/firewire/digi00x/Makefile | 4 + sound/firewire/digi00x/amdtp-dot.c | 436 +++++++++++++++++++++++ sound/firewire/digi00x/digi00x-hwdep.c | 200 +++++++++++ sound/firewire/digi00x/digi00x-midi.c | 198 +++++++++++ sound/firewire/digi00x/digi00x-pcm.c | 353 +++++++++++++++++++ sound/firewire/digi00x/digi00x-proc.c | 99 ++++++ sound/firewire/digi00x/digi00x-stream.c | 422 +++++++++++++++++++++++ sound/firewire/digi00x/digi00x-transaction.c | 137 ++++++++ sound/firewire/digi00x/digi00x.c | 174 ++++++++++ sound/firewire/digi00x/digi00x.h | 157 +++++++++ sound/firewire/fcp.c | 2 +- sound/firewire/fireworks/fireworks.c | 12 +- sound/firewire/fireworks/fireworks.h | 2 +- sound/firewire/fireworks/fireworks_midi.c | 16 +- sound/firewire/fireworks/fireworks_pcm.c | 10 +- sound/firewire/fireworks/fireworks_stream.c | 8 +- sound/firewire/lib.c | 129 +++++++ sound/firewire/lib.h | 52 +++ sound/firewire/oxfw/oxfw-midi.c | 16 +- sound/firewire/oxfw/oxfw-pcm.c | 10 +- sound/firewire/oxfw/oxfw-stream.c | 11 +- sound/firewire/oxfw/oxfw.h | 2 +- sound/firewire/tascam/Makefile | 4 + sound/firewire/tascam/amdtp-tascam.c | 248 +++++++++++++ sound/firewire/tascam/tascam-hwdep.c | 202 +++++++++++ sound/firewire/tascam/tascam-midi.c | 162 +++++++++ sound/firewire/tascam/tascam-pcm.c | 298 ++++++++++++++++ sound/firewire/tascam/tascam-proc.c | 88 +++++ sound/firewire/tascam/tascam-stream.c | 497 +++++++++++++++++++++++++++ sound/firewire/tascam/tascam-transaction.c | 291 ++++++++++++++++ sound/firewire/tascam/tascam.c | 230 +++++++++++++ sound/firewire/tascam/tascam.h | 140 ++++++++ 48 files changed, 5277 insertions(+), 498 deletions(-) create mode 100644 sound/firewire/amdtp-am824.c create mode 100644 sound/firewire/amdtp-am824.h rename sound/firewire/{amdtp.c => amdtp-stream.c} (70%) rename sound/firewire/{amdtp.h => amdtp-stream.h} (77%) create mode 100644 sound/firewire/digi00x/Makefile create mode 100644 sound/firewire/digi00x/amdtp-dot.c create mode 100644 sound/firewire/digi00x/digi00x-hwdep.c create mode 100644 sound/firewire/digi00x/digi00x-midi.c create mode 100644 sound/firewire/digi00x/digi00x-pcm.c create mode 100644 sound/firewire/digi00x/digi00x-proc.c create mode 100644 sound/firewire/digi00x/digi00x-stream.c create mode 100644 sound/firewire/digi00x/digi00x-transaction.c create mode 100644 sound/firewire/digi00x/digi00x.c create mode 100644 sound/firewire/digi00x/digi00x.h create mode 100644 sound/firewire/tascam/Makefile create mode 100644 sound/firewire/tascam/amdtp-tascam.c create mode 100644 sound/firewire/tascam/tascam-hwdep.c create mode 100644 sound/firewire/tascam/tascam-midi.c create mode 100644 sound/firewire/tascam/tascam-pcm.c create mode 100644 sound/firewire/tascam/tascam-proc.c create mode 100644 sound/firewire/tascam/tascam-stream.c create mode 100644 sound/firewire/tascam/tascam-transaction.c create mode 100644 sound/firewire/tascam/tascam.c create mode 100644 sound/firewire/tascam/tascam.h -- 2.1.4

3 37

[alsa-devel] [PATCH 0/4] Minor cleanups to hda code
by Takashi Iwai 17 Aug '15

17 Aug '15

Hi, this is a series of trivial cleanup patches for HDA driver, mostly for procfs code. Takashi Iwai (4): ALSA: hda - Make some helper functions local ALSA: hda/proc - Add const to possible places ALSA: hda/proc - Fix racy string access for power states ALSA: hda/eld - Add const to possible places sound/pci/hda/hda_codec.c | 70 ------------------------------ sound/pci/hda/hda_codec.h | 7 --- sound/pci/hda/hda_eld.c | 10 ++--- sound/pci/hda/hda_proc.c | 107 +++++++++++++++++++++++++++++++++++----------- 4 files changed, 86 insertions(+), 108 deletions(-) -- 2.5.0

1 4

[alsa-devel] [PATCH] ASoC: topology: Add support for TLV bytes control
by mengdong.lin＠intel.com 17 Aug '15

17 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Allow vendor drivers to define bespoke bytes ext handlers and IDs for TLV bytes controls. And the topology core will bind these handlers by matching IDs defined by the vendor driver and user space topology data file. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index 865a141..3e412c6 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -89,6 +89,13 @@ struct snd_soc_tplg_kcontrol_ops { struct snd_ctl_elem_info *uinfo); }; +/* Bytes ext operations, for TLV byte controls */ +struct snd_soc_tplg_bytes_ext_ops { + u32 id; + int (*get)(unsigned int __user *bytes, unsigned int size); + int (*put)(const unsigned int __user *bytes, unsigned int size); +}; + /* * DAPM widget event handlers - used to map handlers onto widgets. */ @@ -139,6 +146,10 @@ struct snd_soc_tplg_ops { /* bespoke kcontrol handlers available for binding */ const struct snd_soc_tplg_kcontrol_ops *io_ops; int io_ops_count; + + /* bespoke bytes ext handlers available for binding */ + const struct snd_soc_tplg_bytes_ext_ops *bytes_ext_ops; + int bytes_ext_ops_count; }; /* gets a pointer to data from the firmware block header */ diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 607f98b..b5a2868 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -70,6 +70,10 @@ struct soc_tplg { const struct snd_soc_tplg_kcontrol_ops *io_ops; int io_ops_count; + /* bespoke bytes ext handlers, for TLV bytes controls */ + const struct snd_soc_tplg_bytes_ext_ops *bytes_ext_ops; + int bytes_ext_ops_count; + /* optional fw loading callbacks to component drivers */ struct snd_soc_tplg_ops *ops; }; @@ -513,6 +517,15 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, { int i; + /* TLV bytes controls don't need get/put ops */ + if (k->iface & SNDRV_CTL_ELEM_IFACE_MIXER + && k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE + && k->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK + && hdr->ops.info == SND_SOC_TPLG_CTL_BYTES) { + k->info = snd_soc_bytes_info_ext; + return 0; + } + /* try and map standard kcontrols handler first */ for (i = 0; i < num_ops; i++) { @@ -547,6 +560,32 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, return -EINVAL; } +/* bind bytes ext get/put handlers for TLV bytes controls */ +static int soc_tplg_bytes_ext_bind_io(struct soc_tplg *tplg, + struct snd_soc_tplg_io_ops *ops_id, + struct soc_bytes_ext *sbe) +{ + const struct snd_soc_tplg_bytes_ext_ops *ops = tplg->bytes_ext_ops; + int num_ops = tplg->bytes_ext_ops_count; + int i; + + /* try bespoke handlers */ + for (i = 0; i < num_ops; i++) { + + if (sbe->put == NULL && ops[i].id == ops_id->put) + sbe->put = ops[i].put; + if (sbe->get == NULL && ops[i].id == ops_id->get) + sbe->get = ops[i].get; + } + + /* bespoke handlers found ? */ + if (sbe->put && sbe->get) + return 0; + + /* nothing to bind */ + return -EINVAL; +} + /* bind a widgets to it's evnt handlers */ int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w, const struct snd_soc_tplg_widget_events *events, @@ -690,6 +729,14 @@ static int soc_tplg_dbytes_create(struct soc_tplg *tplg, unsigned int count, continue; } + /* create any TLV data */ + soc_tplg_create_tlv(tplg, &kc, &be->hdr); + /* map bytes ext io handlers for TLV bytes controls */ + if (kc.access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { + soc_tplg_bytes_ext_bind_io(tplg, + &be->ext_ops, sbe); + } + /* pass control to driver for optional further init */ err = soc_tplg_init_kcontrol(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)be); @@ -1315,6 +1362,14 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dbytes_create( continue; } + /* create any TLV data */ + soc_tplg_create_tlv(tplg, &kc[i], &be->hdr); + /* map bytes ext io handlers for TLV bytes controls */ + if (kc[i].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { + soc_tplg_bytes_ext_bind_io(tplg, + &be->ext_ops, sbe); + } + /* pass control to driver for optional further init */ err = soc_tplg_init_kcontrol(tplg, &kc[i], (struct snd_soc_tplg_ctl_hdr *)be); @@ -1736,6 +1791,8 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, tplg.req_index = id; tplg.io_ops = ops->io_ops; tplg.io_ops_count = ops->io_ops_count; + tplg.bytes_ext_ops = ops->bytes_ext_ops; + tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count; return soc_tplg_load(&tplg); } -- 1.9.1

3 5

[alsa-devel] [PATCH v2 0/2] USB audio fixes
by Pierre-Louis Bossart 16 Aug '15

16 Aug '15

While trying to understand how asynchronous endpoints are supported, I identified two major issues. On my M-Audio transit, the following script tries to play using the 3 different endpoints supported and fails (error and no audio) after the first playback without the patches. With the patches on top of 4.1.5 or Takashi's for-next (4.2.0-rc5), I stopped the audio after an hour. while true do aplay -d5 -Dhw:2,0 ~/16_48.wav # play 48kHz, 16 bit on async ep aplay -d5 -Dhw:2,0 ~/24_48.wav # play 48kHz, 24 bit on 'none'/async ep aplay -d5 -Dhw:2,0 ~/24_96.wav # play 96 kHz, 24 bit on adaptive ep aplay -d5 -Dhw:2,0 ~/24_48.wav aplay -d5 -Dhw:2,0 ~/16_48.wav aplay -d5 -Dhw:2,0 ~/24_96.wav done The first issue is pretty bad with corrupted pointers. When transitioning from a alternate setting with a sync_endpoint to another which doesn't have one by construction (synchronous, adaptive, async on capture), the pointers are not reset and the code tries to set the parameters of a non-existent endpoint. The second issue is that the M-audio Transit descriptors are illegal but the logic can be changed without harm. I sometimes hear noise on playback start, probably the code needs to be changed to add enough silent samples to let the PLL lock. I haven't had time to work on this and this is more of an enhancement. v2: applied Takashi's comments unconditional clean-up of sync_endpoint pointers better logical tests and removal of goto Pierre-Louis Bossart (2): ALSA: usb: fix corrupted pointers due to interface setting change ALSA: usb: handle descriptor with SYNC_NONE illegal value sound/usb/pcm.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) -- 1.9.1

2 3

[alsa-devel] BugReport: Dice works partially [Broken]
by Stanislav Sergiienko 16 Aug '15

16 Aug '15

Hi, I am a user of TC Electronic DesktopKonnekt6 and latest kernel update 3.19.2 add partial support for my device and thus broke my usual sound workflow. So i want to make good bug report to make device usable on latest kernels. With 3.19.2 kernel device is successfully recognized by system and even sometimes can play sound(!). But always, after some time sound is breaks (usually after 30-90 seconds) and to restore it i must restart pulseaudio(v6.0) and application. So device becomes unusable on latests kernels. Earlier i use my sound card through ffado + jackdbus + pulseaudio. Now it's impossible, so i have to downgrade kernel. Please request any additional info that you need to fix problem and i will post it here soon. Also i can test any "bleeding edge" changes thru dkms as described here: https://github.com/takaswie/snd-firewire-improve Related bug(not mine): https://bugs.archlinux.org/task/44258 Some useful info: cat /proc/asound/cards 0 [DesktopKonnekt6]: DICE - DesktopKonnekt6 TC Electronic DesktopKonnekt6 (serial 12941) at fw1.0, S400 cat /proc/asound/card0/dice sections: global: offset 10, size 90 tx: offset 100, size 142 rx: offset 242, size 282 ext_sync: offset 524, size 4 unused2: offset 0, size 0 global: owner: ffc1:000100000000 notification: 00000040 nick name: DesktopKonnekt6 clock select: internal 44100 enable: 1 status: locked 44100 ext status: 00000000 sample rate: 44100 version: 1.0.4.0 clock caps: 44100 48000 88200 96000 176400 192000 arx1 arx2 internal clock source names: Unused\Unused\Unused\Unused\Unused\Unused\Unused\Unused\Unused\Unused\Unused\Unused\INTERNAL\\ tx 0: iso channel: 0 audio channels: 6 midi ports: 0 speed: S400 names: ch 1\ch 2\ - \ - \ - \ - \\ ac3 caps: 00000000 ac3 enable: 00000000 rx 0: iso channel: 1 sequence start: 0 audio channels: 6 midi ports: 0 names: main out 1\main out 2\phones out 1\phones out 2\ - \ - \\ ac3 caps: 00000000 ac3 enable: 00000000 ext status: clock source: internal locked: 1 rate: 44100 adat user data: 0

3 4

[alsa-devel] [PATCH 0/9] Add DSP topology management for SKL
by Subhransu S. Prusty 15 Aug '15

15 Aug '15

[RESEND of the series after removing the extra patches] The SKL driver does not code DSP topology in driver. With this series the soc topology framework is used to parse the topology information to create widgets, controls and route map for the FW topology. It adds routines for SKL DSP module configuration, compute resources for modules, initialize and bind the pipe modules. It uses the SKL IPC library added earlier to send IPC for initialize the module, bind/unbind modules. Last patch in this series removes the unused dais. Jeeja KP (9): ASoC: Intel: Skylake: Add pipe and modules handlers ASoC: Intel: Skylake: Add module configuration helpers ASoC: Intel: Skylake: add DSP platform widget event handlers ASoC: Intel: Skylake: Add FE and BE hw_params handling ASoC: Intel: Skylake: Add topology core init and handlers ASoC: Intel: Skylake: Initialize and load DSP controls ASoC: Intel: Skylake: Add DSP support and enable it ASoC: Intel: Skylake: Initialize NHLT table ASoC: Intel: Skylake: Remove CPU dai that is not used sound/soc/intel/skylake/Makefile | 3 +- sound/soc/intel/skylake/skl-pcm.c | 173 ++-- sound/soc/intel/skylake/skl-topology.c | 1264 ++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-topology.h | 21 + sound/soc/intel/skylake/skl-tplg-interface.h | 78 ++ sound/soc/intel/skylake/skl.c | 29 +- sound/soc/intel/skylake/skl.h | 11 + 7 files changed, 1511 insertions(+), 68 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-topology.c -- 2.4.3

3 28

[alsa-devel] [asoc:topic/fsl-card 2/2] sound/soc/fsl/fsl-asoc-card.c:486:29: error: 'WM8960_SYSCLK_AUTO' undeclared
by kbuild test robot 15 Aug '15

15 Aug '15

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/fsl-card head: 50e0ee01382b8e08289d3db209738c5856fd25cf commit: 50e0ee01382b8e08289d3db209738c5856fd25cf [2/2] ASoC: fsl-asoc-card: add wm8960 support config: xtensa-allyesconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/m… -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 50e0ee01382b8e08289d3db209738c5856fd25cf # save the attached .config to linux build tree make.cross ARCH=xtensa All error/warnings (new ones prefixed by >>): sound/soc/fsl/fsl-asoc-card.c: In function 'fsl_asoc_card_probe': >> sound/soc/fsl/fsl-asoc-card.c:486:29: error: 'WM8960_SYSCLK_AUTO' undeclared (first use in this function) priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO; ^ sound/soc/fsl/fsl-asoc-card.c:486:29: note: each undeclared identifier is reported only once for each function it appears in vim +/WM8960_SYSCLK_AUTO +486 sound/soc/fsl/fsl-asoc-card.c 480 priv->codec_priv.fll_id = WM8962_SYSCLK_FLL; 481 priv->codec_priv.pll_id = WM8962_FLL; 482 priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; 483 } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8960")) { 484 codec_dai_name = "wm8960-hifi"; 485 priv->card.set_bias_level = fsl_asoc_card_set_bias_level; > 486 priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO; 487 priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO; 488 priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; 489 } else { --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: fsl: fix typos for sound/soc/fsl/*
by Xiubo Li 15 Aug '15

15 Aug '15

There are too much noise about the typos for fsl's drivers. So I fix all the typos here in this patch in almost every file I touched. Signed-off-by: Xiubo Li <lixiubo(a)cmss.chinamobile.com> --- sound/soc/fsl/eukrea-tlv320.c | 2 +- sound/soc/fsl/fsl_sai.h | 12 ++++++------ sound/soc/fsl/fsl_spdif.c | 6 +++--- sound/soc/fsl/fsl_ssi.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index e1aa3834..883087f 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -182,7 +182,7 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) ); } else { if (np) { - /* The eukrea,asoc-tlv320 driver was explicitely + /* The eukrea,asoc-tlv320 driver was explicitly * requested (through the device tree). */ dev_err(&pdev->dev, diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 0662809..b4666fd 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -45,7 +45,7 @@ #define FSL_SAI_xFR(tx) (tx ? FSL_SAI_TFR : FSL_SAI_RFR) #define FSL_SAI_xMR(tx) (tx ? FSL_SAI_TMR : FSL_SAI_RMR) -/* SAI Transmit/Recieve Control Register */ +/* SAI Transmit/Receive Control Register */ #define FSL_SAI_CSR_TERE BIT(31) #define FSL_SAI_CSR_FR BIT(25) #define FSL_SAI_CSR_SR BIT(24) @@ -67,10 +67,10 @@ #define FSL_SAI_CSR_FRIE BIT(8) #define FSL_SAI_CSR_FRDE BIT(0) -/* SAI Transmit and Recieve Configuration 1 Register */ +/* SAI Transmit and Receive Configuration 1 Register */ #define FSL_SAI_CR1_RFW_MASK 0x1f -/* SAI Transmit and Recieve Configuration 2 Register */ +/* SAI Transmit and Receive Configuration 2 Register */ #define FSL_SAI_CR2_SYNC BIT(30) #define FSL_SAI_CR2_MSEL_MASK (0x3 << 26) #define FSL_SAI_CR2_MSEL_BUS 0 @@ -82,12 +82,12 @@ #define FSL_SAI_CR2_BCD_MSTR BIT(24) #define FSL_SAI_CR2_DIV_MASK 0xff -/* SAI Transmit and Recieve Configuration 3 Register */ +/* SAI Transmit and Receive Configuration 3 Register */ #define FSL_SAI_CR3_TRCE BIT(16) #define FSL_SAI_CR3_WDFL(x) (x) #define FSL_SAI_CR3_WDFL_MASK 0x1f -/* SAI Transmit and Recieve Configuration 4 Register */ +/* SAI Transmit and Receive Configuration 4 Register */ #define FSL_SAI_CR4_FRSZ(x) (((x) - 1) << 16) #define FSL_SAI_CR4_FRSZ_MASK (0x1f << 16) #define FSL_SAI_CR4_SYWD(x) (((x) - 1) << 8) @@ -97,7 +97,7 @@ #define FSL_SAI_CR4_FSP BIT(1) #define FSL_SAI_CR4_FSD_MSTR BIT(0) -/* SAI Transmit and Recieve Configuration 5 Register */ +/* SAI Transmit and Receive Configuration 5 Register */ #define FSL_SAI_CR5_WNW(x) (((x) - 1) << 24) #define FSL_SAI_CR5_WNW_MASK (0x1f << 24) #define FSL_SAI_CR5_W0W(x) (((x) - 1) << 16) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 8e93221..400d60e 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -707,7 +707,7 @@ static int fsl_spdif_subcode_get(struct snd_kcontrol *kcontrol, return ret; } -/* Q-subcode infomation. The byte size is SPDIF_UBITS_SIZE/8 */ +/* Q-subcode information. The byte size is SPDIF_UBITS_SIZE/8 */ static int fsl_spdif_qinfo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -739,7 +739,7 @@ static int fsl_spdif_qget(struct snd_kcontrol *kcontrol, return ret; } -/* Valid bit infomation */ +/* Valid bit information */ static int fsl_spdif_vbit_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -767,7 +767,7 @@ static int fsl_spdif_vbit_get(struct snd_kcontrol *kcontrol, return 0; } -/* DPLL lock infomation */ +/* DPLL lock information */ static int fsl_spdif_rxrate_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index c0b940e..b759448 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -156,7 +156,7 @@ struct fsl_ssi_soc_data { * * @dbg_stats: Debugging statistics * - * @soc: SoC specifc data + * @soc: SoC specific data */ struct fsl_ssi_private { struct regmap *regs; @@ -1210,7 +1210,7 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev, } } - /* For those SLAVE implementations, we ingore non-baudclk cases + /* For those SLAVE implementations, we ignore non-baudclk cases * and, instead, abandon MASTER mode that needs baud clock. */ ssi_private->baudclk = devm_clk_get(&pdev->dev, "baud"); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: adav80x: Remove .read_flag_mask setting from adav80x_regmap_config
by Axel Lin 15 Aug '15

15 Aug '15

Don't set .read_flag_mask for adav803, it's for adav801 only. Fixes: 0c2d69645628 ("ASoC: adav80x: Split SPI and I2C code into different modules") Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/adav80x.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index 88fd37c..198c924 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -865,7 +865,6 @@ const struct regmap_config adav80x_regmap_config = { .val_bits = 8, .pad_bits = 1, .reg_bits = 7, - .read_flag_mask = 0x01, .max_register = ADAV80X_PLL_OUTE, -- 2.1.0

3 2