March 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 2/3] sound: usb: line6: Replace mdelay with msleep in line6_write_data
by Jia-Ju Bai 18 Mar '18

18 Mar '18

line6_write_data() is never called in atomic context. The call chains ending up at line6_write_data() are: [1] line6_write_data() <- toneport_setup() <- toneport_init() <- line6_probe() [2] line6_write_data() <- toneport_setup() <- toneport_reset_resume() line6_probe() is called in toneport_probe(), pod_probe(), podhd_probe() and variax_probe(), which are set as ".probe" in usb_driver structure. toneport_reset_resume() is set as ".reset_resume" in usb_driver structure. These functions are not called in atomic context. Despite never getting called from atomic context, line6_write_data() calls mdelay for busy wait. That is not necessary and can be replaced with msleep to avoid busy waiting. This is found by a static analysis tool named DCNS written by myself. Signed-off-by: Jia-Ju Bai <baijiaju1990(a)gmail.com> --- sound/usb/line6/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 0ff5a7d..29acd86 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -426,7 +426,7 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data, } for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) { - mdelay(LINE6_READ_WRITE_STATUS_DELAY); + msleep(LINE6_READ_WRITE_STATUS_DELAY); ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67, -- 1.9.1

1 0

[alsa-devel] unstable channel assignments for 8 channel codec
by Daniel Loranger 18 Mar '18

18 Mar '18

Hello all, I don't know if anyone can help me, or if this is even the right place to track down an issue I am facing. I have tried the developer, and filed a bug in github against the c code, but not getting any responses. I am using an audio injector octo sound board on a raspberry pi 3. this sound board has 6 inputs and 8 outputs. The issue I am facing is the audio channels appear to be randomly assigned each time speaker-test utility is ran. My best guess at this point is there is a missing configuration in either the C driver or in the alsa configuration. I am hoping the latter hence my reaching out here. My research has lead me to think that the missing information is related to the channel assignments are missing from the config, but I am out of my league in understanding the right way to go about this. here is the driver if that is relevant at all https://github.com/raspberrypi/linux/blob/rpi-4.9.y/sound/soc/bcm/audioinje… I have configured per the device manufacturers instructions as follow here is the asoundrc contents pcm.!default { # type hw # card 0 type plug slave.pcm "anyChannelCount" } ctl.!default { type hw card 0 } Here is the asound.conf contents pcm.!default { # type hw # card 0 type plug slave.pcm "anyChannelCount" } ctl.!default { type hw card 0 } pcm.anyChannelCount { type route slave.pcm "hw:0" slave.channels 8; ttable { 0.0 1 1.1 1 2.2 1 3.3 1 4.4 1 5.5 1 6.6 1 7.7 1 } } ctl.anyChannelCount { type hw; card 0; } -- Daniel Loranger

1 0

[alsa-devel] [PATCH] ALSA: hda/realtek - Always immediately update mute LED with pin VREF
by Takashi Iwai 17 Mar '18

17 Mar '18

Some HP laptops have a mute mute LED controlled by a pin VREF. The Realtek codec driver updates the VREF via vmaster hook by calling snd_hda_set_pin_ctl_cache(). This works fine as long as the driver is running in a normal mode. However, when the VREF change happens during the codec being in runtime PM suspend, the regmap access will skip and postpone the actual register change. This ends up with the unchanged LED status until the next runtime PM resume even if you change the Master mute switch. (Interestingly, the machine keeps the LED status even after the codec goes into D3 -- but it's another story.) For improving this usability, let the driver temporarily powering up / down only during the pin VREF change. This can be achieved easily by wrapping the call with snd_hda_power_up_pm() / *_down_pm(). Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199073 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 9af301c6bba2..5ef056f2aecc 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3596,8 +3596,12 @@ static void alc269_fixup_mic_mute_hook(void *private_data, int enabled) pinval = snd_hda_codec_get_pin_target(codec, spec->mute_led_nid); pinval &= ~AC_PINCTL_VREFEN; pinval |= enabled ? AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_80; - if (spec->mute_led_nid) + if (spec->mute_led_nid) { + /* temporarily power up/down for setting VREF */ + snd_hda_power_up_pm(codec); snd_hda_set_pin_ctl_cache(codec, spec->mute_led_nid, pinval); + snd_hda_power_down_pm(codec); + } } /* Make sure the led works even in runtime suspend */ -- 2.16.2

1 0

[alsa-devel] alsalib and snd_pcm_hw_params_set_rate_minmax
by Oleksandr Andrushchenko 16 Mar '18

16 Mar '18

Hi, Is it possible for user-space to reduce configuration space with snd_pcm_hw_params_set_rate_minmax and then change it with another snd_pcm_hw_params_set_rate_minmax with values out of the reduced config? For example, the initial min/max is 44100/48000 and I set 44100 first, e.g. snd_pcm_hw_params_set_rate_minmax(handle, hw_params, 44100, 0, 44100, 0) and then want snd_pcm_hw_params_set_rate_minmax(handle, hw_params, 48000, 0, 48000, 0) Obviously, the last call fails as we have already a reduced space of [44100; 44100]. Is there a way I can still set the range to [48000; 48000]? Thank you, Oleksandr P.S. This is in context of work done for [1] [1] https://www.spinics.net/lists/alsa-devel/msg75382.html

4 12

[alsa-devel] [PATCH 0/7] Enablement of BT I2S controller instance for AMD APUs
by Vijendar Mukunda 16 Mar '18

16 Mar '18

This patch set updates Audio CoProcessor (ACP) audio drivers to enable BT I2S controller instance. In Audio Coprocessor, There are three I2S controllers can be configured/enabled.(I2S SP, I2S MICSP, BT I2S) Default enabled I2S controller instance is I2S SP instance. There is a requirement to enable BT I2S controller Instance along with I2S SP controller instance. This patch set bring up functionality to render & capture on BT I2S controller instance. The current code is based on asoc-next, but I'm happy to rebase on whatever tree this ends up going through if there are any problems applying. Vijendar Mukunda (7): ASoC: amd: dma driver changes for BT I2S controller instance ASoC: amd: dma descriptor changes for BT I2S Instance ASoC: amd: Interrupt handler changes for BT I2S instance ASoC: amd: prepare callback modifications for bt i2s instance ASoC: amd: pointer and trigger callback modifications for bt i2s ASoC: amd: 16bit resolution support for bt i2s instance ASoC: amd: enabling bt i2s config after acp reset sound/soc/amd/acp-pcm-dma.c | 521 +++++++++++++++++++++++++++++++++++--------- sound/soc/amd/acp.h | 52 ++++- 2 files changed, 460 insertions(+), 113 deletions(-) -- 2.7.4

3 11

[alsa-devel] [PATCH] ALSA: core: Allow drivers to set R/W wait time.
by Liam Girdwood 16 Mar '18

16 Mar '18

Currently ALSA core blocks userspace for about 10 seconds for PCM R/W IO. This needs to be configurable for modern hardware like DSPs where no pointer update in milliseconds can indicate terminal DSP errors. Add a substream variable to set the wait time in ms. This allows userspace and drivers to recover more quickly from terminal DSP errors. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/pcm.h | 6 ++++++ sound/core/pcm_lib.c | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index e054c583d3b3..e4694684c524 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -462,6 +462,7 @@ struct snd_pcm_substream { /* -- timer section -- */ struct snd_timer *timer; /* timer */ unsigned timer_running: 1; /* time is running */ + unsigned wait_time; /* time in ms for R/W to wait for avail */ /* -- next substream -- */ struct snd_pcm_substream *next; /* -- linked substreams -- */ @@ -579,6 +580,11 @@ int snd_pcm_start(struct snd_pcm_substream *substream); int snd_pcm_stop(struct snd_pcm_substream *substream, snd_pcm_state_t status); int snd_pcm_drain_done(struct snd_pcm_substream *substream); int snd_pcm_stop_xrun(struct snd_pcm_substream *substream); +static inline void snd_pcm_wait_time(struct snd_pcm_substream *substream, + unsigned wait_time) +{ + substream->wait_time = wait_time; +} #ifdef CONFIG_PM int snd_pcm_suspend(struct snd_pcm_substream *substream); int snd_pcm_suspend_all(struct snd_pcm *pcm); diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index a83152e7d387..2ee76c70f55f 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1839,12 +1839,17 @@ static int wait_for_avail(struct snd_pcm_substream *substream, if (runtime->no_period_wakeup) wait_time = MAX_SCHEDULE_TIMEOUT; else { - wait_time = 10; - if (runtime->rate) { - long t = runtime->period_size * 2 / runtime->rate; - wait_time = max(t, wait_time); + /* use wait time from substream if available */ + if (substream->wait_time) { + wait_time = msecs_to_jiffies(substream->wait_time); + } else { + wait_time = 10; + if (runtime->rate) { + long t = runtime->period_size * 2 / runtime->rate; + wait_time = max(t, wait_time); + } + wait_time = msecs_to_jiffies(wait_time * 1000); } - wait_time = msecs_to_jiffies(wait_time * 1000); } for (;;) { -- 2.14.1

3 7

[alsa-devel] [Xen-devel][PATCH v2 0/3] sndif: add explicit back and front synchronization
by Oleksandr Andrushchenko 16 Mar '18

16 Mar '18

From: Oleksandr Andrushchenko <oleksandr_andrushchenko(a)epam.com> Hello, all! In order to provide explicit synchronization between backend and frontend the following changes are introduced in the protocol: - bump protocol version to 2 - add new ring buffer for sending asynchronous events from backend to frontend to report number of bytes played by the frontend (XENSND_EVT_CUR_POS) - introduce trigger events for playback control: start/stop/pause/resume - add "req-" prefix to event-channel and ring-ref to unify naming of the Xen event channels for requests and events Changes since v1: 1. Changed protocol version definition from string to integer, so it can easily be used in comparisons. Konrad, I have removed your r-b tag for the reason of this change. 2. In order to provide explicit stream parameter negotiation between backend and frontend the following changes are introduced in the protocol: add XENSND_OP_HW_PARAM_QUERY request to read/update configuration space for the parameter given: request passes desired parameter interval (mask) and the response to this request returns min/max interval (mask) for the parameter to be used. Parameters supported by this request/response: - format mask - sample rate interval - number of channels interval - buffer size, interval, frames - period size, interval, frames Thank you, Oleksandr Andrushchenko Oleksandr Andrushchenko (3): sndif: Introduce protocol version sndif: Add explicit back and front synchronization sndif: Add explicit back and front parameter negotiation xen/include/public/io/sndif.h | 295 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 286 insertions(+), 9 deletions(-) -- 2.7.4

2 6

Re: [alsa-devel] [PATCH] [sound] hdac-codec runtime suspended at PM:Suspend.
by Subhransu S. Prusty 15 Mar '18

15 Mar '18

On Wed, Mar 14, 2018 at 09:07:14PM +0530, Anshuman Gupta wrote: > On Wed, Mar 14, 2018 at 11:53:58AM +0100, Rafael J. Wysocki wrote: > > On Wed, Mar 14, 2018 at 11:38 AM, Anshuman Gupta > > <anshuman.gupta(a)intel.com> wrote: > > > On Mon, Mar 12, 2018 at 12:26:53PM +0100, Rafael J. Wysocki wrote: > > >> On Mon, Mar 12, 2018 at 12:17 PM, Anshuman Gupta > > >> <anshuman.gupta(a)intel.com> wrote: > > >> > > > >> > + if (pm_runtime_status_suspended(dev)) > > >> > + return; > > >> > > >> That, again, is somewhat fragile from the concurrency perspective. > > >> > > > > And here you want to avoid the below if the device is still suspended. > Yes, if we do not avoid the code below, complete callback takes about > 3 seconds due to snd_hdac_codec_read timed out because hdac controller > would be in runtime suspend state. > > > > Why is the below code located in the ->complete callback anyway? > > Shouldn't it be there in the ->resume one? > > > Yes even i am also having same doubt, why these power down and power up > sequences are part of prepare and complete callback. > Adding driver author "Subhransu S. Prusty" to provide more inputs on this. This driver needs a late resume as it receives a jack notification from the i915 driver and the skl controller driver resume may not have happened and in turn hda controller may not ready. This ensures a synchronization for jack event during resume from S3. I think this patch defeats the purpose. Regards, Subhransu > > >> > /* Power up afg */ > > >> > snd_hdac_codec_read(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE, > > >> > AC_PWRST_D0); > > >> > -- > > >> > 2.7.4 > > -- > Thanks, > Anshuman --

2 1

[alsa-devel] [PATCH 00/47] arch-removal: device drivers
by Arnd Bergmann 15 Mar '18

15 Mar '18

Hi driver maintainers, I just posted one series with the removal of eight architectures, see https://lkml.org/lkml/2018/3/14/505 for details, or https://lwn.net/Articles/748074/ for more background. These are the device drivers that go along with them. I have already picked up the drivers for arch/metag/ into my tree, they were reviewed earlier. Please let me know if you have any concerns with the patch, or if you prefer to pick up the patches in your respective trees. I created the patches with 'git format-patch -D', so they will not apply without manually removing those files. For anything else, I'd keep the removal patches in my asm-generic tree and will send a pull request for 4.17 along with the actual arch removal. Arnd Arnd Bergmann edac: remove tile driver net: tile: remove ethernet drivers net: adi: remove blackfin ethernet drivers net: 8390: remove m32r specific bits net: remove cris etrax ethernet driver net: smsc: remove m32r specific smc91x configuration raid: remove tile specific raid6 implementation rtc: remove tile driver rtc: remove bfin driver char: remove obsolete ds1302 rtc driver char: remove tile-srom.c char: remove blackfin OTP driver pcmcia: remove m32r drivers pcmcia: remove blackfin driver ASoC: remove blackfin drivers video/logo: remove obsolete logo files fbdev: remove blackfin drivers fbdev: s1d13xxxfb: remove m32r specific hacks crypto: remove blackfin CRC driver media: platform: remove blackfin capture driver media: platform: remove m32r specific arv driver cpufreq: remove blackfin driver cpufreq: remove cris specific drivers gpio: remove etraxfs driver pinctrl: remove adi2/blackfin drivers ata: remove bf54x driver input: keyboard: remove bf54x driver input: misc: remove blackfin rotary driver mmc: remove bfin_sdh driver can: remove bfin_can driver watchdog: remove bfin_wdt driver mtd: maps: remove bfin-async-flash driver mtd: nand: remove bf5xx_nand driver spi: remove blackfin related host drivers i2c: remove bfin-twi driver pwm: remobe pwm-bfin driver usb: host: remove tilegx platform glue usb: musb: remove blackfin port usb: isp1362: remove blackfin arch glue serial: remove cris/etrax uart drivers serial: remove blackfin drivers serial: remove m32r_sio driver serial: remove tile uart driver tty: remove bfin_jtag_comm and hvc_bfin_jtag drivers tty: hvc: remove tile driver staging: irda: remove bfin_sir driver staging: iio: remove iio-trig-bfin-timer driver .../devicetree/bindings/gpio/gpio-etraxfs.txt | 22 - .../bindings/serial/axis,etraxfs-uart.txt | 22 - Documentation/watchdog/watchdog-parameters.txt | 5 - MAINTAINERS | 8 - drivers/ata/Kconfig | 9 - drivers/ata/Makefile | 1 - drivers/ata/pata_bf54x.c | 1703 -------- drivers/char/Kconfig | 48 - drivers/char/Makefile | 3 - drivers/char/bfin-otp.c | 237 -- drivers/char/ds1302.c | 357 -- drivers/char/tile-srom.c | 475 --- drivers/cpufreq/Makefile | 3 - drivers/cpufreq/blackfin-cpufreq.c | 217 - drivers/cpufreq/cris-artpec3-cpufreq.c | 93 - drivers/cpufreq/cris-etraxfs-cpufreq.c | 92 - drivers/crypto/Kconfig | 7 - drivers/crypto/Makefile | 1 - drivers/crypto/bfin_crc.c | 753 ---- drivers/crypto/bfin_crc.h | 124 - drivers/edac/Kconfig | 8 - drivers/edac/Makefile | 2 - drivers/edac/tile_edac.c | 265 -- drivers/gpio/Kconfig | 9 - drivers/gpio/Makefile | 1 - drivers/gpio/gpio-etraxfs.c | 475 --- drivers/i2c/busses/Kconfig | 18 - drivers/i2c/busses/Makefile | 1 - drivers/i2c/busses/i2c-bfin-twi.c | 737 ---- drivers/input/keyboard/Kconfig | 9 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/bf54x-keys.c | 396 -- drivers/input/misc/Kconfig | 9 - drivers/input/misc/Makefile | 1 - drivers/input/misc/bfin_rotary.c | 294 -- drivers/media/platform/Kconfig | 22 - drivers/media/platform/Makefile | 4 - drivers/media/platform/arv.c | 884 ---- drivers/media/platform/blackfin/Kconfig | 16 - drivers/media/platform/blackfin/Makefile | 2 - drivers/media/platform/blackfin/bfin_capture.c | 983 ----- drivers/media/platform/blackfin/ppi.c | 361 -- drivers/mmc/host/Kconfig | 19 - drivers/mmc/host/Makefile | 1 - drivers/mmc/host/bfin_sdh.c | 679 ---- drivers/mtd/maps/Kconfig | 10 - drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/bfin-async-flash.c | 196 - drivers/mtd/nand/raw/Kconfig | 32 - drivers/mtd/nand/raw/Makefile | 1 - drivers/mtd/nand/raw/bf5xx_nand.c | 861 ---- drivers/net/Makefile | 1 - drivers/net/can/Kconfig | 9 - drivers/net/can/Makefile | 1 - drivers/net/can/bfin_can.c | 784 ---- drivers/net/cris/Makefile | 1 - drivers/net/cris/eth_v10.c | 1742 -------- drivers/net/ethernet/8390/Kconfig | 3 +- drivers/net/ethernet/8390/ne.c | 23 +- drivers/net/ethernet/Kconfig | 2 - drivers/net/ethernet/Makefile | 2 - drivers/net/ethernet/adi/Kconfig | 66 - drivers/net/ethernet/adi/Makefile | 5 - drivers/net/ethernet/adi/bfin_mac.c | 1881 --------- drivers/net/ethernet/adi/bfin_mac.h | 104 - drivers/net/ethernet/smsc/Kconfig | 4 +- drivers/net/ethernet/smsc/smc91x.h | 26 - drivers/net/ethernet/tile/Kconfig | 18 - drivers/net/ethernet/tile/Makefile | 11 - drivers/net/ethernet/tile/tilegx.c | 2279 ----------- drivers/net/ethernet/tile/tilepro.c | 2397 ----------- drivers/pcmcia/Kconfig | 26 - drivers/pcmcia/Makefile | 3 - drivers/pcmcia/bfin_cf_pcmcia.c | 316 -- drivers/pcmcia/m32r_cfc.c | 786 ---- drivers/pcmcia/m32r_cfc.h | 88 - drivers/pcmcia/m32r_pcc.c | 763 ---- drivers/pcmcia/m32r_pcc.h | 66 - drivers/pinctrl/Kconfig | 19 - drivers/pinctrl/Makefile | 3 - drivers/pinctrl/pinctrl-adi2-bf54x.c | 588 --- drivers/pinctrl/pinctrl-adi2-bf60x.c | 517 --- drivers/pinctrl/pinctrl-adi2.c | 1114 ----- drivers/pinctrl/pinctrl-adi2.h | 75 - drivers/pwm/Kconfig | 9 - drivers/pwm/Makefile | 1 - drivers/pwm/pwm-bfin.c | 157 - drivers/rtc/Kconfig | 17 - drivers/rtc/Makefile | 2 - drivers/rtc/rtc-bfin.c | 448 --- drivers/rtc/rtc-tile.c | 143 - drivers/spi/Kconfig | 19 - drivers/spi/Makefile | 3 - drivers/spi/spi-adi-v3.c | 984 ----- drivers/spi/spi-bfin-sport.c | 919 ----- drivers/spi/spi-bfin5xx.c | 1462 ------- drivers/staging/iio/Kconfig | 1 - drivers/staging/iio/Makefile | 1 - drivers/staging/iio/trigger/Kconfig | 19 - drivers/staging/iio/trigger/Makefile | 5 - drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 292 -- drivers/staging/iio/trigger/iio-trig-bfin-timer.h | 25 - drivers/staging/irda/drivers/Kconfig | 45 - drivers/staging/irda/drivers/Makefile | 1 - drivers/staging/irda/drivers/bfin_sir.c | 819 ---- drivers/staging/irda/drivers/bfin_sir.h | 93 - drivers/tty/Kconfig | 13 - drivers/tty/Makefile | 1 - drivers/tty/bfin_jtag_comm.c | 353 -- drivers/tty/hvc/Kconfig | 9 - drivers/tty/hvc/Makefile | 2 - drivers/tty/hvc/hvc_bfin_jtag.c | 104 - drivers/tty/hvc/hvc_tile.c | 196 - drivers/tty/serial/Kconfig | 198 - drivers/tty/serial/Makefile | 6 - drivers/tty/serial/bfin_sport_uart.c | 937 ----- drivers/tty/serial/bfin_sport_uart.h | 86 - drivers/tty/serial/bfin_uart.c | 1551 ------- drivers/tty/serial/crisv10.c | 4248 -------------------- drivers/tty/serial/crisv10.h | 133 - drivers/tty/serial/etraxfs-uart.c | 960 ----- drivers/tty/serial/m32r_sio.c | 1053 ----- drivers/tty/serial/m32r_sio_reg.h | 150 - drivers/tty/serial/tilegx.c | 689 ---- drivers/usb/host/Kconfig | 1 + drivers/usb/host/ehci-hcd.c | 5 - drivers/usb/host/ehci-tilegx.c | 207 - drivers/usb/host/isp1362.h | 44 - drivers/usb/host/ohci-hcd.c | 18 - drivers/usb/host/ohci-tilegx.c | 196 - drivers/usb/musb/Kconfig | 10 +- drivers/usb/musb/Makefile | 1 - drivers/usb/musb/blackfin.c | 623 --- drivers/usb/musb/blackfin.h | 81 - drivers/usb/musb/musb_core.c | 5 - drivers/usb/musb/musb_core.h | 30 - drivers/usb/musb/musb_debugfs.c | 2 - drivers/usb/musb/musb_dma.h | 11 - drivers/usb/musb/musb_gadget.c | 35 - drivers/usb/musb/musb_regs.h | 182 - drivers/usb/musb/musbhsdma.c | 5 - drivers/usb/musb/musbhsdma.h | 64 - drivers/video/fbdev/Kconfig | 103 - drivers/video/fbdev/Makefile | 5 - drivers/video/fbdev/bf537-lq035.c | 891 ---- drivers/video/fbdev/bf54x-lq043fb.c | 764 ---- drivers/video/fbdev/bfin-lq035q1-fb.c | 864 ---- drivers/video/fbdev/bfin-t350mcqb-fb.c | 669 --- drivers/video/fbdev/bfin_adv7393fb.c | 828 ---- drivers/video/fbdev/bfin_adv7393fb.h | 319 -- drivers/video/fbdev/s1d13xxxfb.c | 10 - drivers/video/logo/Kconfig | 15 - drivers/video/logo/Makefile | 3 - drivers/video/logo/logo.c | 12 - drivers/video/logo/logo_blackfin_clut224.ppm | 1127 ------ drivers/video/logo/logo_blackfin_vga16.ppm | 1127 ------ drivers/video/logo/logo_m32r_clut224.ppm | 1292 ------ drivers/watchdog/Kconfig | 17 - drivers/watchdog/Makefile | 7 - drivers/watchdog/bfin_wdt.c | 476 --- include/linux/bfin_mac.h | 30 - include/linux/linux_logo.h | 3 - include/linux/platform_data/bfin_rotary.h | 117 - include/linux/platform_data/pinctrl-adi2.h | 40 - include/linux/raid/pq.h | 1 - include/linux/usb/musb.h | 7 - include/linux/usb/tilegx.h | 35 - include/media/blackfin/bfin_capture.h | 39 - include/media/blackfin/ppi.h | 94 - lib/raid6/Makefile | 6 - lib/raid6/algos.c | 3 - lib/raid6/test/Makefile | 7 - lib/raid6/tilegx.uc | 87 - sound/soc/Kconfig | 1 - sound/soc/Makefile | 1 - sound/soc/blackfin/Kconfig | 205 - sound/soc/blackfin/Makefile | 40 - sound/soc/blackfin/bf5xx-ac97-pcm.c | 480 --- sound/soc/blackfin/bf5xx-ac97.c | 388 -- sound/soc/blackfin/bf5xx-ac97.h | 57 - sound/soc/blackfin/bf5xx-ad1836.c | 109 - sound/soc/blackfin/bf5xx-ad193x.c | 131 - sound/soc/blackfin/bf5xx-ad1980.c | 109 - sound/soc/blackfin/bf5xx-ad73311.c | 212 - sound/soc/blackfin/bf5xx-i2s-pcm.c | 373 -- sound/soc/blackfin/bf5xx-i2s-pcm.h | 17 - sound/soc/blackfin/bf5xx-i2s.c | 391 -- sound/soc/blackfin/bf5xx-sport.c | 1102 ----- sound/soc/blackfin/bf5xx-sport.h | 174 - sound/soc/blackfin/bf5xx-ssm2602.c | 126 - sound/soc/blackfin/bf6xx-i2s.c | 239 -- sound/soc/blackfin/bf6xx-sport.c | 425 -- sound/soc/blackfin/bf6xx-sport.h | 82 - sound/soc/blackfin/bfin-eval-adau1373.c | 173 - sound/soc/blackfin/bfin-eval-adau1701.c | 113 - sound/soc/blackfin/bfin-eval-adau1x61.c | 142 - sound/soc/blackfin/bfin-eval-adau1x81.c | 129 - sound/soc/blackfin/bfin-eval-adav80x.c | 145 - 198 files changed, 7 insertions(+), 56230 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt delete mode 100644 Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt delete mode 100644 drivers/ata/pata_bf54x.c delete mode 100644 drivers/char/bfin-otp.c delete mode 100644 drivers/char/ds1302.c delete mode 100644 drivers/char/tile-srom.c delete mode 100644 drivers/cpufreq/blackfin-cpufreq.c delete mode 100644 drivers/cpufreq/cris-artpec3-cpufreq.c delete mode 100644 drivers/cpufreq/cris-etraxfs-cpufreq.c delete mode 100644 drivers/crypto/bfin_crc.c delete mode 100644 drivers/crypto/bfin_crc.h delete mode 100644 drivers/edac/tile_edac.c delete mode 100644 drivers/gpio/gpio-etraxfs.c delete mode 100644 drivers/i2c/busses/i2c-bfin-twi.c delete mode 100644 drivers/input/keyboard/bf54x-keys.c delete mode 100644 drivers/input/misc/bfin_rotary.c delete mode 100644 drivers/media/platform/arv.c delete mode 100644 drivers/media/platform/blackfin/Kconfig delete mode 100644 drivers/media/platform/blackfin/Makefile delete mode 100644 drivers/media/platform/blackfin/bfin_capture.c delete mode 100644 drivers/media/platform/blackfin/ppi.c delete mode 100644 drivers/mmc/host/bfin_sdh.c delete mode 100644 drivers/mtd/maps/bfin-async-flash.c delete mode 100644 drivers/mtd/nand/raw/bf5xx_nand.c delete mode 100644 drivers/net/can/bfin_can.c delete mode 100644 drivers/net/cris/Makefile delete mode 100644 drivers/net/cris/eth_v10.c delete mode 100644 drivers/net/ethernet/adi/Kconfig delete mode 100644 drivers/net/ethernet/adi/Makefile delete mode 100644 drivers/net/ethernet/adi/bfin_mac.c delete mode 100644 drivers/net/ethernet/adi/bfin_mac.h delete mode 100644 drivers/net/ethernet/tile/Kconfig delete mode 100644 drivers/net/ethernet/tile/Makefile delete mode 100644 drivers/net/ethernet/tile/tilegx.c delete mode 100644 drivers/net/ethernet/tile/tilepro.c delete mode 100644 drivers/pcmcia/bfin_cf_pcmcia.c delete mode 100644 drivers/pcmcia/m32r_cfc.c delete mode 100644 drivers/pcmcia/m32r_cfc.h delete mode 100644 drivers/pcmcia/m32r_pcc.c delete mode 100644 drivers/pcmcia/m32r_pcc.h delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf54x.c delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf60x.c delete mode 100644 drivers/pinctrl/pinctrl-adi2.c delete mode 100644 drivers/pinctrl/pinctrl-adi2.h delete mode 100644 drivers/pwm/pwm-bfin.c delete mode 100644 drivers/rtc/rtc-bfin.c delete mode 100644 drivers/rtc/rtc-tile.c delete mode 100644 drivers/spi/spi-adi-v3.c delete mode 100644 drivers/spi/spi-bfin-sport.c delete mode 100644 drivers/spi/spi-bfin5xx.c delete mode 100644 drivers/staging/iio/trigger/Kconfig delete mode 100644 drivers/staging/iio/trigger/Makefile delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.c delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.h delete mode 100644 drivers/staging/irda/drivers/bfin_sir.c delete mode 100644 drivers/staging/irda/drivers/bfin_sir.h delete mode 100644 drivers/tty/bfin_jtag_comm.c delete mode 100644 drivers/tty/hvc/hvc_bfin_jtag.c delete mode 100644 drivers/tty/hvc/hvc_tile.c delete mode 100644 drivers/tty/serial/bfin_sport_uart.c delete mode 100644 drivers/tty/serial/bfin_sport_uart.h delete mode 100644 drivers/tty/serial/bfin_uart.c delete mode 100644 drivers/tty/serial/crisv10.c delete mode 100644 drivers/tty/serial/crisv10.h delete mode 100644 drivers/tty/serial/etraxfs-uart.c delete mode 100644 drivers/tty/serial/m32r_sio.c delete mode 100644 drivers/tty/serial/m32r_sio_reg.h delete mode 100644 drivers/tty/serial/tilegx.c delete mode 100644 drivers/usb/host/ehci-tilegx.c delete mode 100644 drivers/usb/host/ohci-tilegx.c delete mode 100644 drivers/usb/musb/blackfin.c delete mode 100644 drivers/usb/musb/blackfin.h delete mode 100644 drivers/video/fbdev/bf537-lq035.c delete mode 100644 drivers/video/fbdev/bf54x-lq043fb.c delete mode 100644 drivers/video/fbdev/bfin-lq035q1-fb.c delete mode 100644 drivers/video/fbdev/bfin-t350mcqb-fb.c delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.c delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.h delete mode 100644 drivers/video/logo/logo_blackfin_clut224.ppm delete mode 100644 drivers/video/logo/logo_blackfin_vga16.ppm delete mode 100644 drivers/video/logo/logo_m32r_clut224.ppm delete mode 100644 drivers/watchdog/bfin_wdt.c delete mode 100644 include/linux/bfin_mac.h delete mode 100644 include/linux/platform_data/bfin_rotary.h delete mode 100644 include/linux/platform_data/pinctrl-adi2.h delete mode 100644 include/linux/usb/tilegx.h delete mode 100644 include/media/blackfin/bfin_capture.h delete mode 100644 include/media/blackfin/ppi.h delete mode 100644 lib/raid6/tilegx.uc delete mode 100644 sound/soc/blackfin/Kconfig delete mode 100644 sound/soc/blackfin/Makefile delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.c delete mode 100644 sound/soc/blackfin/bf5xx-ac97.c delete mode 100644 sound/soc/blackfin/bf5xx-ac97.h delete mode 100644 sound/soc/blackfin/bf5xx-ad1836.c delete mode 100644 sound/soc/blackfin/bf5xx-ad193x.c delete mode 100644 sound/soc/blackfin/bf5xx-ad1980.c delete mode 100644 sound/soc/blackfin/bf5xx-ad73311.c delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.c delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h delete mode 100644 sound/soc/blackfin/bf5xx-i2s.c delete mode 100644 sound/soc/blackfin/bf5xx-sport.c delete mode 100644 sound/soc/blackfin/bf5xx-sport.h delete mode 100644 sound/soc/blackfin/bf5xx-ssm2602.c delete mode 100644 sound/soc/blackfin/bf6xx-i2s.c delete mode 100644 sound/soc/blackfin/bf6xx-sport.c delete mode 100644 sound/soc/blackfin/bf6xx-sport.h delete mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c delete mode 100644 sound/soc/blackfin/bfin-eval-adau1701.c delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x61.c delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x81.c delete mode 100644 sound/soc/blackfin/bfin-eval-adav80x.c -- Cc: linux(a)roeck-us.net Cc: corbet(a)lwn.net Cc: tj(a)kernel.org Cc: gregkh(a)linuxfoundation.org Cc: rjw(a)rjwysocki.net Cc: viresh.kumar(a)linaro.org Cc: herbert(a)gondor.apana.org.au Cc: davem(a)davemloft.net Cc: bp(a)alien8.de Cc: mchehab(a)kernel.org Cc: linus.walleij(a)linaro.org Cc: wsa(a)the-dreams.de Cc: dmitry.torokhov(a)gmail.com Cc: ulf.hansson(a)linaro.org Cc: boris.brezillon(a)bootlin.com Cc: cyrille.pitchen(a)wedev4u.fr Cc: wg(a)grandegger.com Cc: mkl(a)pengutronix.de Cc: alexandre.belloni(a)bootlin.com Cc: broonie(a)kernel.org Cc: jic23(a)kernel.org Cc: lars(a)metafoo.de Cc: jslaby(a)suse.com Cc: stern(a)rowland.harvard.edu Cc: b.zolnierkie(a)samsung.com Cc: shli(a)kernel.org Cc: linux-watchdog(a)vger.kernel.org Cc: linux-doc(a)vger.kernel.org Cc: linux-ide(a)vger.kernel.org Cc: linux-pm(a)vger.kernel.org Cc: linux-crypto(a)vger.kernel.org Cc: linux-edac(a)vger.kernel.org Cc: linux-gpio(a)vger.kernel.org Cc: linux-i2c(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-media(a)vger.kernel.org Cc: linux-mmc(a)vger.kernel.org Cc: linux-mtd(a)lists.infradead.org Cc: netdev(a)vger.kernel.org Cc: linux-can(a)vger.kernel.org Cc: linux-pwm(a)vger.kernel.org Cc: linux-rtc(a)vger.kernel.org Cc: linux-spi(a)vger.kernel.org Cc: linux-iio(a)vger.kernel.org Cc: linux-serial(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: linux-fbdev(a)vger.kernel.org Cc: linux-raid(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org

4 7

[alsa-devel] [PATCH] ASoC: topology: Give more data to clients via callbacks
by Liam Girdwood 14 Mar '18

14 Mar '18

Give topology clients more access to the topology data by passing index, pcm, link_config and dai_driver to clients. This allows clients to fully instantiate and track topology objects. The SOF driver is the first user of these new APIs and needs them to build component topology driver and FW objects. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc-topology.h | 23 ++++++++++++++--------- sound/soc/intel/skylake/skl-pcm.c | 7 ++++--- sound/soc/intel/skylake/skl-topology.c | 5 +++-- sound/soc/intel/skylake/skl-topology.h | 7 +++---- sound/soc/soc-topology.c | 31 ++++++++++++++++++------------- 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index f552c3f56368..e1f265e21ee1 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -30,6 +30,8 @@ struct snd_soc_dapm_context; struct snd_soc_card; struct snd_kcontrol_new; struct snd_soc_dai_link; +struct snd_soc_dai_driver; +struct snd_soc_dai; /* object scan be loaded and unloaded in groups with identfying indexes */ #define SND_SOC_TPLG_INDEX_ALL 0 /* ID that matches all FW objects */ @@ -109,35 +111,38 @@ struct snd_soc_tplg_widget_events { struct snd_soc_tplg_ops { /* external kcontrol init - used for any driver specific init */ - int (*control_load)(struct snd_soc_component *, + int (*control_load)(struct snd_soc_component *, int index, struct snd_kcontrol_new *, struct snd_soc_tplg_ctl_hdr *); int (*control_unload)(struct snd_soc_component *, struct snd_soc_dobj *); /* external widget init - used for any driver specific init */ - int (*widget_load)(struct snd_soc_component *, + int (*widget_load)(struct snd_soc_component *, int index, struct snd_soc_dapm_widget *, struct snd_soc_tplg_dapm_widget *); - int (*widget_ready)(struct snd_soc_component *, + int (*widget_ready)(struct snd_soc_component *, int index, struct snd_soc_dapm_widget *, struct snd_soc_tplg_dapm_widget *); int (*widget_unload)(struct snd_soc_component *, struct snd_soc_dobj *); /* FE DAI - used for any driver specific init */ - int (*dai_load)(struct snd_soc_component *, - struct snd_soc_dai_driver *dai_drv); + int (*dai_load)(struct snd_soc_component *, int index, + struct snd_soc_dai_driver *dai_drv, + struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai); + int (*dai_unload)(struct snd_soc_component *, struct snd_soc_dobj *); /* DAI link - used for any driver specific init */ - int (*link_load)(struct snd_soc_component *, - struct snd_soc_dai_link *link); + int (*link_load)(struct snd_soc_component *, int index, + struct snd_soc_dai_link *link, + struct snd_soc_tplg_link_config *cfg); int (*link_unload)(struct snd_soc_component *, struct snd_soc_dobj *); /* callback to handle vendor bespoke data */ - int (*vendor_load)(struct snd_soc_component *, + int (*vendor_load)(struct snd_soc_component *, int index, struct snd_soc_tplg_hdr *); int (*vendor_unload)(struct snd_soc_component *, struct snd_soc_tplg_hdr *); @@ -146,7 +151,7 @@ struct snd_soc_tplg_ops { void (*complete)(struct snd_soc_component *); /* manifest - optional to inform component of manifest */ - int (*manifest)(struct snd_soc_component *, + int (*manifest)(struct snd_soc_component *, int index, struct snd_soc_tplg_manifest *); /* vendor specific kcontrol handlers available for binding */ diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 15cb8ac3e374..c466265a2fbb 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -989,10 +989,11 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { }, }; -int skl_dai_load(struct snd_soc_component *cmp, - struct snd_soc_dai_driver *pcm_dai) +int skl_dai_load(struct snd_soc_component *cmp, int index, + struct snd_soc_dai_driver *dai_drv, + struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai) { - pcm_dai->ops = &skl_pcm_dai_ops; + dai_drv->ops = &skl_pcm_dai_ops; return 0; } diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 3b1dca419883..6ac081f1f215 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -2851,7 +2851,7 @@ void skl_cleanup_resources(struct skl *skl) * information to the driver about module and pipeline parameters which DSP * FW expects like ids, resource values, formats etc */ -static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, +static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, int index, struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) { @@ -2958,6 +2958,7 @@ static int skl_init_enum_data(struct device *dev, struct soc_enum *se, } static int skl_tplg_control_load(struct snd_soc_component *cmpnt, + int index, struct snd_kcontrol_new *kctl, struct snd_soc_tplg_ctl_hdr *hdr) { @@ -3446,7 +3447,7 @@ static int skl_tplg_get_manifest_data(struct snd_soc_tplg_manifest *manifest, return 0; } -static int skl_manifest_load(struct snd_soc_component *cmpnt, +static int skl_manifest_load(struct snd_soc_component *cmpnt, int index, struct snd_soc_tplg_manifest *manifest) { struct hdac_ext_bus *ebus = snd_soc_component_get_drvdata(cmpnt); diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index b1e0667c0ae0..da301d899431 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h @@ -512,8 +512,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, int skl_pcm_link_dma_prepare(struct device *dev, struct skl_pipe_params *params); -int skl_dai_load(struct snd_soc_component *cmp, - struct snd_soc_dai_driver *pcm_dai); -void skl_tplg_add_moduleid_in_bind_params(struct skl *skl, - struct snd_soc_dapm_widget *w); +int skl_dai_load(struct snd_soc_component *cmp, int index, + struct snd_soc_dai_driver *dai_drv, + struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai); #endif diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index e81b52600d58..9cf98259bb58 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -315,7 +315,7 @@ static int soc_tplg_vendor_load_(struct soc_tplg *tplg, int ret = 0; if (tplg->comp && tplg->ops && tplg->ops->vendor_load) - ret = tplg->ops->vendor_load(tplg->comp, hdr); + ret = tplg->ops->vendor_load(tplg->comp, tplg->index, hdr); else { dev_err(tplg->dev, "ASoC: no vendor load callback for ID %d\n", hdr->vendor_type); @@ -347,7 +347,8 @@ static int soc_tplg_widget_load(struct soc_tplg *tplg, struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) { if (tplg->comp && tplg->ops && tplg->ops->widget_load) - return tplg->ops->widget_load(tplg->comp, w, tplg_w); + return tplg->ops->widget_load(tplg->comp, tplg->index, w, + tplg_w); return 0; } @@ -358,27 +359,30 @@ static int soc_tplg_widget_ready(struct soc_tplg *tplg, struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) { if (tplg->comp && tplg->ops && tplg->ops->widget_ready) - return tplg->ops->widget_ready(tplg->comp, w, tplg_w); + return tplg->ops->widget_ready(tplg->comp, tplg->index, w, + tplg_w); return 0; } /* pass DAI configurations to component driver for extra initialization */ static int soc_tplg_dai_load(struct soc_tplg *tplg, - struct snd_soc_dai_driver *dai_drv) + struct snd_soc_dai_driver *dai_drv, + struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai) { if (tplg->comp && tplg->ops && tplg->ops->dai_load) - return tplg->ops->dai_load(tplg->comp, dai_drv); + return tplg->ops->dai_load(tplg->comp, tplg->index, dai_drv, + pcm, dai); return 0; } /* pass link configurations to component driver for extra initialization */ static int soc_tplg_dai_link_load(struct soc_tplg *tplg, - struct snd_soc_dai_link *link) + struct snd_soc_dai_link *link, struct snd_soc_tplg_link_config *cfg) { if (tplg->comp && tplg->ops && tplg->ops->link_load) - return tplg->ops->link_load(tplg->comp, link); + return tplg->ops->link_load(tplg->comp, tplg->index, link, cfg); return 0; } @@ -692,7 +696,8 @@ static int soc_tplg_init_kcontrol(struct soc_tplg *tplg, struct snd_kcontrol_new *k, struct snd_soc_tplg_ctl_hdr *hdr) { if (tplg->comp && tplg->ops && tplg->ops->control_load) - return tplg->ops->control_load(tplg->comp, k, hdr); + return tplg->ops->control_load(tplg->comp, tplg->index, k, + hdr); return 0; } @@ -1733,7 +1738,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, } /* pass control to component driver for optional further init */ - ret = soc_tplg_dai_load(tplg, dai_drv); + ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL); if (ret < 0) { dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n"); kfree(dai_drv); @@ -1803,7 +1808,7 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, set_link_flags(link, pcm->flag_mask, pcm->flags); /* pass control to component driver for optional further init */ - ret = soc_tplg_dai_link_load(tplg, link); + ret = soc_tplg_dai_link_load(tplg, link, NULL); if (ret < 0) { dev_err(tplg->comp->dev, "ASoC: FE link loading failed\n"); kfree(link); @@ -2094,7 +2099,7 @@ static int soc_tplg_link_config(struct soc_tplg *tplg, set_link_flags(link, cfg->flag_mask, cfg->flags); /* pass control to component driver for optional further init */ - ret = soc_tplg_dai_link_load(tplg, link); + ret = soc_tplg_dai_link_load(tplg, link, cfg); if (ret < 0) { dev_err(tplg->dev, "ASoC: physical link loading failed\n"); return ret; @@ -2216,7 +2221,7 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg, set_dai_flags(dai_drv, d->flag_mask, d->flags); /* pass control to component driver for optional further init */ - ret = soc_tplg_dai_load(tplg, dai_drv); + ret = soc_tplg_dai_load(tplg, dai_drv, NULL, dai); if (ret < 0) { dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n"); return ret; @@ -2322,7 +2327,7 @@ static int soc_tplg_manifest_load(struct soc_tplg *tplg, /* pass control to component driver for optional further init */ if (tplg->comp && tplg->ops && tplg->ops->manifest) - return tplg->ops->manifest(tplg->comp, _manifest); + return tplg->ops->manifest(tplg->comp, tplg->index, _manifest); if (!abi_match) /* free the duplicated one */ kfree(_manifest); -- 2.14.1

1 0