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

[alsa-devel] [PATCH v2 3/3] gpiolib-acpi: Move acpi_dev_add_driver_gpios() et al to consumer.h
by Andy Shevchenko 31 Jul '19

31 Jul '19

The API, which belongs to GPIO library, is foreign to ACPI headers. Earlier we moved out I²C out of the latter, and now it's time for acpi_dev_add_driver_gpios() et al. For time being the acpi_gpio_get_irq_resource() and acpi_dev_gpio_irq_get() are left untouched as they need more thought about. Note, it requires uninline acpi_dev_remove_driver_gpios() to keep purity of consumer.h. Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Jie Yang <yang.jie(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org (moderated list:INTEL ASoC DRIVERS) Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- v2: new patch drivers/gpio/gpiolib-acpi.c | 7 +++ include/linux/acpi.h | 51 ------------------ include/linux/gpio/consumer.h | 57 ++++++++++++++++++++ sound/soc/intel/boards/bytcht_cx2072x.c | 1 + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 1 + sound/soc/intel/boards/cht_bsw_rt5672.c | 1 + 6 files changed, 67 insertions(+), 51 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index d54fc6e7c8a9..fdee8afa5339 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -383,6 +383,13 @@ int acpi_dev_add_driver_gpios(struct acpi_device *adev, } EXPORT_SYMBOL_GPL(acpi_dev_add_driver_gpios); +void acpi_dev_remove_driver_gpios(struct acpi_device *adev) +{ + if (adev) + adev->driver_gpios = NULL; +} +EXPORT_SYMBOL_GPL(acpi_dev_remove_driver_gpios); + static void devm_acpi_dev_release_driver_gpios(struct device *dev, void *res) { acpi_dev_remove_driver_gpios(ACPI_COMPANION(dev)); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 9426b9aaed86..e40e1e27ed8e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -994,62 +994,11 @@ void __acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle, const c #endif #endif -struct acpi_gpio_params { - unsigned int crs_entry_index; - unsigned int line_index; - bool active_low; -}; - -struct acpi_gpio_mapping { - const char *name; - const struct acpi_gpio_params *data; - unsigned int size; - -/* Ignore IoRestriction field */ -#define ACPI_GPIO_QUIRK_NO_IO_RESTRICTION BIT(0) -/* - * When ACPI GPIO mapping table is in use the index parameter inside it - * refers to the GPIO resource in _CRS method. That index has no - * distinction of actual type of the resource. When consumer wants to - * get GpioIo type explicitly, this quirk may be used. - */ -#define ACPI_GPIO_QUIRK_ONLY_GPIOIO BIT(1) - - unsigned int quirks; -}; - #if defined(CONFIG_ACPI) && defined(CONFIG_GPIOLIB) -int acpi_dev_add_driver_gpios(struct acpi_device *adev, - const struct acpi_gpio_mapping *gpios); - -static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) -{ - if (adev) - adev->driver_gpios = NULL; -} - -int devm_acpi_dev_add_driver_gpios(struct device *dev, - const struct acpi_gpio_mapping *gpios); -void devm_acpi_dev_remove_driver_gpios(struct device *dev); - bool acpi_gpio_get_irq_resource(struct acpi_resource *ares, struct acpi_resource_gpio **agpio); int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index); #else -static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev, - const struct acpi_gpio_mapping *gpios) -{ - return -ENXIO; -} -static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) {} - -static inline int devm_acpi_dev_add_driver_gpios(struct device *dev, - const struct acpi_gpio_mapping *gpios) -{ - return -ENXIO; -} -static inline void devm_acpi_dev_remove_driver_gpios(struct device *dev) {} - static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares, struct acpi_resource_gpio **agpio) { diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index b548a3fb5eee..b70af921c614 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -602,6 +602,63 @@ struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev, #endif /* CONFIG_GPIOLIB */ +struct acpi_gpio_params { + unsigned int crs_entry_index; + unsigned int line_index; + bool active_low; +}; + +struct acpi_gpio_mapping { + const char *name; + const struct acpi_gpio_params *data; + unsigned int size; + +/* Ignore IoRestriction field */ +#define ACPI_GPIO_QUIRK_NO_IO_RESTRICTION BIT(0) +/* + * When ACPI GPIO mapping table is in use the index parameter inside it + * refers to the GPIO resource in _CRS method. That index has no + * distinction of actual type of the resource. When consumer wants to + * get GpioIo type explicitly, this quirk may be used. + */ +#define ACPI_GPIO_QUIRK_ONLY_GPIOIO BIT(1) + + unsigned int quirks; +}; + +#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_ACPI) + +struct acpi_device; + +int acpi_dev_add_driver_gpios(struct acpi_device *adev, + const struct acpi_gpio_mapping *gpios); +void acpi_dev_remove_driver_gpios(struct acpi_device *adev); + +int devm_acpi_dev_add_driver_gpios(struct device *dev, + const struct acpi_gpio_mapping *gpios); +void devm_acpi_dev_remove_driver_gpios(struct device *dev); + +#else /* CONFIG_GPIOLIB && CONFIG_ACPI */ + +struct acpi_device; + +static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev, + const struct acpi_gpio_mapping *gpios) +{ + return -ENXIO; +} +static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) {} + +static inline int devm_acpi_dev_add_driver_gpios(struct device *dev, + const struct acpi_gpio_mapping *gpios) +{ + return -ENXIO; +} +static inline void devm_acpi_dev_remove_driver_gpios(struct device *dev) {} + +#endif /* CONFIG_GPIOLIB && CONFIG_ACPI */ + + #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS) int gpiod_export(struct gpio_desc *desc, bool direction_may_change); diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c index 54ac2fd41925..67f06c95eec5 100644 --- a/sound/soc/intel/boards/bytcht_cx2072x.c +++ b/sound/soc/intel/boards/bytcht_cx2072x.c @@ -6,6 +6,7 @@ #include <linux/acpi.h> #include <linux/device.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 33eb72545be6..05db311b579e 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -12,6 +12,7 @@ */ #include <linux/dmi.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index 4977b5a65eb8..9d657421730a 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -8,6 +8,7 @@ * Mengdong Lin <mengdong.lin(a)intel.com> */ +#include <linux/gpio/consumer.h> #include <linux/input.h> #include <linux/module.h> #include <linux/platform_device.h> -- 2.20.1

2 1

[alsa-devel] Handling a device which zeroes the memory on IO start
by Mr ARM 30 Jul '19

30 Jul '19

Hello, My issue involves a specific device quirk. The device generally uses a mmap'ed memory regions, however sending a StartIO command (from a trigger) causes a full buffer erase (which is completed once I get an initial UpdateTimestamp several milliseconds later), and it seems that alsa fills the DMA buffer before calling the start trigger. I'm unsure how to workaround this issue. I have seen the SNDRV_PCM_INFO_DOUBLE flag, however it didn't help me in my issue as from what I understand it's merely an information that the driver is using double buffering. One option is to make the start trigger method copy the buffer, send the StartIO command, then do a blocking-wait for initial timestamp and restore the buffer. I don't think I can get rid of the blocking wait here if I use this temporary-buffer-copy approach as I think that in the time before I get the timestamp update, a client could try to update the shared memory resulting in that data being lost after I restore the original contents later. Another idea I had is to do the same, but in the open callback, however that seems totally wrong. Any ideas are appreciated. I tried grepping for drivers using the SNDRV_PCM_INFO_DOUBLE flag, however I couldn't find any code workarounding similar issues. Thank you, Paul Pawlowski PS: I wrote an email yesterday to this mailing list from another email address, however I have received several SPF failures, so I switched to gmail. Regarding the previous mail, I have figured out the looping audio was caused by the lack of a snd_pcm_period_elapsed call. I have missed it because my device has no proper interrupt handler, and only sends a confusingly named UpdateTimestamp message once the buffer has been fully processed. I'm however still unsure as for what I should return from the _pointer function as the device does not provide a frame pointer.

1 0

[alsa-devel] [PATCH v5 22/29] compat_ioctl: remove translation for sound ioctls
by Arnd Bergmann 30 Jul '19

30 Jul '19

The SNDCTL_* and SOUND_* commands are the old OSS user interface. I checked all the sound ioctl commands listed in fs/compat_ioctl.c to see if we still need the translation handlers. Here is what I found: - sound/oss/ is (almost) gone from the kernel, this is what actually needed all the translations - The ALSA emulation for OSS correctly handles all compat_ioctl commands already. - sound/oss/dmasound/ is the last holdout of the original OSS code, this is only used on arch/m68k, which has no 64-bit mode and hence needs no compat handlers - arch/um/drivers/hostaudio_kern.c may run in 64-bit mode with 32-bit x86 user space underneath it. This rare corner case is the only one that still needs the compat handlers. By adding a simple redirect of .compat_ioctl to .unlocked_ioctl in the UML driver, we can remove all the COMPATIBLE_IOCTL() annotations without a change in functionality. For completeness, I'm adding the same thing to the dmasound file, knowing that it makes no difference. The compat_ioctl list contains one comment about SNDCTL_DSP_MAPINBUF and SNDCTL_DSP_MAPOUTBUF, which actually would need a translation handler if implemented. However, the native implementation just returns -EINVAL, so we don't care. Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/um/drivers/hostaudio_kern.c | 1 + fs/compat_ioctl.c | 158 ----------------------------- sound/core/oss/pcm_oss.c | 4 + sound/oss/dmasound/dmasound_core.c | 2 + 4 files changed, 7 insertions(+), 158 deletions(-) diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c index 7f9dbdbc4eb7..1bf139c3727a 100644 --- a/arch/um/drivers/hostaudio_kern.c +++ b/arch/um/drivers/hostaudio_kern.c @@ -298,6 +298,7 @@ static const struct file_operations hostaudio_fops = { .write = hostaudio_write, .poll = hostaudio_poll, .unlocked_ioctl = hostaudio_ioctl, + .compat_ioctl = compat_ptr_ioctl, .mmap = NULL, .open = hostaudio_open, .release = hostaudio_release, diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 03da7934a351..33f732979f45 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -51,8 +51,6 @@ #include <linux/uaccess.h> #include <linux/watchdog.h> -#include <linux/soundcard.h> - #include <linux/hiddev.h> @@ -458,162 +456,6 @@ COMPATIBLE_IOCTL(PPPIOCDISCONN) COMPATIBLE_IOCTL(PPPIOCATTCHAN) COMPATIBLE_IOCTL(PPPIOCGCHAN) COMPATIBLE_IOCTL(PPPIOCGL2TPSTATS) -/* Big A */ -/* sparc only */ -/* Big Q for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_SEQ_RESET) -COMPATIBLE_IOCTL(SNDCTL_SEQ_SYNC) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_INFO) -COMPATIBLE_IOCTL(SNDCTL_SEQ_CTRLRATE) -COMPATIBLE_IOCTL(SNDCTL_SEQ_GETOUTCOUNT) -COMPATIBLE_IOCTL(SNDCTL_SEQ_GETINCOUNT) -COMPATIBLE_IOCTL(SNDCTL_SEQ_PERCMODE) -COMPATIBLE_IOCTL(SNDCTL_FM_LOAD_INSTR) -COMPATIBLE_IOCTL(SNDCTL_SEQ_TESTMIDI) -COMPATIBLE_IOCTL(SNDCTL_SEQ_RESETSAMPLES) -COMPATIBLE_IOCTL(SNDCTL_SEQ_NRSYNTHS) -COMPATIBLE_IOCTL(SNDCTL_SEQ_NRMIDIS) -COMPATIBLE_IOCTL(SNDCTL_MIDI_INFO) -COMPATIBLE_IOCTL(SNDCTL_SEQ_THRESHOLD) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_MEMAVL) -COMPATIBLE_IOCTL(SNDCTL_FM_4OP_ENABLE) -COMPATIBLE_IOCTL(SNDCTL_SEQ_PANIC) -COMPATIBLE_IOCTL(SNDCTL_SEQ_OUTOFBAND) -COMPATIBLE_IOCTL(SNDCTL_SEQ_GETTIME) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_ID) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_CONTROL) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_REMOVESAMPLE) -/* Big T for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_TMR_TIMEBASE) -COMPATIBLE_IOCTL(SNDCTL_TMR_START) -COMPATIBLE_IOCTL(SNDCTL_TMR_STOP) -COMPATIBLE_IOCTL(SNDCTL_TMR_CONTINUE) -COMPATIBLE_IOCTL(SNDCTL_TMR_TEMPO) -COMPATIBLE_IOCTL(SNDCTL_TMR_SOURCE) -COMPATIBLE_IOCTL(SNDCTL_TMR_METRONOME) -COMPATIBLE_IOCTL(SNDCTL_TMR_SELECT) -/* Little m for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_MIDI_PRETIME) -COMPATIBLE_IOCTL(SNDCTL_MIDI_MPUMODE) -COMPATIBLE_IOCTL(SNDCTL_MIDI_MPUCMD) -/* Big P for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_DSP_RESET) -COMPATIBLE_IOCTL(SNDCTL_DSP_SYNC) -COMPATIBLE_IOCTL(SNDCTL_DSP_SPEED) -COMPATIBLE_IOCTL(SNDCTL_DSP_STEREO) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETBLKSIZE) -COMPATIBLE_IOCTL(SNDCTL_DSP_CHANNELS) -COMPATIBLE_IOCTL(SOUND_PCM_WRITE_FILTER) -COMPATIBLE_IOCTL(SNDCTL_DSP_POST) -COMPATIBLE_IOCTL(SNDCTL_DSP_SUBDIVIDE) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETFRAGMENT) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETFMTS) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETFMT) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETOSPACE) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETISPACE) -COMPATIBLE_IOCTL(SNDCTL_DSP_NONBLOCK) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETCAPS) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETTRIGGER) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETTRIGGER) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETIPTR) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETOPTR) -/* SNDCTL_DSP_MAPINBUF, XXX needs translation */ -/* SNDCTL_DSP_MAPOUTBUF, XXX needs translation */ -COMPATIBLE_IOCTL(SNDCTL_DSP_SETSYNCRO) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETDUPLEX) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETODELAY) -COMPATIBLE_IOCTL(SNDCTL_DSP_PROFILE) -COMPATIBLE_IOCTL(SOUND_PCM_READ_RATE) -COMPATIBLE_IOCTL(SOUND_PCM_READ_CHANNELS) -COMPATIBLE_IOCTL(SOUND_PCM_READ_BITS) -COMPATIBLE_IOCTL(SOUND_PCM_READ_FILTER) -/* Big C for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_COPR_RESET) -COMPATIBLE_IOCTL(SNDCTL_COPR_LOAD) -COMPATIBLE_IOCTL(SNDCTL_COPR_RDATA) -COMPATIBLE_IOCTL(SNDCTL_COPR_RCODE) -COMPATIBLE_IOCTL(SNDCTL_COPR_WDATA) -COMPATIBLE_IOCTL(SNDCTL_COPR_WCODE) -COMPATIBLE_IOCTL(SNDCTL_COPR_RUN) -COMPATIBLE_IOCTL(SNDCTL_COPR_HALT) -COMPATIBLE_IOCTL(SNDCTL_COPR_SENDMSG) -COMPATIBLE_IOCTL(SNDCTL_COPR_RCVMSG) -/* Big M for sound/OSS */ -COMPATIBLE_IOCTL(SOUND_MIXER_READ_VOLUME) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_BASS) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_TREBLE) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_SYNTH) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_PCM) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_SPEAKER) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_MIC) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_CD) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_IMIX) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_ALTPCM) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_RECLEV) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_IGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_OGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE1) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE2) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE3) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_DIGITAL1)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_DIGITAL2)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_DIGITAL3)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_PHONEIN)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_PHONEOUT)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_VIDEO)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_RADIO)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_MONITOR)) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_MUTE) -/* SOUND_MIXER_READ_ENHANCE, same value as READ_MUTE */ -/* SOUND_MIXER_READ_LOUD, same value as READ_MUTE */ -COMPATIBLE_IOCTL(SOUND_MIXER_READ_RECSRC) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_DEVMASK) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_RECMASK) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_STEREODEVS) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_CAPS) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_VOLUME) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_BASS) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_TREBLE) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_SYNTH) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_PCM) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_SPEAKER) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_MIC) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_CD) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_IMIX) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_ALTPCM) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_RECLEV) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_IGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_OGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE1) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE2) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE3) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_DIGITAL1)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_DIGITAL2)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_DIGITAL3)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_PHONEIN)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_PHONEOUT)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_VIDEO)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_RADIO)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_MONITOR)) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_MUTE) -/* SOUND_MIXER_WRITE_ENHANCE, same value as WRITE_MUTE */ -/* SOUND_MIXER_WRITE_LOUD, same value as WRITE_MUTE */ -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_RECSRC) -COMPATIBLE_IOCTL(SOUND_MIXER_INFO) -COMPATIBLE_IOCTL(SOUND_OLD_MIXER_INFO) -COMPATIBLE_IOCTL(SOUND_MIXER_ACCESS) -COMPATIBLE_IOCTL(SOUND_MIXER_AGC) -COMPATIBLE_IOCTL(SOUND_MIXER_3DSE) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE1) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE2) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE3) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE4) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE5) -COMPATIBLE_IOCTL(SOUND_MIXER_GETLEVELS) -COMPATIBLE_IOCTL(SOUND_MIXER_SETLEVELS) -COMPATIBLE_IOCTL(OSS_GETVERSION) /* Raw devices */ COMPATIBLE_IOCTL(RAW_SETBIND) COMPATIBLE_IOCTL(RAW_GETBIND) diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index f57c610d7523..13db77771f0f 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -2717,6 +2717,10 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long static long snd_pcm_oss_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg) { + /* + * Everything is compatbile except SNDCTL_DSP_MAPINBUF/SNDCTL_DSP_MAPOUTBUF, + * which are not implemented for the native case either + */ return snd_pcm_oss_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); } #else diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index fc9bcd47d6a4..f802ea331e24 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -384,6 +384,7 @@ static const struct file_operations mixer_fops = .owner = THIS_MODULE, .llseek = no_llseek, .unlocked_ioctl = mixer_unlocked_ioctl, + .compat_ioctl = compat_ptr_ioctl, .open = mixer_open, .release = mixer_release, }; @@ -1167,6 +1168,7 @@ static const struct file_operations sq_fops = .write = sq_write, .poll = sq_poll, .unlocked_ioctl = sq_unlocked_ioctl, + .compat_ioctl = compat_ptr_ioctl, .open = sq_open, .release = sq_release, }; -- 2.20.0

1 0

[alsa-devel] [PATCH v6 57/57] ALSA: x86: Remove dev_err() usage after platform_get_irq()
by Stephen Boyd 30 Jul '19

30 Jul '19

We don't need dev_err() messages when platform_get_irq() fails now that platform_get_irq() prints an error message itself when something goes wrong. Let's remove these prints with a simple semantic patch. // <smpl> @@ expression ret; struct platform_device *E; @@ ret = ( platform_get_irq(E, ...) | platform_get_irq_byname(E, ...) ); if ( $ ret < 0 \| ret <= 0 $ ) { ( -if (ret != -EPROBE_DEFER) -{ ... -dev_err(...); -... } | ... -dev_err(...); ) ... } // </smpl> While we're here, remove braces on if statements that only have one statement (manually). Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: "Ville Syrjälä" <ville.syrjala(a)linux.intel.com> Cc: Colin Ian King <colin.king(a)canonical.com> Cc: alsa-devel(a)alsa-project.org Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Stephen Boyd <swboyd(a)chromium.org> --- Please apply directly to subsystem trees sound/x86/intel_hdmi_audio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 5fd4e32247a6..cd389d21219a 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1708,10 +1708,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) /* get resources */ irq = platform_get_irq(pdev, 0); - if (irq < 0) { - dev_err(&pdev->dev, "Could not get irq resource: %d\n", irq); + if (irq < 0) return irq; - } res_mmio = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res_mmio) { -- Sent by a computer through tubes

1 0

Re: [alsa-devel] [PATCH] ALSA: usb-audio: Fix gpf in snd_usb_pipe_sanity_check
by Hillf Danton 30 Jul '19

30 Jul '19

On Tue, 30 Jul 2019 18:08:02 +0800 Takashi Iwai wrote: > > You don't have to copy the whole these texts at all. > In general, it'd suffice to point out the dashboard URL, and if the > stack trace is mandatory, drop the useless hex numbers and just show > the significant part of the stack trace. > I am used to give readers as much info as appropriate, and learning that an URL is enough in cases like this one. I will send you the pruned version next time. > > It was introduced in commit 801ebf1043ae for checking pipe and endpoint > > types. It is fixed by adding a check of the ep pointer in question. > > > > Reported-by: syzbot <syzbot+d59c4387bfb6eced94e2(a)syzkaller.appspotmail.com> > > Fixes: commit 801ebf1043ae ("ALSA: usb-audio: Sanity checks for each pipe and EP types") > > Drop "commit" word. > Yes, Sir. > > Cc: Andrey Konovalov <andreyknvl(a)google.com> > > Signed-off-by: Hillf Danton <dhanton(a)sina.com> > > --- There is a typo, s/dhanton/hdanton/, as you pointed out in another mail. > > This is to make syzbot happy for now and in long run we can make > > snd_usb_pipe_sanity_check() available outside sound/usb by making > > usb_urb_ep_type_check() a wrapper of the former. We will revisit > > sound/usb once when things in the usb/core get in place. > > Actually I expected to apply the "long-term" fix now. There is change in usb/core included in that fix as you see, and according to the rule, one fix a patch, it is better and simpler IMO to fix the sound part first. > The same kind > of fix was already submitted from me (<s5hlfwn376e.wl-tiwai(a)suse.de>), > but I didn't merge it because working on the usb core helper would be > a saner solution. > Feel free to merge that, Sir. Thanks Hillf

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: Fix gpf in snd_usb_pipe_sanity_check
by Hillf Danton 30 Jul '19

30 Jul '19

syzbot found the following crash on: HEAD commit: 7f7867ff usb-fuzzer: main usb gadget fuzzer driver git tree: https://github.com/google/kasan.git usb-fuzzer console output: https://syzkaller.appspot.com/x/log.txt?x=12befdc8600000 kernel config: https://syzkaller.appspot.com/x/.config?x=792eb47789f57810 dashboard link: https://syzkaller.appspot.com/bug?extid=d59c4387bfb6eced94e2 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=16efc49fa00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=13245854600000 usb 1-1: New USB device found, idVendor=07fd, idProduct=0004, bcdDevice=d5.ac usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 usb 1-1: config 0 descriptor?? usb 1-1: string descriptor 0 read error: -71 usb 1-1: Waiting for MOTU Microbook II to boot up... kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] SMP KASAN CPU: 1 PID: 21 Comm: kworker/1:1 Not tainted 5.3.0-rc2+ #23 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event RIP: 0010:snd_usb_pipe_sanity_check+0x80/0x130 sound/usb/helper.c:75 Code: 48 c1 ea 03 80 3c 02 00 0f 85 b3 00 00 00 48 8b 6d 00 c1 eb 1e 48 b8 00 00 00 00 00 fc ff df 48 8d 7d 03 48 89 fa 48 c1 ea 03 <0f> b6 04 02 48 89 fa 83 e2 07 38 d0 7f 04 84 c0 75 7b 48 b8 00 00 RSP: 0018:ffff8881da2f7010 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: 0000000000000001 RCX: ffffffff8484d252 RDX: 0000000000000000 RSI: ffffffff8484d26c RDI: 0000000000000003 RBP: 0000000000000000 R08: ffff8881da22e000 R09: ffffed103b665d58 R10: ffffed103b665d57 R11: ffff8881db32eabf R12: 0000000000000000 R13: ffff8881d400ba80 R14: 1ffff1103b45ee06 R15: ffff8881c79244a0 FS: 0000000000000000(0000) GS:ffff8881db300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f31b2a87000 CR3: 00000001d3fd4000 CR4: 00000000001406e0 Call Trace: snd_usb_motu_microbookii_communicate.constprop.0+0xa0/0x2fb sound/usb/quirks.c:1007 snd_usb_motu_microbookii_boot_quirk sound/usb/quirks.c:1051 [inline] snd_usb_apply_boot_quirk.cold+0x163/0x370 sound/usb/quirks.c:1280 usb_audio_probe+0x2ec/0x2010 sound/usb/card.c:576 usb_probe_interface+0x305/0x7a0 drivers/usb/core/driver.c:361 really_probe+0x281/0x650 drivers/base/dd.c:548 driver_probe_device+0x101/0x1b0 drivers/base/dd.c:709 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:816 bus_for_each_drv+0x15c/0x1e0 drivers/base/bus.c:454 __device_attach+0x217/0x360 drivers/base/dd.c:882 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:514 device_add+0xae6/0x16f0 drivers/base/core.c:2114 usb_set_configuration+0xdf6/0x1670 drivers/usb/core/message.c:2023 generic_probe+0x9d/0xd5 drivers/usb/core/generic.c:210 usb_probe_device+0x99/0x100 drivers/usb/core/driver.c:266 really_probe+0x281/0x650 drivers/base/dd.c:548 driver_probe_device+0x101/0x1b0 drivers/base/dd.c:709 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:816 bus_for_each_drv+0x15c/0x1e0 drivers/base/bus.c:454 __device_attach+0x217/0x360 drivers/base/dd.c:882 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:514 device_add+0xae6/0x16f0 drivers/base/core.c:2114 usb_new_device.cold+0x6a4/0xe79 drivers/usb/core/hub.c:2536 hub_port_connect drivers/usb/core/hub.c:5098 [inline] hub_port_connect_change drivers/usb/core/hub.c:5213 [inline] port_event drivers/usb/core/hub.c:5359 [inline] hub_event+0x1b5c/0x3640 drivers/usb/core/hub.c:5441 process_one_work+0x92b/0x1530 kernel/workqueue.c:2269 worker_thread+0x96/0xe20 kernel/workqueue.c:2415 kthread+0x318/0x420 kernel/kthread.c:255 ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 Modules linked in: [ end trace 41e8577a8c48635e ] It was introduced in commit 801ebf1043ae for checking pipe and endpoint types. It is fixed by adding a check of the ep pointer in question. Reported-by: syzbot <syzbot+d59c4387bfb6eced94e2(a)syzkaller.appspotmail.com> Fixes: commit 801ebf1043ae ("ALSA: usb-audio: Sanity checks for each pipe and EP types") Cc: Andrey Konovalov <andreyknvl(a)google.com> Signed-off-by: Hillf Danton <dhanton(a)sina.com> --- This is to make syzbot happy for now and in long run we can make snd_usb_pipe_sanity_check() available outside sound/usb by making usb_urb_ep_type_check() a wrapper of the former. We will revisit sound/usb once when things in the usb/core get in place. sound/usb/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/helper.c b/sound/usb/helper.c index 71d5f54..4c12cc5 100644 --- a/sound/usb/helper.c +++ b/sound/usb/helper.c @@ -72,7 +72,7 @@ int snd_usb_pipe_sanity_check(struct usb_device *dev, unsigned int pipe) struct usb_host_endpoint *ep; ep = usb_pipe_endpoint(dev, pipe); - if (usb_pipetype(pipe) != pipetypes[usb_endpoint_type(&ep->desc)]) + if (!ep || usb_pipetype(pipe) != pipetypes[usb_endpoint_type(&ep->desc)]) return -EINVAL; return 0; } --

2 2

[alsa-devel] general protection fault in snd_usb_pipe_sanity_check
by syzbot 30 Jul '19

30 Jul '19

Hello, syzbot found the following crash on: HEAD commit: 7f7867ff usb-fuzzer: main usb gadget fuzzer driver git tree: https://github.com/google/kasan.git usb-fuzzer console output: https://syzkaller.appspot.com/x/log.txt?x=12befdc8600000 kernel config: https://syzkaller.appspot.com/x/.config?x=792eb47789f57810 dashboard link: https://syzkaller.appspot.com/bug?extid=d59c4387bfb6eced94e2 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=16efc49fa00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=13245854600000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+d59c4387bfb6eced94e2(a)syzkaller.appspotmail.com usb 1-1: New USB device found, idVendor=07fd, idProduct=0004, bcdDevice=d5.ac usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 usb 1-1: config 0 descriptor?? usb 1-1: string descriptor 0 read error: -71 usb 1-1: Waiting for MOTU Microbook II to boot up... kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] SMP KASAN CPU: 1 PID: 21 Comm: kworker/1:1 Not tainted 5.3.0-rc2+ #23 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event RIP: 0010:snd_usb_pipe_sanity_check+0x80/0x130 sound/usb/helper.c:75 Code: 48 c1 ea 03 80 3c 02 00 0f 85 b3 00 00 00 48 8b 6d 00 c1 eb 1e 48 b8 00 00 00 00 00 fc ff df 48 8d 7d 03 48 89 fa 48 c1 ea 03 <0f> b6 04 02 48 89 fa 83 e2 07 38 d0 7f 04 84 c0 75 7b 48 b8 00 00 RSP: 0018:ffff8881da2f7010 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: 0000000000000001 RCX: ffffffff8484d252 RDX: 0000000000000000 RSI: ffffffff8484d26c RDI: 0000000000000003 RBP: 0000000000000000 R08: ffff8881da22e000 R09: ffffed103b665d58 R10: ffffed103b665d57 R11: ffff8881db32eabf R12: 0000000000000000 R13: ffff8881d400ba80 R14: 1ffff1103b45ee06 R15: ffff8881c79244a0 FS: 0000000000000000(0000) GS:ffff8881db300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f31b2a87000 CR3: 00000001d3fd4000 CR4: 00000000001406e0 Call Trace: snd_usb_motu_microbookii_communicate.constprop.0+0xa0/0x2fb sound/usb/quirks.c:1007 snd_usb_motu_microbookii_boot_quirk sound/usb/quirks.c:1051 [inline] snd_usb_apply_boot_quirk.cold+0x163/0x370 sound/usb/quirks.c:1280 usb_audio_probe+0x2ec/0x2010 sound/usb/card.c:576 usb_probe_interface+0x305/0x7a0 drivers/usb/core/driver.c:361 really_probe+0x281/0x650 drivers/base/dd.c:548 driver_probe_device+0x101/0x1b0 drivers/base/dd.c:709 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:816 bus_for_each_drv+0x15c/0x1e0 drivers/base/bus.c:454 __device_attach+0x217/0x360 drivers/base/dd.c:882 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:514 device_add+0xae6/0x16f0 drivers/base/core.c:2114 usb_set_configuration+0xdf6/0x1670 drivers/usb/core/message.c:2023 generic_probe+0x9d/0xd5 drivers/usb/core/generic.c:210 usb_probe_device+0x99/0x100 drivers/usb/core/driver.c:266 really_probe+0x281/0x650 drivers/base/dd.c:548 driver_probe_device+0x101/0x1b0 drivers/base/dd.c:709 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:816 bus_for_each_drv+0x15c/0x1e0 drivers/base/bus.c:454 __device_attach+0x217/0x360 drivers/base/dd.c:882 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:514 device_add+0xae6/0x16f0 drivers/base/core.c:2114 usb_new_device.cold+0x6a4/0xe79 drivers/usb/core/hub.c:2536 hub_port_connect drivers/usb/core/hub.c:5098 [inline] hub_port_connect_change drivers/usb/core/hub.c:5213 [inline] port_event drivers/usb/core/hub.c:5359 [inline] hub_event+0x1b5c/0x3640 drivers/usb/core/hub.c:5441 process_one_work+0x92b/0x1530 kernel/workqueue.c:2269 worker_thread+0x96/0xe20 kernel/workqueue.c:2415 kthread+0x318/0x420 kernel/kthread.c:255 ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 Modules linked in: ---[ end trace 41e8577a8c48635e ]--- RIP: 0010:snd_usb_pipe_sanity_check+0x80/0x130 sound/usb/helper.c:75 Code: 48 c1 ea 03 80 3c 02 00 0f 85 b3 00 00 00 48 8b 6d 00 c1 eb 1e 48 b8 00 00 00 00 00 fc ff df 48 8d 7d 03 48 89 fa 48 c1 ea 03 <0f> b6 04 02 48 89 fa 83 e2 07 38 d0 7f 04 84 c0 75 7b 48 b8 00 00 RSP: 0018:ffff8881da2f7010 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: 0000000000000001 RCX: ffffffff8484d252 RDX: 0000000000000000 RSI: ffffffff8484d26c RDI: 0000000000000003 RBP: 0000000000000000 R08: ffff8881da22e000 R09: ffffed103b665d58 R10: ffffed103b665d57 R11: ffff8881db32eabf R12: 0000000000000000 R13: ffff8881d400ba80 R14: 1ffff1103b45ee06 R15: ffff8881c79244a0 FS: 0000000000000000(0000) GS:ffff8881db300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f31b2a87000 CR3: 00000001d3fd4000 CR4: 00000000001406e0 --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

2 1

[alsa-devel] [PATCH] ALSA: sparc: Mark expected switch fall-throughs
by Gustavo A. R. Silva 30 Jul '19

30 Jul '19

Mark switch cases where we are expecting to fall through. This patch fixes the following warnings (Building: sparc64): sound/sparc/dbri.c: In function ‘reverse_bytes’: sound/sparc/dbri.c:582:5: warning: this statement may fall through [-Wimplicit-fallthrough=] b = ((b & 0xffff0000) >> 16) | ((b & 0x0000ffff) << 16); ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/sparc/dbri.c:583:2: note: here case 16: ^~~~ sound/sparc/dbri.c:584:5: warning: this statement may fall through [-Wimplicit-fallthrough=] b = ((b & 0xff00ff00) >> 8) | ((b & 0x00ff00ff) << 8); ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/sparc/dbri.c:585:2: note: here case 8: ^~~~ sound/sparc/dbri.c:586:5: warning: this statement may fall through [-Wimplicit-fallthrough=] b = ((b & 0xf0f0f0f0) >> 4) | ((b & 0x0f0f0f0f) << 4); ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/sparc/dbri.c:587:2: note: here case 4: ^~~~ sound/sparc/dbri.c:588:5: warning: this statement may fall through [-Wimplicit-fallthrough=] b = ((b & 0xcccccccc) >> 2) | ((b & 0x33333333) << 2); ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/sparc/dbri.c:589:2: note: here case 2: ^~~~ Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- sound/sparc/dbri.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 010113156239..6e065d44060e 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -580,12 +580,16 @@ static __u32 reverse_bytes(__u32 b, int len) switch (len) { case 32: b = ((b & 0xffff0000) >> 16) | ((b & 0x0000ffff) << 16); + /* fall through */ case 16: b = ((b & 0xff00ff00) >> 8) | ((b & 0x00ff00ff) << 8); + /* fall through */ case 8: b = ((b & 0xf0f0f0f0) >> 4) | ((b & 0x0f0f0f0f) << 4); + /* fall through */ case 4: b = ((b & 0xcccccccc) >> 2) | ((b & 0x33333333) << 2); + /* fall through */ case 2: b = ((b & 0xaaaaaaaa) >> 1) | ((b & 0x55555555) << 1); case 1: -- 2.22.0

2 1

[alsa-devel] [PATCH v2] sound: dmasound_atari: Mark expected switch fall-through
by Gustavo A. R. Silva 30 Jul '19

30 Jul '19

Mark switch cases where we are expecting to fall through. This patch fixes the following warning (Building: m68k): sound/oss/dmasound/dmasound_atari.c: warning: this statement may fall through [-Wimplicit-fallthrough=]: => 1449:24 Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find. Reported-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- Changes in v2: - Update code so switch and case statements are at the same indent. sound/oss/dmasound/dmasound_atari.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c index 83653683fd68..823ccfa089b2 100644 --- a/sound/oss/dmasound/dmasound_atari.c +++ b/sound/oss/dmasound/dmasound_atari.c @@ -1432,25 +1432,25 @@ static int FalconMixerIoctl(u_int cmd, u_long arg) { int data; switch (cmd) { - case SOUND_MIXER_READ_RECMASK: + case SOUND_MIXER_READ_RECMASK: return IOCTL_OUT(arg, SOUND_MASK_MIC); - case SOUND_MIXER_READ_DEVMASK: + case SOUND_MIXER_READ_DEVMASK: return IOCTL_OUT(arg, SOUND_MASK_VOLUME | SOUND_MASK_MIC | SOUND_MASK_SPEAKER); - case SOUND_MIXER_READ_STEREODEVS: + case SOUND_MIXER_READ_STEREODEVS: return IOCTL_OUT(arg, SOUND_MASK_VOLUME | SOUND_MASK_MIC); - case SOUND_MIXER_READ_VOLUME: + case SOUND_MIXER_READ_VOLUME: return IOCTL_OUT(arg, VOLUME_ATT_TO_VOXWARE(dmasound.volume_left) | VOLUME_ATT_TO_VOXWARE(dmasound.volume_right) << 8); - case SOUND_MIXER_READ_CAPS: + case SOUND_MIXER_READ_CAPS: return IOCTL_OUT(arg, SOUND_CAP_EXCL_INPUT); - case SOUND_MIXER_WRITE_MIC: + case SOUND_MIXER_WRITE_MIC: IOCTL_IN(arg, data); tt_dmasnd.input_gain = RECLEVEL_VOXWARE_TO_GAIN(data & 0xff) << 4 | RECLEVEL_VOXWARE_TO_GAIN(data >> 8 & 0xff); - /* fall thru, return set value */ - case SOUND_MIXER_READ_MIC: + /* fall through - return set value */ + case SOUND_MIXER_READ_MIC: return IOCTL_OUT(arg, RECLEVEL_GAIN_TO_VOXWARE(tt_dmasnd.input_gain >> 4 & 0xf) | RECLEVEL_GAIN_TO_VOXWARE(tt_dmasnd.input_gain & 0xf) << 8); -- 2.22.0

4 3

[alsa-devel] [PATCH] ALSA: pcm: fix lost wakeup event scenarios in snd_pcm_drain
by Adam Miartus 29 Jul '19

29 Jul '19

From: Yuki Tsunashima <ytsunashima(a)jp.adit-jv.com> lost wakeup can occur after enabling irq, therefore put task into interruptible before enabling interrupts, without this change, task can be put to sleep and snd_pcm_drain will delay Signed-off-by: Yuki Tsunashima <ytsunashima(a)jp.adit-jv.com> Signed-off-by: Suresh Udipi <sudipi(a)jp.adit-jv.com> [ported from 4.9] Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> --- sound/core/pcm_native.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 860543a..fe333c8 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1874,6 +1874,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, if (!to_check) break; /* all drained */ init_waitqueue_entry(&wait, current); + set_current_state(TASK_INTERRUPTIBLE); add_wait_queue(&to_check->sleep, &wait); snd_pcm_stream_unlock_irq(substream); if (runtime->no_period_wakeup) @@ -1886,7 +1887,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, } tout = msecs_to_jiffies(tout * 1000); } - tout = schedule_timeout_interruptible(tout); + tout = schedule_timeout(tout); snd_pcm_stream_lock_irq(substream); group = snd_pcm_stream_group_ref(substream); -- 2.7.4

2 1

[alsa-devel] [PATCH] sound: dmasound_atari: Mark expected switch fall-through
by Gustavo A. R. Silva 29 Jul '19

29 Jul '19

Mark switch cases where we are expecting to fall through. This patch fixes the following warning: sound/oss/dmasound/dmasound_atari.c: warning: this statement may fall through [-Wimplicit-fallthrough=]: => 1449:24 Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find. Reported-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- sound/oss/dmasound/dmasound_atari.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c index 83653683fd68..b5845e904ba1 100644 --- a/sound/oss/dmasound/dmasound_atari.c +++ b/sound/oss/dmasound/dmasound_atari.c @@ -1449,7 +1449,7 @@ static int FalconMixerIoctl(u_int cmd, u_long arg) tt_dmasnd.input_gain = RECLEVEL_VOXWARE_TO_GAIN(data & 0xff) << 4 | RECLEVEL_VOXWARE_TO_GAIN(data >> 8 & 0xff); - /* fall thru, return set value */ + /* fall through - return set value */ case SOUND_MIXER_READ_MIC: return IOCTL_OUT(arg, RECLEVEL_GAIN_TO_VOXWARE(tt_dmasnd.input_gain >> 4 & 0xf) | -- 2.22.0

2 1

[alsa-devel] Writing a driver for a device with no device-side buffer pointer
by Paul 29 Jul '19

29 Jul '19

Hello, I am trying to write an ALSA driver for the T2 controller present in the 2018 MacBook Pro machine by reverse engineering the OS X driver, however I have ran into synchronization issues. The controller uses a ring buffer for the actual audio transfer, however there's no way for me to tell what position the device is currently reading from. Other than the ring buffer the device utilizes a two-way command protocol. Additionally, the host sends a timestamp to the device every 150ms. When starting audio playback the host sends a StartIO command to the device, and then the device periodically sends an UpdateTimestamp command to the host which sends the timestamp in the host's time (by using the timestamp the host sent to it some time before and appropriately offsetting it; the update is sent ~every 0.346s; this is the amount of time that can be stored in the ring buffer at a time - it's forced at 48kHz, with 0x4100 values for each channel in the buffer which also calculates to basically this value; I'm not 100% sure about the full purpose of this command as I suspect it might be also used to reset the buffer position, but this is just a guess). When the playback is finished, a StopIO command is sent by the host. I tried searching in the Linux kernel for devices using a similar system but I had trouble finding any results. I have also tried returning an approximated (by using the synched up time) pointer, however that ended up in garbage audio output. I also tried returning the substream->runtime->control->appl_ptr pointer, but this also ended up in garbage audio output. I have observed the following results while the default test tools: - speaker-test is the closest to giving any output making sense. When using the `sine` mode, you can however hear a clear break every 0.5s or around that. In `pink` mode, the noise generally makes sense but sounds distorted around this 0.5s interval as well. In `wav` mode a repeating "front-" sound can be heard. These observations were originally made when I returned 0 from pcm_pointer, attempting the other methods however ended up in the same result (appl_ptr in particular had to end up this way because it simply ended up in a zero return from the pointer method, as speaker-test seems to fill the whole buffer). - aplay gives either no audible output (0 return) or garbage audio (the appl_ptr and time sync approaches) I have trouble understanding how would this system be implemented using the ALSA's pointer functions. Any help, explanations, code snippets or references to the documentation or existing Linux drivers which may share similarities with this device would be greatly appreciated. I am also attaching code snippets in case they are of any use for my particular issue. Thank you, Paul Pawlowski Additional configuration information: static struct snd_pcm_hardware aaudio_basic_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME | SNDRV_PCM_INFO_SYNC_APPLPTR), .formats = SNDRV_PCM_FMTBIT_S24_LE, .rates = SNDRV_PCM_RATE_48000, .rate_min = 48000, .rate_max = 48000, .channels_min = 4, .channels_max = 4, .buffer_bytes_max = 0x41000, .period_bytes_min = 0x10, .period_bytes_max = 0x10, .periods_min = 0x4100, .periods_max = 0x4100, }; The "time-sync" test approach way of managing the pointer: static snd_pcm_uframes_t aaudio_pcm_pointer(struct snd_pcm_substream *substream) { ktime_t b; struct aaudio_device *a = snd_pcm_substream_chip(substream); b = ktime_get_boottime() - a->recv_ts_remote; b = (ktime_to_ns(b) % 346666666) * 0x41000 / 346666666; b -= b % 0x10; return bytes_to_frames(substream->runtime, b); }

1 0

[alsa-devel] [PATCH] [ASoC][soc-dapm] : memory leak in the func snd_soc_dapm_new_dai
by Satendra Singh Thakur 29 Jul '19

29 Jul '19

In the func snd_soc_dapm_new_dai, if the inner func snd_soc_dapm_alloc_kcontrol fails, there will be memory leak. The label param_fail wont free memory which is allocated by the func devm_kcalloc. Hence new label is created for this purpose. Signed-off-by: Satendra Singh Thakur <thakursatendra2003(a)yahoo.co.in> --- sound/soc/soc-dapm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f013b24c050a..f62d41ee6d68 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4095,7 +4095,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, w_param_text, &private_value); if (!template.kcontrol_news) { ret = -ENOMEM; - goto param_fail; + goto outfree_w_param; } } else { w_param_text = NULL; @@ -4114,6 +4114,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, outfree_kcontrol_news: devm_kfree(card->dev, (void *)template.kcontrol_news); +outfree_w_param: snd_soc_dapm_free_kcontrol(card, &private_value, rtd->dai_link->num_params, w_param_text); param_fail: -- 2.17.1

2 1

[alsa-devel] [alsa-lib][v1.1.19][pcm][multi plug] multi plug stuck in busy loop which caused high cpu loading.
by eleven xiang 29 Jul '19

29 Jul '19

Dear, Currently, for Audio Echo Cancellation process, we combined both mic signal and reference signal into one pcm with the multi plug. And both the mic and ref signal are hw pcm devices, and they lived in the same sound card in driver. Here is the issue: 1. the master slave pcm device is already for read; 2. the second salve pcm is not ready for read, which means no data; 3. under this situation, snd_pcm_read_areas function will be stuck in busy loop as below: avail = snd_pcm_avail_update(pcm); * // here always return avail=0, due to the second salve pcm device wasn't ready* if (avail < 0) { err = avail; goto _end; } if (avail == 0) { if (state == SND_PCM_STATE_DRAINING) goto _end; if (pcm->mode & SND_PCM_NONBLOCK) { err = -EAGAIN; goto _end; } err = snd_pcm_wait(pcm, -1); * // return immediately, due to the master slave pcm was ready for read.* if (err < 0) break; goto _again; *// stuck in busy loop !! again and again until the second pcm data was ready !!!* } it seemed that the root cause is that the two devices have obvious interrupt period gap , and we also found that this issue can be easily reproduced on our device under low memory case. Currently we monitor this gap and return error to up layer to close-and-reopen device to fix this issue. So I wonder if there is any good solution ? Thanks -- BR, eleven_xiang

2 2

[alsa-devel] [PATCH] ALSA: aoa: onyx: always initalize register read value
by Johannes Berg 29 Jul '19

29 Jul '19

A lot of places in the driver use onyx_read_register() without checking the return value, and it's been working OK for ~10 years or so, so probably never fails ... Rather than trying to check the return value everywhere, which would be relatively intrusive, at least make sure we don't use an uninitialized value. Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Johannes Berg <johannes(a)sipsolutions.net> --- sound/aoa/codecs/onyx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c index db917546965d..9827bee109c1 100644 --- a/sound/aoa/codecs/onyx.c +++ b/sound/aoa/codecs/onyx.c @@ -71,8 +71,10 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value) return 0; } v = i2c_smbus_read_byte_data(onyx->i2c, reg); - if (v < 0) + if (v < 0) { + *value = 0; return -1; + } *value = (u8)v; onyx->cache[ONYX_REG_CONTROL-FIRSTREGISTER] = *value; return 0; -- 2.20.1

2 1

[alsa-devel] [BUG] ALSA: core: seq: a possible double-lock bug in snd_seq_midisynth_remove()
by Jia-Ju Bai 29 Jul '19

29 Jul '19

In snd_seq_midisynth_remove(), there is a possible double-lock bug: snd_seq_midisynth_remove() mutex_lock(&register_mutex); -- line 421 snd_seq_delete_kernel_client() --- line 436 seq_free_client() -- line 2244 mutex_lock(&register_mutex); -- line 294 This bug is found by a static analysis tool STCheck written by us. I do not know how to correctly fix this bug, so I only report it. A possible fix is to release the mutex lock before calling seq_free_client() in snd_seq_delete_kernel_client() and then acquiring the lock again after calling seq_free_client(). Best wishes, Jia-Ju Bai

2 1

[alsa-devel] [PATCH V7] ALSA: usb-audio: Scarlett Gen 2 mixer interface
by Geoffrey D. Bennett 28 Jul '19

28 Jul '19

Add mixer quirk for the Focusrite Scarlett 6i6, 18i8, and 18i20 Gen 2 audio interfaces. Although the interfaces are USB compliant, additional input/output level controls and hardware routing/mixing functionality are available using proprietary USB requests. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- Hi all, This patch adds the following controls for the Scarlett 6i6, 18i8, and 18i20 Gen 2: - Master volume knob indicator (18i20 only) - Mute and dim switches (18i20 only) - Volume controls for the analogue HW outputs - HW/SW volume switches for the 10 analogue HW outputs (18i20 only) - Line Level/Instrument Level and Pad controls (6i6 and 18i8 only) - Output mux (where the sound for the HW outputs comes from; defaults to PCM outputs) - Capture mux (where the sound for PCM recording comes from; defaults to HW inputs) - Matrix mux (where the sound going into the mixer comes from; 18 inputs default off) - Mixer matrix (18 inputs * 10 outputs = 180 controls) - Level meters Changes since v1: - Add support for the Scarlett 18i8 Gen 2 - Save configuration parameters to NVRAM - Implemented feedback from Takashi's email 24/Apr/2019 - Moved private field from struct snd_usb_audio to struct usb_mixer_interface - Added timer and buffer fields to struct usb_mixer_interface - Other small code fixes/cleanups/improvements Changes since v2: - Add support for the Scarlett 6i6 Gen 2 - Add support for controlling the mute/dim switches (18i20 only) - Implemented feedback from Takashi's email 29/Apr/2019: One pointer field private_data and one function pointer private_free. Replaced timer with delayed work (thanks for that suggestion; it makes the code a *lot* simpler!). - The new functionality is disabled by default as there were reports of some Gen 2 devices not responding to the initialisation sequence and hanging. Added module parameter "scarlett_gen2_mixer_enable". If this parameter is not set, logs a message "Focusrite Scarlett Gen 2 Mixer Driver disabled; use options snd_usb_audio scarlett_gen2_mixer_enable=1 to enable and report any issues to g(a)b4.vu". Changes since v3: - No functional changes; fix checkpatch.pl error and typo in declaration. Changes since v4: - Implemented feedback from Takashi's email 9/Jul/2019: cancel delayed work on suspend, drop copyright texts, remove unnecessary blank lines, and run kmalloc outside the mutex. Changes since v5: - Implemented feedback from Takashi's emails 9-10/Jul/2019: use chip->setup value (device_setup option) instead of the scarlett_gen2_mixer_enable option and sync config to NVRAM immediately on suspend. - Fixed issue where the config save delayed work would be cancelled and not restarted if a scarlett2_*_ctl_put() function was called and the parameter value was not changed. - Renaming definitions and functions for consistency and move private free/suspend functions above their use so pre-declaration isn't necessary. Changes since v6: - Implemented feedback from Takashi's email 18/Jul/2019: use snd_usb_pipe_sanity_check() to verify pipe, and initialise pointers as "NULL" not "0". diff --git a/sound/usb/Makefile b/sound/usb/Makefile index e1ce257ab705..f4b7384caa9d 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -11,6 +11,7 @@ snd-usb-audio-objs := card.o \ mixer.o \ mixer_quirks.o \ mixer_scarlett.o \ + mixer_scarlett_gen2.o \ mixer_us16x08.o \ pcm.o \ power.o \ diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 7498b5191b68..7b51ab4c35b0 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3509,6 +3509,8 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) usb_kill_urb(mixer->urb); if (mixer->rc_urb) usb_kill_urb(mixer->rc_urb); + if (mixer->private_free) + mixer->private_free(mixer); mixer->disconnected = true; } @@ -3536,6 +3538,8 @@ static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer) int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer) { snd_usb_mixer_inactivate(mixer); + if (mixer->private_suspend) + mixer->private_suspend(mixer); return 0; } diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 394cd9107507..37e1b234c802 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -28,6 +28,10 @@ struct usb_mixer_interface { struct media_mixer_ctl *media_mixer_ctl; bool disconnected; + + void *private_data; + void (*private_free)(struct usb_mixer_interface *mixer); + void (*private_suspend)(struct usb_mixer_interface *mixer); }; #define MAX_CHANNELS 16 /* max logical channels */ diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 199fa157a411..70805c15b0b5 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -32,6 +32,7 @@ #include "mixer.h" #include "mixer_quirks.h" #include "mixer_scarlett.h" +#include "mixer_scarlett_gen2.h" #include "mixer_us16x08.h" #include "helper.h" @@ -2258,6 +2259,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_scarlett_controls_create(mixer); break; + case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */ + case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */ + case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */ + err = snd_scarlett_gen2_controls_create(mixer); + break; + case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ err = snd_soundblaster_e1_switch_create(mixer); break; diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c new file mode 100644 index 000000000000..7d460b1f1735 --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.c @@ -0,0 +1,2075 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Focusrite Scarlett 6i6/18i8/18i20 Gen 2 Driver for ALSA + * + * Copyright (c) 2018-2019 by Geoffrey D. Bennett <g at b4.vu> + * + * Based on the Scarlett (Gen 1) Driver for ALSA: + * + * Copyright (c) 2013 by Tobias Hoffmann + * Copyright (c) 2013 by Robin Gareus <robin at gareus.org> + * Copyright (c) 2002 by Takashi Iwai <tiwai at suse.de> + * Copyright (c) 2014 by Chris J Arges <chris.j.arges at canonical.com> + * + * Many codes borrowed from audio.c by + * Alan Cox (alan at lxorguk.ukuu.org.uk) + * Thomas Sailer (sailer at ife.ee.ethz.ch) + * + * Code cleanup: + * David Henningsson <david.henningsson at canonical.com> + */ + +/* Mixer Interface for the Focusrite Scarlett 6i6/18i8/18i20 Gen 2 audio + * interface. Based on the Gen 1 driver and rewritten. + */ + +/* The protocol was reverse engineered by looking at the communication + * between Focusrite Control 2.3.4 and the Focusrite(R) Scarlett 18i20 + * (firmware 1083) using usbmon in July-August 2018. + * + * Scarlett 18i8 support added in April 2019. + * + * Scarlett 6i6 support added in June 2019 (thanks to Martin Wittmann + * for providing usbmon output and testing). + * + * This ALSA mixer gives access to: + * - input, output, mixer-matrix muxes + * - 18x10 mixer-matrix gain stages + * - gain/volume controls + * - level meters + * - line/inst level and pad controls + * + * <ditaa> + * /--------------\ 18chn 20chn /--------------\ + * | Hardware in +--+------\ /-------------+--+ ALSA PCM out | + * \--------------/ | | | | \--------------/ + * | | | /-----\ | + * | | | | | | + * | v v v | | + * | +---------------+ | | + * | \ Matrix Mux / | | + * | +-----+-----+ | | + * | | | | + * | |18chn | | + * | | | | + * | | 10chn| | + * | v | | + * | +------------+ | | + * | | Mixer | | | + * | | Matrix | | | + * | | | | | + * | | 18x10 Gain | | | + * | | stages | | | + * | +-----+------+ | | + * | | | | + * |18chn |10chn | |20chn + * | | | | + * | +----------/ | + * | | | + * v v v + * =========================== + * +---------------+ +--—------------+ + * \ Output Mux / \ Capture Mux / + * +---+---+---+ +-----+-----+ + * | | | + * 10chn| | |18chn + * | | | + * /--------------\ | | | /--------------\ + * | S/PDIF, ADAT |<--/ |10chn \-->| ALSA PCM in | + * | Hardware out | | \--------------/ + * \--------------/ | + * v + * +-------------+ Software gain per channel. + * | Master Gain |<-- 18i20 only: Switch per channel + * +------+------+ to select HW or SW gain control. + * | + * |10chn + * /--------------\ | + * | Analogue |<------/ + * | Hardware out | + * \--------------/ + * </ditaa> + * + */ + +#include <linux/slab.h> +#include <linux/usb.h> +#include <linux/moduleparam.h> + +#include <sound/control.h> +#include <sound/tlv.h> + +#include "usbaudio.h" +#include "mixer.h" +#include "helper.h" + +#include "mixer_scarlett_gen2.h" + +/* device_setup value to enable */ +#define SCARLETT2_ENABLE 0x01 + +/* some gui mixers can't handle negative ctl values */ +#define SCARLETT2_VOLUME_BIAS 127 + +/* mixer range from -80dB to +6dB in 0.5dB steps */ +#define SCARLETT2_MIXER_MIN_DB -80 +#define SCARLETT2_MIXER_BIAS (-SCARLETT2_MIXER_MIN_DB * 2) +#define SCARLETT2_MIXER_MAX_DB 6 +#define SCARLETT2_MIXER_MAX_VALUE \ + ((SCARLETT2_MIXER_MAX_DB - SCARLETT2_MIXER_MIN_DB) * 2) + +/* map from (dB + 80) * 2 to mixer value + * for dB in 0 .. 172: int(8192 * pow(10, ((dB - 160) / 2 / 20))) + */ +static const u16 scarlett2_mixer_values[173] = { + 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 23, 24, 25, 27, 29, 30, 32, 34, 36, 38, 41, 43, 46, 48, 51, + 54, 57, 61, 65, 68, 73, 77, 81, 86, 91, 97, 103, 109, 115, + 122, 129, 137, 145, 154, 163, 173, 183, 194, 205, 217, 230, + 244, 259, 274, 290, 307, 326, 345, 365, 387, 410, 434, 460, + 487, 516, 547, 579, 614, 650, 689, 730, 773, 819, 867, 919, + 973, 1031, 1092, 1157, 1225, 1298, 1375, 1456, 1543, 1634, + 1731, 1833, 1942, 2057, 2179, 2308, 2445, 2590, 2744, 2906, + 3078, 3261, 3454, 3659, 3876, 4105, 4349, 4606, 4879, 5168, + 5475, 5799, 6143, 6507, 6892, 7301, 7733, 8192, 8677, 9191, + 9736, 10313, 10924, 11571, 12257, 12983, 13752, 14567, 15430, + 16345 +}; + +/* Maximum number of analogue outputs */ +#define SCARLETT2_ANALOGUE_MAX 10 + +/* Maximum number of level and pad switches */ +#define SCARLETT2_LEVEL_SWITCH_MAX 2 +#define SCARLETT2_PAD_SWITCH_MAX 4 + +/* Maximum number of inputs to the mixer */ +#define SCARLETT2_INPUT_MIX_MAX 18 + +/* Maximum number of outputs from the mixer */ +#define SCARLETT2_OUTPUT_MIX_MAX 10 + +/* Maximum size of the data in the USB mux assignment message: + * 18 inputs, 20 outputs, 18 matrix inputs, 8 spare + */ +#define SCARLETT2_MUX_MAX 64 + +/* Number of meters: + * 18 inputs, 20 outputs, 18 matrix inputs + */ +#define SCARLETT2_NUM_METERS 56 + +/* Hardware port types: + * - None (no input to mux) + * - Analogue I/O + * - S/PDIF I/O + * - ADAT I/O + * - Mixer I/O + * - PCM I/O + */ +enum { + SCARLETT2_PORT_TYPE_NONE = 0, + SCARLETT2_PORT_TYPE_ANALOGUE = 1, + SCARLETT2_PORT_TYPE_SPDIF = 2, + SCARLETT2_PORT_TYPE_ADAT = 3, + SCARLETT2_PORT_TYPE_MIX = 4, + SCARLETT2_PORT_TYPE_PCM = 5, + SCARLETT2_PORT_TYPE_COUNT = 6, +}; + +/* Count of total I/O and number available at each sample rate */ +enum { + SCARLETT2_PORT_IN = 0, + SCARLETT2_PORT_OUT = 1, + SCARLETT2_PORT_OUT_44 = 2, + SCARLETT2_PORT_OUT_88 = 3, + SCARLETT2_PORT_OUT_176 = 4, + SCARLETT2_PORT_DIRECTIONS = 5, +}; + +/* Hardware buttons on the 18i20 */ +#define SCARLETT2_BUTTON_MAX 2 + +static const char *const scarlett2_button_names[SCARLETT2_BUTTON_MAX] = { + "Mute", "Dim" +}; + +/* Description of each hardware port type: + * - id: hardware ID for this port type + * - num: number of sources/destinations of this port type + * - src_descr: printf format string for mux input selections + * - src_num_offset: added to channel number for the fprintf + * - dst_descr: printf format string for mixer controls + */ +struct scarlett2_ports { + u16 id; + int num[SCARLETT2_PORT_DIRECTIONS]; + const char * const src_descr; + int src_num_offset; + const char * const dst_descr; +}; + +struct scarlett2_device_info { + u8 line_out_hw_vol; /* line out hw volume is sw controlled */ + u8 button_count; /* number of buttons */ + u8 level_input_count; /* inputs with level selectable */ + u8 pad_input_count; /* inputs with pad selectable */ + const char * const line_out_descrs[SCARLETT2_ANALOGUE_MAX]; + struct scarlett2_ports ports[SCARLETT2_PORT_TYPE_COUNT]; +}; + +struct scarlett2_mixer_data { + struct usb_mixer_interface *mixer; + struct mutex usb_mutex; /* prevent sending concurrent USB requests */ + struct mutex data_mutex; /* lock access to this data */ + struct delayed_work work; + const struct scarlett2_device_info *info; + int num_mux_srcs; + u16 scarlett2_seq; + u8 vol_updated; + u8 master_vol; + u8 vol[SCARLETT2_ANALOGUE_MAX]; + u8 vol_sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + u8 level_switch[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switch[SCARLETT2_PAD_SWITCH_MAX]; + u8 buttons[SCARLETT2_BUTTON_MAX]; + struct snd_kcontrol *master_vol_ctl; + struct snd_kcontrol *vol_ctls[SCARLETT2_ANALOGUE_MAX]; + struct snd_kcontrol *button_ctls[SCARLETT2_BUTTON_MAX]; + u8 mux[SCARLETT2_MUX_MAX]; + u8 mix[SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX]; +}; + +/*** Model-specific data ***/ + +static const struct scarlett2_device_info s6i6_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first two analogue inputs have an optional pad. */ + .pad_input_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones L", + "Headphones R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 8 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 4, 4, 4, 4, 4 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 6, 6, 6, 6, 6 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i8_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first four analogue inputs have an optional pad. */ + .pad_input_count = 4, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 4 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 6, 6, 6, 6 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 0, 0, 0, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i20_gen2_info = { + /* The analogue line outputs on the 18i20 can be switched + * between software and hardware volume control + */ + .line_out_hw_vol = 1, + + /* Mute and dim buttons */ + .button_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + NULL, + NULL, + NULL, + NULL, + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 6 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 10, 10, 10, 10 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 8, 8, 4, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + .dst_descr = "ADAT Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +/* get the starting port index number for a given port type/direction */ +static int scarlett2_get_port_start_num(const struct scarlett2_ports *ports, + int direction, int port_type) +{ + int i, num = 0; + + for (i = 0; i < port_type; i++) + num += ports[i].num[direction]; + + return num; +} + +/*** USB Interactions ***/ + +/* Vendor-Specific Interface, Endpoint, MaxPacketSize, Interval */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE 5 +#define SCARLETT2_USB_INTERRUPT_ENDPOINT 4 +#define SCARLETT2_USB_INTERRUPT_MAX_DATA 64 +#define SCARLETT2_USB_INTERRUPT_INTERVAL 3 + +/* Interrupt flags for volume and mute/dim button changes */ +#define SCARLETT2_USB_INTERRUPT_VOL_CHANGE 0x400000 +#define SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE 0x200000 + +/* Commands for sending/receiving requests/responses */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ 2 +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP 3 + +#define SCARLETT2_USB_INIT_SEQ 0x00000000 +#define SCARLETT2_USB_GET_METER_LEVELS 0x00001001 +#define SCARLETT2_USB_SET_MIX 0x00002002 +#define SCARLETT2_USB_SET_MUX 0x00003002 +#define SCARLETT2_USB_GET_DATA 0x00800000 +#define SCARLETT2_USB_SET_DATA 0x00800001 +#define SCARLETT2_USB_DATA_CMD 0x00800002 +#define SCARLETT2_USB_CONFIG_SAVE 6 + +#define SCARLETT2_USB_VOLUME_STATUS_OFFSET 0x31 +#define SCARLETT2_USB_METER_LEVELS_GET_MAGIC 1 + +/* volume status is read together (matches scarlett2_config_items[]) */ +struct scarlett2_usb_volume_status { + /* mute & dim buttons */ + u8 buttons[SCARLETT2_BUTTON_MAX]; + + u8 pad1; + + /* software volume setting */ + s16 sw_vol[SCARLETT2_ANALOGUE_MAX]; + + /* actual volume of output inc. dim (-18dB) */ + s16 hw_vol[SCARLETT2_ANALOGUE_MAX]; + + u8 pad2[SCARLETT2_ANALOGUE_MAX]; + + /* sw (0) or hw (1) controlled */ + u8 sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + + u8 pad3[6]; + + /* front panel volume knob */ + s16 master_vol; +} __packed; + +/* Configuration parameters that can be read and written */ +enum { + SCARLETT2_CONFIG_BUTTONS = 0, + SCARLETT2_CONFIG_LINE_OUT_VOLUME = 1, + SCARLETT2_CONFIG_SW_HW_SWITCH = 2, + SCARLETT2_CONFIG_LEVEL_SWITCH = 3, + SCARLETT2_CONFIG_PAD_SWITCH = 4, + SCARLETT2_CONFIG_COUNT = 5 +}; + +/* Location, size, and activation command number for the configuration + * parameters + */ +struct scarlett2_config { + u8 offset; + u8 size; + u8 activate; +}; + +static const struct scarlett2_config + scarlett2_config_items[SCARLETT2_CONFIG_COUNT] = { + /* Mute/Dim Buttons */ + { + .offset = 0x31, + .size = 1, + .activate = 2 + }, + + /* Line Out Volume */ + { + .offset = 0x34, + .size = 2, + .activate = 1 + }, + + /* SW/HW Volume Switch */ + { + .offset = 0x66, + .size = 1, + .activate = 3 + }, + + /* Level Switch */ + { + .offset = 0x7c, + .size = 1, + .activate = 7 + }, + + /* Pad Switch */ + { + .offset = 0x84, + .size = 1, + .activate = 8 + } +}; + +/* proprietary request/response format */ +struct scarlett2_usb_packet { + u32 cmd; + u16 size; + u16 seq; + u32 error; + u32 pad; + u8 data[]; +}; + +#define SCARLETT2_USB_PACKET_LEN (sizeof(struct scarlett2_usb_packet)) + +static void scarlett2_fill_request_header(struct scarlett2_mixer_data *private, + struct scarlett2_usb_packet *req, + u32 cmd, u16 req_size) +{ + /* sequence must go up by 1 for each request */ + u16 seq = private->scarlett2_seq++; + + req->cmd = cpu_to_le32(cmd); + req->size = cpu_to_le16(req_size); + req->seq = cpu_to_le16(seq); + req->error = 0; + req->pad = 0; +} + +/* Send a proprietary format request to the Scarlett interface */ +static int scarlett2_usb( + struct usb_mixer_interface *mixer, u32 cmd, + void *req_data, u16 req_size, void *resp_data, u16 resp_size) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + u16 req_buf_size = sizeof(struct scarlett2_usb_packet) + req_size; + u16 resp_buf_size = sizeof(struct scarlett2_usb_packet) + resp_size; + struct scarlett2_usb_packet *req = NULL, *resp = NULL; + int err = 0; + + req = kmalloc(req_buf_size, GFP_KERNEL); + if (!req) { + err = -ENOMEM; + goto error; + } + + resp = kmalloc(resp_buf_size, GFP_KERNEL); + if (!resp) { + err = -ENOMEM; + goto error; + } + + mutex_lock(&private->usb_mutex); + + /* build request message and send it */ + + scarlett2_fill_request_header(private, req, cmd, req_size); + + if (req_size) + memcpy(req->data, req_data, req_size); + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + req, + req_buf_size); + + if (err != req_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB request result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + /* send a second message to get the response */ + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + resp, + resp_buf_size); + + /* validate the response */ + + if (err != resp_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB response result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + if (resp->cmd != req->cmd || + resp->seq != req->seq || + resp_size != le16_to_cpu(resp->size) || + resp->error || + resp->pad) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB invalid response; " + "cmd tx/rx %d/%d seq %d/%d size %d/%d " + "error %d pad %d\n", + le16_to_cpu(req->cmd), le16_to_cpu(resp->cmd), + le16_to_cpu(req->seq), le16_to_cpu(resp->seq), + resp_size, le16_to_cpu(resp->size), + le16_to_cpu(resp->error), + le16_to_cpu(resp->pad)); + err = -EINVAL; + goto unlock; + } + + if (resp_size > 0) + memcpy(resp_data, resp->data, resp_size); + +unlock: + mutex_unlock(&private->usb_mutex); +error: + kfree(req); + kfree(resp); + return err; +} + +/* Send SCARLETT2_USB_DATA_CMD SCARLETT2_USB_CONFIG_SAVE */ +static void scarlett2_config_save(struct usb_mixer_interface *mixer) +{ + u32 req = cpu_to_le32(SCARLETT2_USB_CONFIG_SAVE); + + scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req, sizeof(u32), + NULL, 0); +} + +/* Delayed work to save config */ +static void scarlett2_config_save_work(struct work_struct *work) +{ + struct scarlett2_mixer_data *private = + container_of(work, struct scarlett2_mixer_data, work.work); + + scarlett2_config_save(private->mixer); +} + +/* Send a USB message to set a configuration parameter (volume level, + * sw/hw volume switch, line/inst level switch, or pad switch) + */ +static int scarlett2_usb_set_config( + struct usb_mixer_interface *mixer, + int config_item_num, int index, int value) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + struct { + u32 offset; + u32 bytes; + s32 value; + } __packed req; + u32 req2; + int err; + struct scarlett2_mixer_data *private = mixer->private_data; + + /* Cancel any pending NVRAM save */ + cancel_delayed_work_sync(&private->work); + + /* Send the configuration parameter data */ + req.offset = cpu_to_le32(config_item.offset + index * config_item.size); + req.bytes = cpu_to_le32(config_item.size); + req.value = cpu_to_le32(value); + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_DATA, + &req, sizeof(u32) * 2 + config_item.size, + NULL, 0); + if (err < 0) + return err; + + /* Activate the change */ + req2 = cpu_to_le32(config_item.activate); + err = scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req2, sizeof(req2), NULL, 0); + if (err < 0) + return err; + + /* Schedule the change to be written to NVRAM */ + schedule_delayed_work(&private->work, msecs_to_jiffies(2000)); + + return 0; +} + +/* Send a USB message to get data; result placed in *buf */ +static int scarlett2_usb_get( + struct usb_mixer_interface *mixer, + int offset, void *buf, int size) +{ + struct { + u32 offset; + u32 size; + } __packed req; + + req.offset = cpu_to_le32(offset); + req.size = cpu_to_le32(size); + return scarlett2_usb(mixer, SCARLETT2_USB_GET_DATA, + &req, sizeof(req), buf, size); +} + +/* Send a USB message to get configuration parameters; result placed in *buf */ +static int scarlett2_usb_get_config( + struct usb_mixer_interface *mixer, + int config_item_num, int count, void *buf) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + int size = config_item.size * count; + + return scarlett2_usb_get(mixer, config_item.offset, buf, size); +} + +/* Send a USB message to get volume status; result placed in *buf */ +static int scarlett2_usb_get_volume_status( + struct usb_mixer_interface *mixer, + struct scarlett2_usb_volume_status *buf) +{ + return scarlett2_usb_get(mixer, SCARLETT2_USB_VOLUME_STATUS_OFFSET, + buf, sizeof(*buf)); +} + +/* Send a USB message to set the volumes for all inputs of one mix + * (values obtained from private->mix[]) + */ +static int scarlett2_usb_set_mix(struct usb_mixer_interface *mixer, + int mix_num) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + + struct { + u16 mix_num; + u16 data[SCARLETT2_INPUT_MIX_MAX]; + } __packed req; + + int i, j; + int num_mixer_in = + info->ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + + req.mix_num = cpu_to_le16(mix_num); + + for (i = 0, j = mix_num * num_mixer_in; i < num_mixer_in; i++, j++) + req.data[i] = cpu_to_le16( + scarlett2_mixer_values[private->mix[j]] + ); + + return scarlett2_usb(mixer, SCARLETT2_USB_SET_MIX, + &req, (num_mixer_in + 1) * sizeof(u16), + NULL, 0); +} + +/* Convert a port number index (per info->ports) to a hardware ID */ +static u32 scarlett2_mux_src_num_to_id(const struct scarlett2_ports *ports, + int num) +{ + int port_type; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (num < ports[port_type].num[SCARLETT2_PORT_IN]) + return ports[port_type].id | num; + num -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + /* Oops */ + return 0; +} + +/* Send USB messages to set mux inputs */ +static int scarlett2_usb_set_mux(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int rate, port_dir_rate; + + static const int assignment_order[SCARLETT2_PORT_TYPE_COUNT] = { + SCARLETT2_PORT_TYPE_PCM, + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + SCARLETT2_PORT_TYPE_MIX, + SCARLETT2_PORT_TYPE_NONE, + }; + + struct { + u16 pad; + u16 num; + u32 data[SCARLETT2_MUX_MAX]; + } __packed req; + + req.pad = 0; + + /* mux settings for each rate */ + for (rate = 0, port_dir_rate = SCARLETT2_PORT_OUT_44; + port_dir_rate <= SCARLETT2_PORT_OUT_176; + rate++, port_dir_rate++) { + int order_num, i, err; + + req.num = cpu_to_le16(rate); + + for (order_num = 0, i = 0; + order_num < SCARLETT2_PORT_TYPE_COUNT; + order_num++) { + int port_type = assignment_order[order_num]; + int j = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + port_type); + int port_id = ports[port_type].id; + int channel; + + for (channel = 0; + channel < ports[port_type].num[port_dir_rate]; + channel++, i++, j++) + /* lower 12 bits for the destination and + * next 12 bits for the source + */ + req.data[i] = !port_id + ? 0 + : cpu_to_le32( + port_id | + channel | + scarlett2_mux_src_num_to_id( + ports, private->mux[j] + ) << 12 + ); + + /* skip private->mux[j] entries not output */ + j += ports[port_type].num[SCARLETT2_PORT_OUT] - + ports[port_type].num[port_dir_rate]; + } + + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_MUX, + &req, (i + 1) * sizeof(u32), + NULL, 0); + if (err < 0) + return err; + } + + return 0; +} + +/* Send USB message to get meter levels */ +static int scarlett2_usb_get_meter_levels(struct usb_mixer_interface *mixer, + u16 *levels) +{ + struct { + u16 pad; + u16 num_meters; + u32 magic; + } __packed req; + u32 resp[SCARLETT2_NUM_METERS]; + int i, err; + + req.pad = 0; + req.num_meters = cpu_to_le16(SCARLETT2_NUM_METERS); + req.magic = cpu_to_le32(SCARLETT2_USB_METER_LEVELS_GET_MAGIC); + err = scarlett2_usb(mixer, SCARLETT2_USB_GET_METER_LEVELS, + &req, sizeof(req), resp, sizeof(resp)); + if (err < 0) + return err; + + /* copy, convert to u16 */ + for (i = 0; i < SCARLETT2_NUM_METERS; i++) + levels[i] = resp[i]; + + return 0; +} + +/*** Control Functions ***/ + +/* helper function to create a new control */ +static int scarlett2_add_new_ctl(struct usb_mixer_interface *mixer, + const struct snd_kcontrol_new *ncontrol, + int index, int channels, const char *name, + struct snd_kcontrol **kctl_return) +{ + struct snd_kcontrol *kctl; + struct usb_mixer_elem_info *elem; + int err; + + elem = kzalloc(sizeof(*elem), GFP_KERNEL); + if (!elem) + return -ENOMEM; + + elem->head.mixer = mixer; + elem->control = index; + elem->head.id = index; + elem->channels = channels; + + kctl = snd_ctl_new1(ncontrol, elem); + if (!kctl) { + kfree(elem); + return -ENOMEM; + } + kctl->private_free = snd_usb_mixer_elem_free; + + strlcpy(kctl->id.name, name, sizeof(kctl->id.name)); + + err = snd_usb_mixer_add_control(&elem->head, kctl); + if (err < 0) + return err; + + if (kctl_return) + *kctl_return = kctl; + + return 0; +} + +/*** Analogue Line Out Volume Controls ***/ + +/* Update hardware volume controls after receiving notification that + * they have changed + */ +static int scarlett2_update_volumes(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + struct scarlett2_usb_volume_status volume_status; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + + private->vol_updated = 0; + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + if (private->vol_sw_hw_switch[i]) + private->vol[i] = private->master_vol; + } + + for (i = 0; i < private->info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +static int scarlett2_volume_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT2_VOLUME_BIAS; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->master_vol; + return 0; +} + +static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->vol[index]; + return 0; +} + +static int scarlett2_volume_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->vol[index]; + val = ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol[index] = val; + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, val - SCARLETT2_VOLUME_BIAS); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett2_gain, -SCARLETT2_VOLUME_BIAS * 100, 0 +); + +static const struct snd_kcontrol_new scarlett2_master_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READ | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_master_volume_ctl_get, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett2_gain } +}; + +static const struct snd_kcontrol_new scarlett2_line_out_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_volume_ctl_get, + .put = scarlett2_volume_ctl_put, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett2_gain } +}; + +/*** HW/SW Volume Switch Controls ***/ + +static int scarlett2_sw_hw_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "SW", "HW" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_sw_hw_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->vol_sw_hw_switch[elem->control]; + return 0; +} + +static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->vol_sw_hw_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol_sw_hw_switch[index] = val; + + /* Change access mode to RO (hardware controlled volume) + * or RW (software controlled volume) + */ + if (val) + private->vol_ctls[index]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + else + private->vol_ctls[index]->vd[0].access |= + SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* Reset volume to master volume */ + private->vol[index] = private->master_vol; + + /* Set SW volume to current HW volume */ + err = scarlett2_usb_set_config( + mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, private->master_vol - SCARLETT2_VOLUME_BIAS); + if (err < 0) + goto unlock; + + /* Notify of RO/RW change */ + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_INFO, + &private->vol_ctls[index]->id); + + /* Send SW/HW switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_SW_HW_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_sw_hw_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_sw_hw_enum_ctl_info, + .get = scarlett2_sw_hw_enum_ctl_get, + .put = scarlett2_sw_hw_enum_ctl_put, +}; + +/*** Line Level/Instrument Level Switch Controls ***/ + +static int scarlett2_level_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "Line", "Inst" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_level_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->level_switch[elem->control]; + return 0; +} + +static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->level_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->level_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LEVEL_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_level_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_level_enum_ctl_info, + .get = scarlett2_level_enum_ctl_get, + .put = scarlett2_level_enum_ctl_put, +}; + +/*** Pad Switch Controls ***/ + +static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->pad_switch[elem->control]; + return 0; +} + +static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->pad_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->pad_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_PAD_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_pad_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_pad_ctl_get, + .put = scarlett2_pad_ctl_put, +}; + +/*** Mute/Dim Controls ***/ + +static int scarlett2_button_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.enumerated.item[0] = private->buttons[elem->control]; + return 0; +} + +static int scarlett2_button_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->buttons[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->buttons[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_BUTTONS, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_button_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_button_ctl_get, + .put = scarlett2_button_ctl_put +}; + +/*** Create the analogue output controls ***/ + +static int scarlett2_add_line_out_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add R/O HW volume control */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), "Master HW Playback Volume"); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_master_volume_ctl, + 0, 1, s, &private->master_vol_ctl); + if (err < 0) + return err; + } + + /* Add volume controls */ + for (i = 0; i < num_line_out; i++) { + + /* Fader */ + if (info->line_out_descrs[i]) + snprintf(s, sizeof(s), + "Line %02d (%s) Playback Volume", + i + 1, info->line_out_descrs[i]); + else + snprintf(s, sizeof(s), + "Line %02d Playback Volume", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_line_out_volume_ctl, + i, 1, s, &private->vol_ctls[i]); + if (err < 0) + return err; + + /* Make the fader read-only if the SW/HW switch is set to HW */ + if (private->vol_sw_hw_switch[i]) + private->vol_ctls[i]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* SW/HW Switch */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), + "Line Out %02d Volume Control Playback Enum", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_sw_hw_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + /* Add HW button controls */ + for (i = 0; i < private->info->button_count; i++) { + err = scarlett2_add_new_ctl(mixer, &scarlett2_button_ctl, + i, 1, scarlett2_button_names[i], + &private->button_ctls[i]); + if (err < 0) + return err; + } + + return 0; +} + +/*** Create the analogue input controls ***/ + +static int scarlett2_add_line_in_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add input level (line/inst) controls */ + for (i = 0; i < info->level_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Level Capture Enum", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_level_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + /* Add input pad controls */ + for (i = 0; i < info->pad_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Pad Capture Switch", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_pad_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + return 0; +} + +/*** Mixer Volume Controls ***/ + +static int scarlett2_mixer_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT2_MIXER_MAX_VALUE; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_mixer_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.integer.value[0] = private->mix[elem->control]; + return 0; +} + +static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int oval, val, num_mixer_in, mix_num, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mix[elem->control]; + val = ucontrol->value.integer.value[0]; + num_mixer_in = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + mix_num = elem->control / num_mixer_in; + + if (oval == val) + goto unlock; + + private->mix[elem->control] = val; + err = scarlett2_usb_set_mix(mixer, mix_num); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett2_mixer, + SCARLETT2_MIXER_MIN_DB * 100, + SCARLETT2_MIXER_MAX_DB * 100 +); + +static const struct snd_kcontrol_new scarlett2_mixer_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_mixer_ctl_info, + .get = scarlett2_mixer_ctl_get, + .put = scarlett2_mixer_ctl_put, + .private_value = SCARLETT2_MIXER_MAX_DB, /* max value */ + .tlv = { .p = db_scale_scarlett2_mixer } +}; + +static int scarlett2_add_mixer_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int err, i, j; + int index; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + int num_inputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + int num_outputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_IN]; + + for (i = 0, index = 0; i < num_outputs; i++) { + for (j = 0; j < num_inputs; j++, index++) { + snprintf(s, sizeof(s), + "Mix %c Input %02d Playback Volume", + 'A' + i, j + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_mixer_ctl, + index, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Mux Source Selection Controls ***/ + +static int scarlett2_mux_src_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + unsigned int item = uinfo->value.enumerated.item; + int items = private->num_mux_srcs; + int port_type; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->count = elem->channels; + uinfo->value.enumerated.items = items; + + if (item >= items) + item = uinfo->value.enumerated.item = items - 1; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (item < ports[port_type].num[SCARLETT2_PORT_IN]) { + sprintf(uinfo->value.enumerated.name, + ports[port_type].src_descr, + item + ports[port_type].src_num_offset); + return 0; + } + item -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + return -EINVAL; +} + +static int scarlett2_mux_src_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = private->mux[elem->control]; + return 0; +} + +static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mux[index]; + val = clamp(ucontrol->value.integer.value[0], + 0L, private->num_mux_srcs - 1L); + + if (oval == val) + goto unlock; + + private->mux[index] = val; + err = scarlett2_usb_set_mux(mixer); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_mux_src_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_mux_src_enum_ctl_info, + .get = scarlett2_mux_src_enum_ctl_get, + .put = scarlett2_mux_src_enum_ctl_put, +}; + +static int scarlett2_add_mux_enums(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int port_type, channel, i; + + for (i = 0, port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + for (channel = 0; + channel < ports[port_type].num[SCARLETT2_PORT_OUT]; + channel++, i++) { + int err; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + const char *const descr = ports[port_type].dst_descr; + + snprintf(s, sizeof(s) - 5, descr, channel + 1); + strcat(s, " Enum"); + + err = scarlett2_add_new_ctl(mixer, + &scarlett2_mux_src_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Meter Controls ***/ + +static int scarlett2_meter_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 4095; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + u16 meter_levels[SCARLETT2_NUM_METERS]; + int i, err; + + err = scarlett2_usb_get_meter_levels(elem->head.mixer, meter_levels); + if (err < 0) + return err; + + for (i = 0; i < elem->channels; i++) + ucontrol->value.integer.value[i] = meter_levels[i]; + + return 0; +} + +static const struct snd_kcontrol_new scarlett2_meter_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, + .name = "", + .info = scarlett2_meter_ctl_info, + .get = scarlett2_meter_ctl_get +}; + +static int scarlett2_add_meter_ctl(struct usb_mixer_interface *mixer) +{ + return scarlett2_add_new_ctl(mixer, &scarlett2_meter_ctl, + 0, SCARLETT2_NUM_METERS, + "Level Meter", NULL); +} + +/*** Cleanup/Suspend Callbacks ***/ + +static void scarlett2_private_free(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + cancel_delayed_work_sync(&private->work); + kfree(private); + mixer->private_data = NULL; +} + +static void scarlett2_private_suspend(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + if (cancel_delayed_work_sync(&private->work)) + scarlett2_config_save(private->mixer); +} + +/*** Initialisation ***/ + +static int scarlett2_count_mux_srcs(const struct scarlett2_ports *ports) +{ + int port_type, count = 0; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) + count += ports[port_type].num[SCARLETT2_PORT_IN]; + + return count; +} + +/* Default routing connects PCM outputs and inputs to Analogue, + * S/PDIF, then ADAT + */ +static void scarlett2_init_routing(u8 *mux, + const struct scarlett2_ports *ports) +{ + int i, input_num, input_count, port_type; + int output_num, output_count, port_type_connect_num; + + static const int connect_order[] = { + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + -1 + }; + + /* Assign PCM inputs (routing outputs) */ + output_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + SCARLETT2_PORT_TYPE_PCM); + output_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_OUT]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + input_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_IN, port_type); + input_count = ports[port_type].num[SCARLETT2_PORT_IN]; + for (i = 0; + i < input_count && output_count; + i++, output_count--) + mux[output_num++] = input_num++; + } + + /* Assign PCM outputs (routing inputs) */ + input_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_IN, + SCARLETT2_PORT_TYPE_PCM); + input_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_IN]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + output_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_OUT, port_type); + output_count = ports[port_type].num[SCARLETT2_PORT_OUT]; + for (i = 0; + i < output_count && input_count; + i++, input_count--) + mux[output_num++] = input_num++; + } +} + +/* Initialise private data, routing, sequence number */ +static int scarlett2_init_private(struct usb_mixer_interface *mixer, + const struct scarlett2_device_info *info) +{ + struct scarlett2_mixer_data *private = + kzalloc(sizeof(struct scarlett2_mixer_data), GFP_KERNEL); + + if (!private) + return -ENOMEM; + + mutex_init(&private->usb_mutex); + mutex_init(&private->data_mutex); + INIT_DELAYED_WORK(&private->work, scarlett2_config_save_work); + private->info = info; + private->num_mux_srcs = scarlett2_count_mux_srcs(info->ports); + private->scarlett2_seq = 0; + private->mixer = mixer; + mixer->private_data = private; + mixer->private_free = scarlett2_private_free; + mixer->private_suspend = scarlett2_private_suspend; + + /* Setup default routing */ + scarlett2_init_routing(private->mux, info->ports); + + /* Initialise the sequence number used for the proprietary commands */ + return scarlett2_usb(mixer, SCARLETT2_USB_INIT_SEQ, NULL, 0, NULL, 0); +} + +/* Read line-in config and line-out volume settings on start */ +static int scarlett2_read_configs(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + u8 level_switches[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switches[SCARLETT2_PAD_SWITCH_MAX]; + struct scarlett2_usb_volume_status volume_status; + int err, i; + + if (info->level_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_LEVEL_SWITCH, + info->level_input_count, + level_switches); + if (err < 0) + return err; + for (i = 0; i < info->level_input_count; i++) + private->level_switch[i] = level_switches[i]; + } + + if (info->pad_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_PAD_SWITCH, + info->pad_input_count, + pad_switches); + if (err < 0) + return err; + for (i = 0; i < info->pad_input_count; i++) + private->pad_switch[i] = pad_switches[i]; + } + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + int volume; + + private->vol_sw_hw_switch[i] = + info->line_out_hw_vol + && volume_status.sw_hw_switch[i]; + + volume = private->vol_sw_hw_switch[i] + ? volume_status.master_vol + : volume_status.sw_vol[i]; + volume = clamp(volume + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + private->vol[i] = volume; + } + + for (i = 0; i < info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +/* Notify on volume change */ +static void scarlett2_mixer_interrupt_vol_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int i; + + private->vol_updated = 1; + + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->master_vol_ctl->id); + + for (i = 0; i < num_line_out; i++) { + if (!private->vol_sw_hw_switch[i]) + continue; + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->vol_ctls[i]->id); + } +} + +/* Notify on button change */ +static void scarlett2_mixer_interrupt_button_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + int i; + + private->vol_updated = 1; + + for (i = 0; i < private->info->button_count; i++) + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->button_ctls[i]->id); +} + +/* Interrupt callback */ +static void scarlett2_mixer_interrupt(struct urb *urb) +{ + struct usb_mixer_interface *mixer = urb->context; + int len = urb->actual_length; + int ustatus = urb->status; + u32 data; + + if (ustatus != 0) + goto requeue; + + if (len == 8) { + data = le32_to_cpu(*(u32 *)urb->transfer_buffer); + if (data & SCARLETT2_USB_INTERRUPT_VOL_CHANGE) + scarlett2_mixer_interrupt_vol_change(mixer); + if (data & SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE) + scarlett2_mixer_interrupt_button_change(mixer); + } else { + usb_audio_err(mixer->chip, + "scarlett mixer interrupt length %d\n", len); + } + +requeue: + if (ustatus != -ENOENT && + ustatus != -ECONNRESET && + ustatus != -ESHUTDOWN) { + urb->dev = mixer->chip->dev; + usb_submit_urb(urb, GFP_ATOMIC); + } +} + +static int scarlett2_mixer_status_create(struct usb_mixer_interface *mixer) +{ + struct usb_device *dev = mixer->chip->dev; + unsigned int pipe = usb_rcvintpipe(dev, + SCARLETT2_USB_INTERRUPT_ENDPOINT); + void *transfer_buffer; + + if (mixer->urb) { + usb_audio_err(mixer->chip, + "%s: mixer urb already in use!\n", __func__); + return 0; + } + + if (snd_usb_pipe_sanity_check(dev, pipe)) + return -EINVAL; + + mixer->urb = usb_alloc_urb(0, GFP_KERNEL); + if (!mixer->urb) + return -ENOMEM; + + transfer_buffer = kmalloc(SCARLETT2_USB_INTERRUPT_MAX_DATA, GFP_KERNEL); + if (!transfer_buffer) + return -ENOMEM; + + usb_fill_int_urb(mixer->urb, dev, pipe, + transfer_buffer, SCARLETT2_USB_INTERRUPT_MAX_DATA, + scarlett2_mixer_interrupt, mixer, + SCARLETT2_USB_INTERRUPT_INTERVAL); + + return usb_submit_urb(mixer->urb, GFP_KERNEL); +} + +/* Entry point */ +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) +{ + const struct scarlett2_device_info *info; + int err; + + /* only use UAC_VERSION_2 */ + if (!mixer->protocol) + return 0; + + switch (mixer->chip->usb_id) { + case USB_ID(0x1235, 0x8203): + info = &s6i6_gen2_info; + break; + case USB_ID(0x1235, 0x8204): + info = &s18i8_gen2_info; + break; + case USB_ID(0x1235, 0x8201): + info = &s18i20_gen2_info; + break; + default: /* device not (yet) supported */ + return -EINVAL; + } + + if (!(mixer->chip->setup & SCARLETT2_ENABLE)) { + usb_audio_err(mixer->chip, + "Focusrite Scarlett Gen 2 Mixer Driver disabled; " + "use options snd_usb_audio device_setup=1 " + "to enable and report any issues to g(a)b4.vu"); + return 0; + } + + /* Initialise private data, routing, sequence number */ + err = scarlett2_init_private(mixer, info); + if (err < 0) + return err; + + /* Read volume levels and controls from the interface */ + err = scarlett2_read_configs(mixer); + if (err < 0) + return err; + + /* Create the analogue output controls */ + err = scarlett2_add_line_out_ctls(mixer); + if (err < 0) + return err; + + /* Create the analogue input controls */ + err = scarlett2_add_line_in_ctls(mixer); + if (err < 0) + return err; + + /* Create the input, output, and mixer mux input selections */ + err = scarlett2_add_mux_enums(mixer); + if (err < 0) + return err; + + /* Create the matrix mixer controls */ + err = scarlett2_add_mixer_ctls(mixer); + if (err < 0) + return err; + + /* Create the level meter controls */ + err = scarlett2_add_meter_ctl(mixer); + if (err < 0) + return err; + + /* Set up the interrupt polling if there are hardware buttons */ + if (info->button_count) { + err = scarlett2_mixer_status_create(mixer); + if (err < 0) + return err; + } + + return 0; +} diff --git a/sound/usb/mixer_scarlett_gen2.h b/sound/usb/mixer_scarlett_gen2.h new file mode 100644 index 000000000000..52e1dad77afd --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __USB_MIXER_SCARLETT_GEN2_H +#define __USB_MIXER_SCARLETT_GEN2_H + +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer); + +#endif /* __USB_MIXER_SCARLETT_GEN2_H */

2 1

[alsa-devel] axfer: test: fix invalid comparison of 64 bit storage in ILP32 data type
by GitHub pull_request - opened 28 Jul '19

28 Jul '19

alsa-project/alsa-utils pull request #25 was opened from takaswie: In system V ABIs with ILP32 data model, bit shift for '1ul' can brings undefined behaviour when the calculation result is over 32 bit width. This commit fixes the bug. Reported-by: Rolf Eike Beer <eike(a)sf-mail.de> Reference: https://bugs.gentoo.org/681652 Reference: https://github.com/alsa-project/alsa-utils/issues/23 Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Request URL : https://github.com/alsa-project/alsa-utils/pull/25 Patch URL : https://github.com/alsa-project/alsa-utils/pull/25.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[alsa-devel] axfer: mapper: fix parameter check for demuxer
by GitHub pull_request - opened 28 Jul '19

28 Jul '19

alsa-project/alsa-utils pull request #24 was opened from takaswie: Each container should be configured to store one saple per frame in demuxer case. This commit fixes the bug. Fixes: 25c8e3bebb53 ('axfer: add support for a mapper for multiple target') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Request URL : https://github.com/alsa-project/alsa-utils/pull/24 Patch URL : https://github.com/alsa-project/alsa-utils/pull/24.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[alsa-devel] axfr/tests fail on hppa and sparc
by GitHub issues - opened 27 Jul '19

27 Jul '19

alsa-project/alsa-utils issue #23 was opened from DerDakon: There is a Gentoo bug about this test failures: https://bugs.gentoo.org/681652 The log on hppa says this: ``` ================================================= alsa-utils 1.1.9: axfer/test/test-suite.log ================================================= # TOTAL: 2 # PASS: 0 # SKIP: 0 # XFAIL: 0 # FAIL: 2 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: container-test ==================== container-test: container-test.c:53: test_builder: Assertion `err == 0' failed. FAIL container-test (exit status: 134) FAIL: mapper-test ================= Invalid argument FAIL mapper-test (exit status: 1) ``` The errors are similar on sparc. Does that depend on specific kernel features to be enabled? Also note that both architectures are big endian, which may or may not be related. Issue URL : https://github.com/alsa-project/alsa-utils/issues/23 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[alsa-devel] [PATCH] ALSA: usb-audio: fix PCM device order
by Alexander Tsoy 27 Jul '19

27 Jul '19

Some cards have alternate setting with non-PCM format as the first altsetting in the interface descriptors. This confuses userspace, since alsa-lib uses device 0 by default. So lets parse interfaces in two steps: 1. Parse altsettings with PCM formats. 2. Parse altsettings with non-PCM formats. This fixes at least following cards: - Audinst HUD-mx2 - Audinst HUD-mini Signed-off-by: Alexander Tsoy <alexander(a)tsoy.me> --- sound/usb/stream.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 8e9548bc1f1a..b2ebeae91396 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -477,7 +477,8 @@ static struct uac2_output_terminal_descriptor * return NULL; } -int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no) +static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no, + bool *has_non_pcm, bool non_pcm) { struct usb_device *dev; struct usb_interface *iface; @@ -634,6 +635,10 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no) iface_no, altno); continue; } + if (fmt->bFormatType != UAC_FORMAT_TYPE_I) + *has_non_pcm = true; + if ((fmt->bFormatType == UAC_FORMAT_TYPE_I) == non_pcm) + continue; if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) || ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) { dev_err(&dev->dev, @@ -740,3 +745,23 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no) return 0; } +int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no) +{ + int err; + bool has_non_pcm = false; + + /* parse PCM formats */ + err = __snd_usb_parse_audio_interface(chip, iface_no, &has_non_pcm, false); + if (err < 0) + return err; + + if (has_non_pcm) { + /* parse non-PCM formats */ + err = __snd_usb_parse_audio_interface(chip, iface_no, &has_non_pcm, true); + if (err < 0) + return err; + } + + return 0; +} + -- 2.13.0

3 2

[alsa-devel] Plugged in headphones ignored
by Paul Menzel 27 Jul '19

27 Jul '19

Dear Linux folks, On a Dell OptiPlex 5040 with Linux 5.2-rc6 plugging in a head phone into the front case connector, it is detected just fine and Xfce shows a notification. Then logging out, turning off the monitor connected over DisplayPort at the end of the day, and turning the monitor back on the next morning, logging in, the state is forgotten. I need to unplug the head phone and plug it back in. Please find the output alsa-config.sh for the non-working (1) and replugged (2) situations attached. Is that a Linux kernel problem, or a user space issue? Kind regards, Paul

2 2

[alsa-devel] [PATCHv2] hda: Fix 1-minute detection delay when i915 module is not available
by Samuel Thibault 27 Jul '19

27 Jul '19

Distribution installation images such as Debian include different sets of modules which can be downloaded dynamically. Such images may notably include the hda sound modules but not the i915 DRM module, even if the latter was enabled at build time, as reported on https://bugs.debian.org/931507 In such a case hdac_i915 would be linked in and try to load the i915 module, fail since it is not there, but still wait for a whole minute before giving up binding with it. This fixes such as case by only waiting for the binding if the module was properly loaded (or module support is disabled, in which case i915 is already compiled-in anyway). Signed-off-by: Samuel Thibault <samuel.thibault(a)ens-lyon.org> --- sound/hda/hdac_i915.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -136,10 +136,13 @@ int snd_hdac_i915_init(struct hdac_bus * if (!acomp) return -ENODEV; if (!acomp->ops) { - request_module("i915"); - /* 60s timeout */ - wait_for_completion_timeout(&bind_complete, - msecs_to_jiffies(60 * 1000)); + if (!IS_ENABLED(CONFIG_MODULES) || + !request_module("i915")) + { + /* 60s timeout */ + wait_for_completion_timeout(&bind_complete, + msecs_to_jiffies(60 * 1000)); + } } if (!acomp->ops) { dev_info(bus->dev, "couldn't bind with audio component\n");

2 1

[alsa-devel] [PATCH v2 0/5] ALSA/HDA: abort probe when DMICs are detected
by Pierre-Louis Bossart 27 Jul '19

27 Jul '19

This is the second take on same problem of detecting when the HDaudio legacy driver can be used and when the SST or SOF drivers are required. The previous attempt based on a the PCI Class information was a resounding failure and broke audio on Linus' laptop, so we need additional information to avoid enabling a DSP-based driver without a good reason to do so. This patchset suggests the use of the NHLT information which *in theory* exposes DMIC endpoints. The legacy HDaudio driver cannot handle DMICs and will not provide any capture capabilities. Since it's typically the first one to probe due to the Makefile order, aborting the probe will let the PCI subsystem look for the next driver which hopefully will support this capability. I tested this patch on 5 devices (SKL, KBL, APL, GLK, WHL), three without DMICs and two with, and the detection seems to work as planned. Additional testing by Canonical and Endless folks did not expose any issues. Changes since v1 (Feedback from Takashi): Squashed patch3 in patch2 Changed log to dbg_info Fixed module parameter handling Changes since RFC: Cosmetic code improvements Moved intel-nhlt.h to include/sound Moved intel-nhlt.c to sound/hda Removed SOC prefixes Added full-support for vendor-defined geometries Added Kconfig and kernel module parameter to opt-in Pierre-Louis Bossart (5): ASoC: Intel: Skylake: move NHLT header to common directory ALSA: hda: move parts of NHLT code to new module ALSA: hda: intel-nhlt: handle NHLT VENDOR_DEFINED DMIC geometry ASoC: Intel: Skylake: use common NHLT module ALSA: hda/intel: stop probe if DMICS are detected on Skylake+ platforms .../skl-nhlt.h => include/sound/intel-nhlt.h | 51 +++++++-- sound/hda/Kconfig | 3 + sound/hda/Makefile | 3 + sound/hda/intel-nhlt.c | 102 ++++++++++++++++++ sound/pci/hda/Kconfig | 10 ++ sound/pci/hda/hda_intel.c | 34 ++++++ sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/skl-nhlt.c | 91 +--------------- sound/soc/intel/skylake/skl-ssp-clk.c | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl.c | 12 ++- sound/soc/intel/skylake/skl.h | 4 - 12 files changed, 205 insertions(+), 108 deletions(-) rename sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h (65%) create mode 100644 sound/hda/intel-nhlt.c -- 2.20.1

3 13

[alsa-devel] hda: Fix 1-minute detection delay when i915 module is not available
by Samuel Thibault 26 Jul '19

26 Jul '19

Distribution installation images such as Debian include different sets of modules which can be downloaded dynamically. Such images may notably include the hda sound modules but not the i915 DRM module, even if the latter was enabled at build time, as reported on https://bugs.debian.org/931507 In such a case hdac_i915 would be linked in and try to load the i915 module, fail since it is not there, but still wait for a whole minute before giving up binding with it. This fixes such as case by only waiting for the binding if the module was properly loaded (or module support is disabled, in which case i915 is already compiled-in anyway). Signed-off-by: Samuel Thibault <samuel.thibault(a)ens-lyon.org> --- sound/hda/hdac_i915.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -143,10 +143,14 @@ int snd_hdac_i915_init(struct hdac_bus * if (!acomp) return -ENODEV; if (!acomp->ops) { - request_module("i915"); - /* 60s timeout */ - wait_for_completion_timeout(&bind_complete, - msecs_to_jiffies(60 * 1000)); +#ifdef CONFIG_MODULES + if (request_module("i915") == 0) +#endif + { + /* 60s timeout */ + wait_for_completion_timeout(&bind_complete, + msecs_to_jiffies(60 * 1000)); + } } if (!acomp->ops) { dev_info(bus->dev, "couldn't bind with audio component\n");

2 1

[alsa-devel] [PATCH v4 0/1] Fix driver reload issues
by Amadeusz Sławiński 26 Jul '19

26 Jul '19

Hi, this is last patch left from series fixing driver reload problems. Rebased onto latest for-next in Marks tree. Amadeusz Sławiński (1): ASoC: Intel: Skylake: Remove static table index when parsing topology sound/soc/intel/skylake/skl-topology.c | 34 +++++++++----------------- 1 file changed, 12 insertions(+), 22 deletions(-) -- 2.17.1

2 2

[alsa-devel] [PATCH v3 0/5] ALSA/HDA: abort probe when DMICs are detected
by Pierre-Louis Bossart 26 Jul '19

26 Jul '19

This is the second take on same problem of detecting when the HDaudio legacy driver can be used and when the SST or SOF drivers are required. The previous attempt based on a the PCI Class information was a resounding failure and broke audio on Linus' laptop, so we need additional information to avoid enabling a DSP-based driver without a good reason to do so. This patchset suggests the use of the NHLT information which *in theory* exposes DMIC endpoints. The legacy HDaudio driver cannot handle DMICs and will not provide any capture capabilities. Since it's typically the first one to probe due to the Makefile order, aborting the probe will let the PCI subsystem look for the next driver which hopefully will support this capability. I tested this patch on 5 devices (SKL, KBL, APL, GLK, WHL), three without DMICs and two with, and the detection seems to work as planned. Additional testing by Canonical and Endless folks did not expose any issues. Changes since v2 (Feedback from Takahi and Cezary) Added comment in Kconfig to alert the user to the dependency on ACPI Changes since v1 (Feedback from Takashi): Squashed patch3 in patch2 Changed log to dbg_info Fixed module parameter handling Changes since RFC: Cosmetic code improvements Moved intel-nhlt.h to include/sound Moved intel-nhlt.c to sound/hda Removed SOC prefixes Added full-support for vendor-defined geometries Added Kconfig and kernel module parameter to opt-in Pierre-Louis Bossart (5): ASoC: Intel: Skylake: move NHLT header to common directory ALSA: hda: move parts of NHLT code to new module ALSA: hda: intel-nhlt: handle NHLT VENDOR_DEFINED DMIC geometry ASoC: Intel: Skylake: use common NHLT module ALSA: hda/intel: stop probe if DMICS are detected on Skylake+ platforms .../skl-nhlt.h => include/sound/intel-nhlt.h | 51 +++++++-- sound/hda/Kconfig | 5 + sound/hda/Makefile | 3 + sound/hda/intel-nhlt.c | 102 ++++++++++++++++++ sound/pci/hda/Kconfig | 10 ++ sound/pci/hda/hda_intel.c | 34 ++++++ sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/skl-nhlt.c | 91 +--------------- sound/soc/intel/skylake/skl-ssp-clk.c | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl.c | 12 ++- sound/soc/intel/skylake/skl.h | 4 - 12 files changed, 207 insertions(+), 108 deletions(-) rename sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h (65%) create mode 100644 sound/hda/intel-nhlt.c -- 2.20.1

2 7

[alsa-devel] [PATCH v2 00/26] ReST conversion of text files without .txt extension
by Mauro Carvalho Chehab 26 Jul '19

26 Jul '19

This series converts the text files under Documentation with doesn't end neither .txt or .rst and are not part of ABI or features. This series is at: https://git.linuxtv.org/mchehab/experimental.git/log/?h=rst_for_5_4_v3 And it is based on yesterday's upstream tree. After this series, we have ~320 files left to be converted to ReST. v2: - Added 3 files submitted for v5.3 that weren't merged yet; - markdown patch broken into two, per Rob's request; - rebased on the top of upstream master branch Mauro Carvalho Chehab (26): docs: power: add it to to the main documentation index docs: thermal: add it to the driver API docs: powerpc: convert docs to ReST and rename to *.rst docs: ubifs-authentication.md: convert to ReST docs: writing-schema.md: convert from markdown to ReST docs: i2c: convert to ReST and add to driver-api bookset docs: w1: convert to ReST and add to the kAPI group of docs spi: docs: convert to ReST and add it to the kABI bookset docs: ipmb: place it at driver-api and convert to ReST docs: packing: move it to core-api book and adjust markups docs: admin-guide: add auxdisplay files to it after conversion to ReST docs: README.buddha: convert to ReST and add to m68k book docs: parisc: convert to ReST and add to documentation body docs: openrisc: convert to ReST and add to documentation body docs: isdn: convert to ReST and add to kAPI bookset docs: fs: cifs: convert to ReST and add to admin-guide book docs: fs: convert docs without extension to ReST docs: fs: convert porting to ReST docs: index.rst: don't use genindex for pdf output docs: wimax: convert to ReST and add to admin-guide docs: mips: add to the documentation body as ReST docs: hwmon: pxe1610: convert to ReST format and add to the index docs: nios2: add it to the main Documentation body docs: net: convert two README files to ReST format docs: rcu: convert some articles from html to ReST docs: ABI: remove extension from sysfs-class-mic.txt Documentation/ABI/stable/sysfs-bus-w1 | 2 +- .../ABI/stable/sysfs-driver-w1_ds28e04 | 4 +- .../ABI/stable/sysfs-driver-w1_ds28ea00 | 2 +- .../{sysfs-class-mic.txt => sysfs-class-mic} | 0 Documentation/PCI/pci-error-recovery.rst | 2 +- .../Data-Structures/Data-Structures.html | 1391 ------- .../Data-Structures/Data-Structures.rst | 1163 ++++++ ...riods.html => Expedited-Grace-Periods.rst} | 949 ++--- .../Memory-Ordering/Tree-RCU-Diagram.html | 9 - ...ring.html => Tree-RCU-Memory-Ordering.rst} | 1181 +++--- .../RCU/Design/Requirements/Requirements.html | 3330 ----------------- .../RCU/Design/Requirements/Requirements.rst | 2662 +++++++++++++ Documentation/RCU/index.rst | 5 + Documentation/RCU/whatisRCU.txt | 4 +- .../auxdisplay/cfag12864b.rst} | 115 +- .../admin-guide/auxdisplay/index.rst | 16 + .../auxdisplay/ks0108.rst} | 53 +- .../AUTHORS => admin-guide/cifs/authors.rst} | 64 +- .../CHANGES => admin-guide/cifs/changes.rst} | 4 + Documentation/admin-guide/cifs/index.rst | 21 + .../cifs/introduction.rst} | 8 + .../cifs/TODO => admin-guide/cifs/todo.rst} | 87 +- .../README => admin-guide/cifs/usage.rst} | 560 +-- .../cifs/winucase_convert.pl | 0 Documentation/admin-guide/index.rst | 3 + .../wimax/i2400m.rst} | 145 +- Documentation/admin-guide/wimax/index.rst | 19 + .../wimax/wimax.rst} | 36 +- Documentation/core-api/index.rst | 3 +- .../{packing.txt => core-api/packing.rst} | 81 +- .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 2 +- .../{writing-schema.md => writing-schema.rst} | 137 +- Documentation/driver-api/dmaengine/index.rst | 2 +- Documentation/driver-api/index.rst | 2 + Documentation/driver-api/ipmb.rst | 2 +- Documentation/driver-api/soundwire/index.rst | 2 +- .../thermal/cpu-cooling-api.rst | 0 .../thermal/exynos_thermal.rst | 0 .../thermal/exynos_thermal_emulation.rst | 0 .../{ => driver-api}/thermal/index.rst | 2 +- .../thermal/intel_powerclamp.rst | 0 .../thermal/nouveau_thermal.rst | 0 .../thermal/power_allocator.rst | 0 .../{ => driver-api}/thermal/sysfs-api.rst | 12 +- .../thermal/x86_pkg_temperature_thermal.rst | 2 +- ...irectory-locking => directory-locking.rst} | 40 +- Documentation/filesystems/index.rst | 4 + .../filesystems/{Locking => locking.rst} | 257 +- .../nfs/{Exporting => exporting.rst} | 31 +- .../filesystems/{porting => porting.rst} | 824 ++-- ...entication.md => ubifs-authentication.rst} | 70 +- Documentation/filesystems/vfs.rst | 2 +- Documentation/hwmon/adm1021.rst | 2 +- Documentation/hwmon/adm1275.rst | 2 +- Documentation/hwmon/hih6130.rst | 2 +- Documentation/hwmon/ibm-cffps.rst | 2 +- Documentation/hwmon/index.rst | 1 + Documentation/hwmon/lm25066.rst | 2 +- Documentation/hwmon/max16064.rst | 2 +- Documentation/hwmon/max16065.rst | 2 +- Documentation/hwmon/max20751.rst | 2 +- Documentation/hwmon/max34440.rst | 2 +- Documentation/hwmon/max6650.rst | 2 +- Documentation/hwmon/max8688.rst | 2 +- Documentation/hwmon/menf21bmc.rst | 2 +- Documentation/hwmon/pcf8591.rst | 2 +- Documentation/hwmon/{pxe1610 => pxe1610.rst} | 33 +- Documentation/hwmon/sht3x.rst | 2 +- Documentation/hwmon/shtc1.rst | 2 +- Documentation/hwmon/tmp103.rst | 2 +- Documentation/hwmon/tps40422.rst | 2 +- Documentation/hwmon/ucd9000.rst | 2 +- Documentation/hwmon/ucd9200.rst | 2 +- Documentation/hwmon/via686a.rst | 2 +- Documentation/hwmon/zl6100.rst | 2 +- .../busses/{i2c-ali1535 => i2c-ali1535.rst} | 13 +- .../busses/{i2c-ali1563 => i2c-ali1563.rst} | 3 + .../busses/{i2c-ali15x3 => i2c-ali15x3.rst} | 64 +- .../busses/{i2c-amd-mp2 => i2c-amd-mp2.rst} | 14 +- .../i2c/busses/{i2c-amd756 => i2c-amd756.rst} | 8 +- .../busses/{i2c-amd8111 => i2c-amd8111.rst} | 14 +- .../{i2c-diolan-u2c => i2c-diolan-u2c.rst} | 3 + .../i2c/busses/{i2c-i801 => i2c-i801.rst} | 33 +- .../i2c/busses/{i2c-ismt => i2c-ismt.rst} | 20 +- .../busses/{i2c-mlxcpld => i2c-mlxcpld.rst} | 6 + .../busses/{i2c-nforce2 => i2c-nforce2.rst} | 33 +- .../{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} | 6 +- .../i2c/busses/{i2c-ocores => i2c-ocores.rst} | 22 +- ...2c-parport-light => i2c-parport-light.rst} | 8 +- .../busses/{i2c-parport => i2c-parport.rst} | 164 +- .../busses/{i2c-pca-isa => i2c-pca-isa.rst} | 9 +- .../i2c/busses/{i2c-piix4 => i2c-piix4.rst} | 18 +- .../busses/{i2c-sis5595 => i2c-sis5595.rst} | 19 +- .../i2c/busses/{i2c-sis630 => i2c-sis630.rst} | 39 +- .../i2c/busses/{i2c-sis96x => i2c-sis96x.rst} | 31 +- .../busses/{i2c-taos-evm => i2c-taos-evm.rst} | 8 +- .../i2c/busses/{i2c-via => i2c-via.rst} | 28 +- .../i2c/busses/{i2c-viapro => i2c-viapro.rst} | 12 +- Documentation/i2c/busses/index.rst | 33 + .../i2c/busses/{scx200_acb => scx200_acb.rst} | 9 +- .../i2c/{dev-interface => dev-interface.rst} | 94 +- ...-considerations => dma-considerations.rst} | 0 .../i2c/{fault-codes => fault-codes.rst} | 5 +- .../i2c/{functionality => functionality.rst} | 22 +- ...ult-injection => gpio-fault-injection.rst} | 12 +- .../i2c/{i2c-protocol => i2c-protocol.rst} | 28 +- Documentation/i2c/{i2c-stub => i2c-stub.rst} | 20 +- .../i2c/{i2c-topology => i2c-topology.rst} | 68 +- Documentation/i2c/index.rst | 37 + ...ting-devices => instantiating-devices.rst} | 45 +- .../muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} | 26 +- ...e-parameters => old-module-parameters.rst} | 27 +- ...eprom-backend => slave-eeprom-backend.rst} | 4 +- .../{slave-interface => slave-interface.rst} | 33 +- .../{smbus-protocol => smbus-protocol.rst} | 86 +- Documentation/i2c/{summary => summary.rst} | 6 +- ...en-bit-addresses => ten-bit-addresses.rst} | 5 + ...pgrading-clients => upgrading-clients.rst} | 204 +- .../{writing-clients => writing-clients.rst} | 94 +- Documentation/index.rst | 10 + .../isdn/{README.avmb1 => avmb1.rst} | 231 +- Documentation/isdn/{CREDITS => credits.rst} | 7 +- .../isdn/{README.gigaset => gigaset.rst} | 290 +- .../isdn/{README.hysdn => hysdn.rst} | 125 +- Documentation/isdn/index.rst | 24 + .../{INTERFACE.CAPI => interface_capi.rst} | 182 +- .../isdn/{README.mISDN => m_isdn.rst} | 5 +- .../m68k/{README.buddha => buddha-driver.rst} | 95 +- Documentation/m68k/index.rst | 1 + .../{AU1xxx_IDE.README => au1xxx_ide.rst} | 89 +- Documentation/mips/index.rst | 17 + .../networking/caif/{README => caif.rst} | 88 +- .../networking/device_drivers/index.rst | 2 +- Documentation/networking/index.rst | 2 +- .../{README => mac80211_hwsim.rst} | 28 +- Documentation/nios2/{README => nios2.rst} | 1 + Documentation/openrisc/index.rst | 18 + .../openrisc/{README => openrisc_port.rst} | 25 +- Documentation/openrisc/{TODO => todo.rst} | 9 +- .../parisc/{debugging => debugging.rst} | 7 + Documentation/parisc/index.rst | 18 + .../parisc/{registers => registers.rst} | 59 +- Documentation/power/index.rst | 2 +- .../{bootwrapper.txt => bootwrapper.rst} | 28 +- .../{cpu_families.txt => cpu_families.rst} | 23 +- .../{cpu_features.txt => cpu_features.rst} | 6 +- Documentation/powerpc/{cxl.txt => cxl.rst} | 46 +- .../powerpc/{cxlflash.txt => cxlflash.rst} | 10 +- .../{DAWR-POWER9.txt => dawr-power9.rst} | 15 +- Documentation/powerpc/{dscr.txt => dscr.rst} | 18 +- ...ecovery.txt => eeh-pci-error-recovery.rst} | 108 +- ...ed-dump.txt => firmware-assisted-dump.rst} | 117 +- Documentation/powerpc/{hvcs.txt => hvcs.rst} | 108 +- Documentation/powerpc/index.rst | 34 + Documentation/powerpc/isa-versions.rst | 15 +- .../powerpc/{mpc52xx.txt => mpc52xx.rst} | 12 +- ...nv.txt => pci_iov_resource_on_powernv.rst} | 15 +- .../powerpc/{pmu-ebb.txt => pmu-ebb.rst} | 1 + .../powerpc/{ptrace.txt => ptrace.rst} | 169 +- .../{qe_firmware.txt => qe_firmware.rst} | 37 +- .../{syscall64-abi.txt => syscall64-abi.rst} | 29 +- ...al_memory.txt => transactional_memory.rst} | 45 +- Documentation/sound/index.rst | 2 +- .../spi/{butterfly => butterfly.rst} | 44 +- Documentation/spi/index.rst | 22 + Documentation/spi/{pxa2xx => pxa2xx.rst} | 95 +- .../spi/{spi-lm70llp => spi-lm70llp.rst} | 17 +- .../spi/{spi-sc18is602 => spi-sc18is602.rst} | 5 +- .../spi/{spi-summary => spi-summary.rst} | 105 +- Documentation/spi/{spidev => spidev.rst} | 30 +- Documentation/w1/index.rst | 21 + .../w1/masters/{ds2482 => ds2482.rst} | 16 +- .../w1/masters/{ds2490 => ds2490.rst} | 6 +- Documentation/w1/masters/index.rst | 14 + .../w1/masters/{mxc-w1 => mxc-w1.rst} | 13 +- .../w1/masters/{omap-hdq => omap-hdq.rst} | 12 +- .../w1/masters/{w1-gpio => w1-gpio.rst} | 21 +- Documentation/w1/slaves/index.rst | 16 + .../w1/slaves/{w1_ds2406 => w1_ds2406.rst} | 4 +- .../w1/slaves/{w1_ds2413 => w1_ds2413.rst} | 9 + .../w1/slaves/{w1_ds2423 => w1_ds2423.rst} | 27 +- .../w1/slaves/{w1_ds2438 => w1_ds2438.rst} | 10 +- .../w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} | 5 + .../w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} | 16 +- .../w1/slaves/{w1_therm => w1_therm.rst} | 11 +- .../w1/{w1.generic => w1-generic.rst} | 88 +- .../w1/{w1.netlink => w1-netlink.rst} | 89 +- MAINTAINERS | 68 +- arch/powerpc/kernel/exceptions-64s.S | 2 +- drivers/auxdisplay/Kconfig | 2 +- drivers/hwmon/atxp1.c | 2 +- drivers/hwmon/smm665.c | 2 +- drivers/i2c/Kconfig | 4 +- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-i801.c | 2 +- drivers/i2c/busses/i2c-taos-evm.c | 2 +- drivers/i2c/i2c-core-base.c | 4 +- drivers/iio/dummy/iio_simple_dummy.c | 4 +- drivers/rtc/rtc-ds1374.c | 2 +- drivers/soc/fsl/qe/qe.c | 2 +- drivers/spi/Kconfig | 2 +- drivers/spi/spi-butterfly.c | 2 +- drivers/spi/spi-lm70llp.c | 2 +- drivers/staging/isdn/hysdn/Kconfig | 2 +- drivers/tty/hvc/hvcs.c | 2 +- fs/cifs/export.c | 2 +- fs/exportfs/expfs.c | 2 +- fs/isofs/export.c | 2 +- fs/orangefs/file.c | 2 +- fs/orangefs/orangefs-kernel.h | 2 +- include/linux/dcache.h | 2 +- include/linux/exportfs.h | 2 +- include/linux/i2c.h | 2 +- include/linux/platform_data/sc18is602.h | 2 +- include/linux/thermal.h | 4 +- include/soc/fsl/qe/qe.h | 2 +- 216 files changed, 9148 insertions(+), 8672 deletions(-) rename Documentation/ABI/testing/{sysfs-class-mic.txt => sysfs-class-mic} (100%) delete mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.rst rename Documentation/RCU/Design/Expedited-Grace-Periods/{Expedited-Grace-Periods.html => Expedited-Grace-Periods.rst} (15%) delete mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html rename Documentation/RCU/Design/Memory-Ordering/{Tree-RCU-Memory-Ordering.html => Tree-RCU-Memory-Ordering.rst} (10%) delete mode 100644 Documentation/RCU/Design/Requirements/Requirements.html create mode 100644 Documentation/RCU/Design/Requirements/Requirements.rst rename Documentation/{auxdisplay/cfag12864b => admin-guide/auxdisplay/cfag12864b.rst} (26%) create mode 100644 Documentation/admin-guide/auxdisplay/index.rst rename Documentation/{auxdisplay/ks0108 => admin-guide/auxdisplay/ks0108.rst} (32%) rename Documentation/{filesystems/cifs/AUTHORS => admin-guide/cifs/authors.rst} (60%) rename Documentation/{filesystems/cifs/CHANGES => admin-guide/cifs/changes.rst} (91%) create mode 100644 Documentation/admin-guide/cifs/index.rst rename Documentation/{filesystems/cifs/cifs.txt => admin-guide/cifs/introduction.rst} (98%) rename Documentation/{filesystems/cifs/TODO => admin-guide/cifs/todo.rst} (58%) rename Documentation/{filesystems/cifs/README => admin-guide/cifs/usage.rst} (72%) rename Documentation/{filesystems => admin-guide}/cifs/winucase_convert.pl (100%) rename Documentation/{wimax/README.i2400m => admin-guide/wimax/i2400m.rst} (69%) create mode 100644 Documentation/admin-guide/wimax/index.rst rename Documentation/{wimax/README.wimax => admin-guide/wimax/wimax.rst} (74%) rename Documentation/{packing.txt => core-api/packing.rst} (61%) rename Documentation/devicetree/{writing-schema.md => writing-schema.rst} (48%) rename Documentation/{ => driver-api}/thermal/cpu-cooling-api.rst (100%) rename Documentation/{ => driver-api}/thermal/exynos_thermal.rst (100%) rename Documentation/{ => driver-api}/thermal/exynos_thermal_emulation.rst (100%) rename Documentation/{ => driver-api}/thermal/index.rst (86%) rename Documentation/{ => driver-api}/thermal/intel_powerclamp.rst (100%) rename Documentation/{ => driver-api}/thermal/nouveau_thermal.rst (100%) rename Documentation/{ => driver-api}/thermal/power_allocator.rst (100%) rename Documentation/{ => driver-api}/thermal/sysfs-api.rst (98%) rename Documentation/{ => driver-api}/thermal/x86_pkg_temperature_thermal.rst (94%) rename Documentation/filesystems/{directory-locking => directory-locking.rst} (86%) rename Documentation/filesystems/{Locking => locking.rst} (79%) rename Documentation/filesystems/nfs/{Exporting => exporting.rst} (91%) rename Documentation/filesystems/{porting => porting.rst} (49%) rename Documentation/filesystems/{ubifs-authentication.md => ubifs-authentication.rst} (95%) rename Documentation/hwmon/{pxe1610 => pxe1610.rst} (82%) rename Documentation/i2c/busses/{i2c-ali1535 => i2c-ali1535.rst} (82%) rename Documentation/i2c/busses/{i2c-ali1563 => i2c-ali1563.rst} (93%) rename Documentation/i2c/busses/{i2c-ali15x3 => i2c-ali15x3.rst} (72%) rename Documentation/i2c/busses/{i2c-amd-mp2 => i2c-amd-mp2.rst} (42%) rename Documentation/i2c/busses/{i2c-amd756 => i2c-amd756.rst} (79%) rename Documentation/i2c/busses/{i2c-amd8111 => i2c-amd8111.rst} (66%) rename Documentation/i2c/busses/{i2c-diolan-u2c => i2c-diolan-u2c.rst} (91%) rename Documentation/i2c/busses/{i2c-i801 => i2c-i801.rst} (89%) rename Documentation/i2c/busses/{i2c-ismt => i2c-ismt.rst} (81%) rename Documentation/i2c/busses/{i2c-mlxcpld => i2c-mlxcpld.rst} (88%) rename Documentation/i2c/busses/{i2c-nforce2 => i2c-nforce2.rst} (58%) rename Documentation/i2c/busses/{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} (63%) rename Documentation/i2c/busses/{i2c-ocores => i2c-ocores.rst} (82%) rename Documentation/i2c/busses/{i2c-parport-light => i2c-parport-light.rst} (91%) rename Documentation/i2c/busses/{i2c-parport => i2c-parport.rst} (49%) rename Documentation/i2c/busses/{i2c-pca-isa => i2c-pca-isa.rst} (72%) rename Documentation/i2c/busses/{i2c-piix4 => i2c-piix4.rst} (92%) rename Documentation/i2c/busses/{i2c-sis5595 => i2c-sis5595.rst} (74%) rename Documentation/i2c/busses/{i2c-sis630 => i2c-sis630.rst} (37%) rename Documentation/i2c/busses/{i2c-sis96x => i2c-sis96x.rst} (74%) rename Documentation/i2c/busses/{i2c-taos-evm => i2c-taos-evm.rst} (91%) rename Documentation/i2c/busses/{i2c-via => i2c-via.rst} (54%) rename Documentation/i2c/busses/{i2c-viapro => i2c-viapro.rst} (87%) create mode 100644 Documentation/i2c/busses/index.rst rename Documentation/i2c/busses/{scx200_acb => scx200_acb.rst} (86%) rename Documentation/i2c/{dev-interface => dev-interface.rst} (71%) rename Documentation/i2c/{DMA-considerations => dma-considerations.rst} (100%) rename Documentation/i2c/{fault-codes => fault-codes.rst} (98%) rename Documentation/i2c/{functionality => functionality.rst} (91%) rename Documentation/i2c/{gpio-fault-injection => gpio-fault-injection.rst} (97%) rename Documentation/i2c/{i2c-protocol => i2c-protocol.rst} (83%) rename Documentation/i2c/{i2c-stub => i2c-stub.rst} (93%) rename Documentation/i2c/{i2c-topology => i2c-topology.rst} (89%) create mode 100644 Documentation/i2c/index.rst rename Documentation/i2c/{instantiating-devices => instantiating-devices.rst} (93%) rename Documentation/i2c/muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} (85%) rename Documentation/i2c/{old-module-parameters => old-module-parameters.rst} (75%) rename Documentation/i2c/{slave-eeprom-backend => slave-eeprom-backend.rst} (90%) rename Documentation/i2c/{slave-interface => slave-interface.rst} (94%) rename Documentation/i2c/{smbus-protocol => smbus-protocol.rst} (82%) rename Documentation/i2c/{summary => summary.rst} (96%) rename Documentation/i2c/{ten-bit-addresses => ten-bit-addresses.rst} (95%) rename Documentation/i2c/{upgrading-clients => upgrading-clients.rst} (54%) rename Documentation/i2c/{writing-clients => writing-clients.rst} (91%) rename Documentation/isdn/{README.avmb1 => avmb1.rst} (50%) rename Documentation/isdn/{CREDITS => credits.rst} (96%) rename Documentation/isdn/{README.gigaset => gigaset.rst} (74%) rename Documentation/isdn/{README.hysdn => hysdn.rst} (80%) create mode 100644 Documentation/isdn/index.rst rename Documentation/isdn/{INTERFACE.CAPI => interface_capi.rst} (75%) rename Documentation/isdn/{README.mISDN => m_isdn.rst} (89%) rename Documentation/m68k/{README.buddha => buddha-driver.rst} (73%) rename Documentation/mips/{AU1xxx_IDE.README => au1xxx_ide.rst} (67%) create mode 100644 Documentation/mips/index.rst rename Documentation/networking/caif/{README => caif.rst} (70%) rename Documentation/networking/mac80211_hwsim/{README => mac80211_hwsim.rst} (81%) rename Documentation/nios2/{README => nios2.rst} (96%) create mode 100644 Documentation/openrisc/index.rst rename Documentation/openrisc/{README => openrisc_port.rst} (80%) rename Documentation/openrisc/{TODO => todo.rst} (78%) rename Documentation/parisc/{debugging => debugging.rst} (94%) create mode 100644 Documentation/parisc/index.rst rename Documentation/parisc/{registers => registers.rst} (70%) rename Documentation/powerpc/{bootwrapper.txt => bootwrapper.rst} (93%) rename Documentation/powerpc/{cpu_families.txt => cpu_families.rst} (95%) rename Documentation/powerpc/{cpu_features.txt => cpu_features.rst} (97%) rename Documentation/powerpc/{cxl.txt => cxl.rst} (95%) rename Documentation/powerpc/{cxlflash.txt => cxlflash.rst} (98%) rename Documentation/powerpc/{DAWR-POWER9.txt => dawr-power9.rst} (95%) rename Documentation/powerpc/{dscr.txt => dscr.rst} (91%) rename Documentation/powerpc/{eeh-pci-error-recovery.txt => eeh-pci-error-recovery.rst} (82%) rename Documentation/powerpc/{firmware-assisted-dump.txt => firmware-assisted-dump.rst} (80%) rename Documentation/powerpc/{hvcs.txt => hvcs.rst} (91%) create mode 100644 Documentation/powerpc/index.rst rename Documentation/powerpc/{mpc52xx.txt => mpc52xx.rst} (91%) rename Documentation/powerpc/{pci_iov_resource_on_powernv.txt => pci_iov_resource_on_powernv.rst} (97%) rename Documentation/powerpc/{pmu-ebb.txt => pmu-ebb.rst} (99%) rename Documentation/powerpc/{ptrace.txt => ptrace.rst} (48%) rename Documentation/powerpc/{qe_firmware.txt => qe_firmware.rst} (95%) rename Documentation/powerpc/{syscall64-abi.txt => syscall64-abi.rst} (82%) rename Documentation/powerpc/{transactional_memory.txt => transactional_memory.rst} (93%) rename Documentation/spi/{butterfly => butterfly.rst} (71%) create mode 100644 Documentation/spi/index.rst rename Documentation/spi/{pxa2xx => pxa2xx.rst} (83%) rename Documentation/spi/{spi-lm70llp => spi-lm70llp.rst} (88%) rename Documentation/spi/{spi-sc18is602 => spi-sc18is602.rst} (92%) rename Documentation/spi/{spi-summary => spi-summary.rst} (93%) rename Documentation/spi/{spidev => spidev.rst} (90%) create mode 100644 Documentation/w1/index.rst rename Documentation/w1/masters/{ds2482 => ds2482.rst} (71%) rename Documentation/w1/masters/{ds2490 => ds2490.rst} (98%) create mode 100644 Documentation/w1/masters/index.rst rename Documentation/w1/masters/{mxc-w1 => mxc-w1.rst} (33%) rename Documentation/w1/masters/{omap-hdq => omap-hdq.rst} (90%) rename Documentation/w1/masters/{w1-gpio => w1-gpio.rst} (75%) create mode 100644 Documentation/w1/slaves/index.rst rename Documentation/w1/slaves/{w1_ds2406 => w1_ds2406.rst} (96%) rename Documentation/w1/slaves/{w1_ds2413 => w1_ds2413.rst} (81%) rename Documentation/w1/slaves/{w1_ds2423 => w1_ds2423.rst} (48%) rename Documentation/w1/slaves/{w1_ds2438 => w1_ds2438.rst} (93%) rename Documentation/w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} (93%) rename Documentation/w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} (88%) rename Documentation/w1/slaves/{w1_therm => w1_therm.rst} (95%) rename Documentation/w1/{w1.generic => w1-generic.rst} (59%) rename Documentation/w1/{w1.netlink => w1-netlink.rst} (77%) -- 2.21.0

1 2

[alsa-devel] [PATCH v2] ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls()
by Jia-Ju Bai 26 Jul '19

26 Jul '19

In build_adc_controls(), there is an if statement on line 773 to check whether ak->adc_info is NULL: if (! ak->adc_info || ! ak->adc_info[mixer_ch].switch_name) When ak->adc_info is NULL, it is used on line 792: knew.name = ak->adc_info[mixer_ch].selector_name; Thus, a possible null-pointer dereference may occur. To fix this bug, referring to lines 773 and 774, ak->adc_info and ak->adc_info[mixer_ch].selector_name are checked before being used. This bug is found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai <baijiaju1990(a)gmail.com> --- v2: * Fix the errors reported by checkpatch.pl. Thank Takashi for helpful advice. --- sound/i2c/other/ak4xxx-adda.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index 5f59316f982a..b03e6d1be656 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -775,11 +775,12 @@ static int build_adc_controls(struct snd_akm4xxx *ak) return err; memset(&knew, 0, sizeof(knew)); - knew.name = ak->adc_info[mixer_ch].selector_name; - if (!knew.name) { + if (!ak->adc_info || + !ak->adc_info[mixer_ch].selector_name) { knew.name = "Capture Channel"; knew.index = mixer_ch + ak->idx_offset * 2; - } + } else + knew.name = ak->adc_info[mixer_ch].selector_name; knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER; knew.info = ak4xxx_capture_source_info; -- 2.17.0

2 1

[alsa-devel] [PATCH] ALSA: hda - Show the fatal CORB/RIRB error more clearly
by Takashi Iwai 26 Jul '19

26 Jul '19

The last fallback of CORB/RIRB communication error recovery is to turn on the single command mode, and this last resort usually means that something is really screwed up. Instead of a normal dev_err(), show the error more clearly with dev_WARN_ONCE() with the caller stack trace. Also, show the bus-reset fallback also as an error, too. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_controller.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index c8d1b4316245..cc8ad1be3ef3 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -864,10 +864,13 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr, */ if (hbus->allow_bus_reset && !hbus->response_reset && !hbus->in_reset) { hbus->response_reset = 1; + dev_info(chip->card->dev, + "No response from codec, resetting bus: last cmd=0x%08x\n", + bus->last_cmd[addr]); return -EAGAIN; /* give a chance to retry */ } - dev_err(chip->card->dev, + dev_WARN_ONCE(chip->card->dev, "azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n", bus->last_cmd[addr]); chip->single_cmd = 1; -- 2.16.4

1 1

[alsa-devel] [PATCH] Revert "ASoC: rockchip: i2s: Support mono capture"
by Cheng-Yi Chiang 26 Jul '19

26 Jul '19

This reverts commit db51707b9c9aeedd310ebce60f15d5bb006567e0. Previous discussion in https://patchwork.kernel.org/patch/10147153/ explains the issue of the patch. While device is configured as 1-ch, hardware is still generating a 2-ch stream. When user space reads the data and assumes it is a 1-ch stream, the rate will be slower by 2x. Revert the change so 1-ch is not supported. User space can selectively take one channel data out of two channel if 1-ch is preferred. Currently, both channels record identical data. Signed-off-by: Cheng-Yi Chiang <cychiang(a)chromium.org> --- sound/soc/rockchip/rockchip_i2s.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 0a34d0eb8dba..88ebaf6e1880 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -326,7 +326,6 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, val |= I2S_CHN_4; break; case 2: - case 1: val |= I2S_CHN_2; break; default: @@ -459,7 +458,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = { }, .capture = { .stream_name = "Capture", - .channels_min = 1, + .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_192000, .formats = (SNDRV_PCM_FMTBIT_S8 | @@ -659,7 +658,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) } if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) { - if (val >= 1 && val <= 8) + if (val >= 2 && val <= 8) soc_dai->capture.channels_max = val; } -- 2.22.0.709.g102302147b-goog

2 3

[alsa-devel] [PATCH 0/2] ASoC: ti: davinci-mcasp: sample format constraint fixes
by Peter Ujfalusi 26 Jul '19

26 Jul '19

Hi, The two patch fixes two issues on how the driver have placed constraints on the format size. 1. When the first stream starts and the TDM slot_width is configured we can allow formats which require less or equal number of bits on the bus. 2. For the second stream we must allow only formats which uses exact number of bits on the bus. These issues are visible around the S24_3LE, S24_LE and S32_LE formats. Regards, Peter --- Peter Ujfalusi (2): ASoC: ti: davinci-mcasp: Correct slot_width posed constraint ASoC: ti: davinci-mcasp: Support for correct symmetric sample bits sound/soc/ti/davinci-mcasp.c | 91 +++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 12 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 4

[alsa-devel] [PATCH 7/7] docs: dt: fix a sound binding broken reference
by Mauro Carvalho Chehab 26 Jul '19

26 Jul '19

Address this rename: Documentation/devicetree/bindings/sound/{sun4i-i2s.txt -> allwinner,sun4i-a10-i2s.yaml} Fixes: 0a0ca8e94ca3 ("dt-bindings: sound: Convert Allwinner I2S binding to YAML") Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt b/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt index 2ca3d138528e..7ecf6bd60d27 100644 --- a/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt +++ b/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt @@ -4,7 +4,7 @@ Allwinner SUN8I audio codec On Sun8i-A33 SoCs, the audio is separated in different parts: - A DAI driver. It uses the "sun4i-i2s" driver which is documented here: - Documentation/devicetree/bindings/sound/sun4i-i2s.txt + Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml - An analog part of the codec which is handled as PRCM registers. See Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt - An digital part of the codec which is documented in this current -- 2.21.0

2 2

[alsa-devel] [PATCH v2] ASoC: rockchip: i2s: Revert "ASoC: rockchip: i2s: Support mono capture"
by Cheng-Yi Chiang 26 Jul '19

26 Jul '19

This reverts commit db51707b9c9aeedd310ebce60f15d5bb006567e0. Commit db51707b9c9a ("ASoC: rockchip: i2s: Support mono capture") adds support of mono capture to rockchip_i2s_dai. However, I2S controller is still generating a 2-channel stream because it only supports even number of channels. When user space reads the data and assumes it is a mono stream, the rate will be slowed down. Revert the change so the DAI no longer claims that mono capture is supported. Fixes: db51707b9c9a ("ASoC: rockchip: i2s: Support mono capture") Signed-off-by: Cheng-Yi Chiang <cychiang(a)chromium.org> --- sound/soc/rockchip/rockchip_i2s.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 0a34d0eb8dba..88ebaf6e1880 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -326,7 +326,6 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, val |= I2S_CHN_4; break; case 2: - case 1: val |= I2S_CHN_2; break; default: @@ -459,7 +458,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = { }, .capture = { .stream_name = "Capture", - .channels_min = 1, + .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_192000, .formats = (SNDRV_PCM_FMTBIT_S8 | @@ -659,7 +658,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) } if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) { - if (val >= 1 && val <= 8) + if (val >= 2 && val <= 8) soc_dai->capture.channels_max = val; } -- 2.22.0.709.g102302147b-goog

1 0

[alsa-devel] [RESEND PATCH v2 0/7] ASoC: Intel: Skylake: Driver fundaments overhaul
by Cezary Rojewski 26 Jul '19

26 Jul '19

Skylake driver is divided into two modules: - snd_soc_skl - snd_soc_skl_ipc and nothing would be wrong if not for the fact that both cannot exist without one another. IPC module is not some kind of extension, as it is the case for snd_hda_ext_core which is separated from snd_hda_core - legacy hda interface. It's as much core Skylake module as snd_soc_skl is. Statement backup by existence of circular dependency between this two. To eliminate said problem, struct skl_sst has been created. From that momment, Skylake has been plagued by header errors (incomplete sturcts, unknown references etc.) whenever something new is to be added or code is cleaned up. Fix this flawed design by merging snd_soc_skl and snd_soc_skl_ipc. Also, do not forget about struct skl_sst redundancy. Followup changes address harmful assumptions and false logic which driver currently implements e.g.: attempt to take role of master for DSP scheduling when in fact entire control takes place in DSP. Changes since v1: - Rebased onto 5.4 Amadeusz Sławiński (2): ASoC: Intel: Skylake: Combine snd_soc_skl_ipc and snd_soc_skl ASoC: Intel: Skylake: Do not disable FW notifications Cezary Rojewski (5): ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct ASoC: Intel: Skylake: Remove MCPS available check ASoC: Intel: Skylake: Remove memory available check ASoC: Intel: Skylake: Make MCPS and CPS params obsolete ASoC: Intel: Skylake: Cleanup skl_module_cfg declaration sound/soc/intel/common/sst-ipc.h | 1 + sound/soc/intel/skylake/Makefile | 12 +- sound/soc/intel/skylake/bxt-sst.c | 50 +-- sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- sound/soc/intel/skylake/cnl-sst.c | 37 +- sound/soc/intel/skylake/skl-debug.c | 14 +- sound/soc/intel/skylake/skl-messages.c | 245 ++++++------- sound/soc/intel/skylake/skl-nhlt.c | 18 +- sound/soc/intel/skylake/skl-pcm.c | 74 ++-- sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- sound/soc/intel/skylake/skl-sst-dsp.h | 29 +- sound/soc/intel/skylake/skl-sst-ipc.c | 8 +- sound/soc/intel/skylake/skl-sst-ipc.h | 52 +-- sound/soc/intel/skylake/skl-sst-utils.c | 37 +- sound/soc/intel/skylake/skl-sst.c | 51 +-- sound/soc/intel/skylake/skl-topology.c | 441 ++++++++---------------- sound/soc/intel/skylake/skl-topology.h | 43 +-- sound/soc/intel/skylake/skl.c | 54 +-- sound/soc/intel/skylake/skl.h | 102 ++++-- 20 files changed, 546 insertions(+), 743 deletions(-) -- 2.17.1

4 20

[alsa-devel] [PATCH v2 10/10] docs: remove extra conf.py files
by Mauro Carvalho Chehab 26 Jul '19

26 Jul '19

Now that the latex_documents are handled automatically, we can remove those extra conf.py files. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- Documentation/admin-guide/conf.py | 10 ---------- Documentation/core-api/conf.py | 10 ---------- Documentation/crypto/conf.py | 10 ---------- Documentation/dev-tools/conf.py | 10 ---------- Documentation/doc-guide/conf.py | 10 ---------- Documentation/driver-api/80211/conf.py | 10 ---------- Documentation/driver-api/conf.py | 10 ---------- Documentation/driver-api/pm/conf.py | 10 ---------- Documentation/filesystems/conf.py | 10 ---------- Documentation/gpu/conf.py | 10 ---------- Documentation/input/conf.py | 10 ---------- Documentation/kernel-hacking/conf.py | 10 ---------- Documentation/maintainer/conf.py | 10 ---------- Documentation/media/conf.py | 12 ------------ Documentation/networking/conf.py | 10 ---------- Documentation/process/conf.py | 10 ---------- Documentation/sh/conf.py | 10 ---------- Documentation/sound/conf.py | 10 ---------- Documentation/userspace-api/conf.py | 10 ---------- Documentation/vm/conf.py | 10 ---------- Documentation/x86/conf.py | 10 ---------- 21 files changed, 212 deletions(-) delete mode 100644 Documentation/admin-guide/conf.py delete mode 100644 Documentation/core-api/conf.py delete mode 100644 Documentation/crypto/conf.py delete mode 100644 Documentation/dev-tools/conf.py delete mode 100644 Documentation/doc-guide/conf.py delete mode 100644 Documentation/driver-api/80211/conf.py delete mode 100644 Documentation/driver-api/conf.py delete mode 100644 Documentation/driver-api/pm/conf.py delete mode 100644 Documentation/filesystems/conf.py delete mode 100644 Documentation/gpu/conf.py delete mode 100644 Documentation/input/conf.py delete mode 100644 Documentation/kernel-hacking/conf.py delete mode 100644 Documentation/maintainer/conf.py delete mode 100644 Documentation/media/conf.py delete mode 100644 Documentation/networking/conf.py delete mode 100644 Documentation/process/conf.py delete mode 100644 Documentation/sh/conf.py delete mode 100644 Documentation/sound/conf.py delete mode 100644 Documentation/userspace-api/conf.py delete mode 100644 Documentation/vm/conf.py delete mode 100644 Documentation/x86/conf.py diff --git a/Documentation/admin-guide/conf.py b/Documentation/admin-guide/conf.py deleted file mode 100644 index 86f738953799..000000000000 --- a/Documentation/admin-guide/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = 'Linux Kernel User Documentation' - -tags.add("subproject") - -latex_documents = [ - ('index', 'linux-user.tex', 'Linux Kernel User Documentation', - 'The kernel development community', 'manual'), -] diff --git a/Documentation/core-api/conf.py b/Documentation/core-api/conf.py deleted file mode 100644 index db1f7659f3da..000000000000 --- a/Documentation/core-api/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Core-API Documentation" - -tags.add("subproject") - -latex_documents = [ - ('index', 'core-api.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/crypto/conf.py b/Documentation/crypto/conf.py deleted file mode 100644 index 4335d251ddf3..000000000000 --- a/Documentation/crypto/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = 'Linux Kernel Crypto API' - -tags.add("subproject") - -latex_documents = [ - ('index', 'crypto-api.tex', 'Linux Kernel Crypto API manual', - 'The kernel development community', 'manual'), -] diff --git a/Documentation/dev-tools/conf.py b/Documentation/dev-tools/conf.py deleted file mode 100644 index 7faafa3f7888..000000000000 --- a/Documentation/dev-tools/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Development tools for the kernel" - -tags.add("subproject") - -latex_documents = [ - ('index', 'dev-tools.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/doc-guide/conf.py b/Documentation/doc-guide/conf.py deleted file mode 100644 index fd3731182d5a..000000000000 --- a/Documentation/doc-guide/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = 'Linux Kernel Documentation Guide' - -tags.add("subproject") - -latex_documents = [ - ('index', 'kernel-doc-guide.tex', 'Linux Kernel Documentation Guide', - 'The kernel development community', 'manual'), -] diff --git a/Documentation/driver-api/80211/conf.py b/Documentation/driver-api/80211/conf.py deleted file mode 100644 index 4424b4b0b9c3..000000000000 --- a/Documentation/driver-api/80211/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Linux 802.11 Driver Developer's Guide" - -tags.add("subproject") - -latex_documents = [ - ('index', '80211.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/driver-api/conf.py b/Documentation/driver-api/conf.py deleted file mode 100644 index 202726d20088..000000000000 --- a/Documentation/driver-api/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "The Linux driver implementer's API guide" - -tags.add("subproject") - -latex_documents = [ - ('index', 'driver-api.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/driver-api/pm/conf.py b/Documentation/driver-api/pm/conf.py deleted file mode 100644 index a89fac11272f..000000000000 --- a/Documentation/driver-api/pm/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Device Power Management" - -tags.add("subproject") - -latex_documents = [ - ('index', 'pm.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/filesystems/conf.py b/Documentation/filesystems/conf.py deleted file mode 100644 index ea44172af5c4..000000000000 --- a/Documentation/filesystems/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Linux Filesystems API" - -tags.add("subproject") - -latex_documents = [ - ('index', 'filesystems.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/gpu/conf.py b/Documentation/gpu/conf.py deleted file mode 100644 index 1757b040fb32..000000000000 --- a/Documentation/gpu/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Linux GPU Driver Developer's Guide" - -tags.add("subproject") - -latex_documents = [ - ('index', 'gpu.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/input/conf.py b/Documentation/input/conf.py deleted file mode 100644 index d2352fdc92ed..000000000000 --- a/Documentation/input/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "The Linux input driver subsystem" - -tags.add("subproject") - -latex_documents = [ - ('index', 'linux-input.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/kernel-hacking/conf.py b/Documentation/kernel-hacking/conf.py deleted file mode 100644 index 3d8acf0f33ad..000000000000 --- a/Documentation/kernel-hacking/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Kernel Hacking Guides" - -tags.add("subproject") - -latex_documents = [ - ('index', 'kernel-hacking.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/maintainer/conf.py b/Documentation/maintainer/conf.py deleted file mode 100644 index 81e9eb7a7884..000000000000 --- a/Documentation/maintainer/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = 'Linux Kernel Development Documentation' - -tags.add("subproject") - -latex_documents = [ - ('index', 'maintainer.tex', 'Linux Kernel Development Documentation', - 'The kernel development community', 'manual'), -] diff --git a/Documentation/media/conf.py b/Documentation/media/conf.py deleted file mode 100644 index 1f194fcd2cae..000000000000 --- a/Documentation/media/conf.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -# SPDX-License-Identifier: GPL-2.0 - -project = 'Linux Media Subsystem Documentation' - -tags.add("subproject") - -latex_documents = [ - ('index', 'media.tex', 'Linux Media Subsystem Documentation', - 'The kernel development community', 'manual'), -] diff --git a/Documentation/networking/conf.py b/Documentation/networking/conf.py deleted file mode 100644 index 40f69e67a883..000000000000 --- a/Documentation/networking/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Linux Networking Documentation" - -tags.add("subproject") - -latex_documents = [ - ('index', 'networking.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/process/conf.py b/Documentation/process/conf.py deleted file mode 100644 index 1b01a80ad9ce..000000000000 --- a/Documentation/process/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = 'Linux Kernel Development Documentation' - -tags.add("subproject") - -latex_documents = [ - ('index', 'process.tex', 'Linux Kernel Development Documentation', - 'The kernel development community', 'manual'), -] diff --git a/Documentation/sh/conf.py b/Documentation/sh/conf.py deleted file mode 100644 index 1eb684a13ac8..000000000000 --- a/Documentation/sh/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "SuperH architecture implementation manual" - -tags.add("subproject") - -latex_documents = [ - ('index', 'sh.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/sound/conf.py b/Documentation/sound/conf.py deleted file mode 100644 index 3f1fc5e74e7b..000000000000 --- a/Documentation/sound/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Linux Sound Subsystem Documentation" - -tags.add("subproject") - -latex_documents = [ - ('index', 'sound.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/userspace-api/conf.py b/Documentation/userspace-api/conf.py deleted file mode 100644 index 2eaf59f844e5..000000000000 --- a/Documentation/userspace-api/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "The Linux kernel user-space API guide" - -tags.add("subproject") - -latex_documents = [ - ('index', 'userspace-api.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/vm/conf.py b/Documentation/vm/conf.py deleted file mode 100644 index 3b0b601af558..000000000000 --- a/Documentation/vm/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "Linux Memory Management Documentation" - -tags.add("subproject") - -latex_documents = [ - ('index', 'memory-management.tex', project, - 'The kernel development community', 'manual'), -] diff --git a/Documentation/x86/conf.py b/Documentation/x86/conf.py deleted file mode 100644 index 33c5c3142e20..000000000000 --- a/Documentation/x86/conf.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -project = "X86 architecture specific documentation" - -tags.add("subproject") - -latex_documents = [ - ('index', 'x86.tex', project, - 'The kernel development community', 'manual'), -] -- 2.21.0

1 0

[alsa-devel] [PATCH] ASoC: soc-topology: use for_each_component_dais() at remove_dai()
by Kuninori Morimoto 26 Jul '19

26 Jul '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit 52abe6cc1866a ("ASoC: topology: fix oops/use-after-free case with dai driver") fixups remove_dai() error, but it is directly using list_for_each_entry() for component->dai_list. We already have for_each_component_dais() macro for it. Let's use exising method. Fixes: 52abe6cc1866a ("ASoC: topology: fix oops/use-after-free case Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 6387803..12c58e3 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -530,7 +530,7 @@ static void remove_dai(struct snd_soc_component *comp, if (dobj->ops && dobj->ops->dai_unload) dobj->ops->dai_unload(comp, dobj); - list_for_each_entry(dai, &comp->dai_list, list) + for_each_component_dais(comp, dai) if (dai->driver == dai_drv) dai->driver = NULL; -- 2.7.4

1 0

[alsa-devel] [PATCH] ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls()
by Jia-Ju Bai 26 Jul '19

26 Jul '19

In build_adc_controls(), there is an if statement on line 773 to check whether ak->adc_info is NULL: if (! ak->adc_info || ! ak->adc_info[mixer_ch].switch_name) When ak->adc_info is NULL, it is used on line 792: knew.name = ak->adc_info[mixer_ch].selector_name; Thus, a possible null-pointer dereference may occur. To fix this bug, referring to lines 773 and 774, ak->adc_info and ak->adc_info[mixer_ch].selector_name are checked before being used. This bug is found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai <baijiaju1990(a)gmail.com> --- sound/i2c/other/ak4xxx-adda.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index 5f59316f982a..9a891470e84a 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -775,11 +775,13 @@ static int build_adc_controls(struct snd_akm4xxx *ak) return err; memset(&knew, 0, sizeof(knew)); - knew.name = ak->adc_info[mixer_ch].selector_name; - if (!knew.name) { + if (! ak->adc_info || + ! ak->adc_info[mixer_ch].selector_name) { knew.name = "Capture Channel"; knew.index = mixer_ch + ak->idx_offset * 2; } + else + knew.name = ak->adc_info[mixer_ch].selector_name; knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER; knew.info = ak4xxx_capture_source_info; -- 2.17.0

2 2

[alsa-devel] [PATCH 00/25] ASoC: add soc-component.c
by Kuninori Morimoto 26 Jul '19

26 Jul '19

Hi Mark I want to add multi CPU DAI support to ALSA SoC. But I noticed that we want to cleanup ALSA SoC before that. These patches will do nothing from "technical" point of view, but, will makes code readable. These are focusing to "component". Actually, soc-io.c is also for component. I'm thinking that we can merge soc-io.c into soc-component.c, but do nothing by these patch-set. Kuninori Morimoto (25): ASoC: add soc-component.c ASoC: soc-component: add snd_soc_component_get/put() ASoC: soc-component: add snd_soc_component_open() ASoC: soc-component: add snd_soc_component_close() ASoC: soc-component: add snd_soc_component_prepare() ASoC: soc-component: add snd_soc_component_hw_params() ASoC: soc-component: add snd_soc_component_hw_free() ASoC: soc-component: add snd_soc_component_trigger() ASoC: soc-component: add snd_soc_component_pointer() ASoC: soc-component: add snd_soc_component_ioctrl() ASoC: soc-component: add snd_soc_component_copy_user() ASoC: soc-component: add snd_soc_component_page() ASoC: soc-component: add snd_soc_component_mmap() ASoC: soc-component: add snd_soc_component_pcm_new() ASoC: soc-component: add snd_soc_component_pcm_free() ASoC: soc-component: add snd_soc_component_suspend() ASoC: soc-component: add snd_soc_component_resume() ASoC: soc-component: add snd_soc_component_is_suspended() ASoC: soc-component: add snd_soc_component_probe() ASoC: soc-component: add snd_soc_component_remove() ASoC: soc-component: add snd_soc_component_of_xlate_dai_id() ASoC: soc-component: add snd_soc_component_of_xlate_dai_name() ASoC: soc-component: move snd_soc_component_seq_notifier() ASoC: soc-component: move snd_soc_component_stream_event() ASoC: soc-component: move snd_soc_component_set_bias_level() include/sound/soc-component.h | 378 +++++++++++++++++++++++++++++++ include/sound/soc.h | 306 +------------------------- sound/soc/Makefile | 2 +- sound/soc/soc-component.c | 500 ++++++++++++++++++++++++++++++++++++++++++ sound/soc/soc-core.c | 126 ++--------- sound/soc/soc-jack.c | 18 -- sound/soc/soc-pcm.c | 98 +++------ sound/soc/soc-utils.c | 199 ----------------- 8 files changed, 931 insertions(+), 696 deletions(-) create mode 100644 include/sound/soc-component.h create mode 100644 sound/soc/soc-component.c -- 2.7.4

4 39

[alsa-devel] Best representation for TDM devices
by Maxime Ripard 25 Jul '19

25 Jul '19

Hi, I'm currently working on a device that has two Analog's ADAU7002 connected to an I2S/TDM Controller (sound/soc/sunxi/sun4i-i2s.c, with some modifications), over the slots 1/2 and 3/4. The capture itself is working fine, however I'm not quite sure about the way to expose those streams to the userspace. Since I have two codecs, I have two links (described through simple-card) and thus two subdevices. However, the microphones connected are really separate streams, so ideally (I guess?) we should have 1 subdevice per microphone. An alternative would be that we capture the whole 4 channels and use dsnoop to demux them, but trying to use the device directly (using arecord -D hw:0) results in the ioctl to change the number of channels being rejected, I'm assuming because each codec only has 2 channels? So I'm a bit lost at this point about how I should go and expose this. I couldn't really find any similar setup either in the kernel. Any preferred way of doing this? Thanks! Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com

2 1

[alsa-devel] [PATCH v2] ASoC: SOF: Makefile - fix the top-level kernel module names (add snd- prefix)
by Jaroslav Kysela 25 Jul '19

25 Jul '19

Use the proper module name. The objs assignments are already there. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Mark Brown <broonie(a)kernel.org>0 --- sound/soc/sof/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile index 8f14c9d2950b..585fb6917489 100644 --- a/sound/soc/sof/Makefile +++ b/sound/soc/sof/Makefile @@ -11,8 +11,8 @@ obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o -obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o -obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o +obj-$(CONFIG_SND_SOC_SOF_ACPI) += snd-sof-acpi.o +obj-$(CONFIG_SND_SOC_SOF_PCI) += snd-sof-pci.o obj-$(CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL) += intel/ obj-$(CONFIG_SND_SOC_SOF_XTENSA) += xtensa/ -- 2.20.1

2 1

[alsa-devel] [PATCH 1/3] ASoC: wm_adsp: Allow bus error handler to be called directly
by Charles Keepax 25 Jul '19

25 Jul '19

There is no need for end drivers to add helper functions to allow the bus error handler to be called, simply update the prototype so it can be called directly. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/cs47l90.c | 9 +-------- sound/soc/codecs/wm_adsp.c | 6 ++++-- sound/soc/codecs/wm_adsp.h | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c index c4ecb0e6911af..67cac60a859dd 100644 --- a/sound/soc/codecs/cs47l90.c +++ b/sound/soc/codecs/cs47l90.c @@ -2402,13 +2402,6 @@ static irqreturn_t cs47l90_adsp2_irq(int irq, void *data) return IRQ_HANDLED; } -static irqreturn_t cs47l90_dsp_bus_error(int irq, void *data) -{ - struct wm_adsp *dsp = (struct wm_adsp *)data; - - return wm_adsp2_bus_error(dsp); -} - static int cs47l90_component_probe(struct snd_soc_component *component) { struct cs47l90 *cs47l90 = snd_soc_component_get_drvdata(component); @@ -2558,7 +2551,7 @@ static int cs47l90_probe(struct platform_device *pdev) if (ret == 0) { ret = madera_init_bus_error_irq(&cs47l90->core, i, - cs47l90_dsp_bus_error); + wm_adsp2_bus_error); if (ret != 0) wm_adsp2_remove(&cs47l90->core.adsp[i]); } diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index f5fbadc5e7e25..ae28d9907c30f 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -4242,8 +4242,9 @@ static void wm_adsp_fatal_error(struct wm_adsp *dsp) } } -irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) +irqreturn_t wm_adsp2_bus_error(int irq, void *data) { + struct wm_adsp *dsp = (struct wm_adsp *)data; unsigned int val; struct regmap *regmap = dsp->regmap; int ret = 0; @@ -4307,8 +4308,9 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) } EXPORT_SYMBOL_GPL(wm_adsp2_bus_error); -irqreturn_t wm_halo_bus_error(struct wm_adsp *dsp) +irqreturn_t wm_halo_bus_error(int irq, void *data) { + struct wm_adsp *dsp = (struct wm_adsp *)data; struct regmap *regmap = dsp->regmap; unsigned int fault[6]; struct reg_sequence clear[] = { diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index 3b03d1eb986f0..aa634ef6c9f51 100644 --- a/sound/soc/codecs/wm_adsp.h +++ b/sound/soc/codecs/wm_adsp.h @@ -171,8 +171,8 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, int wm_adsp_early_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event); -irqreturn_t wm_adsp2_bus_error(struct wm_adsp *adsp); -irqreturn_t wm_halo_bus_error(struct wm_adsp *dsp); +irqreturn_t wm_adsp2_bus_error(int irq, void *data); +irqreturn_t wm_halo_bus_error(int irq, void *data); irqreturn_t wm_halo_wdt_expire(int irq, void *data); int wm_adsp_event(struct snd_soc_dapm_widget *w, -- 2.11.0

2 5

[alsa-devel] [PATCH 00/10] Add support for new SAI IP version
by Daniel Baluta 25 Jul '19

25 Jul '19

So far SAI IPs integrated with imx6 only supported one data line. Starting with imx7 and imx8 SAI integration support up to 8 data lines and multiple ways of combining the fifos for each data line. New SAI IP version introduces two new registers (Version and Parmeter registers) which are placed at the beginning of register address space. For this reason we need to fix the register's address. Patches 1 and 2 from Lucas enhance per SOC handling of SAI properties. Patches 3,4,5,6,7,8 allow SAI driver to read active data lines and fifo combine mode from DT. Patch 9 fixes new SAI register address space. Patch 10 enable SAI for imx7ulp and imx8mq. This patch introduces Daniel Baluta (8): ASoC: fsl_sai: Add registers definition for multiple datalines ASoC: fsl_sai: Update Tx/Rx channel enable mask ASoC: fsl_sai: Add support to enable multiple data lines ASoC: dt-bindings: Document dl_mask property ASoC: fsl_sai: Add support for FIFO combine mode ASoC: dt-bindings: Document fcomb_mode property ASoC: fsl_sai: Add support for SAI new version ASoC: fsl_sai: Add support for imx7ulp/imx8mq Lucas Stach (2): ASoC: fsl_sai: add of_match data ASoC: fsl_sai: derive TX FIFO watermark from FIFO depth .../devicetree/bindings/sound/fsl-sai.txt | 9 + sound/soc/fsl/fsl_sai.c | 393 +++++++++++++----- sound/soc/fsl/fsl_sai.h | 98 +++-- 3 files changed, 361 insertions(+), 139 deletions(-) -- 2.17.1

5 26

[alsa-devel] [PATCH] ALSA: echoaudio: Replace kmalloc + memcpy with kmemdup
by Chuhong Yuan 25 Jul '19

25 Jul '19

Instead of using kmalloc + memcpy, use kmemdup to simplify the code. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/pci/echoaudio/echoaudio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index b612a536a5a1..ca9125726be2 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2189,11 +2189,10 @@ static int snd_echo_resume(struct device *dev) u32 pipe_alloc_mask; int err; - commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL); + commpage = chip->comm_page; + commpage_bak = kmemdup(commpage, sizeof(*commpage), GFP_KERNEL); if (commpage_bak == NULL) return -ENOMEM; - commpage = chip->comm_page; - memcpy(commpage_bak, commpage, sizeof(*commpage)); err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device); if (err < 0) { -- 2.20.1

2 1

[alsa-devel] Kernel 5.2.2 - RSpeaker not working - MacBookAir 3,2
by github repository 25 Jul '19

25 Jul '19

Ladies and gentlemen, I tested alsa on Kernel 5.2.2 on an MacBook Air 3,2 with alsa-lib 1.1.9, fftw 3.3.8, ncurses 6.1. Somehow I was not able to get the right speaker to work. On Kernel 4.19.60 everything works. Same setup different results. Distribution: Arch Linux lsmod | grep snd snd_hda_codec_hdmi 65536 3 snd_hda_codec_cirrus 20480 1 snd_hda_codec_generic 94208 1 snd_hda_codec_cirrus ledtrig_audio 16384 1 snd_hda_codec_generic snd_hda_intel 49152 0 snd_hda_codec 155648 4 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec_ci rrus snd_hda_core 102400 5 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec,sn d_hda_codec_cirrus snd_hwdep 16384 1 snd_hda_codec snd_pcm 135168 4 snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec,snd_hda_core snd_timer 40960 1 snd_pcm snd 106496 7 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hwdep,snd_hda_intel,snd_hd a_codec,snd_timer,snd_pcm soundcore 16384 1 snd aplay -L null Discard all samples (playback) or generate zero samples (capture) default:CARD=NVidia HDA NVidia, CS4206 Analog Default Audio Device sysdefault:CARD=NVidia HDA NVidia, CS4206 Analog Default Audio Device front:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Analog Front speakers surround21:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Analog 2.1 Surround output to Front and Subwoofer speakers surround40:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Analog 4.0 Surround output to Front and Rear speakers surround41:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Analog 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Analog 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Analog 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Analog 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers iec958:CARD=NVidia,DEV=0 HDA NVidia, CS4206 Digital IEC958 (S/PDIF) Digital Audio Output hdmi:CARD=NVidia,DEV=0 HDA NVidia, HDMI 0 HDMI Audio Output hdmi:CARD=NVidia,DEV=1 HDA NVidia, HDMI 0 HDMI Audio Output hdmi:CARD=NVidia,DEV=2 HDA NVidia, HDMI 0 HDMI Audio Output aplay -l **** List of PLAYBACK Hardware Devices **** card 0: NVidia [HDA NVidia], device 0: CS4206 Analog [CS4206 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: NVidia [HDA NVidia], device 1: CS4206 Digital [CS4206 Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: NVidia [HDA NVidia], device 3: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: NVidia [HDA NVidia], device 7: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: NVidia [HDA NVidia], device 8: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 ls -l /dev/snd total 0 drwxr-xr-x 2 root root 60 Jul 25 14:25 by-path crw-rw---- 1 root audio 116, 12 Jul 25 14:25 controlC0 crw-rw---- 1 root audio 116, 8 Jul 25 14:25 hwC0D0 crw-rw---- 1 root audio 116, 9 Jul 25 14:25 hwC0D3 crw-rw---- 1 root audio 116, 10 Jul 25 14:25 hwC0D4 crw-rw---- 1 root audio 116, 11 Jul 25 14:25 hwC0D5 crw-rw---- 1 root audio 116, 3 Jul 25 14:25 pcmC0D0c crw-rw---- 1 root audio 116, 2 Jul 25 14:25 pcmC0D0p crw-rw---- 1 root audio 116, 4 Jul 25 14:25 pcmC0D1p crw-rw---- 1 root audio 116, 5 Jul 25 14:25 pcmC0D3p crw-rw---- 1 root audio 116, 6 Jul 25 14:25 pcmC0D7p crw-rw---- 1 root audio 116, 7 Jul 25 14:25 pcmC0D8p crw-rw---- 1 root audio 116, 1 Jul 25 14:25 seq crw-rw---- 1 root audio 116, 33 Jul 25 14:25 timer

1 0

[alsa-devel] [PATCH] ASoC: Intel: Fix some acpi vs apci typo in somme comments
by Christophe JAILLET 25 Jul '19

25 Jul '19

Fix some typo to have the filaname given in a comment match the real name of the file. Some 'acpi' have erroneously been written 'apci' Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-cht-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-glk-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-hda-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-skl-match.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c index 229e39586868..4a5adae1d785 100644 --- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * soc-apci-intel-bxt-match.c - tables and support for BXT ACPI enumeration. + * soc-acpi-intel-bxt-match.c - tables and support for BXT ACPI enumeration. * * Copyright (c) 2018, Intel Corporation. * diff --git a/sound/soc/intel/common/soc-acpi-intel-byt-match.c b/sound/soc/intel/common/soc-acpi-intel-byt-match.c index b94b482ac34f..1cc801ba92eb 100644 --- a/sound/soc/intel/common/soc-acpi-intel-byt-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-byt-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * soc-apci-intel-byt-match.c - tables and support for BYT ACPI enumeration. + * soc-acpi-intel-byt-match.c - tables and support for BYT ACPI enumeration. * * Copyright (c) 2017, Intel Corporation. */ diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c index b7f11f6be1cf..d0fb43c2b9f6 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * soc-apci-intel-cht-match.c - tables and support for CHT ACPI enumeration. + * soc-acpi-intel-cht-match.c - tables and support for CHT ACPI enumeration. * * Copyright (c) 2017, Intel Corporation. */ diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c index c36c0aa4f683..771b0ef21051 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * soc-apci-intel-cnl-match.c - tables and support for CNL ACPI enumeration. + * soc-acpi-intel-cnl-match.c - tables and support for CNL ACPI enumeration. * * Copyright (c) 2018, Intel Corporation. * diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c index 616eb09e78a0..60dea358fa04 100644 --- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * soc-apci-intel-glk-match.c - tables and support for GLK ACPI enumeration. + * soc-acpi-intel-glk-match.c - tables and support for GLK ACPI enumeration. * * Copyright (c) 2018, Intel Corporation. * diff --git a/sound/soc/intel/common/soc-acpi-intel-hda-match.c b/sound/soc/intel/common/soc-acpi-intel-hda-match.c index 68ae43f7b4b2..cc972d2ac691 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hda-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hda-match.c @@ -2,7 +2,7 @@ // Copyright (c) 2018, Intel Corporation. /* - * soc-apci-intel-hda-match.c - tables and support for HDA+ACPI enumeration. + * soc-acpi-intel-hda-match.c - tables and support for HDA+ACPI enumeration. * */ diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c index d27853e7a369..34eb0baaa951 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * soc-apci-intel-hsw-bdw-match.c - tables and support for ACPI enumeration. + * soc-acpi-intel-hsw-bdw-match.c - tables and support for ACPI enumeration. * * Copyright (c) 2017, Intel Corporation. */ diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index 0b430b9b3673..38977669b576 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * soc-apci-intel-icl-match.c - tables and support for ICL ACPI enumeration. + * soc-acpi-intel-icl-match.c - tables and support for ICL ACPI enumeration. * * Copyright (c) 2018, Intel Corporation. * diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c index 4b331058e807..e200baa11011 100644 --- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * soc-apci-intel-kbl-match.c - tables and support for KBL ACPI enumeration. + * soc-acpi-intel-kbl-match.c - tables and support for KBL ACPI enumeration. * * Copyright (c) 2018, Intel Corporation. * diff --git a/sound/soc/intel/common/soc-acpi-intel-skl-match.c b/sound/soc/intel/common/soc-acpi-intel-skl-match.c index 0c9c0edd35b3..42fa40a8d932 100644 --- a/sound/soc/intel/common/soc-acpi-intel-skl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-skl-match.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * soc-apci-intel-skl-match.c - tables and support for SKL ACPI enumeration. + * soc-acpi-intel-skl-match.c - tables and support for SKL ACPI enumeration. * * Copyright (c) 2018, Intel Corporation. * -- 2.20.1

4 3

[alsa-devel] [PATCH 00/22] ReST conversion of text files without .txt extension
by Mauro Carvalho Chehab 25 Jul '19

25 Jul '19

This series converts the text files under Documentation with doesn't end neither .txt or .rst and are not part of ABI or features[1]. This series is at: https://git.linuxtv.org/mchehab/experimental.git/log/?h=rst_for_5_4_v2.1 And comes after the pending patches I had for v5.13 (some not applied yet): https://git.linuxtv.org/mchehab/experimental.git/log/?h=pending_docs_after_… [1] I submitted already a series to handle ABI and features. There are some files besides the ones there with, IMHO, it doesn't make sense to convert. So, I wrote a small ugly script to track the files waiting to be converted: #!/bin/bash find Documentation/ -name '*.txt'|grep -vE '(features/|devicetree/|sphinx/|output/|dax-hv-api.txt|draft-ietf-cipso-ipsecurity-01.txt|translations)' for i in $(find Documentation/ -type f|grep -v translations/|grep -v output/|grep -v devicetree|grep -v -E "\.(rst|txt|py|pyc|pl|dot|conf|svg|sh|awk|gif|S|inf|c|csv|css|vim|exceptions|modes)$"|grep -v ABI/ |grep -v Documentation/EDID/hex|grep -v dontdiff|grep -v Kconfig|grep -v Makefile|grep -v Module.symvers|grep -vE '\b(CodingStyle|SubmittingPatches|target-export-device|hotplug-script|wusb-cbaf)\b'|grep -v -E '(LICENSE|COPY|gitignore|Makefile|AUTHORS|TODO|CHANGES|CREDITS|ChangeLog)'|grep -v Documentation/virtual/kvm/devices/README); do echo $i; done After this patch series, the script reports 358 files missing conversion, all ending with .txt. >From those, ~40 files are already at ReST format - the ones at Documentation/*.txt - except for a couple of files there. So, there's around 320 files left to be converted after this series, with gives me hope that we may finally finish the conversion this year. Let's see. Mauro Carvalho Chehab (22): docs: convert markdown documents to ReST docs: i2c: convert to ReST and add to driver-api bookset docs: w1: convert to ReST and add to the kAPI group of docs docs: spi: convert to ReST and add it to the kABI bookset docs: ipmb: place it at driver-api and convert to ReST docs: packing: move it to core-api book and adjust markups docs: admin-guide: add auxdisplay files to it after conversion to ReST docs: README.buddha: convert to ReST and add to m68k book docs: parisc: convert to ReST and add to documentation body docs: openrisc: convert to ReST and add to documentation body docs: isdn: convert to ReST and add to kAPI bookset docs: fs: cifs: convert to ReST and add to admin-guide book docs: fs: convert docs without extension to ReST docs: fs: convert porting to ReST docs: index.rst: don't use genindex for pdf output docs: wimax: convert to ReST and add to admin-guide docs: mips: add to the documentation body as ReST docs: hwmon: pxe1610: convert to ReST format and add to the index docs: nios2: add it to the main Documentation body docs: net: convert two README files to ReST format docs: rcu: convert some articles from html to ReST docs: ABI: remove extension from sysfs-class-mic.txt Documentation/ABI/stable/sysfs-bus-w1 | 2 +- .../ABI/stable/sysfs-driver-w1_ds28e04 | 4 +- .../ABI/stable/sysfs-driver-w1_ds28ea00 | 2 +- .../{sysfs-class-mic.txt => sysfs-class-mic} | 0 .../Data-Structures/Data-Structures.html | 1391 ------- .../Data-Structures/Data-Structures.rst | 1163 ++++++ .../Expedited-Grace-Periods.html | 668 ---- .../Expedited-Grace-Periods.rst | 521 +++ .../Memory-Ordering/Tree-RCU-Diagram.html | 9 - .../Tree-RCU-Memory-Ordering.html | 704 ---- .../Tree-RCU-Memory-Ordering.rst | 625 ++++ .../RCU/Design/Requirements/Requirements.html | 3330 ----------------- .../RCU/Design/Requirements/Requirements.rst | 2662 +++++++++++++ Documentation/RCU/index.rst | 5 + Documentation/RCU/whatisRCU.txt | 4 +- .../admin-guide/auxdisplay/cfag12864b.rst | 98 + .../admin-guide/auxdisplay/index.rst | 16 + .../admin-guide/auxdisplay/ks0108.rst | 50 + .../AUTHORS => admin-guide/cifs/authors.rst} | 64 +- .../CHANGES => admin-guide/cifs/changes.rst} | 4 + Documentation/admin-guide/cifs/index.rst | 21 + .../cifs/introduction.rst} | 8 + .../cifs/TODO => admin-guide/cifs/todo.rst} | 87 +- .../README => admin-guide/cifs/usage.rst} | 560 +-- .../cifs/winucase_convert.pl | 0 Documentation/admin-guide/index.rst | 3 + .../wimax/i2400m.rst} | 145 +- Documentation/admin-guide/wimax/index.rst | 19 + .../wimax/wimax.rst} | 36 +- Documentation/auxdisplay/cfag12864b | 105 - Documentation/auxdisplay/ks0108 | 55 - Documentation/core-api/index.rst | 3 +- .../{packing.txt => core-api/packing.rst} | 81 +- .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 2 +- Documentation/devicetree/writing-schema.md | 130 - Documentation/devicetree/writing-schema.rst | 153 + Documentation/driver-api/dmaengine/index.rst | 2 +- Documentation/driver-api/index.rst | 1 + Documentation/driver-api/ipmb.rst | 2 +- Documentation/driver-api/soundwire/index.rst | 2 +- ...irectory-locking => directory-locking.rst} | 40 +- Documentation/filesystems/index.rst | 4 + .../filesystems/{Locking => locking.rst} | 257 +- .../nfs/{Exporting => exporting.rst} | 31 +- Documentation/filesystems/porting | 686 ---- Documentation/filesystems/porting.rst | 852 +++++ ...entication.md => ubifs-authentication.rst} | 70 +- Documentation/filesystems/vfs.rst | 2 +- Documentation/hwmon/adm1021.rst | 2 +- Documentation/hwmon/adm1275.rst | 2 +- Documentation/hwmon/hih6130.rst | 2 +- Documentation/hwmon/ibm-cffps.rst | 2 +- Documentation/hwmon/index.rst | 1 + Documentation/hwmon/lm25066.rst | 2 +- Documentation/hwmon/max16064.rst | 2 +- Documentation/hwmon/max16065.rst | 2 +- Documentation/hwmon/max20751.rst | 2 +- Documentation/hwmon/max34440.rst | 2 +- Documentation/hwmon/max6650.rst | 2 +- Documentation/hwmon/max8688.rst | 2 +- Documentation/hwmon/menf21bmc.rst | 2 +- Documentation/hwmon/pcf8591.rst | 2 +- Documentation/hwmon/{pxe1610 => pxe1610.rst} | 33 +- Documentation/hwmon/sht3x.rst | 2 +- Documentation/hwmon/shtc1.rst | 2 +- Documentation/hwmon/tmp103.rst | 2 +- Documentation/hwmon/tps40422.rst | 2 +- Documentation/hwmon/ucd9000.rst | 2 +- Documentation/hwmon/ucd9200.rst | 2 +- Documentation/hwmon/via686a.rst | 2 +- Documentation/hwmon/zl6100.rst | 2 +- .../busses/{i2c-ali1535 => i2c-ali1535.rst} | 13 +- .../busses/{i2c-ali1563 => i2c-ali1563.rst} | 3 + .../busses/{i2c-ali15x3 => i2c-ali15x3.rst} | 64 +- Documentation/i2c/busses/i2c-amd-mp2 | 23 - Documentation/i2c/busses/i2c-amd-mp2.rst | 25 + .../i2c/busses/{i2c-amd756 => i2c-amd756.rst} | 8 +- .../busses/{i2c-amd8111 => i2c-amd8111.rst} | 14 +- .../{i2c-diolan-u2c => i2c-diolan-u2c.rst} | 3 + .../i2c/busses/{i2c-i801 => i2c-i801.rst} | 33 +- .../i2c/busses/{i2c-ismt => i2c-ismt.rst} | 20 +- .../busses/{i2c-mlxcpld => i2c-mlxcpld.rst} | 6 + .../busses/{i2c-nforce2 => i2c-nforce2.rst} | 33 +- .../{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} | 6 +- .../i2c/busses/{i2c-ocores => i2c-ocores.rst} | 22 +- Documentation/i2c/busses/i2c-parport | 178 - ...2c-parport-light => i2c-parport-light.rst} | 8 +- Documentation/i2c/busses/i2c-parport.rst | 190 + .../busses/{i2c-pca-isa => i2c-pca-isa.rst} | 9 +- .../i2c/busses/{i2c-piix4 => i2c-piix4.rst} | 18 +- .../busses/{i2c-sis5595 => i2c-sis5595.rst} | 19 +- Documentation/i2c/busses/i2c-sis630 | 58 - Documentation/i2c/busses/i2c-sis630.rst | 63 + .../i2c/busses/{i2c-sis96x => i2c-sis96x.rst} | 31 +- .../busses/{i2c-taos-evm => i2c-taos-evm.rst} | 8 +- .../i2c/busses/{i2c-via => i2c-via.rst} | 28 +- .../i2c/busses/{i2c-viapro => i2c-viapro.rst} | 12 +- Documentation/i2c/busses/index.rst | 33 + .../i2c/busses/{scx200_acb => scx200_acb.rst} | 9 +- .../i2c/{dev-interface => dev-interface.rst} | 94 +- ...-considerations => dma-considerations.rst} | 0 .../i2c/{fault-codes => fault-codes.rst} | 5 +- .../i2c/{functionality => functionality.rst} | 22 +- ...ult-injection => gpio-fault-injection.rst} | 12 +- .../i2c/{i2c-protocol => i2c-protocol.rst} | 28 +- Documentation/i2c/{i2c-stub => i2c-stub.rst} | 20 +- .../i2c/{i2c-topology => i2c-topology.rst} | 68 +- Documentation/i2c/index.rst | 37 + ...ting-devices => instantiating-devices.rst} | 45 +- .../muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} | 26 +- ...e-parameters => old-module-parameters.rst} | 27 +- ...eprom-backend => slave-eeprom-backend.rst} | 4 +- .../{slave-interface => slave-interface.rst} | 33 +- .../{smbus-protocol => smbus-protocol.rst} | 86 +- Documentation/i2c/{summary => summary.rst} | 6 +- ...en-bit-addresses => ten-bit-addresses.rst} | 5 + ...pgrading-clients => upgrading-clients.rst} | 204 +- .../{writing-clients => writing-clients.rst} | 94 +- Documentation/index.rst | 8 + .../isdn/{README.avmb1 => avmb1.rst} | 231 +- Documentation/isdn/{CREDITS => credits.rst} | 7 +- .../isdn/{README.gigaset => gigaset.rst} | 290 +- .../isdn/{README.hysdn => hysdn.rst} | 125 +- Documentation/isdn/index.rst | 24 + .../{INTERFACE.CAPI => interface_capi.rst} | 182 +- .../isdn/{README.mISDN => m_isdn.rst} | 5 +- .../m68k/{README.buddha => buddha-driver.rst} | 95 +- Documentation/m68k/index.rst | 1 + .../{AU1xxx_IDE.README => au1xxx_ide.rst} | 89 +- Documentation/mips/index.rst | 17 + .../networking/caif/{README => caif.rst} | 88 +- .../networking/device_drivers/index.rst | 2 +- Documentation/networking/index.rst | 2 +- .../{README => mac80211_hwsim.rst} | 28 +- Documentation/nios2/{README => nios2.rst} | 1 + Documentation/openrisc/index.rst | 18 + .../openrisc/{README => openrisc_port.rst} | 25 +- Documentation/openrisc/{TODO => todo.rst} | 9 +- .../parisc/{debugging => debugging.rst} | 7 + Documentation/parisc/index.rst | 18 + .../parisc/{registers => registers.rst} | 59 +- Documentation/sound/index.rst | 2 +- .../spi/{butterfly => butterfly.rst} | 44 +- Documentation/spi/index.rst | 22 + Documentation/spi/{pxa2xx => pxa2xx.rst} | 95 +- .../spi/{spi-lm70llp => spi-lm70llp.rst} | 17 +- .../spi/{spi-sc18is602 => spi-sc18is602.rst} | 5 +- .../spi/{spi-summary => spi-summary.rst} | 105 +- Documentation/spi/{spidev => spidev.rst} | 30 +- Documentation/w1/index.rst | 21 + .../w1/masters/{ds2482 => ds2482.rst} | 16 +- .../w1/masters/{ds2490 => ds2490.rst} | 6 +- Documentation/w1/masters/index.rst | 14 + Documentation/w1/masters/mxc-w1 | 12 - Documentation/w1/masters/mxc-w1.rst | 17 + .../w1/masters/{omap-hdq => omap-hdq.rst} | 12 +- .../w1/masters/{w1-gpio => w1-gpio.rst} | 21 +- Documentation/w1/slaves/index.rst | 16 + .../w1/slaves/{w1_ds2406 => w1_ds2406.rst} | 4 +- .../w1/slaves/{w1_ds2413 => w1_ds2413.rst} | 9 + Documentation/w1/slaves/w1_ds2423 | 47 - Documentation/w1/slaves/w1_ds2423.rst | 54 + .../w1/slaves/{w1_ds2438 => w1_ds2438.rst} | 10 +- .../w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} | 5 + .../w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} | 16 +- .../w1/slaves/{w1_therm => w1_therm.rst} | 11 +- .../w1/{w1.generic => w1-generic.rst} | 88 +- .../w1/{w1.netlink => w1-netlink.rst} | 89 +- MAINTAINERS | 60 +- drivers/auxdisplay/Kconfig | 2 +- drivers/hwmon/atxp1.c | 2 +- drivers/hwmon/smm665.c | 2 +- drivers/i2c/Kconfig | 4 +- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-i801.c | 2 +- drivers/i2c/busses/i2c-taos-evm.c | 2 +- drivers/i2c/i2c-core-base.c | 4 +- drivers/iio/dummy/iio_simple_dummy.c | 4 +- drivers/rtc/rtc-ds1374.c | 2 +- drivers/spi/Kconfig | 2 +- drivers/spi/spi-butterfly.c | 2 +- drivers/spi/spi-lm70llp.c | 2 +- drivers/staging/isdn/hysdn/Kconfig | 2 +- fs/cifs/export.c | 2 +- fs/exportfs/expfs.c | 2 +- fs/isofs/export.c | 2 +- fs/orangefs/file.c | 2 +- fs/orangefs/orangefs-kernel.h | 2 +- include/linux/dcache.h | 2 +- include/linux/exportfs.h | 2 +- include/linux/i2c.h | 2 +- include/linux/platform_data/sc18is602.h | 2 +- 192 files changed, 9538 insertions(+), 9201 deletions(-) rename Documentation/ABI/testing/{sysfs-class-mic.txt => sysfs-class-mic} (100%) delete mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.rst delete mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.rst delete mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html delete mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.rst delete mode 100644 Documentation/RCU/Design/Requirements/Requirements.html create mode 100644 Documentation/RCU/Design/Requirements/Requirements.rst create mode 100644 Documentation/admin-guide/auxdisplay/cfag12864b.rst create mode 100644 Documentation/admin-guide/auxdisplay/index.rst create mode 100644 Documentation/admin-guide/auxdisplay/ks0108.rst rename Documentation/{filesystems/cifs/AUTHORS => admin-guide/cifs/authors.rst} (60%) rename Documentation/{filesystems/cifs/CHANGES => admin-guide/cifs/changes.rst} (91%) create mode 100644 Documentation/admin-guide/cifs/index.rst rename Documentation/{filesystems/cifs/cifs.txt => admin-guide/cifs/introduction.rst} (98%) rename Documentation/{filesystems/cifs/TODO => admin-guide/cifs/todo.rst} (58%) rename Documentation/{filesystems/cifs/README => admin-guide/cifs/usage.rst} (72%) rename Documentation/{filesystems => admin-guide}/cifs/winucase_convert.pl (100%) rename Documentation/{wimax/README.i2400m => admin-guide/wimax/i2400m.rst} (69%) create mode 100644 Documentation/admin-guide/wimax/index.rst rename Documentation/{wimax/README.wimax => admin-guide/wimax/wimax.rst} (74%) delete mode 100644 Documentation/auxdisplay/cfag12864b delete mode 100644 Documentation/auxdisplay/ks0108 rename Documentation/{packing.txt => core-api/packing.rst} (61%) delete mode 100644 Documentation/devicetree/writing-schema.md create mode 100644 Documentation/devicetree/writing-schema.rst rename Documentation/filesystems/{directory-locking => directory-locking.rst} (86%) rename Documentation/filesystems/{Locking => locking.rst} (79%) rename Documentation/filesystems/nfs/{Exporting => exporting.rst} (91%) delete mode 100644 Documentation/filesystems/porting create mode 100644 Documentation/filesystems/porting.rst rename Documentation/filesystems/{ubifs-authentication.md => ubifs-authentication.rst} (95%) rename Documentation/hwmon/{pxe1610 => pxe1610.rst} (82%) rename Documentation/i2c/busses/{i2c-ali1535 => i2c-ali1535.rst} (82%) rename Documentation/i2c/busses/{i2c-ali1563 => i2c-ali1563.rst} (93%) rename Documentation/i2c/busses/{i2c-ali15x3 => i2c-ali15x3.rst} (72%) delete mode 100644 Documentation/i2c/busses/i2c-amd-mp2 create mode 100644 Documentation/i2c/busses/i2c-amd-mp2.rst rename Documentation/i2c/busses/{i2c-amd756 => i2c-amd756.rst} (79%) rename Documentation/i2c/busses/{i2c-amd8111 => i2c-amd8111.rst} (66%) rename Documentation/i2c/busses/{i2c-diolan-u2c => i2c-diolan-u2c.rst} (91%) rename Documentation/i2c/busses/{i2c-i801 => i2c-i801.rst} (89%) rename Documentation/i2c/busses/{i2c-ismt => i2c-ismt.rst} (81%) rename Documentation/i2c/busses/{i2c-mlxcpld => i2c-mlxcpld.rst} (88%) rename Documentation/i2c/busses/{i2c-nforce2 => i2c-nforce2.rst} (58%) rename Documentation/i2c/busses/{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} (63%) rename Documentation/i2c/busses/{i2c-ocores => i2c-ocores.rst} (82%) delete mode 100644 Documentation/i2c/busses/i2c-parport rename Documentation/i2c/busses/{i2c-parport-light => i2c-parport-light.rst} (91%) create mode 100644 Documentation/i2c/busses/i2c-parport.rst rename Documentation/i2c/busses/{i2c-pca-isa => i2c-pca-isa.rst} (72%) rename Documentation/i2c/busses/{i2c-piix4 => i2c-piix4.rst} (92%) rename Documentation/i2c/busses/{i2c-sis5595 => i2c-sis5595.rst} (74%) delete mode 100644 Documentation/i2c/busses/i2c-sis630 create mode 100644 Documentation/i2c/busses/i2c-sis630.rst rename Documentation/i2c/busses/{i2c-sis96x => i2c-sis96x.rst} (74%) rename Documentation/i2c/busses/{i2c-taos-evm => i2c-taos-evm.rst} (91%) rename Documentation/i2c/busses/{i2c-via => i2c-via.rst} (54%) rename Documentation/i2c/busses/{i2c-viapro => i2c-viapro.rst} (87%) create mode 100644 Documentation/i2c/busses/index.rst rename Documentation/i2c/busses/{scx200_acb => scx200_acb.rst} (86%) rename Documentation/i2c/{dev-interface => dev-interface.rst} (71%) rename Documentation/i2c/{DMA-considerations => dma-considerations.rst} (100%) rename Documentation/i2c/{fault-codes => fault-codes.rst} (98%) rename Documentation/i2c/{functionality => functionality.rst} (91%) rename Documentation/i2c/{gpio-fault-injection => gpio-fault-injection.rst} (97%) rename Documentation/i2c/{i2c-protocol => i2c-protocol.rst} (83%) rename Documentation/i2c/{i2c-stub => i2c-stub.rst} (93%) rename Documentation/i2c/{i2c-topology => i2c-topology.rst} (89%) create mode 100644 Documentation/i2c/index.rst rename Documentation/i2c/{instantiating-devices => instantiating-devices.rst} (93%) rename Documentation/i2c/muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} (85%) rename Documentation/i2c/{old-module-parameters => old-module-parameters.rst} (75%) rename Documentation/i2c/{slave-eeprom-backend => slave-eeprom-backend.rst} (90%) rename Documentation/i2c/{slave-interface => slave-interface.rst} (94%) rename Documentation/i2c/{smbus-protocol => smbus-protocol.rst} (82%) rename Documentation/i2c/{summary => summary.rst} (96%) rename Documentation/i2c/{ten-bit-addresses => ten-bit-addresses.rst} (95%) rename Documentation/i2c/{upgrading-clients => upgrading-clients.rst} (54%) rename Documentation/i2c/{writing-clients => writing-clients.rst} (91%) rename Documentation/isdn/{README.avmb1 => avmb1.rst} (50%) rename Documentation/isdn/{CREDITS => credits.rst} (96%) rename Documentation/isdn/{README.gigaset => gigaset.rst} (74%) rename Documentation/isdn/{README.hysdn => hysdn.rst} (80%) create mode 100644 Documentation/isdn/index.rst rename Documentation/isdn/{INTERFACE.CAPI => interface_capi.rst} (75%) rename Documentation/isdn/{README.mISDN => m_isdn.rst} (89%) rename Documentation/m68k/{README.buddha => buddha-driver.rst} (73%) rename Documentation/mips/{AU1xxx_IDE.README => au1xxx_ide.rst} (67%) create mode 100644 Documentation/mips/index.rst rename Documentation/networking/caif/{README => caif.rst} (70%) rename Documentation/networking/mac80211_hwsim/{README => mac80211_hwsim.rst} (81%) rename Documentation/nios2/{README => nios2.rst} (96%) create mode 100644 Documentation/openrisc/index.rst rename Documentation/openrisc/{README => openrisc_port.rst} (80%) rename Documentation/openrisc/{TODO => todo.rst} (78%) rename Documentation/parisc/{debugging => debugging.rst} (94%) create mode 100644 Documentation/parisc/index.rst rename Documentation/parisc/{registers => registers.rst} (70%) rename Documentation/spi/{butterfly => butterfly.rst} (71%) create mode 100644 Documentation/spi/index.rst rename Documentation/spi/{pxa2xx => pxa2xx.rst} (83%) rename Documentation/spi/{spi-lm70llp => spi-lm70llp.rst} (88%) rename Documentation/spi/{spi-sc18is602 => spi-sc18is602.rst} (92%) rename Documentation/spi/{spi-summary => spi-summary.rst} (93%) rename Documentation/spi/{spidev => spidev.rst} (90%) create mode 100644 Documentation/w1/index.rst rename Documentation/w1/masters/{ds2482 => ds2482.rst} (71%) rename Documentation/w1/masters/{ds2490 => ds2490.rst} (98%) create mode 100644 Documentation/w1/masters/index.rst delete mode 100644 Documentation/w1/masters/mxc-w1 create mode 100644 Documentation/w1/masters/mxc-w1.rst rename Documentation/w1/masters/{omap-hdq => omap-hdq.rst} (90%) rename Documentation/w1/masters/{w1-gpio => w1-gpio.rst} (75%) create mode 100644 Documentation/w1/slaves/index.rst rename Documentation/w1/slaves/{w1_ds2406 => w1_ds2406.rst} (96%) rename Documentation/w1/slaves/{w1_ds2413 => w1_ds2413.rst} (81%) delete mode 100644 Documentation/w1/slaves/w1_ds2423 create mode 100644 Documentation/w1/slaves/w1_ds2423.rst rename Documentation/w1/slaves/{w1_ds2438 => w1_ds2438.rst} (93%) rename Documentation/w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} (93%) rename Documentation/w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} (88%) rename Documentation/w1/slaves/{w1_therm => w1_therm.rst} (95%) rename Documentation/w1/{w1.generic => w1-generic.rst} (59%) rename Documentation/w1/{w1.netlink => w1-netlink.rst} (77%) -- 2.21.0

2 2

[alsa-devel] [PATCH] ASoC: SOF: Makefile - fix the top-level kernel module names (add snd- prefix)
by Jaroslav Kysela 25 Jul '19

25 Jul '19

Use the proper module name. The objs assignments are already there. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Mark Brown <broonie(a)kernel.org>0 --- sound/soc/sof/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile index 8f14c9d2950b..d2f7a1bc09a1 100644 --- a/sound/soc/sof/Makefile +++ b/sound/soc/sof/Makefile @@ -11,8 +11,8 @@ obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o -obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o -obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o +obj-$(CONFIG_SND_SOC_SOF_ACPI) += snd-sof-acpi-dev.o +obj-$(CONFIG_SND_SOC_SOF_PCI) += snd-sof-pci-dev.o obj-$(CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL) += intel/ obj-$(CONFIG_SND_SOC_SOF_XTENSA) += xtensa/ -- 2.20.1

3 3

[alsa-devel] [PATCH 0/6] ASoC: improve codec to codec link support
by Jerome Brunet 25 Jul '19

25 Jul '19

As explained in this previous series [0], on Amlogic, we are using codec to codec links to deal with the glue which is between the i2s backends and the synopsys hdmi controller. This worked well until I tried to .get_eld() support in the dw-hdmi-i2s driver. Doing so adds channel mapping controls to the codec. This shown several problem 1) .pcm_new() is not called on codec to codec links. struct snd_soc_pcm_runtime do not even have a valid .pcm 2) struct snd_pcm_substream and struct snd_pcm_runtime are ephemeral This is a problem if a control needs to access them The goal of this patchset is to resolve the above issues and improve the codec to codec link support enough to correctly handle the hdmi-codec The support of these codec to codec links could probably be improved in the future to behave like any other link and use soc_pcm_open(), soc_pcm_hw_params(), etc... The challenge lies in the dapm mutex. The soc_pcm call dapm function locking this mutex but the dapm mutex is already held in snd_soc_dai_link_event() [0]: https://lkml.kernel.org/r/20190515131858.32130-1-jbrunet@baylibre.com Jerome Brunet (6): ASoC: codec2codec: run callbacks in order ASoC: codec2codec: name link using stream direction ASoC: codec2codec: deal with params when necessary ASoC: create pcm for codec2codec links as well ASoC: codec2codec: remove ephemeral variables ASoC: codec2codec: fill some of the runtime stream parameters sound/soc/soc-core.c | 42 +++------- sound/soc/soc-dapm.c | 186 +++++++++++++++++++++++++++---------------- sound/soc/soc-pcm.c | 35 +++++++- 3 files changed, 162 insertions(+), 101 deletions(-) -- 2.21.0

2 10

[alsa-devel] [PATCH] ASoC: pcm3168a: Allow all channels in case of parallel DIN/DOUT setup
by Peter Ujfalusi 25 Jul '19

25 Jul '19

If multi DIN/DOUT mode is selected (tdm_slots == 2) then configure the channel constraint to allow all channels. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/codecs/pcm3168a.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 5d59ce254821..e84a1509fe65 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -599,6 +599,10 @@ static int pcm3168a_startup(struct snd_pcm_substream *substream, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, sample_min, 32); + /* Allow all channels in multi DIN/DOUT mode */ + if (pcm3168a->tdm_slots == 2) + channel_max = channel_maxs[tx]; + snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_CHANNELS, 2, channel_max); -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1

[alsa-devel] [PATCH] ASoC: ti: davinci-mcasp: Add support for RIGHT_J format
by Peter Ujfalusi 25 Jul '19

25 Jul '19

The formater unit's rotation needs to be programmed differently for right aligned bus format to have the data moved to the correct place. Take the opportunity and simplify the formater unit setup code. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/ti/davinci-mcasp.c | 43 ++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index ac59b509ead5..09ba3d3c70a0 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -465,6 +465,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, /* FS need to be inverted */ inv_fs = true; break; + case SND_SOC_DAIFMT_RIGHT_J: case SND_SOC_DAIFMT_LEFT_J: /* configure a full-word SYNC pulse (LRCLK) */ mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXDUR); @@ -758,34 +759,28 @@ static int davinci_config_channel_size(struct davinci_mcasp *mcasp, int sample_width) { u32 fmt; - u32 tx_rotate = (sample_width / 4) & 0x7; + u32 tx_rotate, rx_rotate, slot_width; u32 mask = (1ULL << sample_width) - 1; - u32 slot_width = sample_width; - - /* - * For captured data we should not rotate, inversion and masking is - * enoguh to get the data to the right position: - * Format data from bus after reverse (XRBUF) - * S16_LE: |LSB|MSB|xxx|xxx| |xxx|xxx|MSB|LSB| - * S24_3LE: |LSB|DAT|MSB|xxx| |xxx|MSB|DAT|LSB| - * S24_LE: |LSB|DAT|MSB|xxx| |xxx|MSB|DAT|LSB| - * S32_LE: |LSB|DAT|DAT|MSB| |MSB|DAT|DAT|LSB| - */ - u32 rx_rotate = 0; + if (mcasp->slot_width) + slot_width = mcasp->slot_width; + else + slot_width = sample_width; /* - * Setting the tdm slot width either with set_clkdiv() or - * set_tdm_slot() allows us to for example send 32 bits per - * channel to the codec, while only 16 of them carry audio - * payload. + * TX rotation: + * right aligned formats: rotate w/ slot_width + * left aligned formats: rotate w/ sample_width + * + * RX rotation: + * right aligned formats: no rotation needed + * left aligned formats: rotate w/ (slot_width - sample_width) */ - if (mcasp->slot_width) { - /* - * When we have more bclk then it is needed for the - * data, we need to use the rotation to move the - * received samples to have correct alignment. - */ - slot_width = mcasp->slot_width; + if ((mcasp->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK) == + SND_SOC_DAIFMT_RIGHT_J) { + tx_rotate = (slot_width / 4) & 0x7; + rx_rotate = 0; + } else { + tx_rotate = (sample_width / 4) & 0x7; rx_rotate = (slot_width - sample_width) / 4; } -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1

[alsa-devel] [PATCH] ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master mode
by Peter Ujfalusi 25 Jul '19

25 Jul '19

When running McASP as master capture alone will not record any audio unless a parallel playback stream is running. As soon as the playback stops the captured data is going to be silent again. In McASP master mode we need to set the PDIR for the clock pins and fix the mcasp_set_axr_pdir() to skip the bits in the PDIR registers above AMUTE. This went unnoticed as most of the boards uses McASP as slave and neither of these issues are visible (audible) in those setups. Fixes: 2302be4126f52 ("ASoC: davinci-mcasp: Update PDIR (pin direction) register handling") Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/ti/davinci-mcasp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 09ba3d3c70a0..6a87455d7c42 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -195,7 +195,7 @@ static inline void mcasp_set_axr_pdir(struct davinci_mcasp *mcasp, bool enable) { u32 bit; - for_each_set_bit(bit, &mcasp->pdir, PIN_BIT_AFSR) { + for_each_set_bit(bit, &mcasp->pdir, PIN_BIT_AMUTE) { if (enable) mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, BIT(bit)); else @@ -223,6 +223,7 @@ static void mcasp_start_rx(struct davinci_mcasp *mcasp) if (mcasp_is_synchronous(mcasp)) { mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLX_REG, TXHCLKRST); mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLX_REG, TXCLKRST); + mcasp_set_clk_pdir(mcasp, true); } /* Activate serializer(s) */ -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1

[alsa-devel] [PATCH] ASoC: ti: davinci-mcasp: Improve serializer handling in multi AXR setups
by Peter Ujfalusi 25 Jul '19

25 Jul '19

When multiple serializers are used we need to track the number of serializers used by the other stream direction to avoid killing data lines when the first stream used more serializers than the second would need. We are still protected against the case when the second stream uses more serializers which had affected the running stream as well. To take advantage of the improved serializer logic we need to modify the channel constraints rule as well to allow the use of multiple serializers for the second stream as additional ones will not affect the FS/BCLK on the bus. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/ti/davinci-mcasp.c | 92 +++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 39 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 6a87455d7c42..7c2081b63a60 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -109,6 +109,7 @@ struct davinci_mcasp { /* Used for comstraint setting on the second stream */ u32 channels; + u8 active_serializers[2]; #ifdef CONFIG_GPIOLIB struct gpio_chip gpio_chip; @@ -814,6 +815,7 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream, u8 rx_ser = 0; u8 slots = mcasp->tdm_slots; u8 max_active_serializers = (channels + slots - 1) / slots; + u8 max_rx_serializers, max_tx_serializers; int active_serializers, numevt; u32 reg; /* Default configuration */ @@ -823,22 +825,28 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream, if (stream == SNDRV_PCM_STREAM_PLAYBACK) { mcasp_set_reg(mcasp, DAVINCI_MCASP_TXSTAT_REG, 0xFFFFFFFF); mcasp_clr_bits(mcasp, DAVINCI_MCASP_XEVTCTL_REG, TXDATADMADIS); + max_tx_serializers = max_active_serializers; + max_rx_serializers = + mcasp->active_serializers[SNDRV_PCM_STREAM_CAPTURE]; } else { mcasp_set_reg(mcasp, DAVINCI_MCASP_RXSTAT_REG, 0xFFFFFFFF); mcasp_clr_bits(mcasp, DAVINCI_MCASP_REVTCTL_REG, RXDATADMADIS); + max_tx_serializers = + mcasp->active_serializers[SNDRV_PCM_STREAM_PLAYBACK]; + max_rx_serializers = max_active_serializers; } for (i = 0; i < mcasp->num_serializer; i++) { mcasp_set_bits(mcasp, DAVINCI_MCASP_XRSRCTL_REG(i), mcasp->serial_dir[i]); if (mcasp->serial_dir[i] == TX_MODE && - tx_ser < max_active_serializers) { + tx_ser < max_tx_serializers) { mcasp_mod_bits(mcasp, DAVINCI_MCASP_XRSRCTL_REG(i), mcasp->dismod, DISMOD_MASK); set_bit(PIN_BIT_AXR(i), &mcasp->pdir); tx_ser++; } else if (mcasp->serial_dir[i] == RX_MODE && - rx_ser < max_active_serializers) { + rx_ser < max_rx_serializers) { clear_bit(PIN_BIT_AXR(i), &mcasp->pdir); rx_ser++; } else { @@ -885,7 +893,8 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream, } else { dma_data->maxburst = 0; } - return 0; + + goto out; } if (period_words % active_serializers) { @@ -915,6 +924,9 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream, numevt = 0; dma_data->maxburst = numevt; +out: + mcasp->active_serializers[stream] = active_serializers; + return 0; } @@ -1154,6 +1166,37 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, int period_size = params_period_size(params); int ret; + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_U8: + case SNDRV_PCM_FORMAT_S8: + word_length = 8; + break; + + case SNDRV_PCM_FORMAT_U16_LE: + case SNDRV_PCM_FORMAT_S16_LE: + word_length = 16; + break; + + case SNDRV_PCM_FORMAT_U24_3LE: + case SNDRV_PCM_FORMAT_S24_3LE: + word_length = 24; + break; + + case SNDRV_PCM_FORMAT_U24_LE: + case SNDRV_PCM_FORMAT_S24_LE: + word_length = 24; + break; + + case SNDRV_PCM_FORMAT_U32_LE: + case SNDRV_PCM_FORMAT_S32_LE: + word_length = 32; + break; + + default: + printk(KERN_WARNING "davinci-mcasp: unsupported PCM format"); + return -EINVAL; + } + ret = davinci_mcasp_set_dai_fmt(cpu_dai, mcasp->dai_fmt); if (ret) return ret; @@ -1188,37 +1231,6 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, if (ret) return ret; - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_U8: - case SNDRV_PCM_FORMAT_S8: - word_length = 8; - break; - - case SNDRV_PCM_FORMAT_U16_LE: - case SNDRV_PCM_FORMAT_S16_LE: - word_length = 16; - break; - - case SNDRV_PCM_FORMAT_U24_3LE: - case SNDRV_PCM_FORMAT_S24_3LE: - word_length = 24; - break; - - case SNDRV_PCM_FORMAT_U24_LE: - case SNDRV_PCM_FORMAT_S24_LE: - word_length = 24; - break; - - case SNDRV_PCM_FORMAT_U32_LE: - case SNDRV_PCM_FORMAT_S32_LE: - word_length = 32; - break; - - default: - printk(KERN_WARNING "davinci-mcasp: unsupported PCM format"); - return -EINVAL; - } - davinci_config_channel_size(mcasp, word_length); if (mcasp->op_mode == DAVINCI_MCASP_IIS_MODE) @@ -1405,12 +1417,13 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, max_channels *= tdm_slots; /* * If the already active stream has less channels than the calculated - * limnit based on the seirializers * tdm_slots, we need to use that as - * a constraint for the second stream. - * Otherwise (first stream or less allowed channels) we use the - * calculated constraint. + * limit based on the seirializers * tdm_slots, and only one serializer + * is in use we need to use that as a constraint for the second stream. + * Otherwise (first stream or less allowed channels or more than one + * serializer in use) we use the calculated constraint. */ - if (mcasp->channels && mcasp->channels < max_channels) + if (mcasp->channels && mcasp->channels < max_channels && + ruledata->serializers == 1) max_channels = mcasp->channels; /* * But we can always allow channels upto the amount of @@ -1471,6 +1484,7 @@ static void davinci_mcasp_shutdown(struct snd_pcm_substream *substream, struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(cpu_dai); mcasp->substreams[substream->stream] = NULL; + mcasp->active_serializers[substream->stream] = 0; if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE) return; -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1

[alsa-devel] [PATCH v2 1/2] ASoC: cs47l15: Add codec driver for Cirrus Logic CS47L15
by Charles Keepax 25 Jul '19

25 Jul '19

From: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> Adds the codec driver for the CS47L15 SmartCodec. This is a multi-functional codec based on the Cirrus Logic Madera platform. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> Signed-off-by: Jaswinder Jassal <jjassal(a)opensource.wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Changes since v1: - Minor tweak to commit message Thanks, Charles sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l15.c | 1498 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/madera.c | 4 + 4 files changed, 1510 insertions(+) create mode 100644 sound/soc/codecs/cs47l15.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 9f89a5346299d..b027af8e9f39f 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -71,6 +71,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS4341 if SND_SOC_I2C_AND_SPI select SND_SOC_CS4349 if I2C select SND_SOC_CS47L24 if MFD_CS47L24 + select SND_SOC_CS47L15 if MFD_CS47L15 select SND_SOC_CS47L35 if MFD_CS47L35 select SND_SOC_CS47L85 if MFD_CS47L85 select SND_SOC_CS47L90 if MFD_CS47L90 @@ -584,6 +585,9 @@ config SND_SOC_CS4349 config SND_SOC_CS47L24 tristate +config SND_SOC_CS47L15 + tristate + config SND_SOC_CS47L35 tristate @@ -722,9 +726,11 @@ config SND_SOC_LOCHNAGAR_SC config SND_SOC_MADERA tristate + default y if SND_SOC_CS47L15=y default y if SND_SOC_CS47L35=y default y if SND_SOC_CS47L85=y default y if SND_SOC_CS47L90=y + default m if SND_SOC_CS47L15=m default m if SND_SOC_CS47L35=m default m if SND_SOC_CS47L85=m default m if SND_SOC_CS47L90=m diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 5b4bb8cf43256..2de423621ba4a 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -65,6 +65,7 @@ snd-soc-cs43130-objs := cs43130.o snd-soc-cs4341-objs := cs4341.o snd-soc-cs4349-objs := cs4349.o snd-soc-cs47l24-objs := cs47l24.o +snd-soc-cs47l15-objs := cs47l15.o snd-soc-cs47l35-objs := cs47l35.o snd-soc-cs47l85-objs := cs47l85.o snd-soc-cs47l90-objs := cs47l90.o @@ -346,6 +347,7 @@ obj-$(CONFIG_SND_SOC_CS43130) += snd-soc-cs43130.o obj-$(CONFIG_SND_SOC_CS4341) += snd-soc-cs4341.o obj-$(CONFIG_SND_SOC_CS4349) += snd-soc-cs4349.o obj-$(CONFIG_SND_SOC_CS47L24) += snd-soc-cs47l24.o +obj-$(CONFIG_SND_SOC_CS47L15) += snd-soc-cs47l15.o obj-$(CONFIG_SND_SOC_CS47L35) += snd-soc-cs47l35.o obj-$(CONFIG_SND_SOC_CS47L85) += snd-soc-cs47l85.o obj-$(CONFIG_SND_SOC_CS47L90) += snd-soc-cs47l90.o diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c new file mode 100644 index 0000000000000..919f1c49d7cf1 --- /dev/null +++ b/sound/soc/codecs/cs47l15.c @@ -0,0 +1,1498 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// ALSA SoC Audio driver for CS47L15 codec +// +// Copyright (C) 2016-2019 Cirrus Logic, Inc. and +// Cirrus Logic International Semiconductor Ltd. +// + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/init.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/tlv.h> + +#include <linux/irqchip/irq-madera.h> +#include <linux/mfd/madera/core.h> +#include <linux/mfd/madera/registers.h> + +#include "madera.h" +#include "wm_adsp.h" + +#define CS47L15_NUM_ADSP 1 +#define CS47L15_MONO_OUTPUTS 1 + +/* Mid-mode registers */ +#define CS47L15_ADC_INT_BIAS_MASK 0x3800 +#define CS47L15_ADC_INT_BIAS_SHIFT 11 +#define CS47L15_PGA_BIAS_SEL_MASK 0x03 +#define CS47L15_PGA_BIAS_SEL_SHIFT 0 + +#define DRV_NAME "cs47l15-codec" + +struct cs47l15 { + struct madera_priv core; + struct madera_fll fll[2]; + + bool in1_lp_mode; +}; + +static const struct wm_adsp_region cs47l15_dsp1_regions[] = { + { .type = WMFW_ADSP2_PM, .base = 0x080000 }, + { .type = WMFW_ADSP2_ZM, .base = 0x0e0000 }, + { .type = WMFW_ADSP2_XM, .base = 0x0a0000 }, + { .type = WMFW_ADSP2_YM, .base = 0x0c0000 }, +}; + +static const char * const cs47l15_outdemux_texts[] = { + "HPOUT", + "EPOUT", +}; + +static SOC_ENUM_SINGLE_DECL(cs47l15_outdemux_enum, SND_SOC_NOPM, 0, + cs47l15_outdemux_texts); + +static const struct snd_kcontrol_new cs47l15_outdemux = + SOC_DAPM_ENUM_EXT("HPOUT1 Demux", cs47l15_outdemux_enum, + madera_out1_demux_get, madera_out1_demux_put); + +static int cs47l15_adsp_power_ev(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, + int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera_priv *priv = &cs47l15->core; + struct madera *madera = priv->madera; + unsigned int freq; + int ret; + + ret = regmap_read(madera->regmap, MADERA_DSP_CLOCK_2, &freq); + if (ret != 0) { + dev_err(madera->dev, + "Failed to read MADERA_DSP_CLOCK_2: %d\n", ret); + return ret; + } + + switch (event) { + case SND_SOC_DAPM_PRE_PMU: + ret = madera_set_adsp_clk(&cs47l15->core, w->shift, freq); + if (ret) + return ret; + break; + default: + break; + } + + return wm_adsp_early_event(w, kcontrol, event); +} + +#define CS47L15_NG_SRC(name, base) \ + SOC_SINGLE(name " NG HPOUT1L Switch", base, 0, 1, 0), \ + SOC_SINGLE(name " NG HPOUT1R Switch", base, 1, 1, 0), \ + SOC_SINGLE(name " NG SPKOUTL Switch", base, 6, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1L Switch", base, 8, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1R Switch", base, 9, 1, 0) + +static int cs47l15_in1_adc_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + + ucontrol->value.integer.value[0] = !!cs47l15->in1_lp_mode; + + return 0; +} + +static int cs47l15_in1_adc_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + + switch (ucontrol->value.integer.value[0]) { + case 0: + /* Set IN1 to normal mode */ + snd_soc_component_update_bits(component, MADERA_DMIC1L_CONTROL, + MADERA_IN1_OSR_MASK, + 5 << MADERA_IN1_OSR_SHIFT); + snd_soc_component_update_bits(component, CS47L15_ADC_INT_BIAS, + CS47L15_ADC_INT_BIAS_MASK, + 4 << CS47L15_ADC_INT_BIAS_SHIFT); + snd_soc_component_update_bits(component, CS47L15_PGA_BIAS_SEL, + CS47L15_PGA_BIAS_SEL_MASK, 0); + cs47l15->in1_lp_mode = false; + break; + default: + /* Set IN1 to LP mode */ + snd_soc_component_update_bits(component, MADERA_DMIC1L_CONTROL, + MADERA_IN1_OSR_MASK, + 4 << MADERA_IN1_OSR_SHIFT); + snd_soc_component_update_bits(component, CS47L15_ADC_INT_BIAS, + CS47L15_ADC_INT_BIAS_MASK, + 1 << CS47L15_ADC_INT_BIAS_SHIFT); + snd_soc_component_update_bits(component, CS47L15_PGA_BIAS_SEL, + CS47L15_PGA_BIAS_SEL_MASK, + 3 << CS47L15_PGA_BIAS_SEL_SHIFT); + cs47l15->in1_lp_mode = true; + break; + } + + return 0; +} + +static const struct snd_kcontrol_new cs47l15_snd_controls[] = { +SOC_ENUM("IN1 OSR", madera_in_dmic_osr[0]), +SOC_ENUM("IN2 OSR", madera_in_dmic_osr[1]), + +SOC_SINGLE_RANGE_TLV("IN1L Volume", MADERA_IN1L_CONTROL, + MADERA_IN1L_PGA_VOL_SHIFT, 0x40, 0x5f, 0, madera_ana_tlv), +SOC_SINGLE_RANGE_TLV("IN1R Volume", MADERA_IN1R_CONTROL, + MADERA_IN1R_PGA_VOL_SHIFT, 0x40, 0x5f, 0, madera_ana_tlv), + +SOC_ENUM("IN HPF Cutoff Frequency", madera_in_hpf_cut_enum), + +SOC_SINGLE("IN1L HPF Switch", MADERA_IN1L_CONTROL, MADERA_IN1L_HPF_SHIFT, 1, 0), +SOC_SINGLE("IN1R HPF Switch", MADERA_IN1R_CONTROL, MADERA_IN1R_HPF_SHIFT, 1, 0), +SOC_SINGLE("IN2L HPF Switch", MADERA_IN2L_CONTROL, MADERA_IN2L_HPF_SHIFT, 1, 0), +SOC_SINGLE("IN2R HPF Switch", MADERA_IN2R_CONTROL, MADERA_IN2R_HPF_SHIFT, 1, 0), + +SOC_SINGLE_TLV("IN1L Digital Volume", MADERA_ADC_DIGITAL_VOLUME_1L, + MADERA_IN1L_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("IN1R Digital Volume", MADERA_ADC_DIGITAL_VOLUME_1R, + MADERA_IN1R_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("IN2L Digital Volume", MADERA_ADC_DIGITAL_VOLUME_2L, + MADERA_IN2L_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("IN2R Digital Volume", MADERA_ADC_DIGITAL_VOLUME_2R, + MADERA_IN2R_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), + +SOC_ENUM("Input Ramp Up", madera_in_vi_ramp), +SOC_ENUM("Input Ramp Down", madera_in_vd_ramp), + +MADERA_MIXER_CONTROLS("EQ1", MADERA_EQ1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("EQ2", MADERA_EQ2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("EQ3", MADERA_EQ3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("EQ4", MADERA_EQ4MIX_INPUT_1_SOURCE), + +MADERA_EQ_CONTROL("EQ1 Coefficients", MADERA_EQ1_2), +SOC_SINGLE_TLV("EQ1 B1 Volume", MADERA_EQ1_1, MADERA_EQ1_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B2 Volume", MADERA_EQ1_1, MADERA_EQ1_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B3 Volume", MADERA_EQ1_1, MADERA_EQ1_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B4 Volume", MADERA_EQ1_2, MADERA_EQ1_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B5 Volume", MADERA_EQ1_2, MADERA_EQ1_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_EQ_CONTROL("EQ2 Coefficients", MADERA_EQ2_2), +SOC_SINGLE_TLV("EQ2 B1 Volume", MADERA_EQ2_1, MADERA_EQ2_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B2 Volume", MADERA_EQ2_1, MADERA_EQ2_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B3 Volume", MADERA_EQ2_1, MADERA_EQ2_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B4 Volume", MADERA_EQ2_2, MADERA_EQ2_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B5 Volume", MADERA_EQ2_2, MADERA_EQ2_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_EQ_CONTROL("EQ3 Coefficients", MADERA_EQ3_2), +SOC_SINGLE_TLV("EQ3 B1 Volume", MADERA_EQ3_1, MADERA_EQ3_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B2 Volume", MADERA_EQ3_1, MADERA_EQ3_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B3 Volume", MADERA_EQ3_1, MADERA_EQ3_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B4 Volume", MADERA_EQ3_2, MADERA_EQ3_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B5 Volume", MADERA_EQ3_2, MADERA_EQ3_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_EQ_CONTROL("EQ4 Coefficients", MADERA_EQ4_2), +SOC_SINGLE_TLV("EQ4 B1 Volume", MADERA_EQ4_1, MADERA_EQ4_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B2 Volume", MADERA_EQ4_1, MADERA_EQ4_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B3 Volume", MADERA_EQ4_1, MADERA_EQ4_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B4 Volume", MADERA_EQ4_2, MADERA_EQ4_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B5 Volume", MADERA_EQ4_2, MADERA_EQ4_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_MIXER_CONTROLS("DRC1L", MADERA_DRC1LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DRC1R", MADERA_DRC1RMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DRC2L", MADERA_DRC2LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DRC2R", MADERA_DRC2RMIX_INPUT_1_SOURCE), + +SND_SOC_BYTES_MASK("DRC1", MADERA_DRC1_CTRL1, 5, + MADERA_DRC1R_ENA | MADERA_DRC1L_ENA), +SND_SOC_BYTES_MASK("DRC2", MADERA_DRC2_CTRL1, 5, + MADERA_DRC2R_ENA | MADERA_DRC2L_ENA), + +MADERA_MIXER_CONTROLS("LHPF1", MADERA_HPLP1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("LHPF2", MADERA_HPLP2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("LHPF3", MADERA_HPLP3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("LHPF4", MADERA_HPLP4MIX_INPUT_1_SOURCE), + +MADERA_LHPF_CONTROL("LHPF1 Coefficients", MADERA_HPLPF1_2), +MADERA_LHPF_CONTROL("LHPF2 Coefficients", MADERA_HPLPF2_2), +MADERA_LHPF_CONTROL("LHPF3 Coefficients", MADERA_HPLPF3_2), +MADERA_LHPF_CONTROL("LHPF4 Coefficients", MADERA_HPLPF4_2), + +SOC_ENUM("LHPF1 Mode", madera_lhpf1_mode), +SOC_ENUM("LHPF2 Mode", madera_lhpf2_mode), +SOC_ENUM("LHPF3 Mode", madera_lhpf3_mode), +SOC_ENUM("LHPF4 Mode", madera_lhpf4_mode), + +MADERA_RATE_ENUM("ISRC1 FSL", madera_isrc_fsl[0]), +MADERA_RATE_ENUM("ISRC2 FSL", madera_isrc_fsl[1]), +MADERA_RATE_ENUM("ISRC1 FSH", madera_isrc_fsh[0]), +MADERA_RATE_ENUM("ISRC2 FSH", madera_isrc_fsh[1]), + +WM_ADSP2_PRELOAD_SWITCH("DSP1", 1), + +MADERA_MIXER_CONTROLS("DSP1L", MADERA_DSP1LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DSP1R", MADERA_DSP1RMIX_INPUT_1_SOURCE), + +SOC_SINGLE_TLV("Noise Generator Volume", MADERA_COMFORT_NOISE_GENERATOR, + MADERA_NOISE_GEN_GAIN_SHIFT, 0x16, 0, madera_noise_tlv), + +MADERA_MIXER_CONTROLS("HPOUT1L", MADERA_OUT1LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("HPOUT1R", MADERA_OUT1RMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("SPKOUTL", MADERA_OUT4LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("SPKDAT1L", MADERA_OUT5LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("SPKDAT1R", MADERA_OUT5RMIX_INPUT_1_SOURCE), + +SOC_SINGLE("HPOUT1 SC Protect Switch", MADERA_HP1_SHORT_CIRCUIT_CTRL, + MADERA_HP1_SC_ENA_SHIFT, 1, 0), + +SOC_SINGLE("SPKDAT1 High Performance Switch", MADERA_OUTPUT_PATH_CONFIG_5L, + MADERA_OUT5_OSR_SHIFT, 1, 0), + +SOC_DOUBLE_R("HPOUT1 Digital Switch", MADERA_DAC_DIGITAL_VOLUME_1L, + MADERA_DAC_DIGITAL_VOLUME_1R, MADERA_OUT1L_MUTE_SHIFT, 1, 1), +SOC_SINGLE("Speaker Digital Switch", MADERA_DAC_DIGITAL_VOLUME_4L, + MADERA_OUT4L_MUTE_SHIFT, 1, 1), +SOC_DOUBLE_R("SPKDAT1 Digital Switch", MADERA_DAC_DIGITAL_VOLUME_5L, + MADERA_DAC_DIGITAL_VOLUME_5R, MADERA_OUT5L_MUTE_SHIFT, 1, 1), + +SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", MADERA_DAC_DIGITAL_VOLUME_1L, + MADERA_DAC_DIGITAL_VOLUME_1R, MADERA_OUT1L_VOL_SHIFT, + 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("Speaker Digital Volume", MADERA_DAC_DIGITAL_VOLUME_4L, + MADERA_OUT4L_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", MADERA_DAC_DIGITAL_VOLUME_5L, + MADERA_DAC_DIGITAL_VOLUME_5R, MADERA_OUT5L_VOL_SHIFT, + 0xbf, 0, madera_digital_tlv), + +SOC_DOUBLE("SPKDAT1 Switch", MADERA_PDM_SPK1_CTRL_1, MADERA_SPK1L_MUTE_SHIFT, + MADERA_SPK1R_MUTE_SHIFT, 1, 1), + +SOC_ENUM("Output Ramp Up", madera_out_vi_ramp), +SOC_ENUM("Output Ramp Down", madera_out_vd_ramp), + +SOC_SINGLE("Noise Gate Switch", MADERA_NOISE_GATE_CONTROL, + MADERA_NGATE_ENA_SHIFT, 1, 0), +SOC_SINGLE_TLV("Noise Gate Threshold Volume", MADERA_NOISE_GATE_CONTROL, + MADERA_NGATE_THR_SHIFT, 7, 1, madera_ng_tlv), +SOC_ENUM("Noise Gate Hold", madera_ng_hold), + +SOC_SINGLE_BOOL_EXT("IN1 LP Mode Switch", 0, + cs47l15_in1_adc_get, cs47l15_in1_adc_put), + +CS47L15_NG_SRC("HPOUT1L", MADERA_NOISE_GATE_SELECT_1L), +CS47L15_NG_SRC("HPOUT1R", MADERA_NOISE_GATE_SELECT_1R), +CS47L15_NG_SRC("SPKOUTL", MADERA_NOISE_GATE_SELECT_4L), +CS47L15_NG_SRC("SPKDAT1L", MADERA_NOISE_GATE_SELECT_5L), +CS47L15_NG_SRC("SPKDAT1R", MADERA_NOISE_GATE_SELECT_5R), + +MADERA_MIXER_CONTROLS("AIF1TX1", MADERA_AIF1TX1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX2", MADERA_AIF1TX2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX3", MADERA_AIF1TX3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX4", MADERA_AIF1TX4MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX5", MADERA_AIF1TX5MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX6", MADERA_AIF1TX6MIX_INPUT_1_SOURCE), + +MADERA_MIXER_CONTROLS("AIF2TX1", MADERA_AIF2TX1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF2TX2", MADERA_AIF2TX2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF2TX3", MADERA_AIF2TX3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF2TX4", MADERA_AIF2TX4MIX_INPUT_1_SOURCE), + +MADERA_MIXER_CONTROLS("AIF3TX1", MADERA_AIF3TX1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF3TX2", MADERA_AIF3TX2MIX_INPUT_1_SOURCE), + +MADERA_GAINMUX_CONTROLS("SPDIF1TX1", MADERA_SPDIF1TX1MIX_INPUT_1_SOURCE), +MADERA_GAINMUX_CONTROLS("SPDIF1TX2", MADERA_SPDIF1TX2MIX_INPUT_1_SOURCE), + +WM_ADSP_FW_CONTROL("DSP1", 0), +}; + +MADERA_MIXER_ENUMS(EQ1, MADERA_EQ1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(EQ2, MADERA_EQ2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(EQ3, MADERA_EQ3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(EQ4, MADERA_EQ4MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(DRC1L, MADERA_DRC1LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DRC1R, MADERA_DRC1RMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DRC2L, MADERA_DRC2LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DRC2R, MADERA_DRC2RMIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(LHPF1, MADERA_HPLP1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(LHPF2, MADERA_HPLP2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(LHPF3, MADERA_HPLP3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(LHPF4, MADERA_HPLP4MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(DSP1L, MADERA_DSP1LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DSP1R, MADERA_DSP1RMIX_INPUT_1_SOURCE); +MADERA_DSP_AUX_ENUMS(DSP1, MADERA_DSP1AUX1MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(PWM1, MADERA_PWM1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(PWM2, MADERA_PWM2MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(OUT1L, MADERA_OUT1LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(OUT1R, MADERA_OUT1RMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(SPKOUTL, MADERA_OUT4LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(SPKDAT1L, MADERA_OUT5LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(SPKDAT1R, MADERA_OUT5RMIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(AIF1TX1, MADERA_AIF1TX1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX2, MADERA_AIF1TX2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX3, MADERA_AIF1TX3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX4, MADERA_AIF1TX4MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX5, MADERA_AIF1TX5MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX6, MADERA_AIF1TX6MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(AIF2TX1, MADERA_AIF2TX1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF2TX2, MADERA_AIF2TX2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF2TX3, MADERA_AIF2TX3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF2TX4, MADERA_AIF2TX4MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(AIF3TX1, MADERA_AIF3TX1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF3TX2, MADERA_AIF3TX2MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(SPD1TX1, MADERA_SPDIF1TX1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(SPD1TX2, MADERA_SPDIF1TX2MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC1INT1, MADERA_ISRC1INT1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1INT2, MADERA_ISRC1INT2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1INT3, MADERA_ISRC1INT3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1INT4, MADERA_ISRC1INT4MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC1DEC1, MADERA_ISRC1DEC1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1DEC2, MADERA_ISRC1DEC2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1DEC3, MADERA_ISRC1DEC3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1DEC4, MADERA_ISRC1DEC4MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC2INT1, MADERA_ISRC2INT1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2INT2, MADERA_ISRC2INT2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2INT3, MADERA_ISRC2INT3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2INT4, MADERA_ISRC2INT4MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC2DEC1, MADERA_ISRC2DEC1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2DEC2, MADERA_ISRC2DEC2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2DEC3, MADERA_ISRC2DEC3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2DEC4, MADERA_ISRC2DEC4MIX_INPUT_1_SOURCE); + +static const char * const cs47l15_aec_loopback_texts[] = { + "HPOUT1L", "HPOUT1R", "SPKOUTL", "SPKDAT1L", "SPKDAT1R", +}; + +static const unsigned int cs47l15_aec_loopback_values[] = { + 0, 1, 6, 8, 9, +}; + +static const struct soc_enum cs47l15_aec1_loopback = + SOC_VALUE_ENUM_SINGLE(MADERA_DAC_AEC_CONTROL_1, + MADERA_AEC1_LOOPBACK_SRC_SHIFT, 0xf, + ARRAY_SIZE(cs47l15_aec_loopback_texts), + cs47l15_aec_loopback_texts, + cs47l15_aec_loopback_values); + +static const struct soc_enum cs47l15_aec2_loopback = + SOC_VALUE_ENUM_SINGLE(MADERA_DAC_AEC_CONTROL_2, + MADERA_AEC2_LOOPBACK_SRC_SHIFT, 0xf, + ARRAY_SIZE(cs47l15_aec_loopback_texts), + cs47l15_aec_loopback_texts, + cs47l15_aec_loopback_values); + +static const struct snd_kcontrol_new cs47l15_aec_loopback_mux[] = { + SOC_DAPM_ENUM("AEC1 Loopback", cs47l15_aec1_loopback), + SOC_DAPM_ENUM("AEC2 Loopback", cs47l15_aec2_loopback), +}; + +static const struct snd_soc_dapm_widget cs47l15_dapm_widgets[] = { +SND_SOC_DAPM_SUPPLY("SYSCLK", MADERA_SYSTEM_CLOCK_1, MADERA_SYSCLK_ENA_SHIFT, + 0, madera_sysclk_ev, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), +SND_SOC_DAPM_SUPPLY("OPCLK", MADERA_OUTPUT_SYSTEM_CLOCK, + MADERA_OPCLK_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("DSPCLK", MADERA_DSP_CLOCK_1, + MADERA_DSP_CLK_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD1", 20, 0), +SND_SOC_DAPM_REGULATOR_SUPPLY("MICVDD", 0, SND_SOC_DAPM_REGULATOR_BYPASS), +SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDD", 0, 0), + +SND_SOC_DAPM_SUPPLY("MICBIAS1", MADERA_MIC_BIAS_CTRL_1, + MADERA_MICB1_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_SUPPLY("MICBIAS1A", MADERA_MIC_BIAS_CTRL_5, + MADERA_MICB1A_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("MICBIAS1B", MADERA_MIC_BIAS_CTRL_5, + MADERA_MICB1B_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("MICBIAS1C", MADERA_MIC_BIAS_CTRL_5, + MADERA_MICB1C_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_SUPPLY("FXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_FX, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("ISRC1CLK", SND_SOC_NOPM, + MADERA_DOM_GRP_ISRC1, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("ISRC2CLK", SND_SOC_NOPM, + MADERA_DOM_GRP_ISRC2, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("OUTCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_OUT, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("SPDCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_SPD, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("DSP1CLK", SND_SOC_NOPM, + MADERA_DOM_GRP_DSP1, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("AIF1TXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_AIF1, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("AIF2TXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_AIF2, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("AIF3TXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_AIF3, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("PWMCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_PWM, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), + +SND_SOC_DAPM_SIGGEN("TONE"), +SND_SOC_DAPM_SIGGEN("NOISE"), + +SND_SOC_DAPM_INPUT("IN1ALN"), +SND_SOC_DAPM_INPUT("IN1ALP"), +SND_SOC_DAPM_INPUT("IN1BLN"), +SND_SOC_DAPM_INPUT("IN1BLP"), +SND_SOC_DAPM_INPUT("IN1ARN"), +SND_SOC_DAPM_INPUT("IN1ARP"), +SND_SOC_DAPM_INPUT("IN1BRN"), +SND_SOC_DAPM_INPUT("IN1BRP"), +SND_SOC_DAPM_INPUT("IN2N"), +SND_SOC_DAPM_INPUT("IN2P"), +SND_SOC_DAPM_INPUT("SPKRXDAT"), + +SND_SOC_DAPM_MUX("IN1L Analog Mux", SND_SOC_NOPM, 0, 0, &madera_inmux[0]), +SND_SOC_DAPM_MUX("IN1R Analog Mux", SND_SOC_NOPM, 0, 0, &madera_inmux[1]), + +SND_SOC_DAPM_MUX("IN1L Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[0]), +SND_SOC_DAPM_MUX("IN1R Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[0]), + +SND_SOC_DAPM_MUX("IN2L Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[1]), +SND_SOC_DAPM_MUX("IN2R Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[1]), + +SND_SOC_DAPM_OUTPUT("DRC1 Signal Activity"), +SND_SOC_DAPM_OUTPUT("DRC2 Signal Activity"), + +SND_SOC_DAPM_OUTPUT("DSP Trigger Out"), + +SND_SOC_DAPM_DEMUX("HPOUT1 Demux", SND_SOC_NOPM, 0, 0, &cs47l15_outdemux), + +SND_SOC_DAPM_PGA("PWM1 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM1_ENA_SHIFT, + 0, NULL, 0), +SND_SOC_DAPM_PGA("PWM2 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM2_ENA_SHIFT, + 0, NULL, 0), + +SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX4_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX5_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX6_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX4_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0, + MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0, + MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX2_ENA_SHIFT, 0), + +SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, + MADERA_OUT1L_ENA_SHIFT, 0, NULL, 0, madera_hp_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM, + MADERA_OUT1R_ENA_SHIFT, 0, NULL, 0, madera_hp_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT4L", SND_SOC_NOPM, + MADERA_OUT4L_ENA_SHIFT, 0, NULL, 0, madera_spk_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT5L", MADERA_OUTPUT_ENABLES_1, + MADERA_OUT5L_ENA_SHIFT, 0, NULL, 0, madera_out_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT5R", MADERA_OUTPUT_ENABLES_1, + MADERA_OUT5R_ENA_SHIFT, 0, NULL, 0, madera_out_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + +SND_SOC_DAPM_PGA("SPD1TX1", MADERA_SPD1_TX_CONTROL, + MADERA_SPD1_VAL1_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("SPD1TX2", MADERA_SPD1_TX_CONTROL, + MADERA_SPD1_VAL2_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_OUT_DRV("SPD1", MADERA_SPD1_TX_CONTROL, + MADERA_SPD1_ENA_SHIFT, 0, NULL, 0), + +/* + * mux_in widgets : arranged in the order of sources + * specified in MADERA_MIXER_INPUT_ROUTES + */ + +SND_SOC_DAPM_PGA("Noise Generator", MADERA_COMFORT_NOISE_GENERATOR, + MADERA_NOISE_GEN_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("Tone Generator 1", MADERA_TONE_GENERATOR_1, + MADERA_TONE1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("Tone Generator 2", MADERA_TONE_GENERATOR_1, + MADERA_TONE2_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_SIGGEN("HAPTICS"), + +SND_SOC_DAPM_MUX("AEC1 Loopback", MADERA_DAC_AEC_CONTROL_1, + MADERA_AEC1_LOOPBACK_ENA_SHIFT, 0, + &cs47l15_aec_loopback_mux[0]), +SND_SOC_DAPM_MUX("AEC2 Loopback", MADERA_DAC_AEC_CONTROL_2, + MADERA_AEC2_LOOPBACK_ENA_SHIFT, 0, + &cs47l15_aec_loopback_mux[1]), + +SND_SOC_DAPM_PGA_E("IN1L", MADERA_INPUT_ENABLES, MADERA_IN1L_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("IN1R", MADERA_INPUT_ENABLES, MADERA_IN1R_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("IN2L", MADERA_INPUT_ENABLES, MADERA_IN2L_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("IN2R", MADERA_INPUT_ENABLES, MADERA_IN2R_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), + +SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX4_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX5_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX6_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX4_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, + MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, + MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX2_ENA_SHIFT, 0), + +SND_SOC_DAPM_PGA("EQ1", MADERA_EQ1_1, MADERA_EQ1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("EQ2", MADERA_EQ2_1, MADERA_EQ2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("EQ3", MADERA_EQ3_1, MADERA_EQ3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("EQ4", MADERA_EQ4_1, MADERA_EQ4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("DRC1L", MADERA_DRC1_CTRL1, MADERA_DRC1L_ENA_SHIFT, 0, + NULL, 0), +SND_SOC_DAPM_PGA("DRC1R", MADERA_DRC1_CTRL1, MADERA_DRC1R_ENA_SHIFT, 0, + NULL, 0), +SND_SOC_DAPM_PGA("DRC2L", MADERA_DRC2_CTRL1, MADERA_DRC2L_ENA_SHIFT, 0, + NULL, 0), +SND_SOC_DAPM_PGA("DRC2R", MADERA_DRC2_CTRL1, MADERA_DRC2R_ENA_SHIFT, 0, + NULL, 0), + +SND_SOC_DAPM_PGA("LHPF1", MADERA_HPLPF1_1, MADERA_LHPF1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("LHPF2", MADERA_HPLPF2_1, MADERA_LHPF2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("LHPF3", MADERA_HPLPF3_1, MADERA_LHPF3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("LHPF4", MADERA_HPLPF4_1, MADERA_LHPF4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC1DEC1", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1DEC2", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1DEC3", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1DEC4", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC1INT1", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1INT2", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1INT3", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1INT4", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC2DEC1", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2DEC2", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2DEC3", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2DEC4", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC2INT1", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2INT2", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2INT3", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2INT4", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT4_ENA_SHIFT, 0, NULL, 0), + +WM_ADSP2("DSP1", 0, cs47l15_adsp_power_ev), + +/* end of ordered widget list */ + +MADERA_MIXER_WIDGETS(EQ1, "EQ1"), +MADERA_MIXER_WIDGETS(EQ2, "EQ2"), +MADERA_MIXER_WIDGETS(EQ3, "EQ3"), +MADERA_MIXER_WIDGETS(EQ4, "EQ4"), + +MADERA_MIXER_WIDGETS(DRC1L, "DRC1L"), +MADERA_MIXER_WIDGETS(DRC1R, "DRC1R"), +MADERA_MIXER_WIDGETS(DRC2L, "DRC2L"), +MADERA_MIXER_WIDGETS(DRC2R, "DRC2R"), + +SND_SOC_DAPM_SWITCH("DRC1 Activity Output", SND_SOC_NOPM, 0, 0, + &madera_drc_activity_output_mux[0]), +SND_SOC_DAPM_SWITCH("DRC2 Activity Output", SND_SOC_NOPM, 0, 0, + &madera_drc_activity_output_mux[1]), + +MADERA_MIXER_WIDGETS(LHPF1, "LHPF1"), +MADERA_MIXER_WIDGETS(LHPF2, "LHPF2"), +MADERA_MIXER_WIDGETS(LHPF3, "LHPF3"), +MADERA_MIXER_WIDGETS(LHPF4, "LHPF4"), + +MADERA_MIXER_WIDGETS(PWM1, "PWM1"), +MADERA_MIXER_WIDGETS(PWM2, "PWM2"), + +MADERA_MIXER_WIDGETS(OUT1L, "HPOUT1L"), +MADERA_MIXER_WIDGETS(OUT1R, "HPOUT1R"), +MADERA_MIXER_WIDGETS(SPKOUTL, "SPKOUTL"), +MADERA_MIXER_WIDGETS(SPKDAT1L, "SPKDAT1L"), +MADERA_MIXER_WIDGETS(SPKDAT1R, "SPKDAT1R"), + +MADERA_MIXER_WIDGETS(AIF1TX1, "AIF1TX1"), +MADERA_MIXER_WIDGETS(AIF1TX2, "AIF1TX2"), +MADERA_MIXER_WIDGETS(AIF1TX3, "AIF1TX3"), +MADERA_MIXER_WIDGETS(AIF1TX4, "AIF1TX4"), +MADERA_MIXER_WIDGETS(AIF1TX5, "AIF1TX5"), +MADERA_MIXER_WIDGETS(AIF1TX6, "AIF1TX6"), + +MADERA_MIXER_WIDGETS(AIF2TX1, "AIF2TX1"), +MADERA_MIXER_WIDGETS(AIF2TX2, "AIF2TX2"), +MADERA_MIXER_WIDGETS(AIF2TX3, "AIF2TX3"), +MADERA_MIXER_WIDGETS(AIF2TX4, "AIF2TX4"), + +MADERA_MIXER_WIDGETS(AIF3TX1, "AIF3TX1"), +MADERA_MIXER_WIDGETS(AIF3TX2, "AIF3TX2"), + +MADERA_MUX_WIDGETS(SPD1TX1, "SPDIF1TX1"), +MADERA_MUX_WIDGETS(SPD1TX2, "SPDIF1TX2"), + +MADERA_DSP_WIDGETS(DSP1, "DSP1"), + +SND_SOC_DAPM_SWITCH("DSP1 Trigger Output", SND_SOC_NOPM, 0, 0, + &madera_dsp_trigger_output_mux[0]), + +MADERA_MUX_WIDGETS(ISRC1DEC1, "ISRC1DEC1"), +MADERA_MUX_WIDGETS(ISRC1DEC2, "ISRC1DEC2"), +MADERA_MUX_WIDGETS(ISRC1DEC3, "ISRC1DEC3"), +MADERA_MUX_WIDGETS(ISRC1DEC4, "ISRC1DEC4"), + +MADERA_MUX_WIDGETS(ISRC1INT1, "ISRC1INT1"), +MADERA_MUX_WIDGETS(ISRC1INT2, "ISRC1INT2"), +MADERA_MUX_WIDGETS(ISRC1INT3, "ISRC1INT3"), +MADERA_MUX_WIDGETS(ISRC1INT4, "ISRC1INT4"), + +MADERA_MUX_WIDGETS(ISRC2DEC1, "ISRC2DEC1"), +MADERA_MUX_WIDGETS(ISRC2DEC2, "ISRC2DEC2"), +MADERA_MUX_WIDGETS(ISRC2DEC3, "ISRC2DEC3"), +MADERA_MUX_WIDGETS(ISRC2DEC4, "ISRC2DEC4"), + +MADERA_MUX_WIDGETS(ISRC2INT1, "ISRC2INT1"), +MADERA_MUX_WIDGETS(ISRC2INT2, "ISRC2INT2"), +MADERA_MUX_WIDGETS(ISRC2INT3, "ISRC2INT3"), +MADERA_MUX_WIDGETS(ISRC2INT4, "ISRC2INT4"), + +SND_SOC_DAPM_OUTPUT("HPOUTL"), +SND_SOC_DAPM_OUTPUT("HPOUTR"), +SND_SOC_DAPM_OUTPUT("EPOUTP"), +SND_SOC_DAPM_OUTPUT("EPOUTN"), +SND_SOC_DAPM_OUTPUT("SPKOUTN"), +SND_SOC_DAPM_OUTPUT("SPKOUTP"), +SND_SOC_DAPM_OUTPUT("SPKDAT1L"), +SND_SOC_DAPM_OUTPUT("SPKDAT1R"), +SND_SOC_DAPM_OUTPUT("SPDIF1"), + +SND_SOC_DAPM_OUTPUT("MICSUPP"), +}; + +#define MADERA_MIXER_INPUT_ROUTES(name) \ + { name, "Noise Generator", "Noise Generator" }, \ + { name, "Tone Generator 1", "Tone Generator 1" }, \ + { name, "Tone Generator 2", "Tone Generator 2" }, \ + { name, "Haptics", "HAPTICS" }, \ + { name, "AEC1", "AEC1 Loopback" }, \ + { name, "AEC2", "AEC2 Loopback" }, \ + { name, "IN1L", "IN1L" }, \ + { name, "IN1R", "IN1R" }, \ + { name, "IN2L", "IN2L" }, \ + { name, "IN2R", "IN2R" }, \ + { name, "AIF1RX1", "AIF1RX1" }, \ + { name, "AIF1RX2", "AIF1RX2" }, \ + { name, "AIF1RX3", "AIF1RX3" }, \ + { name, "AIF1RX4", "AIF1RX4" }, \ + { name, "AIF1RX5", "AIF1RX5" }, \ + { name, "AIF1RX6", "AIF1RX6" }, \ + { name, "AIF2RX1", "AIF2RX1" }, \ + { name, "AIF2RX2", "AIF2RX2" }, \ + { name, "AIF2RX3", "AIF2RX3" }, \ + { name, "AIF2RX4", "AIF2RX4" }, \ + { name, "AIF3RX1", "AIF3RX1" }, \ + { name, "AIF3RX2", "AIF3RX2" }, \ + { name, "EQ1", "EQ1" }, \ + { name, "EQ2", "EQ2" }, \ + { name, "EQ3", "EQ3" }, \ + { name, "EQ4", "EQ4" }, \ + { name, "DRC1L", "DRC1L" }, \ + { name, "DRC1R", "DRC1R" }, \ + { name, "DRC2L", "DRC2L" }, \ + { name, "DRC2R", "DRC2R" }, \ + { name, "LHPF1", "LHPF1" }, \ + { name, "LHPF2", "LHPF2" }, \ + { name, "LHPF3", "LHPF3" }, \ + { name, "LHPF4", "LHPF4" }, \ + { name, "ISRC1DEC1", "ISRC1DEC1" }, \ + { name, "ISRC1DEC2", "ISRC1DEC2" }, \ + { name, "ISRC1DEC3", "ISRC1DEC3" }, \ + { name, "ISRC1DEC4", "ISRC1DEC4" }, \ + { name, "ISRC1INT1", "ISRC1INT1" }, \ + { name, "ISRC1INT2", "ISRC1INT2" }, \ + { name, "ISRC1INT3", "ISRC1INT3" }, \ + { name, "ISRC1INT4", "ISRC1INT4" }, \ + { name, "ISRC2DEC1", "ISRC2DEC1" }, \ + { name, "ISRC2DEC2", "ISRC2DEC2" }, \ + { name, "ISRC2DEC3", "ISRC2DEC3" }, \ + { name, "ISRC2DEC4", "ISRC2DEC4" }, \ + { name, "ISRC2INT1", "ISRC2INT1" }, \ + { name, "ISRC2INT2", "ISRC2INT2" }, \ + { name, "ISRC2INT3", "ISRC2INT3" }, \ + { name, "ISRC2INT4", "ISRC2INT4" }, \ + { name, "DSP1.1", "DSP1" }, \ + { name, "DSP1.2", "DSP1" }, \ + { name, "DSP1.3", "DSP1" }, \ + { name, "DSP1.4", "DSP1" }, \ + { name, "DSP1.5", "DSP1" }, \ + { name, "DSP1.6", "DSP1" } + +static const struct snd_soc_dapm_route cs47l15_dapm_routes[] = { + /* Internal clock domains */ + { "EQ1", NULL, "FXCLK" }, + { "EQ2", NULL, "FXCLK" }, + { "EQ3", NULL, "FXCLK" }, + { "EQ4", NULL, "FXCLK" }, + { "DRC1L", NULL, "FXCLK" }, + { "DRC1R", NULL, "FXCLK" }, + { "DRC2L", NULL, "FXCLK" }, + { "DRC2R", NULL, "FXCLK" }, + { "LHPF1", NULL, "FXCLK" }, + { "LHPF2", NULL, "FXCLK" }, + { "LHPF3", NULL, "FXCLK" }, + { "LHPF4", NULL, "FXCLK" }, + { "PWM1 Mixer", NULL, "PWMCLK" }, + { "PWM2 Mixer", NULL, "PWMCLK" }, + { "OUT1L", NULL, "OUTCLK" }, + { "OUT1R", NULL, "OUTCLK" }, + { "OUT4L", NULL, "OUTCLK" }, + { "OUT5L", NULL, "OUTCLK" }, + { "OUT5R", NULL, "OUTCLK" }, + { "AIF1TX1", NULL, "AIF1TXCLK" }, + { "AIF1TX2", NULL, "AIF1TXCLK" }, + { "AIF1TX3", NULL, "AIF1TXCLK" }, + { "AIF1TX4", NULL, "AIF1TXCLK" }, + { "AIF1TX5", NULL, "AIF1TXCLK" }, + { "AIF1TX6", NULL, "AIF1TXCLK" }, + { "AIF2TX1", NULL, "AIF2TXCLK" }, + { "AIF2TX2", NULL, "AIF2TXCLK" }, + { "AIF2TX3", NULL, "AIF2TXCLK" }, + { "AIF2TX4", NULL, "AIF2TXCLK" }, + { "AIF3TX1", NULL, "AIF3TXCLK" }, + { "AIF3TX2", NULL, "AIF3TXCLK" }, + { "SPD1TX1", NULL, "SPDCLK" }, + { "SPD1TX2", NULL, "SPDCLK" }, + { "DSP1", NULL, "DSP1CLK" }, + { "ISRC1DEC1", NULL, "ISRC1CLK" }, + { "ISRC1DEC2", NULL, "ISRC1CLK" }, + { "ISRC1DEC3", NULL, "ISRC1CLK" }, + { "ISRC1DEC4", NULL, "ISRC1CLK" }, + { "ISRC1INT1", NULL, "ISRC1CLK" }, + { "ISRC1INT2", NULL, "ISRC1CLK" }, + { "ISRC1INT3", NULL, "ISRC1CLK" }, + { "ISRC1INT4", NULL, "ISRC1CLK" }, + { "ISRC2DEC1", NULL, "ISRC2CLK" }, + { "ISRC2DEC2", NULL, "ISRC2CLK" }, + { "ISRC2DEC3", NULL, "ISRC2CLK" }, + { "ISRC2DEC4", NULL, "ISRC2CLK" }, + { "ISRC2INT1", NULL, "ISRC2CLK" }, + { "ISRC2INT2", NULL, "ISRC2CLK" }, + { "ISRC2INT3", NULL, "ISRC2CLK" }, + { "ISRC2INT4", NULL, "ISRC2CLK" }, + + { "OUT1L", NULL, "CPVDD1" }, + { "OUT1R", NULL, "CPVDD1" }, + { "OUT4L", NULL, "SPKVDD" }, + + { "OUT1L", NULL, "SYSCLK" }, + { "OUT1R", NULL, "SYSCLK" }, + { "OUT4L", NULL, "SYSCLK" }, + { "OUT5L", NULL, "SYSCLK" }, + { "OUT5R", NULL, "SYSCLK" }, + + { "SPD1", NULL, "SYSCLK" }, + { "SPD1", NULL, "SPD1TX1" }, + { "SPD1", NULL, "SPD1TX2" }, + + { "IN1L", NULL, "SYSCLK" }, + { "IN1R", NULL, "SYSCLK" }, + { "IN2L", NULL, "SYSCLK" }, + { "IN2R", NULL, "SYSCLK" }, + + { "MICBIAS1", NULL, "MICVDD" }, + + { "MICBIAS1A", NULL, "MICBIAS1" }, + { "MICBIAS1B", NULL, "MICBIAS1" }, + { "MICBIAS1C", NULL, "MICBIAS1" }, + + { "Noise Generator", NULL, "SYSCLK" }, + { "Tone Generator 1", NULL, "SYSCLK" }, + { "Tone Generator 2", NULL, "SYSCLK" }, + + { "Noise Generator", NULL, "NOISE" }, + { "Tone Generator 1", NULL, "TONE" }, + { "Tone Generator 2", NULL, "TONE" }, + + { "AIF1 Capture", NULL, "AIF1TX1" }, + { "AIF1 Capture", NULL, "AIF1TX2" }, + { "AIF1 Capture", NULL, "AIF1TX3" }, + { "AIF1 Capture", NULL, "AIF1TX4" }, + { "AIF1 Capture", NULL, "AIF1TX5" }, + { "AIF1 Capture", NULL, "AIF1TX6" }, + + { "AIF1RX1", NULL, "AIF1 Playback" }, + { "AIF1RX2", NULL, "AIF1 Playback" }, + { "AIF1RX3", NULL, "AIF1 Playback" }, + { "AIF1RX4", NULL, "AIF1 Playback" }, + { "AIF1RX5", NULL, "AIF1 Playback" }, + { "AIF1RX6", NULL, "AIF1 Playback" }, + + { "AIF2 Capture", NULL, "AIF2TX1" }, + { "AIF2 Capture", NULL, "AIF2TX2" }, + { "AIF2 Capture", NULL, "AIF2TX3" }, + { "AIF2 Capture", NULL, "AIF2TX4" }, + + { "AIF2RX1", NULL, "AIF2 Playback" }, + { "AIF2RX2", NULL, "AIF2 Playback" }, + { "AIF2RX3", NULL, "AIF2 Playback" }, + { "AIF2RX4", NULL, "AIF2 Playback" }, + + { "AIF3 Capture", NULL, "AIF3TX1" }, + { "AIF3 Capture", NULL, "AIF3TX2" }, + + { "AIF3RX1", NULL, "AIF3 Playback" }, + { "AIF3RX2", NULL, "AIF3 Playback" }, + + { "AIF1 Playback", NULL, "SYSCLK" }, + { "AIF2 Playback", NULL, "SYSCLK" }, + { "AIF3 Playback", NULL, "SYSCLK" }, + + { "AIF1 Capture", NULL, "SYSCLK" }, + { "AIF2 Capture", NULL, "SYSCLK" }, + { "AIF3 Capture", NULL, "SYSCLK" }, + + { "Audio Trace DSP", NULL, "DSP1" }, + + { "IN1L Analog Mux", "A", "IN1ALN" }, + { "IN1L Analog Mux", "A", "IN1ALP" }, + { "IN1L Analog Mux", "B", "IN1BLN" }, + { "IN1L Analog Mux", "B", "IN1BLP" }, + { "IN1R Analog Mux", "A", "IN1ARN" }, + { "IN1R Analog Mux", "A", "IN1ARP" }, + { "IN1R Analog Mux", "B", "IN1BRN" }, + { "IN1R Analog Mux", "B", "IN1BRP" }, + + { "IN1L Mode", "Analog", "IN1L Analog Mux" }, + { "IN1R Mode", "Analog", "IN1R Analog Mux" }, + + { "IN1L Mode", "Digital", "IN1ALN" }, + { "IN1L Mode", "Digital", "IN1ALP" }, + { "IN1R Mode", "Digital", "IN1ALN" }, + { "IN1R Mode", "Digital", "IN1ALP" }, + + { "IN1L", NULL, "IN1L Mode" }, + { "IN1R", NULL, "IN1R Mode" }, + + { "IN2L Mode", "Analog", "IN2N" }, + { "IN2L Mode", "Analog", "IN2P" }, + + { "IN2L Mode", "Digital", "SPKRXDAT" }, + { "IN2R Mode", "Digital", "SPKRXDAT" }, + + { "IN2L", NULL, "IN2L Mode" }, + { "IN2R", NULL, "IN2R Mode" }, + + MADERA_MIXER_ROUTES("OUT1L", "HPOUT1L"), + MADERA_MIXER_ROUTES("OUT1R", "HPOUT1R"), + MADERA_MIXER_ROUTES("OUT4L", "SPKOUTL"), + MADERA_MIXER_ROUTES("OUT5L", "SPKDAT1L"), + MADERA_MIXER_ROUTES("OUT5R", "SPKDAT1R"), + + MADERA_MIXER_ROUTES("PWM1 Driver", "PWM1"), + MADERA_MIXER_ROUTES("PWM2 Driver", "PWM2"), + + MADERA_MIXER_ROUTES("AIF1TX1", "AIF1TX1"), + MADERA_MIXER_ROUTES("AIF1TX2", "AIF1TX2"), + MADERA_MIXER_ROUTES("AIF1TX3", "AIF1TX3"), + MADERA_MIXER_ROUTES("AIF1TX4", "AIF1TX4"), + MADERA_MIXER_ROUTES("AIF1TX5", "AIF1TX5"), + MADERA_MIXER_ROUTES("AIF1TX6", "AIF1TX6"), + + MADERA_MIXER_ROUTES("AIF2TX1", "AIF2TX1"), + MADERA_MIXER_ROUTES("AIF2TX2", "AIF2TX2"), + MADERA_MIXER_ROUTES("AIF2TX3", "AIF2TX3"), + MADERA_MIXER_ROUTES("AIF2TX4", "AIF2TX4"), + + MADERA_MIXER_ROUTES("AIF3TX1", "AIF3TX1"), + MADERA_MIXER_ROUTES("AIF3TX2", "AIF3TX2"), + + MADERA_MUX_ROUTES("SPD1TX1", "SPDIF1TX1"), + MADERA_MUX_ROUTES("SPD1TX2", "SPDIF1TX2"), + + MADERA_MIXER_ROUTES("EQ1", "EQ1"), + MADERA_MIXER_ROUTES("EQ2", "EQ2"), + MADERA_MIXER_ROUTES("EQ3", "EQ3"), + MADERA_MIXER_ROUTES("EQ4", "EQ4"), + + MADERA_MIXER_ROUTES("DRC1L", "DRC1L"), + MADERA_MIXER_ROUTES("DRC1R", "DRC1R"), + MADERA_MIXER_ROUTES("DRC2L", "DRC2L"), + MADERA_MIXER_ROUTES("DRC2R", "DRC2R"), + + MADERA_MIXER_ROUTES("LHPF1", "LHPF1"), + MADERA_MIXER_ROUTES("LHPF2", "LHPF2"), + MADERA_MIXER_ROUTES("LHPF3", "LHPF3"), + MADERA_MIXER_ROUTES("LHPF4", "LHPF4"), + + MADERA_DSP_ROUTES("DSP1"), + + { "DSP Trigger Out", NULL, "DSP1 Trigger Output" }, + + { "DSP1 Trigger Output", "Switch", "DSP1" }, + + MADERA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"), + MADERA_MUX_ROUTES("ISRC1INT2", "ISRC1INT2"), + MADERA_MUX_ROUTES("ISRC1INT3", "ISRC1INT3"), + MADERA_MUX_ROUTES("ISRC1INT4", "ISRC1INT4"), + + MADERA_MUX_ROUTES("ISRC1DEC1", "ISRC1DEC1"), + MADERA_MUX_ROUTES("ISRC1DEC2", "ISRC1DEC2"), + MADERA_MUX_ROUTES("ISRC1DEC3", "ISRC1DEC3"), + MADERA_MUX_ROUTES("ISRC1DEC4", "ISRC1DEC4"), + + MADERA_MUX_ROUTES("ISRC2INT1", "ISRC2INT1"), + MADERA_MUX_ROUTES("ISRC2INT2", "ISRC2INT2"), + MADERA_MUX_ROUTES("ISRC2INT3", "ISRC2INT3"), + MADERA_MUX_ROUTES("ISRC2INT4", "ISRC2INT4"), + + MADERA_MUX_ROUTES("ISRC2DEC1", "ISRC2DEC1"), + MADERA_MUX_ROUTES("ISRC2DEC2", "ISRC2DEC2"), + MADERA_MUX_ROUTES("ISRC2DEC3", "ISRC2DEC3"), + MADERA_MUX_ROUTES("ISRC2DEC4", "ISRC2DEC4"), + + { "AEC1 Loopback", "HPOUT1L", "OUT1L" }, + { "AEC1 Loopback", "HPOUT1R", "OUT1R" }, + { "AEC2 Loopback", "HPOUT1L", "OUT1L" }, + { "AEC2 Loopback", "HPOUT1R", "OUT1R" }, + { "HPOUT1 Demux", NULL, "OUT1L" }, + { "HPOUT1 Demux", NULL, "OUT1R" }, + { "HPOUTL", "HPOUT", "HPOUT1 Demux" }, + { "HPOUTR", "HPOUT", "HPOUT1 Demux" }, + { "EPOUTP", "EPOUT", "HPOUT1 Demux" }, + { "EPOUTN", "EPOUT", "HPOUT1 Demux" }, + + { "AEC1 Loopback", "SPKOUTL", "OUT4L" }, + { "AEC2 Loopback", "SPKOUTL", "OUT4L" }, + { "SPKOUTN", NULL, "OUT4L" }, + { "SPKOUTP", NULL, "OUT4L" }, + + { "AEC1 Loopback", "SPKDAT1L", "OUT5L" }, + { "AEC1 Loopback", "SPKDAT1R", "OUT5R" }, + { "AEC2 Loopback", "SPKDAT1L", "OUT5L" }, + { "AEC2 Loopback", "SPKDAT1R", "OUT5R" }, + { "SPKDAT1L", NULL, "OUT5L" }, + { "SPKDAT1R", NULL, "OUT5R" }, + + { "SPDIF1", NULL, "SPD1" }, + + { "MICSUPP", NULL, "SYSCLK" }, + + { "DRC1 Signal Activity", NULL, "DRC1 Activity Output" }, + { "DRC2 Signal Activity", NULL, "DRC2 Activity Output" }, + { "DRC1 Activity Output", "Switch", "DRC1L" }, + { "DRC1 Activity Output", "Switch", "DRC1R" }, + { "DRC2 Activity Output", "Switch", "DRC2L" }, + { "DRC2 Activity Output", "Switch", "DRC2R" }, +}; + +static int cs47l15_set_fll(struct snd_soc_component *component, int fll_id, + int source, unsigned int fref, unsigned int fout) +{ + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + + switch (fll_id) { + case MADERA_FLL1_REFCLK: + return madera_set_fll_refclk(&cs47l15->fll[0], source, fref, + fout); + case MADERA_FLLAO_REFCLK: + return madera_set_fll_ao_refclk(&cs47l15->fll[1], source, fref, + fout); + case MADERA_FLL1_SYNCCLK: + return madera_set_fll_syncclk(&cs47l15->fll[0], source, fref, + fout); + default: + return -EINVAL; + } +} + +static struct snd_soc_dai_driver cs47l15_dai[] = { + { + .name = "cs47l15-aif1", + .id = 1, + .base = MADERA_AIF1_BCLK_CTRL, + .playback = { + .stream_name = "AIF1 Playback", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .capture = { + .stream_name = "AIF1 Capture", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .ops = &madera_dai_ops, + .symmetric_rates = 1, + .symmetric_samplebits = 1, + }, + { + .name = "cs47l15-aif2", + .id = 2, + .base = MADERA_AIF2_BCLK_CTRL, + .playback = { + .stream_name = "AIF2 Playback", + .channels_min = 1, + .channels_max = 4, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .capture = { + .stream_name = "AIF2 Capture", + .channels_min = 1, + .channels_max = 4, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .ops = &madera_dai_ops, + .symmetric_rates = 1, + .symmetric_samplebits = 1, + }, + { + .name = "cs47l15-aif3", + .id = 3, + .base = MADERA_AIF3_BCLK_CTRL, + .playback = { + .stream_name = "AIF3 Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .capture = { + .stream_name = "AIF3 Capture", + .channels_min = 1, + .channels_max = 2, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .ops = &madera_dai_ops, + .symmetric_rates = 1, + .symmetric_samplebits = 1, + }, + { + .name = "cs47l15-cpu-trace", + .capture = { + .stream_name = "Audio Trace CPU", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .compress_new = snd_soc_new_compress, + }, + { + .name = "cs47l15-dsp-trace", + .capture = { + .stream_name = "Audio Trace DSP", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + }, +}; + +static int cs47l15_open(struct snd_compr_stream *stream) +{ + struct snd_soc_pcm_runtime *rtd = stream->private_data; + struct snd_soc_component *component = + snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera_priv *priv = &cs47l15->core; + struct madera *madera = priv->madera; + int n_adsp; + + if (strcmp(rtd->codec_dai->name, "cs47l15-dsp-trace") == 0) { + n_adsp = 0; + } else { + dev_err(madera->dev, + "No suitable compressed stream for DAI '%s'\n", + rtd->codec_dai->name); + return -EINVAL; + } + + return wm_adsp_compr_open(&priv->adsp[n_adsp], stream); +} + +static irqreturn_t cs47l15_adsp2_irq(int irq, void *data) +{ + struct cs47l15 *cs47l15 = data; + struct madera_priv *priv = &cs47l15->core; + struct madera *madera = priv->madera; + int ret; + + ret = wm_adsp_compr_handle_irq(&priv->adsp[0]); + if (ret == -ENODEV) { + dev_err(madera->dev, "Spurious compressed data IRQ\n"); + return IRQ_NONE; + } + + return IRQ_HANDLED; +} + +static irqreturn_t cs47l15_dsp_bus_error(int irq, void *data) +{ + struct wm_adsp *dsp = (struct wm_adsp *)data; + + return wm_adsp2_bus_error(dsp); +} + +static int cs47l15_component_probe(struct snd_soc_component *component) +{ + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera *madera = cs47l15->core.madera; + int ret; + + snd_soc_component_init_regmap(component, madera->regmap); + + mutex_lock(&madera->dapm_ptr_lock); + madera->dapm = snd_soc_component_get_dapm(component); + mutex_unlock(&madera->dapm_ptr_lock); + + ret = madera_init_inputs(component); + if (ret) + return ret; + + ret = madera_init_outputs(component, CS47L15_MONO_OUTPUTS); + if (ret) + return ret; + + snd_soc_component_disable_pin(component, "HAPTICS"); + + ret = snd_soc_add_component_controls(component, + madera_adsp_rate_controls, + CS47L15_NUM_ADSP); + if (ret) + return ret; + + wm_adsp2_component_probe(&cs47l15->core.adsp[0], component); + + return 0; +} + +static void cs47l15_component_remove(struct snd_soc_component *component) +{ + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera *madera = cs47l15->core.madera; + + mutex_lock(&madera->dapm_ptr_lock); + madera->dapm = NULL; + mutex_unlock(&madera->dapm_ptr_lock); + + wm_adsp2_component_remove(&cs47l15->core.adsp[0], component); +} + +#define CS47L15_DIG_VU 0x0200 + +static unsigned int cs47l15_digital_vu[] = { + MADERA_DAC_DIGITAL_VOLUME_1L, + MADERA_DAC_DIGITAL_VOLUME_1R, + MADERA_DAC_DIGITAL_VOLUME_4L, + MADERA_DAC_DIGITAL_VOLUME_5L, + MADERA_DAC_DIGITAL_VOLUME_5R, +}; + +static const struct snd_compr_ops cs47l15_compr_ops = { + .open = &cs47l15_open, + .free = &wm_adsp_compr_free, + .set_params = &wm_adsp_compr_set_params, + .get_caps = &wm_adsp_compr_get_caps, + .trigger = &wm_adsp_compr_trigger, + .pointer = &wm_adsp_compr_pointer, + .copy = &wm_adsp_compr_copy, +}; + +static const struct snd_soc_component_driver soc_component_dev_cs47l15 = { + .probe = &cs47l15_component_probe, + .remove = &cs47l15_component_remove, + .set_sysclk = &madera_set_sysclk, + .set_pll = &cs47l15_set_fll, + .name = DRV_NAME, + .compr_ops = &cs47l15_compr_ops, + .controls = cs47l15_snd_controls, + .num_controls = ARRAY_SIZE(cs47l15_snd_controls), + .dapm_widgets = cs47l15_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs47l15_dapm_widgets), + .dapm_routes = cs47l15_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(cs47l15_dapm_routes), + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; + +static int cs47l15_probe(struct platform_device *pdev) +{ + struct madera *madera = dev_get_drvdata(pdev->dev.parent); + struct cs47l15 *cs47l15; + int i, ret; + + BUILD_BUG_ON(ARRAY_SIZE(cs47l15_dai) > MADERA_MAX_DAI); + + /* quick exit if Madera irqchip driver hasn't completed probe */ + if (!madera->irq_dev) { + dev_dbg(&pdev->dev, "irqchip driver not ready\n"); + return -EPROBE_DEFER; + } + + cs47l15 = devm_kzalloc(&pdev->dev, sizeof(struct cs47l15), + GFP_KERNEL); + if (!cs47l15) + return -ENOMEM; + + platform_set_drvdata(pdev, cs47l15); + + cs47l15->core.madera = madera; + cs47l15->core.dev = &pdev->dev; + cs47l15->core.num_inputs = 4; + + ret = madera_core_init(&cs47l15->core); + if (ret) + return ret; + + ret = madera_init_overheat(&cs47l15->core); + if (ret) + goto error_core; + + ret = madera_request_irq(madera, MADERA_IRQ_DSP_IRQ1, + "ADSP2 Compressed IRQ", cs47l15_adsp2_irq, + cs47l15); + if (ret != 0) { + dev_err(&pdev->dev, "Failed to request DSP IRQ: %d\n", ret); + goto error_overheat; + } + + ret = madera_set_irq_wake(madera, MADERA_IRQ_DSP_IRQ1, 1); + if (ret) + dev_warn(&pdev->dev, "Failed to set DSP IRQ wake: %d\n", ret); + + cs47l15->core.adsp[0].part = "cs47l15"; + cs47l15->core.adsp[0].num = 1; + cs47l15->core.adsp[0].type = WMFW_ADSP2; + cs47l15->core.adsp[0].rev = 2; + cs47l15->core.adsp[0].dev = madera->dev; + cs47l15->core.adsp[0].regmap = madera->regmap_32bit; + + cs47l15->core.adsp[0].base = MADERA_DSP1_CONFIG_1; + cs47l15->core.adsp[0].mem = cs47l15_dsp1_regions; + cs47l15->core.adsp[0].num_mems = ARRAY_SIZE(cs47l15_dsp1_regions); + + cs47l15->core.adsp[0].lock_regions = + WM_ADSP2_REGION_1 | WM_ADSP2_REGION_2 | WM_ADSP2_REGION_3; + + ret = wm_adsp2_init(&cs47l15->core.adsp[0]); + if (ret != 0) + goto error_dsp_irq; + + ret = madera_init_bus_error_irq(&cs47l15->core, 0, + cs47l15_dsp_bus_error); + if (ret) + goto error_adsp; + + madera_init_fll(madera, 1, MADERA_FLL1_CONTROL_1 - 1, + &cs47l15->fll[0]); + madera_init_fll(madera, 4, MADERA_FLLAO_CONTROL_1 - 1, + &cs47l15->fll[1]); + + for (i = 0; i < ARRAY_SIZE(cs47l15_dai); i++) + madera_init_dai(&cs47l15->core, i); + + /* Latch volume update bits */ + for (i = 0; i < ARRAY_SIZE(cs47l15_digital_vu); i++) + regmap_update_bits(madera->regmap, cs47l15_digital_vu[i], + CS47L15_DIG_VU, CS47L15_DIG_VU); + + pm_runtime_enable(&pdev->dev); + pm_runtime_idle(&pdev->dev); + + ret = devm_snd_soc_register_component(&pdev->dev, + &soc_component_dev_cs47l15, + cs47l15_dai, + ARRAY_SIZE(cs47l15_dai)); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to register component: %d\n", ret); + goto error_pm_runtime; + } + + return ret; + +error_pm_runtime: + pm_runtime_disable(&pdev->dev); + madera_free_bus_error_irq(&cs47l15->core, 0); +error_adsp: + wm_adsp2_remove(&cs47l15->core.adsp[0]); +error_dsp_irq: + madera_set_irq_wake(madera, MADERA_IRQ_DSP_IRQ1, 0); + madera_free_irq(madera, MADERA_IRQ_DSP_IRQ1, cs47l15); +error_overheat: + madera_free_overheat(&cs47l15->core); +error_core: + madera_core_free(&cs47l15->core); + + return ret; +} + +static int cs47l15_remove(struct platform_device *pdev) +{ + struct cs47l15 *cs47l15 = platform_get_drvdata(pdev); + + pm_runtime_disable(&pdev->dev); + + madera_free_bus_error_irq(&cs47l15->core, 0); + + wm_adsp2_remove(&cs47l15->core.adsp[0]); + + madera_set_irq_wake(cs47l15->core.madera, MADERA_IRQ_DSP_IRQ1, 0); + madera_free_irq(cs47l15->core.madera, MADERA_IRQ_DSP_IRQ1, cs47l15); + madera_free_overheat(&cs47l15->core); + madera_core_free(&cs47l15->core); + + return 0; +} + +static struct platform_driver cs47l15_codec_driver = { + .driver = { + .name = "cs47l15-codec", + }, + .probe = &cs47l15_probe, + .remove = &cs47l15_remove, +}; + +module_platform_driver(cs47l15_codec_driver); + +MODULE_SOFTDEP("pre: madera irq-madera arizona-micsupp"); +MODULE_DESCRIPTION("ASoC CS47L15 driver"); +MODULE_AUTHOR("Richard Fitzgerald <rf(a)opensource.cirrus.com>"); +MODULE_AUTHOR("Jaswinder Jassal <jjassal(a)opensource.cirrus.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:cs47l15-codec"); diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 5f1e32a5a8556..1c00e2a115bcd 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -1041,6 +1041,10 @@ static void madera_configure_input_mode(struct madera *madera) int max_analogue_inputs, max_dmic_sup, i; switch (madera->type) { + case CS47L15: + max_analogue_inputs = 1; + max_dmic_sup = 2; + break; case CS47L35: max_analogue_inputs = 2; max_dmic_sup = 2; -- 2.11.0

2 3

[alsa-devel] [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers
by Masahiro Yamada 25 Jul '19

25 Jul '19

UAPI headers licensed under GPL are supposed to have exception "WITH Linux-syscall-note" so that they can be included into non-GPL user space application code. The exception note is missing in some UAPI headers. Some of them slipped in by the treewide conversion commit b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license"). Just run: $ git show --oneline b24413180f56 -- arch/x86/include/uapi/asm/ I believe they are not intentional, and should be fixed too. This patch was generated by the following script: git grep -l --not -e Linux-syscall-note --and -e SPDX-License-Identifier \ -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild | while read file do sed -i -e '/[[:space:]]OR[[:space:]]/s/$GPL-[^[:space:]]*$/(\1 WITH Linux-syscall-note)/g' \ -e '/[[:space:]]or[[:space:]]/s/$GPL-[^[:space:]]*$/(\1 WITH Linux-syscall-note)/g' \ -e '/[[:space:]]OR[[:space:]]/!{/[[:space:]]or[[:space:]]/!s/$GPL-[^[:space:]]*$/\1 WITH Linux-syscall-note/g}' $file done After this patch is applied, there are 5 UAPI headers that do not contain "WITH Linux-syscall-note". They are kept untouched since this exception applies only to GPL variants. $ git grep --not -e Linux-syscall-note --and -e SPDX-License-Identifier \ -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild include/uapi/drm/panfrost_drm.h:/* SPDX-License-Identifier: MIT */ include/uapi/linux/batman_adv.h:/* SPDX-License-Identifier: MIT */ include/uapi/linux/qemu_fw_cfg.h:/* SPDX-License-Identifier: BSD-3-Clause */ include/uapi/linux/vbox_err.h:/* SPDX-License-Identifier: MIT */ include/uapi/linux/virtio_iommu.h:/* SPDX-License-Identifier: BSD-3-Clause */ Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Fix missing parentheses arch/arm64/include/uapi/asm/bpf_perf_event.h | 2 +- arch/csky/include/uapi/asm/byteorder.h | 2 +- arch/csky/include/uapi/asm/cachectl.h | 2 +- arch/csky/include/uapi/asm/perf_regs.h | 2 +- arch/csky/include/uapi/asm/ptrace.h | 2 +- arch/csky/include/uapi/asm/sigcontext.h | 2 +- arch/csky/include/uapi/asm/unistd.h | 2 +- arch/nds32/include/uapi/asm/auxvec.h | 2 +- arch/nds32/include/uapi/asm/byteorder.h | 2 +- arch/nds32/include/uapi/asm/cachectl.h | 2 +- arch/nds32/include/uapi/asm/fp_udfiex_crtl.h | 2 +- arch/nds32/include/uapi/asm/param.h | 2 +- arch/nds32/include/uapi/asm/ptrace.h | 2 +- arch/nds32/include/uapi/asm/sigcontext.h | 2 +- arch/nds32/include/uapi/asm/unistd.h | 2 +- arch/powerpc/include/uapi/asm/bpf_perf_event.h | 2 +- arch/riscv/include/uapi/asm/auxvec.h | 2 +- arch/riscv/include/uapi/asm/bitsperlong.h | 2 +- arch/riscv/include/uapi/asm/byteorder.h | 2 +- arch/riscv/include/uapi/asm/hwcap.h | 2 +- arch/riscv/include/uapi/asm/ptrace.h | 2 +- arch/riscv/include/uapi/asm/sigcontext.h | 2 +- arch/riscv/include/uapi/asm/ucontext.h | 2 +- arch/s390/include/uapi/asm/bpf_perf_event.h | 2 +- arch/s390/include/uapi/asm/ipl.h | 2 +- arch/sh/include/uapi/asm/setup.h | 2 +- arch/sh/include/uapi/asm/types.h | 2 +- arch/sparc/include/uapi/asm/oradax.h | 2 +- arch/x86/include/uapi/asm/byteorder.h | 2 +- arch/x86/include/uapi/asm/hwcap2.h | 2 +- arch/x86/include/uapi/asm/sigcontext32.h | 2 +- arch/x86/include/uapi/asm/types.h | 2 +- include/uapi/linux/bpfilter.h | 2 +- include/uapi/linux/ipmi_bmc.h | 2 +- include/uapi/linux/isst_if.h | 2 +- include/uapi/linux/netfilter/nf_synproxy.h | 2 +- include/uapi/linux/psp-sev.h | 2 +- include/uapi/linux/rxrpc.h | 2 +- include/uapi/linux/usb/g_uvc.h | 2 +- include/uapi/linux/vbox_vmmdev_types.h | 2 +- include/uapi/linux/vboxguest.h | 2 +- include/uapi/linux/virtio_pmem.h | 2 +- include/uapi/linux/vmcore.h | 2 +- include/uapi/linux/wmi.h | 2 +- include/uapi/misc/fastrpc.h | 2 +- include/uapi/rdma/rvt-abi.h | 2 +- include/uapi/rdma/siw-abi.h | 2 +- include/uapi/scsi/scsi_bsg_ufs.h | 2 +- include/uapi/sound/skl-tplg-interface.h | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/arch/arm64/include/uapi/asm/bpf_perf_event.h b/arch/arm64/include/uapi/asm/bpf_perf_event.h index b551b741653d..5e1e648aeec4 100644 --- a/arch/arm64/include/uapi/asm/bpf_perf_event.h +++ b/arch/arm64/include/uapi/asm/bpf_perf_event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__ #define _UAPI__ASM_BPF_PERF_EVENT_H__ diff --git a/arch/csky/include/uapi/asm/byteorder.h b/arch/csky/include/uapi/asm/byteorder.h index b079ec715cdf..d150cd664873 100644 --- a/arch/csky/include/uapi/asm/byteorder.h +++ b/arch/csky/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #ifndef __ASM_CSKY_BYTEORDER_H diff --git a/arch/csky/include/uapi/asm/cachectl.h b/arch/csky/include/uapi/asm/cachectl.h index ddf2f39aa925..ed7fad1ea20d 100644 --- a/arch/csky/include/uapi/asm/cachectl.h +++ b/arch/csky/include/uapi/asm/cachectl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef __ASM_CSKY_CACHECTL_H #define __ASM_CSKY_CACHECTL_H diff --git a/arch/csky/include/uapi/asm/perf_regs.h b/arch/csky/include/uapi/asm/perf_regs.h index ee323d818592..49d4e147a559 100644 --- a/arch/csky/include/uapi/asm/perf_regs.h +++ b/arch/csky/include/uapi/asm/perf_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. #ifndef _ASM_CSKY_PERF_REGS_H diff --git a/arch/csky/include/uapi/asm/ptrace.h b/arch/csky/include/uapi/asm/ptrace.h index 4e248d5b86ef..66b2268e324e 100644 --- a/arch/csky/include/uapi/asm/ptrace.h +++ b/arch/csky/include/uapi/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #ifndef _CSKY_PTRACE_H diff --git a/arch/csky/include/uapi/asm/sigcontext.h b/arch/csky/include/uapi/asm/sigcontext.h index e81e7ff11e36..670c020f2cb8 100644 --- a/arch/csky/include/uapi/asm/sigcontext.h +++ b/arch/csky/include/uapi/asm/sigcontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #ifndef __ASM_CSKY_SIGCONTEXT_H diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h index ec60e49cea66..211c983c7282 100644 --- a/arch/csky/include/uapi/asm/unistd.h +++ b/arch/csky/include/uapi/asm/unistd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #define __ARCH_WANT_SYS_CLONE diff --git a/arch/nds32/include/uapi/asm/auxvec.h b/arch/nds32/include/uapi/asm/auxvec.h index b5d58ea8decb..bc0b92ab8c15 100644 --- a/arch/nds32/include/uapi/asm/auxvec.h +++ b/arch/nds32/include/uapi/asm/auxvec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __ASM_AUXVEC_H diff --git a/arch/nds32/include/uapi/asm/byteorder.h b/arch/nds32/include/uapi/asm/byteorder.h index 511e653c709d..c264ef12c49c 100644 --- a/arch/nds32/include/uapi/asm/byteorder.h +++ b/arch/nds32/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __NDS32_BYTEORDER_H__ diff --git a/arch/nds32/include/uapi/asm/cachectl.h b/arch/nds32/include/uapi/asm/cachectl.h index 73793662815c..31b9b439d819 100644 --- a/arch/nds32/include/uapi/asm/cachectl.h +++ b/arch/nds32/include/uapi/asm/cachectl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 1994, 1995, 1996 by Ralf Baechle // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef _ASM_CACHECTL diff --git a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h index d54a5d6c6538..f17396db16ec 100644 --- a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h +++ b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (C) 2005-2019 Andes Technology Corporation */ #ifndef _FP_UDF_IEX_CRTL_H #define _FP_UDF_IEX_CRTL_H diff --git a/arch/nds32/include/uapi/asm/param.h b/arch/nds32/include/uapi/asm/param.h index 2977534a6bd3..48d00328d328 100644 --- a/arch/nds32/include/uapi/asm/param.h +++ b/arch/nds32/include/uapi/asm/param.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __ASM_NDS32_PARAM_H diff --git a/arch/nds32/include/uapi/asm/ptrace.h b/arch/nds32/include/uapi/asm/ptrace.h index 1a6e01c00e6f..d76217c7c010 100644 --- a/arch/nds32/include/uapi/asm/ptrace.h +++ b/arch/nds32/include/uapi/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __UAPI_ASM_NDS32_PTRACE_H diff --git a/arch/nds32/include/uapi/asm/sigcontext.h b/arch/nds32/include/uapi/asm/sigcontext.h index dc89af7ddcc3..6c1e6648878f 100644 --- a/arch/nds32/include/uapi/asm/sigcontext.h +++ b/arch/nds32/include/uapi/asm/sigcontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef _ASMNDS32_SIGCONTEXT_H diff --git a/arch/nds32/include/uapi/asm/unistd.h b/arch/nds32/include/uapi/asm/unistd.h index a0b2f7b9c0f2..410795e280fe 100644 --- a/arch/nds32/include/uapi/asm/unistd.h +++ b/arch/nds32/include/uapi/asm/unistd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #define __ARCH_WANT_STAT64 diff --git a/arch/powerpc/include/uapi/asm/bpf_perf_event.h b/arch/powerpc/include/uapi/asm/bpf_perf_event.h index b551b741653d..5e1e648aeec4 100644 --- a/arch/powerpc/include/uapi/asm/bpf_perf_event.h +++ b/arch/powerpc/include/uapi/asm/bpf_perf_event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__ #define _UAPI__ASM_BPF_PERF_EVENT_H__ diff --git a/arch/riscv/include/uapi/asm/auxvec.h b/arch/riscv/include/uapi/asm/auxvec.h index 62716653554b..d86cb17bbabe 100644 --- a/arch/riscv/include/uapi/asm/auxvec.h +++ b/arch/riscv/include/uapi/asm/auxvec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2015 Regents of the University of California diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h index 0b9b58b57ff6..7d0b32e3b701 100644 --- a/arch/riscv/include/uapi/asm/bitsperlong.h +++ b/arch/riscv/include/uapi/asm/bitsperlong.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2015 Regents of the University of California diff --git a/arch/riscv/include/uapi/asm/byteorder.h b/arch/riscv/include/uapi/asm/byteorder.h index 1920debc09c0..f671e16bf6af 100644 --- a/arch/riscv/include/uapi/asm/byteorder.h +++ b/arch/riscv/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2015 Regents of the University of California diff --git a/arch/riscv/include/uapi/asm/hwcap.h b/arch/riscv/include/uapi/asm/hwcap.h index 7d786145183b..4e7646077056 100644 --- a/arch/riscv/include/uapi/asm/hwcap.h +++ b/arch/riscv/include/uapi/asm/hwcap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copied from arch/arm64/include/asm/hwcap.h * diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 92d8f7cd8f84..882547f6bd5c 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 Regents of the University of California */ diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h index 053f809e52ce..84f2dfcfdbce 100644 --- a/arch/riscv/include/uapi/asm/sigcontext.h +++ b/arch/riscv/include/uapi/asm/sigcontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 Regents of the University of California */ diff --git a/arch/riscv/include/uapi/asm/ucontext.h b/arch/riscv/include/uapi/asm/ucontext.h index b58e00cee2ec..411dd7b52ed6 100644 --- a/arch/riscv/include/uapi/asm/ucontext.h +++ b/arch/riscv/include/uapi/asm/ucontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2017 SiFive, Inc. diff --git a/arch/s390/include/uapi/asm/bpf_perf_event.h b/arch/s390/include/uapi/asm/bpf_perf_event.h index cefe7c7cd4f6..3ed42ff6da94 100644 --- a/arch/s390/include/uapi/asm/bpf_perf_event.h +++ b/arch/s390/include/uapi/asm/bpf_perf_event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__ #define _UAPI__ASM_BPF_PERF_EVENT_H__ diff --git a/arch/s390/include/uapi/asm/ipl.h b/arch/s390/include/uapi/asm/ipl.h index fd32b1cd80d2..451ba7d08905 100644 --- a/arch/s390/include/uapi/asm/ipl.h +++ b/arch/s390/include/uapi/asm/ipl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_S390_UAPI_IPL_H #define _ASM_S390_UAPI_IPL_H diff --git a/arch/sh/include/uapi/asm/setup.h b/arch/sh/include/uapi/asm/setup.h index 1170dd2fb998..4bd19f80f9b0 100644 --- a/arch/sh/include/uapi/asm/setup.h +++ b/arch/sh/include/uapi/asm/setup.h @@ -1,2 +1,2 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #include <asm-generic/setup.h> diff --git a/arch/sh/include/uapi/asm/types.h b/arch/sh/include/uapi/asm/types.h index f83795fdc0da..68100e108ea6 100644 --- a/arch/sh/include/uapi/asm/types.h +++ b/arch/sh/include/uapi/asm/types.h @@ -1,2 +1,2 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #include <asm-generic/types.h> diff --git a/arch/sparc/include/uapi/asm/oradax.h b/arch/sparc/include/uapi/asm/oradax.h index 64c67f2ea33f..0dace69058ab 100644 --- a/arch/sparc/include/uapi/asm/oradax.h +++ b/arch/sparc/include/uapi/asm/oradax.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ /* * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. */ diff --git a/arch/x86/include/uapi/asm/byteorder.h b/arch/x86/include/uapi/asm/byteorder.h index 484e3cfd7ef2..149143cab9ff 100644 --- a/arch/x86/include/uapi/asm/byteorder.h +++ b/arch/x86/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_BYTEORDER_H #define _ASM_X86_BYTEORDER_H diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h index 6ebaae90e207..8b2effe6efb8 100644 --- a/arch/x86/include/uapi/asm/hwcap2.h +++ b/arch/x86/include/uapi/asm/hwcap2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_HWCAP2_H #define _ASM_X86_HWCAP2_H diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h index 6b18e88de8a6..7114801d0499 100644 --- a/arch/x86/include/uapi/asm/sigcontext32.h +++ b/arch/x86/include/uapi/asm/sigcontext32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_SIGCONTEXT32_H #define _ASM_X86_SIGCONTEXT32_H diff --git a/arch/x86/include/uapi/asm/types.h b/arch/x86/include/uapi/asm/types.h index df55e1ddb0c9..9d5c11a24279 100644 --- a/arch/x86/include/uapi/asm/types.h +++ b/arch/x86/include/uapi/asm/types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_TYPES_H #define _ASM_X86_TYPES_H diff --git a/include/uapi/linux/bpfilter.h b/include/uapi/linux/bpfilter.h index 2ec3cc99ea4c..cbc1f5813f50 100644 --- a/include/uapi/linux/bpfilter.h +++ b/include/uapi/linux/bpfilter.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_LINUX_BPFILTER_H #define _UAPI_LINUX_BPFILTER_H diff --git a/include/uapi/linux/ipmi_bmc.h b/include/uapi/linux/ipmi_bmc.h index 1670f0944227..782a03eb1086 100644 --- a/include/uapi/linux/ipmi_bmc.h +++ b/include/uapi/linux/ipmi_bmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (c) 2015-2018, Intel Corporation. */ diff --git a/include/uapi/linux/isst_if.h b/include/uapi/linux/isst_if.h index d10b832c58c5..0a52b7b093d3 100644 --- a/include/uapi/linux/isst_if.h +++ b/include/uapi/linux/isst_if.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Intel Speed Select Interface: OS to hardware Interface * Copyright (c) 2019, Intel Corporation. diff --git a/include/uapi/linux/netfilter/nf_synproxy.h b/include/uapi/linux/netfilter/nf_synproxy.h index 6f3791c8946f..00d787f0260e 100644 --- a/include/uapi/linux/netfilter/nf_synproxy.h +++ b/include/uapi/linux/netfilter/nf_synproxy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _NF_SYNPROXY_H #define _NF_SYNPROXY_H diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h index 8654b2442f6a..592a0c1b77c9 100644 --- a/include/uapi/linux/psp-sev.h +++ b/include/uapi/linux/psp-sev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Userspace interface for AMD Secure Encrypted Virtualization (SEV) * platform management commands. diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h index 782069dcf607..4accfa7e266d 100644 --- a/include/uapi/linux/rxrpc.h +++ b/include/uapi/linux/rxrpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ /* Types and definitions for AF_RXRPC. * * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h index 3c9ee3020cbb..652f169a019e 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ /* * g_uvc.h -- USB Video Class Gadget driver API * diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h index 26f39816af14..c27289fd619a 100644 --- a/include/uapi/linux/vbox_vmmdev_types.h +++ b/include/uapi/linux/vbox_vmmdev_types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */ /* * Virtual Device for Guest <-> VMM/Host communication, type definitions * which are also used for the vboxguest ioctl interface / by vboxsf diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h index 612f0c7d3558..9cec58a6a5ea 100644 --- a/include/uapi/linux/vboxguest.h +++ b/include/uapi/linux/vboxguest.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */ /* * VBoxGuest - VirtualBox Guest Additions Driver Interface. * diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h index 9a63ed6d062f..b022787ffb94 100644 --- a/include/uapi/linux/virtio_pmem.h +++ b/include/uapi/linux/virtio_pmem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */ /* * Definitions for virtio-pmem devices. * diff --git a/include/uapi/linux/vmcore.h b/include/uapi/linux/vmcore.h index 022619668e0e..3e9da91866ff 100644 --- a/include/uapi/linux/vmcore.h +++ b/include/uapi/linux/vmcore.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_VMCORE_H #define _UAPI_VMCORE_H diff --git a/include/uapi/linux/wmi.h b/include/uapi/linux/wmi.h index c36f2d7675a4..7085c5dca9fa 100644 --- a/include/uapi/linux/wmi.h +++ b/include/uapi/linux/wmi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * User API methods for ACPI-WMI mapping driver * diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h index 6d701af9fc42..fb792e882cef 100644 --- a/include/uapi/misc/fastrpc.h +++ b/include/uapi/misc/fastrpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef __QCOM_FASTRPC_H__ #define __QCOM_FASTRPC_H__ diff --git a/include/uapi/rdma/rvt-abi.h b/include/uapi/rdma/rvt-abi.h index 7328293c715c..7c05a02d2be5 100644 --- a/include/uapi/rdma/rvt-abi.h +++ b/include/uapi/rdma/rvt-abi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * This file contains defines, structures, etc. that are used diff --git a/include/uapi/rdma/siw-abi.h b/include/uapi/rdma/siw-abi.h index 3dd8071ace7b..7de68f1dc707 100644 --- a/include/uapi/rdma/siw-abi.h +++ b/include/uapi/rdma/siw-abi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) or BSD-3-Clause */ /* Authors: Bernard Metzler <bmt(a)zurich.ibm.com> */ /* Copyright (c) 2008-2019, IBM Corporation */ diff --git a/include/uapi/scsi/scsi_bsg_ufs.h b/include/uapi/scsi/scsi_bsg_ufs.h index 17c7abd0803a..9988db6ad244 100644 --- a/include/uapi/scsi/scsi_bsg_ufs.h +++ b/include/uapi/scsi/scsi_bsg_ufs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * UFS Transport SGIO v4 BSG Message Support * diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h index f39352cef382..9eee32f5e407 100644 --- a/include/uapi/sound/skl-tplg-interface.h +++ b/include/uapi/sound/skl-tplg-interface.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * skl-tplg-interface.h - Intel DSP FW private data interface * -- 2.17.1

3 6

[alsa-devel] [PATCH 1/2] ASoC: cs47l15: Add codec driver for CS47L15
by Charles Keepax 25 Jul '19

25 Jul '19

From: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> Adds the codec driver for the CS47L15 SmartCodec. This is a multi-functional codec based on the Cirrus Logic Madera platform. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> Signed-off-by: Jaswinder Jassal <jjassal(a)opensource.wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l15.c | 1498 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/madera.c | 4 + 4 files changed, 1510 insertions(+) create mode 100644 sound/soc/codecs/cs47l15.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 9f89a5346299d..b027af8e9f39f 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -71,6 +71,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS4341 if SND_SOC_I2C_AND_SPI select SND_SOC_CS4349 if I2C select SND_SOC_CS47L24 if MFD_CS47L24 + select SND_SOC_CS47L15 if MFD_CS47L15 select SND_SOC_CS47L35 if MFD_CS47L35 select SND_SOC_CS47L85 if MFD_CS47L85 select SND_SOC_CS47L90 if MFD_CS47L90 @@ -584,6 +585,9 @@ config SND_SOC_CS4349 config SND_SOC_CS47L24 tristate +config SND_SOC_CS47L15 + tristate + config SND_SOC_CS47L35 tristate @@ -722,9 +726,11 @@ config SND_SOC_LOCHNAGAR_SC config SND_SOC_MADERA tristate + default y if SND_SOC_CS47L15=y default y if SND_SOC_CS47L35=y default y if SND_SOC_CS47L85=y default y if SND_SOC_CS47L90=y + default m if SND_SOC_CS47L15=m default m if SND_SOC_CS47L35=m default m if SND_SOC_CS47L85=m default m if SND_SOC_CS47L90=m diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 5b4bb8cf43256..2de423621ba4a 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -65,6 +65,7 @@ snd-soc-cs43130-objs := cs43130.o snd-soc-cs4341-objs := cs4341.o snd-soc-cs4349-objs := cs4349.o snd-soc-cs47l24-objs := cs47l24.o +snd-soc-cs47l15-objs := cs47l15.o snd-soc-cs47l35-objs := cs47l35.o snd-soc-cs47l85-objs := cs47l85.o snd-soc-cs47l90-objs := cs47l90.o @@ -346,6 +347,7 @@ obj-$(CONFIG_SND_SOC_CS43130) += snd-soc-cs43130.o obj-$(CONFIG_SND_SOC_CS4341) += snd-soc-cs4341.o obj-$(CONFIG_SND_SOC_CS4349) += snd-soc-cs4349.o obj-$(CONFIG_SND_SOC_CS47L24) += snd-soc-cs47l24.o +obj-$(CONFIG_SND_SOC_CS47L15) += snd-soc-cs47l15.o obj-$(CONFIG_SND_SOC_CS47L35) += snd-soc-cs47l35.o obj-$(CONFIG_SND_SOC_CS47L85) += snd-soc-cs47l85.o obj-$(CONFIG_SND_SOC_CS47L90) += snd-soc-cs47l90.o diff --git a/sound/soc/codecs/cs47l15.c b/sound/soc/codecs/cs47l15.c new file mode 100644 index 0000000000000..919f1c49d7cf1 --- /dev/null +++ b/sound/soc/codecs/cs47l15.c @@ -0,0 +1,1498 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// ALSA SoC Audio driver for CS47L15 codec +// +// Copyright (C) 2016-2019 Cirrus Logic, Inc. and +// Cirrus Logic International Semiconductor Ltd. +// + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/init.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/tlv.h> + +#include <linux/irqchip/irq-madera.h> +#include <linux/mfd/madera/core.h> +#include <linux/mfd/madera/registers.h> + +#include "madera.h" +#include "wm_adsp.h" + +#define CS47L15_NUM_ADSP 1 +#define CS47L15_MONO_OUTPUTS 1 + +/* Mid-mode registers */ +#define CS47L15_ADC_INT_BIAS_MASK 0x3800 +#define CS47L15_ADC_INT_BIAS_SHIFT 11 +#define CS47L15_PGA_BIAS_SEL_MASK 0x03 +#define CS47L15_PGA_BIAS_SEL_SHIFT 0 + +#define DRV_NAME "cs47l15-codec" + +struct cs47l15 { + struct madera_priv core; + struct madera_fll fll[2]; + + bool in1_lp_mode; +}; + +static const struct wm_adsp_region cs47l15_dsp1_regions[] = { + { .type = WMFW_ADSP2_PM, .base = 0x080000 }, + { .type = WMFW_ADSP2_ZM, .base = 0x0e0000 }, + { .type = WMFW_ADSP2_XM, .base = 0x0a0000 }, + { .type = WMFW_ADSP2_YM, .base = 0x0c0000 }, +}; + +static const char * const cs47l15_outdemux_texts[] = { + "HPOUT", + "EPOUT", +}; + +static SOC_ENUM_SINGLE_DECL(cs47l15_outdemux_enum, SND_SOC_NOPM, 0, + cs47l15_outdemux_texts); + +static const struct snd_kcontrol_new cs47l15_outdemux = + SOC_DAPM_ENUM_EXT("HPOUT1 Demux", cs47l15_outdemux_enum, + madera_out1_demux_get, madera_out1_demux_put); + +static int cs47l15_adsp_power_ev(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, + int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera_priv *priv = &cs47l15->core; + struct madera *madera = priv->madera; + unsigned int freq; + int ret; + + ret = regmap_read(madera->regmap, MADERA_DSP_CLOCK_2, &freq); + if (ret != 0) { + dev_err(madera->dev, + "Failed to read MADERA_DSP_CLOCK_2: %d\n", ret); + return ret; + } + + switch (event) { + case SND_SOC_DAPM_PRE_PMU: + ret = madera_set_adsp_clk(&cs47l15->core, w->shift, freq); + if (ret) + return ret; + break; + default: + break; + } + + return wm_adsp_early_event(w, kcontrol, event); +} + +#define CS47L15_NG_SRC(name, base) \ + SOC_SINGLE(name " NG HPOUT1L Switch", base, 0, 1, 0), \ + SOC_SINGLE(name " NG HPOUT1R Switch", base, 1, 1, 0), \ + SOC_SINGLE(name " NG SPKOUTL Switch", base, 6, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1L Switch", base, 8, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1R Switch", base, 9, 1, 0) + +static int cs47l15_in1_adc_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + + ucontrol->value.integer.value[0] = !!cs47l15->in1_lp_mode; + + return 0; +} + +static int cs47l15_in1_adc_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + + switch (ucontrol->value.integer.value[0]) { + case 0: + /* Set IN1 to normal mode */ + snd_soc_component_update_bits(component, MADERA_DMIC1L_CONTROL, + MADERA_IN1_OSR_MASK, + 5 << MADERA_IN1_OSR_SHIFT); + snd_soc_component_update_bits(component, CS47L15_ADC_INT_BIAS, + CS47L15_ADC_INT_BIAS_MASK, + 4 << CS47L15_ADC_INT_BIAS_SHIFT); + snd_soc_component_update_bits(component, CS47L15_PGA_BIAS_SEL, + CS47L15_PGA_BIAS_SEL_MASK, 0); + cs47l15->in1_lp_mode = false; + break; + default: + /* Set IN1 to LP mode */ + snd_soc_component_update_bits(component, MADERA_DMIC1L_CONTROL, + MADERA_IN1_OSR_MASK, + 4 << MADERA_IN1_OSR_SHIFT); + snd_soc_component_update_bits(component, CS47L15_ADC_INT_BIAS, + CS47L15_ADC_INT_BIAS_MASK, + 1 << CS47L15_ADC_INT_BIAS_SHIFT); + snd_soc_component_update_bits(component, CS47L15_PGA_BIAS_SEL, + CS47L15_PGA_BIAS_SEL_MASK, + 3 << CS47L15_PGA_BIAS_SEL_SHIFT); + cs47l15->in1_lp_mode = true; + break; + } + + return 0; +} + +static const struct snd_kcontrol_new cs47l15_snd_controls[] = { +SOC_ENUM("IN1 OSR", madera_in_dmic_osr[0]), +SOC_ENUM("IN2 OSR", madera_in_dmic_osr[1]), + +SOC_SINGLE_RANGE_TLV("IN1L Volume", MADERA_IN1L_CONTROL, + MADERA_IN1L_PGA_VOL_SHIFT, 0x40, 0x5f, 0, madera_ana_tlv), +SOC_SINGLE_RANGE_TLV("IN1R Volume", MADERA_IN1R_CONTROL, + MADERA_IN1R_PGA_VOL_SHIFT, 0x40, 0x5f, 0, madera_ana_tlv), + +SOC_ENUM("IN HPF Cutoff Frequency", madera_in_hpf_cut_enum), + +SOC_SINGLE("IN1L HPF Switch", MADERA_IN1L_CONTROL, MADERA_IN1L_HPF_SHIFT, 1, 0), +SOC_SINGLE("IN1R HPF Switch", MADERA_IN1R_CONTROL, MADERA_IN1R_HPF_SHIFT, 1, 0), +SOC_SINGLE("IN2L HPF Switch", MADERA_IN2L_CONTROL, MADERA_IN2L_HPF_SHIFT, 1, 0), +SOC_SINGLE("IN2R HPF Switch", MADERA_IN2R_CONTROL, MADERA_IN2R_HPF_SHIFT, 1, 0), + +SOC_SINGLE_TLV("IN1L Digital Volume", MADERA_ADC_DIGITAL_VOLUME_1L, + MADERA_IN1L_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("IN1R Digital Volume", MADERA_ADC_DIGITAL_VOLUME_1R, + MADERA_IN1R_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("IN2L Digital Volume", MADERA_ADC_DIGITAL_VOLUME_2L, + MADERA_IN2L_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("IN2R Digital Volume", MADERA_ADC_DIGITAL_VOLUME_2R, + MADERA_IN2R_DIG_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), + +SOC_ENUM("Input Ramp Up", madera_in_vi_ramp), +SOC_ENUM("Input Ramp Down", madera_in_vd_ramp), + +MADERA_MIXER_CONTROLS("EQ1", MADERA_EQ1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("EQ2", MADERA_EQ2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("EQ3", MADERA_EQ3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("EQ4", MADERA_EQ4MIX_INPUT_1_SOURCE), + +MADERA_EQ_CONTROL("EQ1 Coefficients", MADERA_EQ1_2), +SOC_SINGLE_TLV("EQ1 B1 Volume", MADERA_EQ1_1, MADERA_EQ1_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B2 Volume", MADERA_EQ1_1, MADERA_EQ1_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B3 Volume", MADERA_EQ1_1, MADERA_EQ1_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B4 Volume", MADERA_EQ1_2, MADERA_EQ1_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ1 B5 Volume", MADERA_EQ1_2, MADERA_EQ1_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_EQ_CONTROL("EQ2 Coefficients", MADERA_EQ2_2), +SOC_SINGLE_TLV("EQ2 B1 Volume", MADERA_EQ2_1, MADERA_EQ2_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B2 Volume", MADERA_EQ2_1, MADERA_EQ2_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B3 Volume", MADERA_EQ2_1, MADERA_EQ2_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B4 Volume", MADERA_EQ2_2, MADERA_EQ2_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ2 B5 Volume", MADERA_EQ2_2, MADERA_EQ2_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_EQ_CONTROL("EQ3 Coefficients", MADERA_EQ3_2), +SOC_SINGLE_TLV("EQ3 B1 Volume", MADERA_EQ3_1, MADERA_EQ3_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B2 Volume", MADERA_EQ3_1, MADERA_EQ3_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B3 Volume", MADERA_EQ3_1, MADERA_EQ3_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B4 Volume", MADERA_EQ3_2, MADERA_EQ3_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ3 B5 Volume", MADERA_EQ3_2, MADERA_EQ3_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_EQ_CONTROL("EQ4 Coefficients", MADERA_EQ4_2), +SOC_SINGLE_TLV("EQ4 B1 Volume", MADERA_EQ4_1, MADERA_EQ4_B1_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B2 Volume", MADERA_EQ4_1, MADERA_EQ4_B2_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B3 Volume", MADERA_EQ4_1, MADERA_EQ4_B3_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B4 Volume", MADERA_EQ4_2, MADERA_EQ4_B4_GAIN_SHIFT, + 24, 0, madera_eq_tlv), +SOC_SINGLE_TLV("EQ4 B5 Volume", MADERA_EQ4_2, MADERA_EQ4_B5_GAIN_SHIFT, + 24, 0, madera_eq_tlv), + +MADERA_MIXER_CONTROLS("DRC1L", MADERA_DRC1LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DRC1R", MADERA_DRC1RMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DRC2L", MADERA_DRC2LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DRC2R", MADERA_DRC2RMIX_INPUT_1_SOURCE), + +SND_SOC_BYTES_MASK("DRC1", MADERA_DRC1_CTRL1, 5, + MADERA_DRC1R_ENA | MADERA_DRC1L_ENA), +SND_SOC_BYTES_MASK("DRC2", MADERA_DRC2_CTRL1, 5, + MADERA_DRC2R_ENA | MADERA_DRC2L_ENA), + +MADERA_MIXER_CONTROLS("LHPF1", MADERA_HPLP1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("LHPF2", MADERA_HPLP2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("LHPF3", MADERA_HPLP3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("LHPF4", MADERA_HPLP4MIX_INPUT_1_SOURCE), + +MADERA_LHPF_CONTROL("LHPF1 Coefficients", MADERA_HPLPF1_2), +MADERA_LHPF_CONTROL("LHPF2 Coefficients", MADERA_HPLPF2_2), +MADERA_LHPF_CONTROL("LHPF3 Coefficients", MADERA_HPLPF3_2), +MADERA_LHPF_CONTROL("LHPF4 Coefficients", MADERA_HPLPF4_2), + +SOC_ENUM("LHPF1 Mode", madera_lhpf1_mode), +SOC_ENUM("LHPF2 Mode", madera_lhpf2_mode), +SOC_ENUM("LHPF3 Mode", madera_lhpf3_mode), +SOC_ENUM("LHPF4 Mode", madera_lhpf4_mode), + +MADERA_RATE_ENUM("ISRC1 FSL", madera_isrc_fsl[0]), +MADERA_RATE_ENUM("ISRC2 FSL", madera_isrc_fsl[1]), +MADERA_RATE_ENUM("ISRC1 FSH", madera_isrc_fsh[0]), +MADERA_RATE_ENUM("ISRC2 FSH", madera_isrc_fsh[1]), + +WM_ADSP2_PRELOAD_SWITCH("DSP1", 1), + +MADERA_MIXER_CONTROLS("DSP1L", MADERA_DSP1LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("DSP1R", MADERA_DSP1RMIX_INPUT_1_SOURCE), + +SOC_SINGLE_TLV("Noise Generator Volume", MADERA_COMFORT_NOISE_GENERATOR, + MADERA_NOISE_GEN_GAIN_SHIFT, 0x16, 0, madera_noise_tlv), + +MADERA_MIXER_CONTROLS("HPOUT1L", MADERA_OUT1LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("HPOUT1R", MADERA_OUT1RMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("SPKOUTL", MADERA_OUT4LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("SPKDAT1L", MADERA_OUT5LMIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("SPKDAT1R", MADERA_OUT5RMIX_INPUT_1_SOURCE), + +SOC_SINGLE("HPOUT1 SC Protect Switch", MADERA_HP1_SHORT_CIRCUIT_CTRL, + MADERA_HP1_SC_ENA_SHIFT, 1, 0), + +SOC_SINGLE("SPKDAT1 High Performance Switch", MADERA_OUTPUT_PATH_CONFIG_5L, + MADERA_OUT5_OSR_SHIFT, 1, 0), + +SOC_DOUBLE_R("HPOUT1 Digital Switch", MADERA_DAC_DIGITAL_VOLUME_1L, + MADERA_DAC_DIGITAL_VOLUME_1R, MADERA_OUT1L_MUTE_SHIFT, 1, 1), +SOC_SINGLE("Speaker Digital Switch", MADERA_DAC_DIGITAL_VOLUME_4L, + MADERA_OUT4L_MUTE_SHIFT, 1, 1), +SOC_DOUBLE_R("SPKDAT1 Digital Switch", MADERA_DAC_DIGITAL_VOLUME_5L, + MADERA_DAC_DIGITAL_VOLUME_5R, MADERA_OUT5L_MUTE_SHIFT, 1, 1), + +SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", MADERA_DAC_DIGITAL_VOLUME_1L, + MADERA_DAC_DIGITAL_VOLUME_1R, MADERA_OUT1L_VOL_SHIFT, + 0xbf, 0, madera_digital_tlv), +SOC_SINGLE_TLV("Speaker Digital Volume", MADERA_DAC_DIGITAL_VOLUME_4L, + MADERA_OUT4L_VOL_SHIFT, 0xbf, 0, madera_digital_tlv), +SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", MADERA_DAC_DIGITAL_VOLUME_5L, + MADERA_DAC_DIGITAL_VOLUME_5R, MADERA_OUT5L_VOL_SHIFT, + 0xbf, 0, madera_digital_tlv), + +SOC_DOUBLE("SPKDAT1 Switch", MADERA_PDM_SPK1_CTRL_1, MADERA_SPK1L_MUTE_SHIFT, + MADERA_SPK1R_MUTE_SHIFT, 1, 1), + +SOC_ENUM("Output Ramp Up", madera_out_vi_ramp), +SOC_ENUM("Output Ramp Down", madera_out_vd_ramp), + +SOC_SINGLE("Noise Gate Switch", MADERA_NOISE_GATE_CONTROL, + MADERA_NGATE_ENA_SHIFT, 1, 0), +SOC_SINGLE_TLV("Noise Gate Threshold Volume", MADERA_NOISE_GATE_CONTROL, + MADERA_NGATE_THR_SHIFT, 7, 1, madera_ng_tlv), +SOC_ENUM("Noise Gate Hold", madera_ng_hold), + +SOC_SINGLE_BOOL_EXT("IN1 LP Mode Switch", 0, + cs47l15_in1_adc_get, cs47l15_in1_adc_put), + +CS47L15_NG_SRC("HPOUT1L", MADERA_NOISE_GATE_SELECT_1L), +CS47L15_NG_SRC("HPOUT1R", MADERA_NOISE_GATE_SELECT_1R), +CS47L15_NG_SRC("SPKOUTL", MADERA_NOISE_GATE_SELECT_4L), +CS47L15_NG_SRC("SPKDAT1L", MADERA_NOISE_GATE_SELECT_5L), +CS47L15_NG_SRC("SPKDAT1R", MADERA_NOISE_GATE_SELECT_5R), + +MADERA_MIXER_CONTROLS("AIF1TX1", MADERA_AIF1TX1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX2", MADERA_AIF1TX2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX3", MADERA_AIF1TX3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX4", MADERA_AIF1TX4MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX5", MADERA_AIF1TX5MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF1TX6", MADERA_AIF1TX6MIX_INPUT_1_SOURCE), + +MADERA_MIXER_CONTROLS("AIF2TX1", MADERA_AIF2TX1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF2TX2", MADERA_AIF2TX2MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF2TX3", MADERA_AIF2TX3MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF2TX4", MADERA_AIF2TX4MIX_INPUT_1_SOURCE), + +MADERA_MIXER_CONTROLS("AIF3TX1", MADERA_AIF3TX1MIX_INPUT_1_SOURCE), +MADERA_MIXER_CONTROLS("AIF3TX2", MADERA_AIF3TX2MIX_INPUT_1_SOURCE), + +MADERA_GAINMUX_CONTROLS("SPDIF1TX1", MADERA_SPDIF1TX1MIX_INPUT_1_SOURCE), +MADERA_GAINMUX_CONTROLS("SPDIF1TX2", MADERA_SPDIF1TX2MIX_INPUT_1_SOURCE), + +WM_ADSP_FW_CONTROL("DSP1", 0), +}; + +MADERA_MIXER_ENUMS(EQ1, MADERA_EQ1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(EQ2, MADERA_EQ2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(EQ3, MADERA_EQ3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(EQ4, MADERA_EQ4MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(DRC1L, MADERA_DRC1LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DRC1R, MADERA_DRC1RMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DRC2L, MADERA_DRC2LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DRC2R, MADERA_DRC2RMIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(LHPF1, MADERA_HPLP1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(LHPF2, MADERA_HPLP2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(LHPF3, MADERA_HPLP3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(LHPF4, MADERA_HPLP4MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(DSP1L, MADERA_DSP1LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(DSP1R, MADERA_DSP1RMIX_INPUT_1_SOURCE); +MADERA_DSP_AUX_ENUMS(DSP1, MADERA_DSP1AUX1MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(PWM1, MADERA_PWM1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(PWM2, MADERA_PWM2MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(OUT1L, MADERA_OUT1LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(OUT1R, MADERA_OUT1RMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(SPKOUTL, MADERA_OUT4LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(SPKDAT1L, MADERA_OUT5LMIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(SPKDAT1R, MADERA_OUT5RMIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(AIF1TX1, MADERA_AIF1TX1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX2, MADERA_AIF1TX2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX3, MADERA_AIF1TX3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX4, MADERA_AIF1TX4MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX5, MADERA_AIF1TX5MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF1TX6, MADERA_AIF1TX6MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(AIF2TX1, MADERA_AIF2TX1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF2TX2, MADERA_AIF2TX2MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF2TX3, MADERA_AIF2TX3MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF2TX4, MADERA_AIF2TX4MIX_INPUT_1_SOURCE); + +MADERA_MIXER_ENUMS(AIF3TX1, MADERA_AIF3TX1MIX_INPUT_1_SOURCE); +MADERA_MIXER_ENUMS(AIF3TX2, MADERA_AIF3TX2MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(SPD1TX1, MADERA_SPDIF1TX1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(SPD1TX2, MADERA_SPDIF1TX2MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC1INT1, MADERA_ISRC1INT1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1INT2, MADERA_ISRC1INT2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1INT3, MADERA_ISRC1INT3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1INT4, MADERA_ISRC1INT4MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC1DEC1, MADERA_ISRC1DEC1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1DEC2, MADERA_ISRC1DEC2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1DEC3, MADERA_ISRC1DEC3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC1DEC4, MADERA_ISRC1DEC4MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC2INT1, MADERA_ISRC2INT1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2INT2, MADERA_ISRC2INT2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2INT3, MADERA_ISRC2INT3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2INT4, MADERA_ISRC2INT4MIX_INPUT_1_SOURCE); + +MADERA_MUX_ENUMS(ISRC2DEC1, MADERA_ISRC2DEC1MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2DEC2, MADERA_ISRC2DEC2MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2DEC3, MADERA_ISRC2DEC3MIX_INPUT_1_SOURCE); +MADERA_MUX_ENUMS(ISRC2DEC4, MADERA_ISRC2DEC4MIX_INPUT_1_SOURCE); + +static const char * const cs47l15_aec_loopback_texts[] = { + "HPOUT1L", "HPOUT1R", "SPKOUTL", "SPKDAT1L", "SPKDAT1R", +}; + +static const unsigned int cs47l15_aec_loopback_values[] = { + 0, 1, 6, 8, 9, +}; + +static const struct soc_enum cs47l15_aec1_loopback = + SOC_VALUE_ENUM_SINGLE(MADERA_DAC_AEC_CONTROL_1, + MADERA_AEC1_LOOPBACK_SRC_SHIFT, 0xf, + ARRAY_SIZE(cs47l15_aec_loopback_texts), + cs47l15_aec_loopback_texts, + cs47l15_aec_loopback_values); + +static const struct soc_enum cs47l15_aec2_loopback = + SOC_VALUE_ENUM_SINGLE(MADERA_DAC_AEC_CONTROL_2, + MADERA_AEC2_LOOPBACK_SRC_SHIFT, 0xf, + ARRAY_SIZE(cs47l15_aec_loopback_texts), + cs47l15_aec_loopback_texts, + cs47l15_aec_loopback_values); + +static const struct snd_kcontrol_new cs47l15_aec_loopback_mux[] = { + SOC_DAPM_ENUM("AEC1 Loopback", cs47l15_aec1_loopback), + SOC_DAPM_ENUM("AEC2 Loopback", cs47l15_aec2_loopback), +}; + +static const struct snd_soc_dapm_widget cs47l15_dapm_widgets[] = { +SND_SOC_DAPM_SUPPLY("SYSCLK", MADERA_SYSTEM_CLOCK_1, MADERA_SYSCLK_ENA_SHIFT, + 0, madera_sysclk_ev, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), +SND_SOC_DAPM_SUPPLY("OPCLK", MADERA_OUTPUT_SYSTEM_CLOCK, + MADERA_OPCLK_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("DSPCLK", MADERA_DSP_CLOCK_1, + MADERA_DSP_CLK_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD1", 20, 0), +SND_SOC_DAPM_REGULATOR_SUPPLY("MICVDD", 0, SND_SOC_DAPM_REGULATOR_BYPASS), +SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDD", 0, 0), + +SND_SOC_DAPM_SUPPLY("MICBIAS1", MADERA_MIC_BIAS_CTRL_1, + MADERA_MICB1_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_SUPPLY("MICBIAS1A", MADERA_MIC_BIAS_CTRL_5, + MADERA_MICB1A_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("MICBIAS1B", MADERA_MIC_BIAS_CTRL_5, + MADERA_MICB1B_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("MICBIAS1C", MADERA_MIC_BIAS_CTRL_5, + MADERA_MICB1C_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_SUPPLY("FXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_FX, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("ISRC1CLK", SND_SOC_NOPM, + MADERA_DOM_GRP_ISRC1, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("ISRC2CLK", SND_SOC_NOPM, + MADERA_DOM_GRP_ISRC2, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("OUTCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_OUT, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("SPDCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_SPD, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("DSP1CLK", SND_SOC_NOPM, + MADERA_DOM_GRP_DSP1, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("AIF1TXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_AIF1, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("AIF2TXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_AIF2, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("AIF3TXCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_AIF3, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("PWMCLK", SND_SOC_NOPM, + MADERA_DOM_GRP_PWM, 0, + madera_domain_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), + +SND_SOC_DAPM_SIGGEN("TONE"), +SND_SOC_DAPM_SIGGEN("NOISE"), + +SND_SOC_DAPM_INPUT("IN1ALN"), +SND_SOC_DAPM_INPUT("IN1ALP"), +SND_SOC_DAPM_INPUT("IN1BLN"), +SND_SOC_DAPM_INPUT("IN1BLP"), +SND_SOC_DAPM_INPUT("IN1ARN"), +SND_SOC_DAPM_INPUT("IN1ARP"), +SND_SOC_DAPM_INPUT("IN1BRN"), +SND_SOC_DAPM_INPUT("IN1BRP"), +SND_SOC_DAPM_INPUT("IN2N"), +SND_SOC_DAPM_INPUT("IN2P"), +SND_SOC_DAPM_INPUT("SPKRXDAT"), + +SND_SOC_DAPM_MUX("IN1L Analog Mux", SND_SOC_NOPM, 0, 0, &madera_inmux[0]), +SND_SOC_DAPM_MUX("IN1R Analog Mux", SND_SOC_NOPM, 0, 0, &madera_inmux[1]), + +SND_SOC_DAPM_MUX("IN1L Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[0]), +SND_SOC_DAPM_MUX("IN1R Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[0]), + +SND_SOC_DAPM_MUX("IN2L Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[1]), +SND_SOC_DAPM_MUX("IN2R Mode", SND_SOC_NOPM, 0, 0, &madera_inmode[1]), + +SND_SOC_DAPM_OUTPUT("DRC1 Signal Activity"), +SND_SOC_DAPM_OUTPUT("DRC2 Signal Activity"), + +SND_SOC_DAPM_OUTPUT("DSP Trigger Out"), + +SND_SOC_DAPM_DEMUX("HPOUT1 Demux", SND_SOC_NOPM, 0, 0, &cs47l15_outdemux), + +SND_SOC_DAPM_PGA("PWM1 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM1_ENA_SHIFT, + 0, NULL, 0), +SND_SOC_DAPM_PGA("PWM2 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM2_ENA_SHIFT, + 0, NULL, 0), + +SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX4_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX5_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0, + MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX6_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0, + MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX4_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0, + MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0, + MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX2_ENA_SHIFT, 0), + +SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, + MADERA_OUT1L_ENA_SHIFT, 0, NULL, 0, madera_hp_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM, + MADERA_OUT1R_ENA_SHIFT, 0, NULL, 0, madera_hp_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT4L", SND_SOC_NOPM, + MADERA_OUT4L_ENA_SHIFT, 0, NULL, 0, madera_spk_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT5L", MADERA_OUTPUT_ENABLES_1, + MADERA_OUT5L_ENA_SHIFT, 0, NULL, 0, madera_out_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("OUT5R", MADERA_OUTPUT_ENABLES_1, + MADERA_OUT5R_ENA_SHIFT, 0, NULL, 0, madera_out_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + +SND_SOC_DAPM_PGA("SPD1TX1", MADERA_SPD1_TX_CONTROL, + MADERA_SPD1_VAL1_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("SPD1TX2", MADERA_SPD1_TX_CONTROL, + MADERA_SPD1_VAL2_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_OUT_DRV("SPD1", MADERA_SPD1_TX_CONTROL, + MADERA_SPD1_ENA_SHIFT, 0, NULL, 0), + +/* + * mux_in widgets : arranged in the order of sources + * specified in MADERA_MIXER_INPUT_ROUTES + */ + +SND_SOC_DAPM_PGA("Noise Generator", MADERA_COMFORT_NOISE_GENERATOR, + MADERA_NOISE_GEN_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("Tone Generator 1", MADERA_TONE_GENERATOR_1, + MADERA_TONE1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("Tone Generator 2", MADERA_TONE_GENERATOR_1, + MADERA_TONE2_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_SIGGEN("HAPTICS"), + +SND_SOC_DAPM_MUX("AEC1 Loopback", MADERA_DAC_AEC_CONTROL_1, + MADERA_AEC1_LOOPBACK_ENA_SHIFT, 0, + &cs47l15_aec_loopback_mux[0]), +SND_SOC_DAPM_MUX("AEC2 Loopback", MADERA_DAC_AEC_CONTROL_2, + MADERA_AEC2_LOOPBACK_ENA_SHIFT, 0, + &cs47l15_aec_loopback_mux[1]), + +SND_SOC_DAPM_PGA_E("IN1L", MADERA_INPUT_ENABLES, MADERA_IN1L_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("IN1R", MADERA_INPUT_ENABLES, MADERA_IN1R_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("IN2L", MADERA_INPUT_ENABLES, MADERA_IN2L_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), +SND_SOC_DAPM_PGA_E("IN2R", MADERA_INPUT_ENABLES, MADERA_IN2R_ENA_SHIFT, + 0, NULL, 0, madera_in_ev, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD | + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), + +SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX4_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX5_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0, + MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX6_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX2_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX3_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0, + MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX4_ENA_SHIFT, 0), + +SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, + MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX1_ENA_SHIFT, 0), +SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, + MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX2_ENA_SHIFT, 0), + +SND_SOC_DAPM_PGA("EQ1", MADERA_EQ1_1, MADERA_EQ1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("EQ2", MADERA_EQ2_1, MADERA_EQ2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("EQ3", MADERA_EQ3_1, MADERA_EQ3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("EQ4", MADERA_EQ4_1, MADERA_EQ4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("DRC1L", MADERA_DRC1_CTRL1, MADERA_DRC1L_ENA_SHIFT, 0, + NULL, 0), +SND_SOC_DAPM_PGA("DRC1R", MADERA_DRC1_CTRL1, MADERA_DRC1R_ENA_SHIFT, 0, + NULL, 0), +SND_SOC_DAPM_PGA("DRC2L", MADERA_DRC2_CTRL1, MADERA_DRC2L_ENA_SHIFT, 0, + NULL, 0), +SND_SOC_DAPM_PGA("DRC2R", MADERA_DRC2_CTRL1, MADERA_DRC2R_ENA_SHIFT, 0, + NULL, 0), + +SND_SOC_DAPM_PGA("LHPF1", MADERA_HPLPF1_1, MADERA_LHPF1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("LHPF2", MADERA_HPLPF2_1, MADERA_LHPF2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("LHPF3", MADERA_HPLPF3_1, MADERA_LHPF3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("LHPF4", MADERA_HPLPF4_1, MADERA_LHPF4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC1DEC1", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1DEC2", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1DEC3", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1DEC4", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_DEC4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC1INT1", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1INT2", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1INT3", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC1INT4", MADERA_ISRC_1_CTRL_3, + MADERA_ISRC1_INT4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC2DEC1", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2DEC2", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2DEC3", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2DEC4", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_DEC4_ENA_SHIFT, 0, NULL, 0), + +SND_SOC_DAPM_PGA("ISRC2INT1", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT1_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2INT2", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT2_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2INT3", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT3_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_PGA("ISRC2INT4", MADERA_ISRC_2_CTRL_3, + MADERA_ISRC2_INT4_ENA_SHIFT, 0, NULL, 0), + +WM_ADSP2("DSP1", 0, cs47l15_adsp_power_ev), + +/* end of ordered widget list */ + +MADERA_MIXER_WIDGETS(EQ1, "EQ1"), +MADERA_MIXER_WIDGETS(EQ2, "EQ2"), +MADERA_MIXER_WIDGETS(EQ3, "EQ3"), +MADERA_MIXER_WIDGETS(EQ4, "EQ4"), + +MADERA_MIXER_WIDGETS(DRC1L, "DRC1L"), +MADERA_MIXER_WIDGETS(DRC1R, "DRC1R"), +MADERA_MIXER_WIDGETS(DRC2L, "DRC2L"), +MADERA_MIXER_WIDGETS(DRC2R, "DRC2R"), + +SND_SOC_DAPM_SWITCH("DRC1 Activity Output", SND_SOC_NOPM, 0, 0, + &madera_drc_activity_output_mux[0]), +SND_SOC_DAPM_SWITCH("DRC2 Activity Output", SND_SOC_NOPM, 0, 0, + &madera_drc_activity_output_mux[1]), + +MADERA_MIXER_WIDGETS(LHPF1, "LHPF1"), +MADERA_MIXER_WIDGETS(LHPF2, "LHPF2"), +MADERA_MIXER_WIDGETS(LHPF3, "LHPF3"), +MADERA_MIXER_WIDGETS(LHPF4, "LHPF4"), + +MADERA_MIXER_WIDGETS(PWM1, "PWM1"), +MADERA_MIXER_WIDGETS(PWM2, "PWM2"), + +MADERA_MIXER_WIDGETS(OUT1L, "HPOUT1L"), +MADERA_MIXER_WIDGETS(OUT1R, "HPOUT1R"), +MADERA_MIXER_WIDGETS(SPKOUTL, "SPKOUTL"), +MADERA_MIXER_WIDGETS(SPKDAT1L, "SPKDAT1L"), +MADERA_MIXER_WIDGETS(SPKDAT1R, "SPKDAT1R"), + +MADERA_MIXER_WIDGETS(AIF1TX1, "AIF1TX1"), +MADERA_MIXER_WIDGETS(AIF1TX2, "AIF1TX2"), +MADERA_MIXER_WIDGETS(AIF1TX3, "AIF1TX3"), +MADERA_MIXER_WIDGETS(AIF1TX4, "AIF1TX4"), +MADERA_MIXER_WIDGETS(AIF1TX5, "AIF1TX5"), +MADERA_MIXER_WIDGETS(AIF1TX6, "AIF1TX6"), + +MADERA_MIXER_WIDGETS(AIF2TX1, "AIF2TX1"), +MADERA_MIXER_WIDGETS(AIF2TX2, "AIF2TX2"), +MADERA_MIXER_WIDGETS(AIF2TX3, "AIF2TX3"), +MADERA_MIXER_WIDGETS(AIF2TX4, "AIF2TX4"), + +MADERA_MIXER_WIDGETS(AIF3TX1, "AIF3TX1"), +MADERA_MIXER_WIDGETS(AIF3TX2, "AIF3TX2"), + +MADERA_MUX_WIDGETS(SPD1TX1, "SPDIF1TX1"), +MADERA_MUX_WIDGETS(SPD1TX2, "SPDIF1TX2"), + +MADERA_DSP_WIDGETS(DSP1, "DSP1"), + +SND_SOC_DAPM_SWITCH("DSP1 Trigger Output", SND_SOC_NOPM, 0, 0, + &madera_dsp_trigger_output_mux[0]), + +MADERA_MUX_WIDGETS(ISRC1DEC1, "ISRC1DEC1"), +MADERA_MUX_WIDGETS(ISRC1DEC2, "ISRC1DEC2"), +MADERA_MUX_WIDGETS(ISRC1DEC3, "ISRC1DEC3"), +MADERA_MUX_WIDGETS(ISRC1DEC4, "ISRC1DEC4"), + +MADERA_MUX_WIDGETS(ISRC1INT1, "ISRC1INT1"), +MADERA_MUX_WIDGETS(ISRC1INT2, "ISRC1INT2"), +MADERA_MUX_WIDGETS(ISRC1INT3, "ISRC1INT3"), +MADERA_MUX_WIDGETS(ISRC1INT4, "ISRC1INT4"), + +MADERA_MUX_WIDGETS(ISRC2DEC1, "ISRC2DEC1"), +MADERA_MUX_WIDGETS(ISRC2DEC2, "ISRC2DEC2"), +MADERA_MUX_WIDGETS(ISRC2DEC3, "ISRC2DEC3"), +MADERA_MUX_WIDGETS(ISRC2DEC4, "ISRC2DEC4"), + +MADERA_MUX_WIDGETS(ISRC2INT1, "ISRC2INT1"), +MADERA_MUX_WIDGETS(ISRC2INT2, "ISRC2INT2"), +MADERA_MUX_WIDGETS(ISRC2INT3, "ISRC2INT3"), +MADERA_MUX_WIDGETS(ISRC2INT4, "ISRC2INT4"), + +SND_SOC_DAPM_OUTPUT("HPOUTL"), +SND_SOC_DAPM_OUTPUT("HPOUTR"), +SND_SOC_DAPM_OUTPUT("EPOUTP"), +SND_SOC_DAPM_OUTPUT("EPOUTN"), +SND_SOC_DAPM_OUTPUT("SPKOUTN"), +SND_SOC_DAPM_OUTPUT("SPKOUTP"), +SND_SOC_DAPM_OUTPUT("SPKDAT1L"), +SND_SOC_DAPM_OUTPUT("SPKDAT1R"), +SND_SOC_DAPM_OUTPUT("SPDIF1"), + +SND_SOC_DAPM_OUTPUT("MICSUPP"), +}; + +#define MADERA_MIXER_INPUT_ROUTES(name) \ + { name, "Noise Generator", "Noise Generator" }, \ + { name, "Tone Generator 1", "Tone Generator 1" }, \ + { name, "Tone Generator 2", "Tone Generator 2" }, \ + { name, "Haptics", "HAPTICS" }, \ + { name, "AEC1", "AEC1 Loopback" }, \ + { name, "AEC2", "AEC2 Loopback" }, \ + { name, "IN1L", "IN1L" }, \ + { name, "IN1R", "IN1R" }, \ + { name, "IN2L", "IN2L" }, \ + { name, "IN2R", "IN2R" }, \ + { name, "AIF1RX1", "AIF1RX1" }, \ + { name, "AIF1RX2", "AIF1RX2" }, \ + { name, "AIF1RX3", "AIF1RX3" }, \ + { name, "AIF1RX4", "AIF1RX4" }, \ + { name, "AIF1RX5", "AIF1RX5" }, \ + { name, "AIF1RX6", "AIF1RX6" }, \ + { name, "AIF2RX1", "AIF2RX1" }, \ + { name, "AIF2RX2", "AIF2RX2" }, \ + { name, "AIF2RX3", "AIF2RX3" }, \ + { name, "AIF2RX4", "AIF2RX4" }, \ + { name, "AIF3RX1", "AIF3RX1" }, \ + { name, "AIF3RX2", "AIF3RX2" }, \ + { name, "EQ1", "EQ1" }, \ + { name, "EQ2", "EQ2" }, \ + { name, "EQ3", "EQ3" }, \ + { name, "EQ4", "EQ4" }, \ + { name, "DRC1L", "DRC1L" }, \ + { name, "DRC1R", "DRC1R" }, \ + { name, "DRC2L", "DRC2L" }, \ + { name, "DRC2R", "DRC2R" }, \ + { name, "LHPF1", "LHPF1" }, \ + { name, "LHPF2", "LHPF2" }, \ + { name, "LHPF3", "LHPF3" }, \ + { name, "LHPF4", "LHPF4" }, \ + { name, "ISRC1DEC1", "ISRC1DEC1" }, \ + { name, "ISRC1DEC2", "ISRC1DEC2" }, \ + { name, "ISRC1DEC3", "ISRC1DEC3" }, \ + { name, "ISRC1DEC4", "ISRC1DEC4" }, \ + { name, "ISRC1INT1", "ISRC1INT1" }, \ + { name, "ISRC1INT2", "ISRC1INT2" }, \ + { name, "ISRC1INT3", "ISRC1INT3" }, \ + { name, "ISRC1INT4", "ISRC1INT4" }, \ + { name, "ISRC2DEC1", "ISRC2DEC1" }, \ + { name, "ISRC2DEC2", "ISRC2DEC2" }, \ + { name, "ISRC2DEC3", "ISRC2DEC3" }, \ + { name, "ISRC2DEC4", "ISRC2DEC4" }, \ + { name, "ISRC2INT1", "ISRC2INT1" }, \ + { name, "ISRC2INT2", "ISRC2INT2" }, \ + { name, "ISRC2INT3", "ISRC2INT3" }, \ + { name, "ISRC2INT4", "ISRC2INT4" }, \ + { name, "DSP1.1", "DSP1" }, \ + { name, "DSP1.2", "DSP1" }, \ + { name, "DSP1.3", "DSP1" }, \ + { name, "DSP1.4", "DSP1" }, \ + { name, "DSP1.5", "DSP1" }, \ + { name, "DSP1.6", "DSP1" } + +static const struct snd_soc_dapm_route cs47l15_dapm_routes[] = { + /* Internal clock domains */ + { "EQ1", NULL, "FXCLK" }, + { "EQ2", NULL, "FXCLK" }, + { "EQ3", NULL, "FXCLK" }, + { "EQ4", NULL, "FXCLK" }, + { "DRC1L", NULL, "FXCLK" }, + { "DRC1R", NULL, "FXCLK" }, + { "DRC2L", NULL, "FXCLK" }, + { "DRC2R", NULL, "FXCLK" }, + { "LHPF1", NULL, "FXCLK" }, + { "LHPF2", NULL, "FXCLK" }, + { "LHPF3", NULL, "FXCLK" }, + { "LHPF4", NULL, "FXCLK" }, + { "PWM1 Mixer", NULL, "PWMCLK" }, + { "PWM2 Mixer", NULL, "PWMCLK" }, + { "OUT1L", NULL, "OUTCLK" }, + { "OUT1R", NULL, "OUTCLK" }, + { "OUT4L", NULL, "OUTCLK" }, + { "OUT5L", NULL, "OUTCLK" }, + { "OUT5R", NULL, "OUTCLK" }, + { "AIF1TX1", NULL, "AIF1TXCLK" }, + { "AIF1TX2", NULL, "AIF1TXCLK" }, + { "AIF1TX3", NULL, "AIF1TXCLK" }, + { "AIF1TX4", NULL, "AIF1TXCLK" }, + { "AIF1TX5", NULL, "AIF1TXCLK" }, + { "AIF1TX6", NULL, "AIF1TXCLK" }, + { "AIF2TX1", NULL, "AIF2TXCLK" }, + { "AIF2TX2", NULL, "AIF2TXCLK" }, + { "AIF2TX3", NULL, "AIF2TXCLK" }, + { "AIF2TX4", NULL, "AIF2TXCLK" }, + { "AIF3TX1", NULL, "AIF3TXCLK" }, + { "AIF3TX2", NULL, "AIF3TXCLK" }, + { "SPD1TX1", NULL, "SPDCLK" }, + { "SPD1TX2", NULL, "SPDCLK" }, + { "DSP1", NULL, "DSP1CLK" }, + { "ISRC1DEC1", NULL, "ISRC1CLK" }, + { "ISRC1DEC2", NULL, "ISRC1CLK" }, + { "ISRC1DEC3", NULL, "ISRC1CLK" }, + { "ISRC1DEC4", NULL, "ISRC1CLK" }, + { "ISRC1INT1", NULL, "ISRC1CLK" }, + { "ISRC1INT2", NULL, "ISRC1CLK" }, + { "ISRC1INT3", NULL, "ISRC1CLK" }, + { "ISRC1INT4", NULL, "ISRC1CLK" }, + { "ISRC2DEC1", NULL, "ISRC2CLK" }, + { "ISRC2DEC2", NULL, "ISRC2CLK" }, + { "ISRC2DEC3", NULL, "ISRC2CLK" }, + { "ISRC2DEC4", NULL, "ISRC2CLK" }, + { "ISRC2INT1", NULL, "ISRC2CLK" }, + { "ISRC2INT2", NULL, "ISRC2CLK" }, + { "ISRC2INT3", NULL, "ISRC2CLK" }, + { "ISRC2INT4", NULL, "ISRC2CLK" }, + + { "OUT1L", NULL, "CPVDD1" }, + { "OUT1R", NULL, "CPVDD1" }, + { "OUT4L", NULL, "SPKVDD" }, + + { "OUT1L", NULL, "SYSCLK" }, + { "OUT1R", NULL, "SYSCLK" }, + { "OUT4L", NULL, "SYSCLK" }, + { "OUT5L", NULL, "SYSCLK" }, + { "OUT5R", NULL, "SYSCLK" }, + + { "SPD1", NULL, "SYSCLK" }, + { "SPD1", NULL, "SPD1TX1" }, + { "SPD1", NULL, "SPD1TX2" }, + + { "IN1L", NULL, "SYSCLK" }, + { "IN1R", NULL, "SYSCLK" }, + { "IN2L", NULL, "SYSCLK" }, + { "IN2R", NULL, "SYSCLK" }, + + { "MICBIAS1", NULL, "MICVDD" }, + + { "MICBIAS1A", NULL, "MICBIAS1" }, + { "MICBIAS1B", NULL, "MICBIAS1" }, + { "MICBIAS1C", NULL, "MICBIAS1" }, + + { "Noise Generator", NULL, "SYSCLK" }, + { "Tone Generator 1", NULL, "SYSCLK" }, + { "Tone Generator 2", NULL, "SYSCLK" }, + + { "Noise Generator", NULL, "NOISE" }, + { "Tone Generator 1", NULL, "TONE" }, + { "Tone Generator 2", NULL, "TONE" }, + + { "AIF1 Capture", NULL, "AIF1TX1" }, + { "AIF1 Capture", NULL, "AIF1TX2" }, + { "AIF1 Capture", NULL, "AIF1TX3" }, + { "AIF1 Capture", NULL, "AIF1TX4" }, + { "AIF1 Capture", NULL, "AIF1TX5" }, + { "AIF1 Capture", NULL, "AIF1TX6" }, + + { "AIF1RX1", NULL, "AIF1 Playback" }, + { "AIF1RX2", NULL, "AIF1 Playback" }, + { "AIF1RX3", NULL, "AIF1 Playback" }, + { "AIF1RX4", NULL, "AIF1 Playback" }, + { "AIF1RX5", NULL, "AIF1 Playback" }, + { "AIF1RX6", NULL, "AIF1 Playback" }, + + { "AIF2 Capture", NULL, "AIF2TX1" }, + { "AIF2 Capture", NULL, "AIF2TX2" }, + { "AIF2 Capture", NULL, "AIF2TX3" }, + { "AIF2 Capture", NULL, "AIF2TX4" }, + + { "AIF2RX1", NULL, "AIF2 Playback" }, + { "AIF2RX2", NULL, "AIF2 Playback" }, + { "AIF2RX3", NULL, "AIF2 Playback" }, + { "AIF2RX4", NULL, "AIF2 Playback" }, + + { "AIF3 Capture", NULL, "AIF3TX1" }, + { "AIF3 Capture", NULL, "AIF3TX2" }, + + { "AIF3RX1", NULL, "AIF3 Playback" }, + { "AIF3RX2", NULL, "AIF3 Playback" }, + + { "AIF1 Playback", NULL, "SYSCLK" }, + { "AIF2 Playback", NULL, "SYSCLK" }, + { "AIF3 Playback", NULL, "SYSCLK" }, + + { "AIF1 Capture", NULL, "SYSCLK" }, + { "AIF2 Capture", NULL, "SYSCLK" }, + { "AIF3 Capture", NULL, "SYSCLK" }, + + { "Audio Trace DSP", NULL, "DSP1" }, + + { "IN1L Analog Mux", "A", "IN1ALN" }, + { "IN1L Analog Mux", "A", "IN1ALP" }, + { "IN1L Analog Mux", "B", "IN1BLN" }, + { "IN1L Analog Mux", "B", "IN1BLP" }, + { "IN1R Analog Mux", "A", "IN1ARN" }, + { "IN1R Analog Mux", "A", "IN1ARP" }, + { "IN1R Analog Mux", "B", "IN1BRN" }, + { "IN1R Analog Mux", "B", "IN1BRP" }, + + { "IN1L Mode", "Analog", "IN1L Analog Mux" }, + { "IN1R Mode", "Analog", "IN1R Analog Mux" }, + + { "IN1L Mode", "Digital", "IN1ALN" }, + { "IN1L Mode", "Digital", "IN1ALP" }, + { "IN1R Mode", "Digital", "IN1ALN" }, + { "IN1R Mode", "Digital", "IN1ALP" }, + + { "IN1L", NULL, "IN1L Mode" }, + { "IN1R", NULL, "IN1R Mode" }, + + { "IN2L Mode", "Analog", "IN2N" }, + { "IN2L Mode", "Analog", "IN2P" }, + + { "IN2L Mode", "Digital", "SPKRXDAT" }, + { "IN2R Mode", "Digital", "SPKRXDAT" }, + + { "IN2L", NULL, "IN2L Mode" }, + { "IN2R", NULL, "IN2R Mode" }, + + MADERA_MIXER_ROUTES("OUT1L", "HPOUT1L"), + MADERA_MIXER_ROUTES("OUT1R", "HPOUT1R"), + MADERA_MIXER_ROUTES("OUT4L", "SPKOUTL"), + MADERA_MIXER_ROUTES("OUT5L", "SPKDAT1L"), + MADERA_MIXER_ROUTES("OUT5R", "SPKDAT1R"), + + MADERA_MIXER_ROUTES("PWM1 Driver", "PWM1"), + MADERA_MIXER_ROUTES("PWM2 Driver", "PWM2"), + + MADERA_MIXER_ROUTES("AIF1TX1", "AIF1TX1"), + MADERA_MIXER_ROUTES("AIF1TX2", "AIF1TX2"), + MADERA_MIXER_ROUTES("AIF1TX3", "AIF1TX3"), + MADERA_MIXER_ROUTES("AIF1TX4", "AIF1TX4"), + MADERA_MIXER_ROUTES("AIF1TX5", "AIF1TX5"), + MADERA_MIXER_ROUTES("AIF1TX6", "AIF1TX6"), + + MADERA_MIXER_ROUTES("AIF2TX1", "AIF2TX1"), + MADERA_MIXER_ROUTES("AIF2TX2", "AIF2TX2"), + MADERA_MIXER_ROUTES("AIF2TX3", "AIF2TX3"), + MADERA_MIXER_ROUTES("AIF2TX4", "AIF2TX4"), + + MADERA_MIXER_ROUTES("AIF3TX1", "AIF3TX1"), + MADERA_MIXER_ROUTES("AIF3TX2", "AIF3TX2"), + + MADERA_MUX_ROUTES("SPD1TX1", "SPDIF1TX1"), + MADERA_MUX_ROUTES("SPD1TX2", "SPDIF1TX2"), + + MADERA_MIXER_ROUTES("EQ1", "EQ1"), + MADERA_MIXER_ROUTES("EQ2", "EQ2"), + MADERA_MIXER_ROUTES("EQ3", "EQ3"), + MADERA_MIXER_ROUTES("EQ4", "EQ4"), + + MADERA_MIXER_ROUTES("DRC1L", "DRC1L"), + MADERA_MIXER_ROUTES("DRC1R", "DRC1R"), + MADERA_MIXER_ROUTES("DRC2L", "DRC2L"), + MADERA_MIXER_ROUTES("DRC2R", "DRC2R"), + + MADERA_MIXER_ROUTES("LHPF1", "LHPF1"), + MADERA_MIXER_ROUTES("LHPF2", "LHPF2"), + MADERA_MIXER_ROUTES("LHPF3", "LHPF3"), + MADERA_MIXER_ROUTES("LHPF4", "LHPF4"), + + MADERA_DSP_ROUTES("DSP1"), + + { "DSP Trigger Out", NULL, "DSP1 Trigger Output" }, + + { "DSP1 Trigger Output", "Switch", "DSP1" }, + + MADERA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"), + MADERA_MUX_ROUTES("ISRC1INT2", "ISRC1INT2"), + MADERA_MUX_ROUTES("ISRC1INT3", "ISRC1INT3"), + MADERA_MUX_ROUTES("ISRC1INT4", "ISRC1INT4"), + + MADERA_MUX_ROUTES("ISRC1DEC1", "ISRC1DEC1"), + MADERA_MUX_ROUTES("ISRC1DEC2", "ISRC1DEC2"), + MADERA_MUX_ROUTES("ISRC1DEC3", "ISRC1DEC3"), + MADERA_MUX_ROUTES("ISRC1DEC4", "ISRC1DEC4"), + + MADERA_MUX_ROUTES("ISRC2INT1", "ISRC2INT1"), + MADERA_MUX_ROUTES("ISRC2INT2", "ISRC2INT2"), + MADERA_MUX_ROUTES("ISRC2INT3", "ISRC2INT3"), + MADERA_MUX_ROUTES("ISRC2INT4", "ISRC2INT4"), + + MADERA_MUX_ROUTES("ISRC2DEC1", "ISRC2DEC1"), + MADERA_MUX_ROUTES("ISRC2DEC2", "ISRC2DEC2"), + MADERA_MUX_ROUTES("ISRC2DEC3", "ISRC2DEC3"), + MADERA_MUX_ROUTES("ISRC2DEC4", "ISRC2DEC4"), + + { "AEC1 Loopback", "HPOUT1L", "OUT1L" }, + { "AEC1 Loopback", "HPOUT1R", "OUT1R" }, + { "AEC2 Loopback", "HPOUT1L", "OUT1L" }, + { "AEC2 Loopback", "HPOUT1R", "OUT1R" }, + { "HPOUT1 Demux", NULL, "OUT1L" }, + { "HPOUT1 Demux", NULL, "OUT1R" }, + { "HPOUTL", "HPOUT", "HPOUT1 Demux" }, + { "HPOUTR", "HPOUT", "HPOUT1 Demux" }, + { "EPOUTP", "EPOUT", "HPOUT1 Demux" }, + { "EPOUTN", "EPOUT", "HPOUT1 Demux" }, + + { "AEC1 Loopback", "SPKOUTL", "OUT4L" }, + { "AEC2 Loopback", "SPKOUTL", "OUT4L" }, + { "SPKOUTN", NULL, "OUT4L" }, + { "SPKOUTP", NULL, "OUT4L" }, + + { "AEC1 Loopback", "SPKDAT1L", "OUT5L" }, + { "AEC1 Loopback", "SPKDAT1R", "OUT5R" }, + { "AEC2 Loopback", "SPKDAT1L", "OUT5L" }, + { "AEC2 Loopback", "SPKDAT1R", "OUT5R" }, + { "SPKDAT1L", NULL, "OUT5L" }, + { "SPKDAT1R", NULL, "OUT5R" }, + + { "SPDIF1", NULL, "SPD1" }, + + { "MICSUPP", NULL, "SYSCLK" }, + + { "DRC1 Signal Activity", NULL, "DRC1 Activity Output" }, + { "DRC2 Signal Activity", NULL, "DRC2 Activity Output" }, + { "DRC1 Activity Output", "Switch", "DRC1L" }, + { "DRC1 Activity Output", "Switch", "DRC1R" }, + { "DRC2 Activity Output", "Switch", "DRC2L" }, + { "DRC2 Activity Output", "Switch", "DRC2R" }, +}; + +static int cs47l15_set_fll(struct snd_soc_component *component, int fll_id, + int source, unsigned int fref, unsigned int fout) +{ + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + + switch (fll_id) { + case MADERA_FLL1_REFCLK: + return madera_set_fll_refclk(&cs47l15->fll[0], source, fref, + fout); + case MADERA_FLLAO_REFCLK: + return madera_set_fll_ao_refclk(&cs47l15->fll[1], source, fref, + fout); + case MADERA_FLL1_SYNCCLK: + return madera_set_fll_syncclk(&cs47l15->fll[0], source, fref, + fout); + default: + return -EINVAL; + } +} + +static struct snd_soc_dai_driver cs47l15_dai[] = { + { + .name = "cs47l15-aif1", + .id = 1, + .base = MADERA_AIF1_BCLK_CTRL, + .playback = { + .stream_name = "AIF1 Playback", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .capture = { + .stream_name = "AIF1 Capture", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .ops = &madera_dai_ops, + .symmetric_rates = 1, + .symmetric_samplebits = 1, + }, + { + .name = "cs47l15-aif2", + .id = 2, + .base = MADERA_AIF2_BCLK_CTRL, + .playback = { + .stream_name = "AIF2 Playback", + .channels_min = 1, + .channels_max = 4, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .capture = { + .stream_name = "AIF2 Capture", + .channels_min = 1, + .channels_max = 4, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .ops = &madera_dai_ops, + .symmetric_rates = 1, + .symmetric_samplebits = 1, + }, + { + .name = "cs47l15-aif3", + .id = 3, + .base = MADERA_AIF3_BCLK_CTRL, + .playback = { + .stream_name = "AIF3 Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .capture = { + .stream_name = "AIF3 Capture", + .channels_min = 1, + .channels_max = 2, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .ops = &madera_dai_ops, + .symmetric_rates = 1, + .symmetric_samplebits = 1, + }, + { + .name = "cs47l15-cpu-trace", + .capture = { + .stream_name = "Audio Trace CPU", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + .compress_new = snd_soc_new_compress, + }, + { + .name = "cs47l15-dsp-trace", + .capture = { + .stream_name = "Audio Trace DSP", + .channels_min = 1, + .channels_max = 6, + .rates = MADERA_RATES, + .formats = MADERA_FORMATS, + }, + }, +}; + +static int cs47l15_open(struct snd_compr_stream *stream) +{ + struct snd_soc_pcm_runtime *rtd = stream->private_data; + struct snd_soc_component *component = + snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera_priv *priv = &cs47l15->core; + struct madera *madera = priv->madera; + int n_adsp; + + if (strcmp(rtd->codec_dai->name, "cs47l15-dsp-trace") == 0) { + n_adsp = 0; + } else { + dev_err(madera->dev, + "No suitable compressed stream for DAI '%s'\n", + rtd->codec_dai->name); + return -EINVAL; + } + + return wm_adsp_compr_open(&priv->adsp[n_adsp], stream); +} + +static irqreturn_t cs47l15_adsp2_irq(int irq, void *data) +{ + struct cs47l15 *cs47l15 = data; + struct madera_priv *priv = &cs47l15->core; + struct madera *madera = priv->madera; + int ret; + + ret = wm_adsp_compr_handle_irq(&priv->adsp[0]); + if (ret == -ENODEV) { + dev_err(madera->dev, "Spurious compressed data IRQ\n"); + return IRQ_NONE; + } + + return IRQ_HANDLED; +} + +static irqreturn_t cs47l15_dsp_bus_error(int irq, void *data) +{ + struct wm_adsp *dsp = (struct wm_adsp *)data; + + return wm_adsp2_bus_error(dsp); +} + +static int cs47l15_component_probe(struct snd_soc_component *component) +{ + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera *madera = cs47l15->core.madera; + int ret; + + snd_soc_component_init_regmap(component, madera->regmap); + + mutex_lock(&madera->dapm_ptr_lock); + madera->dapm = snd_soc_component_get_dapm(component); + mutex_unlock(&madera->dapm_ptr_lock); + + ret = madera_init_inputs(component); + if (ret) + return ret; + + ret = madera_init_outputs(component, CS47L15_MONO_OUTPUTS); + if (ret) + return ret; + + snd_soc_component_disable_pin(component, "HAPTICS"); + + ret = snd_soc_add_component_controls(component, + madera_adsp_rate_controls, + CS47L15_NUM_ADSP); + if (ret) + return ret; + + wm_adsp2_component_probe(&cs47l15->core.adsp[0], component); + + return 0; +} + +static void cs47l15_component_remove(struct snd_soc_component *component) +{ + struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component); + struct madera *madera = cs47l15->core.madera; + + mutex_lock(&madera->dapm_ptr_lock); + madera->dapm = NULL; + mutex_unlock(&madera->dapm_ptr_lock); + + wm_adsp2_component_remove(&cs47l15->core.adsp[0], component); +} + +#define CS47L15_DIG_VU 0x0200 + +static unsigned int cs47l15_digital_vu[] = { + MADERA_DAC_DIGITAL_VOLUME_1L, + MADERA_DAC_DIGITAL_VOLUME_1R, + MADERA_DAC_DIGITAL_VOLUME_4L, + MADERA_DAC_DIGITAL_VOLUME_5L, + MADERA_DAC_DIGITAL_VOLUME_5R, +}; + +static const struct snd_compr_ops cs47l15_compr_ops = { + .open = &cs47l15_open, + .free = &wm_adsp_compr_free, + .set_params = &wm_adsp_compr_set_params, + .get_caps = &wm_adsp_compr_get_caps, + .trigger = &wm_adsp_compr_trigger, + .pointer = &wm_adsp_compr_pointer, + .copy = &wm_adsp_compr_copy, +}; + +static const struct snd_soc_component_driver soc_component_dev_cs47l15 = { + .probe = &cs47l15_component_probe, + .remove = &cs47l15_component_remove, + .set_sysclk = &madera_set_sysclk, + .set_pll = &cs47l15_set_fll, + .name = DRV_NAME, + .compr_ops = &cs47l15_compr_ops, + .controls = cs47l15_snd_controls, + .num_controls = ARRAY_SIZE(cs47l15_snd_controls), + .dapm_widgets = cs47l15_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs47l15_dapm_widgets), + .dapm_routes = cs47l15_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(cs47l15_dapm_routes), + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; + +static int cs47l15_probe(struct platform_device *pdev) +{ + struct madera *madera = dev_get_drvdata(pdev->dev.parent); + struct cs47l15 *cs47l15; + int i, ret; + + BUILD_BUG_ON(ARRAY_SIZE(cs47l15_dai) > MADERA_MAX_DAI); + + /* quick exit if Madera irqchip driver hasn't completed probe */ + if (!madera->irq_dev) { + dev_dbg(&pdev->dev, "irqchip driver not ready\n"); + return -EPROBE_DEFER; + } + + cs47l15 = devm_kzalloc(&pdev->dev, sizeof(struct cs47l15), + GFP_KERNEL); + if (!cs47l15) + return -ENOMEM; + + platform_set_drvdata(pdev, cs47l15); + + cs47l15->core.madera = madera; + cs47l15->core.dev = &pdev->dev; + cs47l15->core.num_inputs = 4; + + ret = madera_core_init(&cs47l15->core); + if (ret) + return ret; + + ret = madera_init_overheat(&cs47l15->core); + if (ret) + goto error_core; + + ret = madera_request_irq(madera, MADERA_IRQ_DSP_IRQ1, + "ADSP2 Compressed IRQ", cs47l15_adsp2_irq, + cs47l15); + if (ret != 0) { + dev_err(&pdev->dev, "Failed to request DSP IRQ: %d\n", ret); + goto error_overheat; + } + + ret = madera_set_irq_wake(madera, MADERA_IRQ_DSP_IRQ1, 1); + if (ret) + dev_warn(&pdev->dev, "Failed to set DSP IRQ wake: %d\n", ret); + + cs47l15->core.adsp[0].part = "cs47l15"; + cs47l15->core.adsp[0].num = 1; + cs47l15->core.adsp[0].type = WMFW_ADSP2; + cs47l15->core.adsp[0].rev = 2; + cs47l15->core.adsp[0].dev = madera->dev; + cs47l15->core.adsp[0].regmap = madera->regmap_32bit; + + cs47l15->core.adsp[0].base = MADERA_DSP1_CONFIG_1; + cs47l15->core.adsp[0].mem = cs47l15_dsp1_regions; + cs47l15->core.adsp[0].num_mems = ARRAY_SIZE(cs47l15_dsp1_regions); + + cs47l15->core.adsp[0].lock_regions = + WM_ADSP2_REGION_1 | WM_ADSP2_REGION_2 | WM_ADSP2_REGION_3; + + ret = wm_adsp2_init(&cs47l15->core.adsp[0]); + if (ret != 0) + goto error_dsp_irq; + + ret = madera_init_bus_error_irq(&cs47l15->core, 0, + cs47l15_dsp_bus_error); + if (ret) + goto error_adsp; + + madera_init_fll(madera, 1, MADERA_FLL1_CONTROL_1 - 1, + &cs47l15->fll[0]); + madera_init_fll(madera, 4, MADERA_FLLAO_CONTROL_1 - 1, + &cs47l15->fll[1]); + + for (i = 0; i < ARRAY_SIZE(cs47l15_dai); i++) + madera_init_dai(&cs47l15->core, i); + + /* Latch volume update bits */ + for (i = 0; i < ARRAY_SIZE(cs47l15_digital_vu); i++) + regmap_update_bits(madera->regmap, cs47l15_digital_vu[i], + CS47L15_DIG_VU, CS47L15_DIG_VU); + + pm_runtime_enable(&pdev->dev); + pm_runtime_idle(&pdev->dev); + + ret = devm_snd_soc_register_component(&pdev->dev, + &soc_component_dev_cs47l15, + cs47l15_dai, + ARRAY_SIZE(cs47l15_dai)); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to register component: %d\n", ret); + goto error_pm_runtime; + } + + return ret; + +error_pm_runtime: + pm_runtime_disable(&pdev->dev); + madera_free_bus_error_irq(&cs47l15->core, 0); +error_adsp: + wm_adsp2_remove(&cs47l15->core.adsp[0]); +error_dsp_irq: + madera_set_irq_wake(madera, MADERA_IRQ_DSP_IRQ1, 0); + madera_free_irq(madera, MADERA_IRQ_DSP_IRQ1, cs47l15); +error_overheat: + madera_free_overheat(&cs47l15->core); +error_core: + madera_core_free(&cs47l15->core); + + return ret; +} + +static int cs47l15_remove(struct platform_device *pdev) +{ + struct cs47l15 *cs47l15 = platform_get_drvdata(pdev); + + pm_runtime_disable(&pdev->dev); + + madera_free_bus_error_irq(&cs47l15->core, 0); + + wm_adsp2_remove(&cs47l15->core.adsp[0]); + + madera_set_irq_wake(cs47l15->core.madera, MADERA_IRQ_DSP_IRQ1, 0); + madera_free_irq(cs47l15->core.madera, MADERA_IRQ_DSP_IRQ1, cs47l15); + madera_free_overheat(&cs47l15->core); + madera_core_free(&cs47l15->core); + + return 0; +} + +static struct platform_driver cs47l15_codec_driver = { + .driver = { + .name = "cs47l15-codec", + }, + .probe = &cs47l15_probe, + .remove = &cs47l15_remove, +}; + +module_platform_driver(cs47l15_codec_driver); + +MODULE_SOFTDEP("pre: madera irq-madera arizona-micsupp"); +MODULE_DESCRIPTION("ASoC CS47L15 driver"); +MODULE_AUTHOR("Richard Fitzgerald <rf(a)opensource.cirrus.com>"); +MODULE_AUTHOR("Jaswinder Jassal <jjassal(a)opensource.cirrus.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:cs47l15-codec"); diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 5f1e32a5a8556..1c00e2a115bcd 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -1041,6 +1041,10 @@ static void madera_configure_input_mode(struct madera *madera) int max_analogue_inputs, max_dmic_sup, i; switch (madera->type) { + case CS47L15: + max_analogue_inputs = 1; + max_dmic_sup = 2; + break; case CS47L35: max_analogue_inputs = 2; max_dmic_sup = 2; -- 2.11.0

1 2

[alsa-devel] [PATCH] ASoC: soc-pcm: Use format size instead physical for sample_bits symmetry
by Peter Ujfalusi 25 Jul '19

25 Jul '19

For DAIs the format size in bits matters when it comes to symmetry. The physical width is the in-memory format size which matters mostly for the platform drivers. If for example a DAI requests symmetric_samplebits and the first stream is using S24_LE then the second stream would not be allowed to use S24_3LE despite both S24_LE and S24_3LE would need the same clocking on the bus. But S32_LE would be allowed (S24_LE and S32_LE is both physically 32 bits in memory) which would not be compatible with S24_LE on the bus. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/soc-pcm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 1406f935af22..c70722dc1f4f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -243,7 +243,7 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream, rate = params_rate(params); channels = params_channels(params); - sample_bits = snd_pcm_format_physical_width(params_format(params)); + sample_bits = snd_pcm_format_width(params_format(params)); /* reject unmatched parameters when applying symmetry */ symmetry = cpu_dai->driver->symmetric_rates || @@ -932,7 +932,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_dai->rate = params_rate(&codec_params); codec_dai->channels = params_channels(&codec_params); - codec_dai->sample_bits = snd_pcm_format_physical_width( + codec_dai->sample_bits = snd_pcm_format_width( params_format(&codec_params)); snd_soc_dapm_update_dai(substream, &codec_params, codec_dai); @@ -945,8 +945,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, /* store the parameters for each DAIs */ cpu_dai->rate = params_rate(params); cpu_dai->channels = params_channels(params); - cpu_dai->sample_bits = - snd_pcm_format_physical_width(params_format(params)); + cpu_dai->sample_bits = snd_pcm_format_width(params_format(params)); snd_soc_dapm_update_dai(substream, params, cpu_dai); -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

1 1

[alsa-devel] [PATCH] ALSA: hda - Add a conexant codec entry to let mute led work
by Hui Wang 25 Jul '19

25 Jul '19

This conexant codec isn't in the supported codec list yet, the hda generic driver can drive this codec well, but on a Lenovo machine with mute/mic-mute leds, we need to apply CXT_FIXUP_THINKPAD_ACPI to make the leds work. After adding this codec to the list, the driver patch_conexant.c will apply THINKPAD_ACPI to this machine. Cc: stable(a)vger.kernel.org Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 4f8d0845ee1e..f299f137eaea 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -1083,6 +1083,7 @@ static int patch_conexant_auto(struct hda_codec *codec) */ static const struct hda_device_id snd_hda_id_conexant[] = { + HDA_CODEC_ENTRY(0x14f11f86, "CX8070", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f15045, "CX20549 (Venice)", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f15047, "CX20551 (Waikiki)", patch_conexant_auto), -- 2.17.1

2 1

[alsa-devel] [PATCH 1/2] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers
by Masahiro Yamada 25 Jul '19

25 Jul '19

UAPI headers licensed under GPL are supposed to have exception "WITH Linux-syscall-note" so that they can be included into non-GPL user space application code. The exception note is missing in some UAPI headers. Some of them slipped in by the treewide conversion commit b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license"). Just run: $ git show --oneline b24413180f56 -- arch/x86/include/uapi/asm/ I believe they are not intentional, and should be fixed too. This patch was generated by the following script: git grep -l --not -e Linux-syscall-note --and -e SPDX-License-Identifier \ -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild | while read file do sed -i -e 's/$GPL-[^[:space:]]*$/\1 WITH Linux-syscall-note/g' $file done After this patch is applied, there are 5 UAPI headers that do not contain "WITH Linux-syscall-note". They are kept untouched since this exception applies only to GPL variants. $ git grep --not -e Linux-syscall-note --and -e SPDX-License-Identifier \ -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild include/uapi/drm/panfrost_drm.h:/* SPDX-License-Identifier: MIT */ include/uapi/linux/batman_adv.h:/* SPDX-License-Identifier: MIT */ include/uapi/linux/qemu_fw_cfg.h:/* SPDX-License-Identifier: BSD-3-Clause */ include/uapi/linux/vbox_err.h:/* SPDX-License-Identifier: MIT */ include/uapi/linux/virtio_iommu.h:/* SPDX-License-Identifier: BSD-3-Clause */ Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm64/include/uapi/asm/bpf_perf_event.h | 2 +- arch/csky/include/uapi/asm/byteorder.h | 2 +- arch/csky/include/uapi/asm/cachectl.h | 2 +- arch/csky/include/uapi/asm/perf_regs.h | 2 +- arch/csky/include/uapi/asm/ptrace.h | 2 +- arch/csky/include/uapi/asm/sigcontext.h | 2 +- arch/csky/include/uapi/asm/unistd.h | 2 +- arch/nds32/include/uapi/asm/auxvec.h | 2 +- arch/nds32/include/uapi/asm/byteorder.h | 2 +- arch/nds32/include/uapi/asm/cachectl.h | 2 +- arch/nds32/include/uapi/asm/fp_udfiex_crtl.h | 2 +- arch/nds32/include/uapi/asm/param.h | 2 +- arch/nds32/include/uapi/asm/ptrace.h | 2 +- arch/nds32/include/uapi/asm/sigcontext.h | 2 +- arch/nds32/include/uapi/asm/unistd.h | 2 +- arch/powerpc/include/uapi/asm/bpf_perf_event.h | 2 +- arch/riscv/include/uapi/asm/auxvec.h | 2 +- arch/riscv/include/uapi/asm/bitsperlong.h | 2 +- arch/riscv/include/uapi/asm/byteorder.h | 2 +- arch/riscv/include/uapi/asm/hwcap.h | 2 +- arch/riscv/include/uapi/asm/ptrace.h | 2 +- arch/riscv/include/uapi/asm/sigcontext.h | 2 +- arch/riscv/include/uapi/asm/ucontext.h | 2 +- arch/s390/include/uapi/asm/bpf_perf_event.h | 2 +- arch/s390/include/uapi/asm/ipl.h | 2 +- arch/sh/include/uapi/asm/setup.h | 2 +- arch/sh/include/uapi/asm/types.h | 2 +- arch/sparc/include/uapi/asm/oradax.h | 2 +- arch/x86/include/uapi/asm/byteorder.h | 2 +- arch/x86/include/uapi/asm/hwcap2.h | 2 +- arch/x86/include/uapi/asm/sigcontext32.h | 2 +- arch/x86/include/uapi/asm/types.h | 2 +- include/uapi/linux/bpfilter.h | 2 +- include/uapi/linux/ipmi_bmc.h | 2 +- include/uapi/linux/isst_if.h | 2 +- include/uapi/linux/netfilter/nf_synproxy.h | 2 +- include/uapi/linux/psp-sev.h | 2 +- include/uapi/linux/rxrpc.h | 2 +- include/uapi/linux/usb/g_uvc.h | 2 +- include/uapi/linux/vbox_vmmdev_types.h | 2 +- include/uapi/linux/vboxguest.h | 2 +- include/uapi/linux/virtio_pmem.h | 2 +- include/uapi/linux/vmcore.h | 2 +- include/uapi/linux/wmi.h | 2 +- include/uapi/misc/fastrpc.h | 2 +- include/uapi/rdma/rvt-abi.h | 2 +- include/uapi/rdma/siw-abi.h | 2 +- include/uapi/scsi/scsi_bsg_ufs.h | 2 +- include/uapi/sound/skl-tplg-interface.h | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/arch/arm64/include/uapi/asm/bpf_perf_event.h b/arch/arm64/include/uapi/asm/bpf_perf_event.h index b551b741653d..5e1e648aeec4 100644 --- a/arch/arm64/include/uapi/asm/bpf_perf_event.h +++ b/arch/arm64/include/uapi/asm/bpf_perf_event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__ #define _UAPI__ASM_BPF_PERF_EVENT_H__ diff --git a/arch/csky/include/uapi/asm/byteorder.h b/arch/csky/include/uapi/asm/byteorder.h index b079ec715cdf..d150cd664873 100644 --- a/arch/csky/include/uapi/asm/byteorder.h +++ b/arch/csky/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #ifndef __ASM_CSKY_BYTEORDER_H diff --git a/arch/csky/include/uapi/asm/cachectl.h b/arch/csky/include/uapi/asm/cachectl.h index ddf2f39aa925..ed7fad1ea20d 100644 --- a/arch/csky/include/uapi/asm/cachectl.h +++ b/arch/csky/include/uapi/asm/cachectl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef __ASM_CSKY_CACHECTL_H #define __ASM_CSKY_CACHECTL_H diff --git a/arch/csky/include/uapi/asm/perf_regs.h b/arch/csky/include/uapi/asm/perf_regs.h index ee323d818592..49d4e147a559 100644 --- a/arch/csky/include/uapi/asm/perf_regs.h +++ b/arch/csky/include/uapi/asm/perf_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. #ifndef _ASM_CSKY_PERF_REGS_H diff --git a/arch/csky/include/uapi/asm/ptrace.h b/arch/csky/include/uapi/asm/ptrace.h index 4e248d5b86ef..66b2268e324e 100644 --- a/arch/csky/include/uapi/asm/ptrace.h +++ b/arch/csky/include/uapi/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #ifndef _CSKY_PTRACE_H diff --git a/arch/csky/include/uapi/asm/sigcontext.h b/arch/csky/include/uapi/asm/sigcontext.h index e81e7ff11e36..670c020f2cb8 100644 --- a/arch/csky/include/uapi/asm/sigcontext.h +++ b/arch/csky/include/uapi/asm/sigcontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #ifndef __ASM_CSKY_SIGCONTEXT_H diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h index ec60e49cea66..211c983c7282 100644 --- a/arch/csky/include/uapi/asm/unistd.h +++ b/arch/csky/include/uapi/asm/unistd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #define __ARCH_WANT_SYS_CLONE diff --git a/arch/nds32/include/uapi/asm/auxvec.h b/arch/nds32/include/uapi/asm/auxvec.h index b5d58ea8decb..bc0b92ab8c15 100644 --- a/arch/nds32/include/uapi/asm/auxvec.h +++ b/arch/nds32/include/uapi/asm/auxvec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __ASM_AUXVEC_H diff --git a/arch/nds32/include/uapi/asm/byteorder.h b/arch/nds32/include/uapi/asm/byteorder.h index 511e653c709d..c264ef12c49c 100644 --- a/arch/nds32/include/uapi/asm/byteorder.h +++ b/arch/nds32/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __NDS32_BYTEORDER_H__ diff --git a/arch/nds32/include/uapi/asm/cachectl.h b/arch/nds32/include/uapi/asm/cachectl.h index 73793662815c..31b9b439d819 100644 --- a/arch/nds32/include/uapi/asm/cachectl.h +++ b/arch/nds32/include/uapi/asm/cachectl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 1994, 1995, 1996 by Ralf Baechle // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef _ASM_CACHECTL diff --git a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h index d54a5d6c6538..f17396db16ec 100644 --- a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h +++ b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (C) 2005-2019 Andes Technology Corporation */ #ifndef _FP_UDF_IEX_CRTL_H #define _FP_UDF_IEX_CRTL_H diff --git a/arch/nds32/include/uapi/asm/param.h b/arch/nds32/include/uapi/asm/param.h index 2977534a6bd3..48d00328d328 100644 --- a/arch/nds32/include/uapi/asm/param.h +++ b/arch/nds32/include/uapi/asm/param.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __ASM_NDS32_PARAM_H diff --git a/arch/nds32/include/uapi/asm/ptrace.h b/arch/nds32/include/uapi/asm/ptrace.h index 1a6e01c00e6f..d76217c7c010 100644 --- a/arch/nds32/include/uapi/asm/ptrace.h +++ b/arch/nds32/include/uapi/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __UAPI_ASM_NDS32_PTRACE_H diff --git a/arch/nds32/include/uapi/asm/sigcontext.h b/arch/nds32/include/uapi/asm/sigcontext.h index dc89af7ddcc3..6c1e6648878f 100644 --- a/arch/nds32/include/uapi/asm/sigcontext.h +++ b/arch/nds32/include/uapi/asm/sigcontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef _ASMNDS32_SIGCONTEXT_H diff --git a/arch/nds32/include/uapi/asm/unistd.h b/arch/nds32/include/uapi/asm/unistd.h index a0b2f7b9c0f2..410795e280fe 100644 --- a/arch/nds32/include/uapi/asm/unistd.h +++ b/arch/nds32/include/uapi/asm/unistd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #define __ARCH_WANT_STAT64 diff --git a/arch/powerpc/include/uapi/asm/bpf_perf_event.h b/arch/powerpc/include/uapi/asm/bpf_perf_event.h index b551b741653d..5e1e648aeec4 100644 --- a/arch/powerpc/include/uapi/asm/bpf_perf_event.h +++ b/arch/powerpc/include/uapi/asm/bpf_perf_event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__ #define _UAPI__ASM_BPF_PERF_EVENT_H__ diff --git a/arch/riscv/include/uapi/asm/auxvec.h b/arch/riscv/include/uapi/asm/auxvec.h index 62716653554b..d86cb17bbabe 100644 --- a/arch/riscv/include/uapi/asm/auxvec.h +++ b/arch/riscv/include/uapi/asm/auxvec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2015 Regents of the University of California diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h index 0b9b58b57ff6..7d0b32e3b701 100644 --- a/arch/riscv/include/uapi/asm/bitsperlong.h +++ b/arch/riscv/include/uapi/asm/bitsperlong.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2015 Regents of the University of California diff --git a/arch/riscv/include/uapi/asm/byteorder.h b/arch/riscv/include/uapi/asm/byteorder.h index 1920debc09c0..f671e16bf6af 100644 --- a/arch/riscv/include/uapi/asm/byteorder.h +++ b/arch/riscv/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2015 Regents of the University of California diff --git a/arch/riscv/include/uapi/asm/hwcap.h b/arch/riscv/include/uapi/asm/hwcap.h index 7d786145183b..4e7646077056 100644 --- a/arch/riscv/include/uapi/asm/hwcap.h +++ b/arch/riscv/include/uapi/asm/hwcap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copied from arch/arm64/include/asm/hwcap.h * diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 92d8f7cd8f84..882547f6bd5c 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 Regents of the University of California */ diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h index 053f809e52ce..84f2dfcfdbce 100644 --- a/arch/riscv/include/uapi/asm/sigcontext.h +++ b/arch/riscv/include/uapi/asm/sigcontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 Regents of the University of California */ diff --git a/arch/riscv/include/uapi/asm/ucontext.h b/arch/riscv/include/uapi/asm/ucontext.h index b58e00cee2ec..411dd7b52ed6 100644 --- a/arch/riscv/include/uapi/asm/ucontext.h +++ b/arch/riscv/include/uapi/asm/ucontext.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Copyright (C) 2012 ARM Ltd. * Copyright (C) 2017 SiFive, Inc. diff --git a/arch/s390/include/uapi/asm/bpf_perf_event.h b/arch/s390/include/uapi/asm/bpf_perf_event.h index cefe7c7cd4f6..3ed42ff6da94 100644 --- a/arch/s390/include/uapi/asm/bpf_perf_event.h +++ b/arch/s390/include/uapi/asm/bpf_perf_event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__ #define _UAPI__ASM_BPF_PERF_EVENT_H__ diff --git a/arch/s390/include/uapi/asm/ipl.h b/arch/s390/include/uapi/asm/ipl.h index fd32b1cd80d2..451ba7d08905 100644 --- a/arch/s390/include/uapi/asm/ipl.h +++ b/arch/s390/include/uapi/asm/ipl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_S390_UAPI_IPL_H #define _ASM_S390_UAPI_IPL_H diff --git a/arch/sh/include/uapi/asm/setup.h b/arch/sh/include/uapi/asm/setup.h index 1170dd2fb998..4bd19f80f9b0 100644 --- a/arch/sh/include/uapi/asm/setup.h +++ b/arch/sh/include/uapi/asm/setup.h @@ -1,2 +1,2 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #include <asm-generic/setup.h> diff --git a/arch/sh/include/uapi/asm/types.h b/arch/sh/include/uapi/asm/types.h index f83795fdc0da..68100e108ea6 100644 --- a/arch/sh/include/uapi/asm/types.h +++ b/arch/sh/include/uapi/asm/types.h @@ -1,2 +1,2 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #include <asm-generic/types.h> diff --git a/arch/sparc/include/uapi/asm/oradax.h b/arch/sparc/include/uapi/asm/oradax.h index 64c67f2ea33f..0dace69058ab 100644 --- a/arch/sparc/include/uapi/asm/oradax.h +++ b/arch/sparc/include/uapi/asm/oradax.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ /* * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. */ diff --git a/arch/x86/include/uapi/asm/byteorder.h b/arch/x86/include/uapi/asm/byteorder.h index 484e3cfd7ef2..149143cab9ff 100644 --- a/arch/x86/include/uapi/asm/byteorder.h +++ b/arch/x86/include/uapi/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_BYTEORDER_H #define _ASM_X86_BYTEORDER_H diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h index 6ebaae90e207..8b2effe6efb8 100644 --- a/arch/x86/include/uapi/asm/hwcap2.h +++ b/arch/x86/include/uapi/asm/hwcap2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_HWCAP2_H #define _ASM_X86_HWCAP2_H diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h index 6b18e88de8a6..7114801d0499 100644 --- a/arch/x86/include/uapi/asm/sigcontext32.h +++ b/arch/x86/include/uapi/asm/sigcontext32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_SIGCONTEXT32_H #define _ASM_X86_SIGCONTEXT32_H diff --git a/arch/x86/include/uapi/asm/types.h b/arch/x86/include/uapi/asm/types.h index df55e1ddb0c9..9d5c11a24279 100644 --- a/arch/x86/include/uapi/asm/types.h +++ b/arch/x86/include/uapi/asm/types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_X86_TYPES_H #define _ASM_X86_TYPES_H diff --git a/include/uapi/linux/bpfilter.h b/include/uapi/linux/bpfilter.h index 2ec3cc99ea4c..cbc1f5813f50 100644 --- a/include/uapi/linux/bpfilter.h +++ b/include/uapi/linux/bpfilter.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_LINUX_BPFILTER_H #define _UAPI_LINUX_BPFILTER_H diff --git a/include/uapi/linux/ipmi_bmc.h b/include/uapi/linux/ipmi_bmc.h index 1670f0944227..782a03eb1086 100644 --- a/include/uapi/linux/ipmi_bmc.h +++ b/include/uapi/linux/ipmi_bmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (c) 2015-2018, Intel Corporation. */ diff --git a/include/uapi/linux/isst_if.h b/include/uapi/linux/isst_if.h index d10b832c58c5..0a52b7b093d3 100644 --- a/include/uapi/linux/isst_if.h +++ b/include/uapi/linux/isst_if.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Intel Speed Select Interface: OS to hardware Interface * Copyright (c) 2019, Intel Corporation. diff --git a/include/uapi/linux/netfilter/nf_synproxy.h b/include/uapi/linux/netfilter/nf_synproxy.h index 6f3791c8946f..00d787f0260e 100644 --- a/include/uapi/linux/netfilter/nf_synproxy.h +++ b/include/uapi/linux/netfilter/nf_synproxy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _NF_SYNPROXY_H #define _NF_SYNPROXY_H diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h index 8654b2442f6a..592a0c1b77c9 100644 --- a/include/uapi/linux/psp-sev.h +++ b/include/uapi/linux/psp-sev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Userspace interface for AMD Secure Encrypted Virtualization (SEV) * platform management commands. diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h index 782069dcf607..4accfa7e266d 100644 --- a/include/uapi/linux/rxrpc.h +++ b/include/uapi/linux/rxrpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ /* Types and definitions for AF_RXRPC. * * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h index 3c9ee3020cbb..652f169a019e 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ /* * g_uvc.h -- USB Video Class Gadget driver API * diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h index 26f39816af14..83c3aa649b08 100644 --- a/include/uapi/linux/vbox_vmmdev_types.h +++ b/include/uapi/linux/vbox_vmmdev_types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note OR CDDL-1.0) */ /* * Virtual Device for Guest <-> VMM/Host communication, type definitions * which are also used for the vboxguest ioctl interface / by vboxsf diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h index 612f0c7d3558..17194495b648 100644 --- a/include/uapi/linux/vboxguest.h +++ b/include/uapi/linux/vboxguest.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note OR CDDL-1.0) */ /* * VBoxGuest - VirtualBox Guest Additions Driver Interface. * diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h index 9a63ed6d062f..c7a82f347e84 100644 --- a/include/uapi/linux/virtio_pmem.h +++ b/include/uapi/linux/virtio_pmem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note OR BSD-3-Clause */ /* * Definitions for virtio-pmem devices. * diff --git a/include/uapi/linux/vmcore.h b/include/uapi/linux/vmcore.h index 022619668e0e..3e9da91866ff 100644 --- a/include/uapi/linux/vmcore.h +++ b/include/uapi/linux/vmcore.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_VMCORE_H #define _UAPI_VMCORE_H diff --git a/include/uapi/linux/wmi.h b/include/uapi/linux/wmi.h index c36f2d7675a4..7085c5dca9fa 100644 --- a/include/uapi/linux/wmi.h +++ b/include/uapi/linux/wmi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * User API methods for ACPI-WMI mapping driver * diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h index 6d701af9fc42..fb792e882cef 100644 --- a/include/uapi/misc/fastrpc.h +++ b/include/uapi/misc/fastrpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef __QCOM_FASTRPC_H__ #define __QCOM_FASTRPC_H__ diff --git a/include/uapi/rdma/rvt-abi.h b/include/uapi/rdma/rvt-abi.h index 7328293c715c..81c89b322f1f 100644 --- a/include/uapi/rdma/rvt-abi.h +++ b/include/uapi/rdma/rvt-abi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note OR BSD-3-Clause) */ /* * This file contains defines, structures, etc. that are used diff --git a/include/uapi/rdma/siw-abi.h b/include/uapi/rdma/siw-abi.h index 3dd8071ace7b..2cc2331cb254 100644 --- a/include/uapi/rdma/siw-abi.h +++ b/include/uapi/rdma/siw-abi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note or BSD-3-Clause */ /* Authors: Bernard Metzler <bmt(a)zurich.ibm.com> */ /* Copyright (c) 2008-2019, IBM Corporation */ diff --git a/include/uapi/scsi/scsi_bsg_ufs.h b/include/uapi/scsi/scsi_bsg_ufs.h index 17c7abd0803a..9988db6ad244 100644 --- a/include/uapi/scsi/scsi_bsg_ufs.h +++ b/include/uapi/scsi/scsi_bsg_ufs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * UFS Transport SGIO v4 BSG Message Support * diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h index f39352cef382..9eee32f5e407 100644 --- a/include/uapi/sound/skl-tplg-interface.h +++ b/include/uapi/sound/skl-tplg-interface.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * skl-tplg-interface.h - Intel DSP FW private data interface * -- 2.17.1

1 2

[alsa-devel] [PATCH 5.1 201/371] ASoC: audio-graph-card: fix use-after-free in graph_for_each_link
by Greg Kroah-Hartman 24 Jul '19

24 Jul '19

[ Upstream commit 1bcc1fd64e4dd903f4d868a9e053986e3b102713 ] After calling of_node_put() on the codec_ep and codec_port variables, they are still being used, which may result in use-after-free. We fix this issue by calling of_node_put() after the last usage. Fixes: fce9b90c1ab7 ("ASoC: audio-graph-card: cleanup DAI link loop method - step2") Signed-off-by: Wen Yang <wen.yang99(a)zte.com.cn> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Link: https://lore.kernel.org/r/1562229530-8121-1-git-send-email-wen.yang99@zte.c… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/generic/audio-graph-card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 69bc4848d787..f730830fb36c 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -460,9 +460,6 @@ static int graph_for_each_link(struct graph_priv *priv, codec_ep = of_graph_get_remote_endpoint(cpu_ep); codec_port = of_get_parent(codec_ep); - of_node_put(codec_ep); - of_node_put(codec_port); - /* get convert-xxx property */ memset(&adata, 0, sizeof(adata)); graph_get_conversion(dev, codec_ep, &adata); @@ -482,6 +479,9 @@ static int graph_for_each_link(struct graph_priv *priv, else ret = func_noml(priv, cpu_ep, codec_ep, li); + of_node_put(codec_ep); + of_node_put(codec_port); + if (ret < 0) return ret; -- 2.20.1

1 0

[alsa-devel] [PATCH 5.2 224/413] ASoC: audio-graph-card: fix use-after-free in graph_for_each_link
by Greg Kroah-Hartman 24 Jul '19

24 Jul '19

[ Upstream commit 1bcc1fd64e4dd903f4d868a9e053986e3b102713 ] After calling of_node_put() on the codec_ep and codec_port variables, they are still being used, which may result in use-after-free. We fix this issue by calling of_node_put() after the last usage. Fixes: fce9b90c1ab7 ("ASoC: audio-graph-card: cleanup DAI link loop method - step2") Signed-off-by: Wen Yang <wen.yang99(a)zte.com.cn> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Link: https://lore.kernel.org/r/1562229530-8121-1-git-send-email-wen.yang99@zte.c… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/generic/audio-graph-card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index ec7e673ba475..70ed28d97d49 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -435,9 +435,6 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, codec_ep = of_graph_get_remote_endpoint(cpu_ep); codec_port = of_get_parent(codec_ep); - of_node_put(codec_ep); - of_node_put(codec_port); - /* get convert-xxx property */ memset(&adata, 0, sizeof(adata)); graph_parse_convert(dev, codec_ep, &adata); @@ -457,6 +454,9 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, else ret = func_noml(priv, cpu_ep, codec_ep, li); + of_node_put(codec_ep); + of_node_put(codec_port); + if (ret < 0) return ret; -- 2.20.1

1 0

[alsa-devel] [PATCH] ASoC: wm8955: Fix a typo in 'wm8995_pll_factors()' function name
by Christophe JAILLET 24 Jul '19

24 Jul '19

This should be 'wm8955_pll_factors()' instead. Fix it and use it. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/codecs/wm8955.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index cd204f79647d..ec82a8fafdf6 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -143,7 +143,7 @@ struct pll_factors { * to allow rounding later */ #define FIXED_FLL_SIZE ((1 << 22) * 10) -static int wm8995_pll_factors(struct device *dev, +static int wm8955_pll_factors(struct device *dev, int Fref, int Fout, struct pll_factors *pll) { u64 Kpart; @@ -282,7 +282,7 @@ static int wm8955_configure_clocking(struct snd_soc_component *component) /* Use the last divider configuration we saw for the * sample rate. */ - ret = wm8995_pll_factors(component->dev, wm8955->mclk_rate, + ret = wm8955_pll_factors(component->dev, wm8955->mclk_rate, clock_cfgs[sr].mclk, &pll); if (ret != 0) { dev_err(component->dev, -- 2.20.1

3 2

[alsa-devel] [PATCH] ASoC: Fail card instantiation if DAI format setup fails
by Ricard Wanderlof 24 Jul '19

24 Jul '19

If the DAI format setup fails, there is no valid communication format between CPU and CODEC, so fail card instantiation, rather than continue with a card that will most likely not function properly. Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- I've had the problem of a sound card coming up even though an incorrect DAI format was selected in the devicetree, apparently caused by not checking the return value of snd_soc_runtime_set_dai_fmt() when the card is instantiated, with the result in this particular case that that the audio data was not transferred correctly (capture data was shifted one bit up). I'm unsure though if this is intentional, I can't think why it should be, since the DAI format is only set up at this time and not for instance later when a stream is enabled, but perhaps I'm missing something here. At any rate, with this patch, the card does not come up under these circumstances. The error message from snd_soc_runtime_set_dai_fmt() is still printed to the kernel log so it's possible to see what the reason is. /Ricard sound/soc/soc-core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7ecfe641ca46..06697b2d96b1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1511,8 +1511,11 @@ static int soc_probe_link_dais(struct snd_soc_card *card, } } - if (dai_link->dai_fmt) - snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); + if (dai_link->dai_fmt) { + ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); + if (ret) + return ret; + } ret = soc_post_component_init(rtd, dai_link->name); if (ret) -- 2.11.0 -- Ricard Wolf Wanderlof ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 1

[alsa-devel] [PATCH] ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips
by Takashi Iwai 24 Jul '19

24 Jul '19

It turned out that the recent Intel HD-audio controller chips show a significant stall during the system PM resume intermittently. It doesn't happen so often and usually it may read back successfully after one or more seconds, but in some rare worst cases the driver went into fallback mode. After trial-and-error, we found out that the communication stall seems covered by issuing the sync after each verb write, as already done for AMD and other chipsets. So this patch enables the write-sync flag for the recent Intel chips, Skylake and onward, as a workaround. Also, since Broxton and co have the very same driver flags as Skylake, refer to the Skylake driver flags instead of defining the same contents again for simplification. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201901 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index cb8b0945547c..1e14d7270adf 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -313,11 +313,10 @@ enum { #define AZX_DCAPS_INTEL_SKYLAKE \ (AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME |\ + AZX_DCAPS_SYNC_WRITE |\ AZX_DCAPS_SEPARATE_STREAM_TAG | AZX_DCAPS_I915_COMPONENT) -#define AZX_DCAPS_INTEL_BROXTON \ - (AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME |\ - AZX_DCAPS_SEPARATE_STREAM_TAG | AZX_DCAPS_I915_COMPONENT) +#define AZX_DCAPS_INTEL_BROXTON AZX_DCAPS_INTEL_SKYLAKE /* quirks for ATI SB / AMD Hudson */ #define AZX_DCAPS_PRESET_ATI_SB \ -- 2.16.4

1 0

[alsa-devel] Reminder: 1 open syzbot bug in sound subsystem
by Eric Biggers 24 Jul '19

24 Jul '19

[This email was generated by a script. Let me know if you have any suggestions to make it better, or if you want it re-generated with the latest status.] Of the currently open syzbot reports against the upstream kernel, I've manually marked 1 of them as possibly being a bug in the sound subsystem. If you believe this bug is no longer valid, please close the syzbot report by sending a '#syz fix', '#syz dup', or '#syz invalid' command in reply to the original thread, as explained at https://goo.gl/tpsmEJ#status If you believe I misattributed this bug to the sound subsystem, please let me know, and if possible forward the report to the correct people or mailing list. Here is the bug: -------------------------------------------------------------------------------- Title: KASAN: use-after-free Read in wake_up_if_idle Last occurred: 131 days ago Reported: 267 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=b1e300cd7b124fc83dd4199d4d1df26310111b… Original thread: https://lkml.kernel.org/lkml/00000000000066ab7105795f245e@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one replied to the original thread for this bug. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+2c1253bc508adef78a7f(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/00000000000066ab7105795f245e@google.com

2 2

[alsa-devel] [PATCH 0/2 v2] Open Alsa dshare without channel binding
by Adam Miartus 24 Jul '19

24 Jul '19

The general idea of this patch is to be able to open the device without defined bindings. As a result, it allows starting the audio clock of underlying device without blocking a channel. This might be useful for creating a dummy dsnoop pcm for hardware that requires running clock early at system start. This clock is then present even without application streaming audio data. Patch n.1 is intended to check for null pointer of pcm callbacks, it is not intended to alter any current functionality, properly defined plugins should not suffer from this change Patch n.2 is not intended to alter any current functionality, only extend it V2 of the patch, changes from V1: - instead of creating new "pcm_unsupported.c" with ops and fast_ops callbacks returning -ENOSYS, callback == NULL is checked directly in core implementation and error is returned when pcm has no callback defined Adam Miartus (2): alsa: pcm: return -ENOSYS when ops or fast_ops callback is NULL alsa: dshare: allow missing bindings src/pcm/pcm.c | 134 +++++++++++++++++++++++++++++++++++++++++---------- src/pcm/pcm_dshare.c | 29 ++++++----- src/pcm/pcm_local.h | 20 ++++++++ src/pcm/pcm_mmap.c | 15 ++++-- src/pcm/pcm_params.c | 10 +++- 5 files changed, 166 insertions(+), 42 deletions(-) -- 2.7.4

2 3

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Use dev_get_drvdata where possible
by Chuhong Yuan 24 Jul '19

24 Jul '19

Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/soc/intel/skylake/skl-nhlt.c | 3 +-- sound/soc/intel/skylake/skl.c | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index 1132109cb992..46d9977224d1 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -241,8 +241,7 @@ int skl_nhlt_update_topology_bin(struct skl *skl) static ssize_t skl_nhlt_platform_id_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct pci_dev *pci = to_pci_dev(dev); - struct hdac_bus *bus = pci_get_drvdata(pci); + struct hdac_bus *bus = dev_get_drvdata(dev); struct skl *skl = bus_to_skl(bus); struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt; char platform_id[32]; diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 3362e71b4563..1f625fc65307 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -141,8 +141,7 @@ static int skl_init_chip(struct hdac_bus *bus, bool full_reset) void skl_update_d0i3c(struct device *dev, bool enable) { - struct pci_dev *pci = to_pci_dev(dev); - struct hdac_bus *bus = pci_get_drvdata(pci); + struct hdac_bus *bus = dev_get_drvdata(dev); u8 reg; int timeout = 50; @@ -274,8 +273,7 @@ static int skl_acquire_irq(struct hdac_bus *bus, int do_disconnect) static int skl_suspend_late(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); - struct hdac_bus *bus = pci_get_drvdata(pci); + struct hdac_bus *bus = dev_get_drvdata(dev); struct skl *skl = bus_to_skl(bus); return skl_suspend_late_dsp(skl); @@ -400,8 +398,7 @@ static int skl_resume(struct device *dev) #ifdef CONFIG_PM static int skl_runtime_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); - struct hdac_bus *bus = pci_get_drvdata(pci); + struct hdac_bus *bus = dev_get_drvdata(dev); dev_dbg(bus->dev, "in %s\n", __func__); @@ -410,8 +407,7 @@ static int skl_runtime_suspend(struct device *dev) static int skl_runtime_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); - struct hdac_bus *bus = pci_get_drvdata(pci); + struct hdac_bus *bus = dev_get_drvdata(dev); dev_dbg(bus->dev, "in %s\n", __func__); -- 2.20.1

1 0

[alsa-devel] [PATCH] sound: line6: sizeof (byte) is always 1, use that fact.
by Pavel Machek 24 Jul '19

24 Jul '19

sizeof (byte) is always 1, use that fact and make interesting code explicit. Signed-off-by: Pavel Machek <pavel(a)denx.de> diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index ab2ec89..387c5c2 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -342,7 +342,7 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data, if (address > 0xffff || datalen > 0xff) return -EINVAL; - len = kmalloc(sizeof(*len), GFP_KERNEL); + len = kmalloc(1, GFP_KERNEL); if (!len) return -ENOMEM; @@ -418,7 +421,7 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data, if (address > 0xffff || datalen > 0xffff) return -EINVAL; - status = kmalloc(sizeof(*status), GFP_KERNEL); + status = kmalloc(1, GFP_KERNEL); if (!status) return -ENOMEM; -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2 1

[alsa-devel] [PATCH] ALSA: core: Fix possible null-pointer dereferences in snd_timer_proc_read()
by Jia-Ju Bai 24 Jul '19

24 Jul '19

In snd_timer_proc_read(), there is an if statement on line 1204 to check whether timer->card is NULL: if (timer->card && timer->card->shutdown) When timer->card is NULL, it is used on lines 1212 and 1215: timer->card->number Thus, possible null-pointer dereferences may occur. To fix these bugs, timer->card is checked before being used. These bugs are found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai <baijiaju1990(a)gmail.com> --- sound/core/timer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/core/timer.c b/sound/core/timer.c index 5c9fbf3f4340..967d06a3cdec 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1208,11 +1208,13 @@ static void snd_timer_proc_read(struct snd_info_entry *entry, snd_iprintf(buffer, "G%i: ", timer->tmr_device); break; case SNDRV_TIMER_CLASS_CARD: - snd_iprintf(buffer, "C%i-%i: ", - timer->card->number, timer->tmr_device); + snd_iprintf(buffer, "C%i-%i: ", + timer->card ? timer->card->number : -1, + timer->tmr_device); break; case SNDRV_TIMER_CLASS_PCM: - snd_iprintf(buffer, "P%i-%i-%i: ", timer->card->number, + snd_iprintf(buffer, "P%i-%i-%i: ", + timer->card ? timer->card->number : -1, timer->tmr_device, timer->tmr_subdevice); break; default: -- 2.17.0

2 1

[alsa-devel] [PATCH 00/16] ASoC: add soc-dai.c
by Kuninori Morimoto 23 Jul '19

23 Jul '19

Hi Mark I want to cleanup ALSA SoC. It will do nothing from "technical" point of view, but, will makes code readable. I already have many cleanup patches in my local branch. This is first patch-set for it. Kuninori Morimoto (16): ASoC: add soc-dai.c ASoC: soc-dai: mv soc_dai_hw_params() to soc-dai ASoC: soc-dai: add snd_soc_dai_hw_free() ASoC: soc-dai: add snd_soc_dai_startup() ASoC: soc-dai: add snd_soc_dai_shutdown() ASoC: soc-dai: add snd_soc_dai_prepare() ASoC: soc-dai: add snd_soc_dai_trigger() ASoC: soc-dai: add snd_soc_dai_bespoke_trigger() ASoC: soc-dai: add snd_soc_dai_delay() ASoC: soc-dai: add snd_soc_dai_suspend() ASoC: soc-dai: add snd_soc_dai_resume() ASoC: soc-dai: add snd_soc_dai_probe() ASoC: soc-dai: add snd_soc_dai_remove() ASoC: soc-dai: add snd_soc_dai_compress_new() ASoC: soc-dai: move snd_soc_dai_stream_valid() to soc-dai.c ASoC: soc-core: use existing snd_soc_dai_digital_mute() include/sound/soc-dai.h | 25 +++ include/sound/soc.h | 4 - sound/soc/Makefile | 2 +- sound/soc/soc-compress.c | 9 +- sound/soc/soc-core.c | 316 ++++-------------------------------- sound/soc/soc-dai.c | 407 +++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/soc-dapm.c | 46 ++---- sound/soc/soc-pcm.c | 200 +++++++---------------- 8 files changed, 548 insertions(+), 461 deletions(-) create mode 100644 sound/soc/soc-dai.c -- 2.7.4

2 33

[alsa-devel] [PATCH 0/5] ASoC: Intel: IPC framework updates
by Cezary Rojewski 23 Jul '19

23 Jul '19

Existing IPC framework omits crucial part of the entire communication: reply header. Some IPCs cannot function at all without the access to said header. Update the sst-ipc with new sst_ipc_message structure to represent both request and reply allowing reply-processing handlers to save received responses. Despite the range of changes required for model to be updated, no functional changes are made for core hanswell, baytrail and skylake message handlers. Reply-processing handlers now save received response header yet no usage is added by default. To allow for future changes, righful kings of IPC kingdom need to be put back on the throne. This update addresses one of them: LARGE_CONFIG_GET. Cezary Rojewski (5): ASoC: Intel: Update request-reply IPC model ASoC: Intel: Haswell: Align with updated request-reply model ASoC: Intel: Baytrail: Align with updated request-reply model ASoC: Intel: Skylake: Align with updated request-reply model ASoC: Intel: Skylake: large_config_get overhaul sound/soc/intel/baytrail/sst-baytrail-ipc.c | 65 ++++---- sound/soc/intel/common/sst-ipc.c | 68 ++++---- sound/soc/intel/common/sst-ipc.h | 27 ++-- sound/soc/intel/haswell/sst-haswell-ipc.c | 164 +++++++++++--------- sound/soc/intel/skylake/cnl-sst.c | 6 +- sound/soc/intel/skylake/skl-messages.c | 3 +- sound/soc/intel/skylake/skl-sst-ipc.c | 152 ++++++++++-------- sound/soc/intel/skylake/skl-sst-ipc.h | 3 +- 8 files changed, 259 insertions(+), 229 deletions(-) -- 2.17.1

3 12

[alsa-devel] [PATCH 00/21] ASoC: SOF: updates for 5.4
by Pierre-Louis Bossart 23 Jul '19

23 Jul '19

Core updates for runtime-pm, loader extensions for i.MX support, increased timeouts for QEMU tests and state machine fixes to make PulseAudio happy. I included in the same set Intel HDaudio patches, mostly about code refactoring, jack detection and robustness improvements for IPC/DMA handling. If Mark/Takashi prefer separate patchsets for core and Intel stuff I can split the two. This is a rather large set mostly due to Summer vacations and a peak of product validation earlier in Q2, I expect more frequent/smaller updates moving forward. We also have quite a few SoundWire-related patches but they aren't strictly related to SOF. Comments and feedback welcome! Daniel Baluta (3): ASoC: SOF: Introduce snd_sof_dsp_get_bar_index ops ASoC: SOF: loader: Use the BAR provided by FW ASoC: SOF: loader: Don't ignore SRAM block types Fred Oh (1): ASoC: SOF: remove unused state variable in suspend function Guennadi Liakhovetski (1): ASoC: SOF: Intel: hda: add a parameter to disable MSI Janusz Jankowski (1): ASoC: SOF: Intel: ssp: BCLK delay parameter Kai Vehmanen (6): ASoC: SOF: reset DMA state in prepare ASoC: SOF: use common code to send PCM_FREE IPC ASoC: SOF: ipc: use timeout configured at probe ASoC: SOF: core: increase default IPC timeouts ASoC: SOF: Intel: hda: reset link DMA state in prepare ASoC: SOF: Intel: hda: remove misleading error trace from IRQ thread Keyon Jie (1): ASoC: SOF: Intel: hda: correct ROM state mask Pan Xiuli (1): ASoC: SOF: pci: mark last_busy value at runtime PM init Rander Wang (4): ASoC: SOF: Intel: hda: reduce ifdef usage for hda ASoC: SOF: Intel: hda: Enable jack detection ASoC: SOF: Intel: hda: fix link DMA config ASoC: SOF: Intel: hda: fix stream id setting Zhu Yingjiang (3): ASoC: SOF: Intel: hda: set position buffer in init chip ASoC: SOF: Intel: hda: use SOF defined init chip in resume ASoC: SOF: Intel: hda: remove duplicated clear WAKESTS include/sound/sof/dai-intel.h | 3 + include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 1 + sound/soc/sof/core.c | 4 +- sound/soc/sof/intel/cnl.c | 4 +- sound/soc/sof/intel/hda-codec.c | 44 +++++++++++++- sound/soc/sof/intel/hda-ctrl.c | 21 ++++--- sound/soc/sof/intel/hda-dai.c | 38 +++++++----- sound/soc/sof/intel/hda-dsp.c | 100 +++++++++++--------------------- sound/soc/sof/intel/hda-ipc.c | 4 +- sound/soc/sof/intel/hda.c | 28 +++++---- sound/soc/sof/intel/hda.h | 9 +-- sound/soc/sof/ipc.c | 8 +-- sound/soc/sof/loader.c | 14 ++++- sound/soc/sof/ops.h | 28 +++++++-- sound/soc/sof/pcm.c | 63 ++++++++++---------- sound/soc/sof/pm.c | 6 +- sound/soc/sof/sof-pci-dev.c | 3 + sound/soc/sof/sof-priv.h | 12 ++-- sound/soc/sof/topology.c | 3 + 20 files changed, 229 insertions(+), 166 deletions(-) -- 2.20.1

2 45

[alsa-devel] [PATCH v2] ASoC: Intel: Skylake: Recover BXT FW on DSP boot timeout error
by Pawel Harlozinski 23 Jul '19

23 Jul '19

When DSP boots with timeout error try to reload firmware to keep best user expeirience. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek(a)intel.com> Signed-off-by: Pawel Harlozinski <pawel.harlozinski(a)linux.intel.com> --- sound/soc/intel/skylake/bxt-sst.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 440bca7afbf1..dd0260557530 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -455,13 +455,19 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id) /* If core 1 was turned on for booting core 0, turn it off */ skl_dsp_core_power_down(ctx, SKL_DSP_CORE_MASK(1)); if (ret == 0) { - dev_err(ctx->dev, "%s: DSP boot timeout\n", __func__); - dev_err(ctx->dev, "Error code=0x%x: FW status=0x%x\n", + dev_warn(ctx->dev, + "DSP boot timeout: Error code=0x%x: FW status=0x%x\n", sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE), sst_dsp_shim_read(ctx, BXT_ADSP_FW_STATUS)); - dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); - ret = -EIO; - goto err; + dev_warn(ctx->dev,"Reloading FW\n"); + + ret = bxt_sst_init_fw(skl->dev, skl); + if (ret < 0) { + dev_err(ctx->dev, "Reload fw failed: %d\n", ret); + dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); + ret = -EIO; + goto err; + } } } @@ -486,7 +492,6 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id) if (core_id == SKL_DSP_CORE0_ID) core_mask |= SKL_DSP_CORE_MASK(1); skl_dsp_disable_core(ctx, core_mask); - return ret; } -- 2.17.1

2 1

[alsa-devel] [PATCH v2] ASoC: madera: Read device tree configuration
by Charles Keepax 23 Jul '19

23 Jul '19

Read the configuration of the Madera ASoC driver from device tree. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Changes since v1: - Returned to using a helping in the madera driver itself, discussions around adding a generic helper indicated that all the error reporting would still need to be contained in the driver which constitutes the vast majority of the code in the helper anyway. - Updated the code to use the new device_property_count_u32 helper. Thanks, Charles sound/soc/codecs/madera.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 1b1be19a2f991..5f1e32a5a8556 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -300,6 +300,100 @@ int madera_free_overheat(struct madera_priv *priv) } EXPORT_SYMBOL_GPL(madera_free_overheat); +static int madera_get_variable_u32_array(struct device *dev, + const char *propname, + u32 *dest, int n_max, + int multiple) +{ + int n, ret; + + n = device_property_count_u32(dev, propname); + if (n < 0) { + if (n == -EINVAL) + return 0; /* missing, ignore */ + + dev_warn(dev, "%s malformed (%d)\n", propname, n); + + return n; + } else if ((n % multiple) != 0) { + dev_warn(dev, "%s not a multiple of %d entries\n", + propname, multiple); + + return -EINVAL; + } + + if (n > n_max) + n = n_max; + + ret = device_property_read_u32_array(dev, propname, dest, n); + if (ret < 0) + return ret; + + return n; +} + +static void madera_prop_get_inmode(struct madera_priv *priv) +{ + struct madera *madera = priv->madera; + struct madera_codec_pdata *pdata = &madera->pdata.codec; + u32 tmp[MADERA_MAX_INPUT * MADERA_MAX_MUXED_CHANNELS]; + int n, i, in_idx, ch_idx; + + BUILD_BUG_ON(ARRAY_SIZE(pdata->inmode) != MADERA_MAX_INPUT); + BUILD_BUG_ON(ARRAY_SIZE(pdata->inmode[0]) != MADERA_MAX_MUXED_CHANNELS); + + n = madera_get_variable_u32_array(madera->dev, "cirrus,inmode", + tmp, ARRAY_SIZE(tmp), + MADERA_MAX_MUXED_CHANNELS); + if (n < 0) + return; + + in_idx = 0; + ch_idx = 0; + for (i = 0; i < n; ++i) { + pdata->inmode[in_idx][ch_idx] = tmp[i]; + + if (++ch_idx == MADERA_MAX_MUXED_CHANNELS) { + ch_idx = 0; + ++in_idx; + } + } +} + +static void madera_prop_get_pdata(struct madera_priv *priv) +{ + struct madera *madera = priv->madera; + struct madera_codec_pdata *pdata = &madera->pdata.codec; + u32 out_mono[ARRAY_SIZE(pdata->out_mono)]; + int i, n; + + madera_prop_get_inmode(priv); + + n = madera_get_variable_u32_array(madera->dev, "cirrus,out-mono", + out_mono, ARRAY_SIZE(out_mono), 1); + if (n > 0) + for (i = 0; i < n; ++i) + pdata->out_mono[i] = !!out_mono[i]; + + madera_get_variable_u32_array(madera->dev, + "cirrus,max-channels-clocked", + pdata->max_channels_clocked, + ARRAY_SIZE(pdata->max_channels_clocked), + 1); + + madera_get_variable_u32_array(madera->dev, "cirrus,pdm-fmt", + pdata->pdm_fmt, + ARRAY_SIZE(pdata->pdm_fmt), 1); + + madera_get_variable_u32_array(madera->dev, "cirrus,pdm-mute", + pdata->pdm_mute, + ARRAY_SIZE(pdata->pdm_mute), 1); + + madera_get_variable_u32_array(madera->dev, "cirrus,dmic-ref", + pdata->dmic_ref, + ARRAY_SIZE(pdata->dmic_ref), 1); +} + int madera_core_init(struct madera_priv *priv) { int i; @@ -308,6 +402,9 @@ int madera_core_init(struct madera_priv *priv) BUILD_BUG_ON(!madera_mixer_texts[MADERA_NUM_MIXER_INPUTS - 1]); BUILD_BUG_ON(!madera_mixer_values[MADERA_NUM_MIXER_INPUTS - 1]); + if (!dev_get_platdata(priv->madera->dev)) + madera_prop_get_pdata(priv); + mutex_init(&priv->rate_lock); for (i = 0; i < MADERA_MAX_HP_OUTPUT; i++) -- 2.11.0

3 7

[alsa-devel] [PATCH 0/2] wm8904: adapt driver for use with audio-graph-card
by Michał Mirosław 23 Jul '19

23 Jul '19

This series allows to use WM8904 codec as audio-graph-card component. It is a rewrite of an earlier approach from https://patchwork.kernel.org/patch/10738097/ Series based on tiwai/sound/for-next tree. You can also pull from: https://rere.qmqm.pl/git/linux branch: wm8904 Example DTS: / { sound { compatible = "audio-graph-card"; widgets = "Speaker", "Loudspeaker", "Headphone", "Headphone Jack", "Microphone", "Internal Mic", routing = "Headphone Jack", "HPOUTL", "Headphone Jack", "HPOUTR", "Amplifier", "LINEOUTL", "Amplifier", "LINEOUTR", "Loudspeaker", "Amplifier", "IN1L", "MICBIAS", "IN1L", "Internal Mic"; dais = <&ssc0_port>; }; }; &i2c1 { status = "okay"; wm8904: acodec@1a { compatible = "wlf,wm8904"; reg = <0x1a>; clocks = <&rtc_32k>; clock-names = "mclk"; interrupts-extended = <&pioA PIN_PB3 IRQ_TYPE_LEVEL_HIGH>; #sound-dai-cells = <0>; codec_port: port { codec_ep: endpoint { remote-endpoint = <&ssc0_ep>; dai-format = "left_j"; bitclock-master; frame-master; mclk-fs = <256>; }; }; }; }; &ssc0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ssc0_default>; status = "okay"; atmel,shared-fs-pin; #sound-dai-cells = <0>; ssc0_port: port { ssc0_ep: endpoint { remote-endpoint = <&codec_ep>; }; }; }; Michał Mirosław (2): ASoC: wm8904: rework FLL handling ASoC: wm8904: automatically choose clock source .../devicetree/bindings/sound/wm8904.txt | 4 + sound/soc/atmel/atmel_wm8904.c | 11 +- sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wm8904.c | 494 ++++++------------ sound/soc/codecs/wm8904.h | 5 - sound/soc/codecs/wm_fll.c | 339 ++++++++++++ sound/soc/codecs/wm_fll.h | 26 + 8 files changed, 531 insertions(+), 354 deletions(-) create mode 100644 sound/soc/codecs/wm_fll.c create mode 100644 sound/soc/codecs/wm_fll.h -- 2.20.1

3 7

[alsa-devel] [PATCH] ALSA: isa: gus: Fix a possible null-pointer dereference in snd_gf1_mem_xfree()
by Jia-Ju Bai 23 Jul '19

23 Jul '19

In snd_gf1_mem_xfree(), there is an if statement on line 72 and line 74 to check whether block->next is NULL: if (block->next) When block->next is NULL, block->next is used on line 84: block->next->prev = block->prev; Thus, a possible null-pointer dereference may occur in this case. To fix this possible bug, block->next is checked before using it. This bug is found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai <baijiaju1990(a)gmail.com> --- sound/isa/gus/gus_mem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index cb02d18dde60..ed6205b88057 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -81,7 +81,8 @@ int snd_gf1_mem_xfree(struct snd_gf1_mem * alloc, struct snd_gf1_mem_block * blo if (block->prev) block->prev->next = NULL; } else { - block->next->prev = block->prev; + if (block->next) + block->next->prev = block->prev; if (block->prev) block->prev->next = block->next; } -- 2.17.0

2 2

[alsa-devel] [PATCH] ALSA: ac97: Fix double free of ac97_codec_device
by Ding Xiang 23 Jul '19

23 Jul '19

put_device will call ac97_codec_release to free ac97_codec_device and other resources, so remove the kfree and other redundant code. Signed-off-by: Ding Xiang <dingxiang(a)cmss.chinamobile.com> --- sound/ac97/bus.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c index 7b977b7..7985dd8 100644 --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -122,17 +122,12 @@ static int ac97_codec_add(struct ac97_controller *ac97_ctrl, int idx, vendor_id); ret = device_add(&codec->dev); - if (ret) - goto err_free_codec; + if (ret) { + put_device(&codec->dev); + return ret; + } return 0; -err_free_codec: - of_node_put(codec->dev.of_node); - put_device(&codec->dev); - kfree(codec); - ac97_ctrl->codecs[idx] = NULL; - - return ret; } unsigned int snd_ac97_bus_scan_one(struct ac97_controller *adrv, -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: qcom: apq8016_sbc: Fix oops with multiple DAI links
by Stephan Gerhold 23 Jul '19

23 Jul '19

apq8016_sbc_parse_of() sets up multiple DAI links, depending on the number of nodes in the device tree. However, at the moment CPU and platform components are only allocated for the first link. This causes an oops when more than one link is defined: Internal error: Oops: 96000044 [#1] SMP CPU: 0 PID: 1015 Comm: kworker/0:2 Not tainted 5.3.0-rc1 #4 Call trace: apq8016_sbc_platform_probe+0x1a8/0x3f0 platform_drv_probe+0x50/0xa0 ... Move the allocation inside the loop to ensure that each link is properly initialized. Fixes: 98b232ca9e0e ("ASoC: qcom: apq8016_sbc: use modern dai_link style") Signed-off-by: Stephan Gerhold <stephan(a)gerhold.net> --- sound/soc/qcom/apq8016_sbc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index f60a71990f66..ac75838bbfab 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -150,17 +150,17 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) link = data->dai_link; - dlc = devm_kzalloc(dev, 2 * sizeof(*dlc), GFP_KERNEL); - if (!dlc) - return ERR_PTR(-ENOMEM); + for_each_child_of_node(node, np) { + dlc = devm_kzalloc(dev, 2 * sizeof(*dlc), GFP_KERNEL); + if (!dlc) + return ERR_PTR(-ENOMEM); - link->cpus = &dlc[0]; - link->platforms = &dlc[1]; + link->cpus = &dlc[0]; + link->platforms = &dlc[1]; - link->num_cpus = 1; - link->num_platforms = 1; + link->num_cpus = 1; + link->num_platforms = 1; - for_each_child_of_node(node, np) { cpu = of_get_child_by_name(np, "cpu"); codec = of_get_child_by_name(np, "codec"); -- 2.22.0

3 2

[alsa-devel] [PATCH] ASoC: pcm3168a: Fix a typo in the name of a constant
by Christophe JAILLET 23 Jul '19

23 Jul '19

There is a typo in PCM1368A_MAX_SYSCLK, it should be PCM3168A_MAX_SYSCLK (1 and 3 switched in 3168) Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/codecs/pcm3168a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index ed0b4317c9ae..844602710eee 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -263,7 +263,7 @@ static unsigned int pcm3168a_scki_ratios[] = { #define PCM3168A_NUM_SCKI_RATIOS_DAC ARRAY_SIZE(pcm3168a_scki_ratios) #define PCM3168A_NUM_SCKI_RATIOS_ADC (ARRAY_SIZE(pcm3168a_scki_ratios) - 2) -#define PCM1368A_MAX_SYSCLK 36864000 +#define PCM3168A_MAX_SYSCLK 36864000 static int pcm3168a_reset(struct pcm3168a_priv *pcm3168a) { @@ -296,7 +296,7 @@ static int pcm3168a_set_dai_sysclk(struct snd_soc_dai *dai, struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(dai->component); int ret; - if (freq > PCM1368A_MAX_SYSCLK) + if (freq > PCM3168A_MAX_SYSCLK) return -EINVAL; ret = clk_set_rate(pcm3168a->scki, freq); -- 2.20.1

2 1

[alsa-devel] [PATCH V4 0/2] recover the channel swap after xrun
by shengjiu.wang＠nxp.com 23 Jul '19

23 Jul '19

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> recover the channel swap after xrun Shengjiu Wang (2): ASoC: fsl_esai: Wrap some operations to be functions ASoC: fsl_esai: recover the channel swap after xrun sound/soc/fsl/fsl_esai.c | 266 ++++++++++++++++++++++++++++----------- 1 file changed, 193 insertions(+), 73 deletions(-) Changes in v4 -add more comments and remove read saisr Changes in V3 - update code sytle. Changes in v2 - add one patch for wrap operations to functions. - fix some coding style issue -- 2.21.0

3 5

[alsa-devel] [PATCH] ASoC: rt5665: Fix a typo in the name of a function
by Christophe JAILLET 23 Jul '19

23 Jul '19

All function names start with rt5665_, except 'rt5655_set_verf()'. It is likely a typo. Fix it to be consistent. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/codecs/rt5665.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index f2ad3a4c3b7f..897e53d4c40a 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -2569,7 +2569,7 @@ static int set_dmic_power(struct snd_soc_dapm_widget *w, return 0; } -static int rt5655_set_verf(struct snd_soc_dapm_widget *w, +static int rt5665_set_verf(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); @@ -2689,11 +2689,11 @@ static const struct snd_soc_dapm_widget rt5665_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("Mic Det Power", RT5665_PWR_VOL, RT5665_PWR_MIC_DET_BIT, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("Vref1", RT5665_PWR_ANLG_1, RT5665_PWR_VREF1_BIT, 0, - rt5655_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), + rt5665_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), SND_SOC_DAPM_SUPPLY("Vref2", RT5665_PWR_ANLG_1, RT5665_PWR_VREF2_BIT, 0, - rt5655_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), + rt5665_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), SND_SOC_DAPM_SUPPLY("Vref3", RT5665_PWR_ANLG_1, RT5665_PWR_VREF3_BIT, 0, - rt5655_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), + rt5665_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU), /* ASRC */ SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5665_ASRC_1, -- 2.20.1

2 1

[alsa-devel] [PATCH v2] ASoC: rt1308: Convert headers to SPDX
by shumingf＠realtek.com 23 Jul '19

23 Jul '19

From: Shuming Fan <shumingf(a)realtek.com> Convert include and source files to SPDX. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1308.c | 17 +++++++---------- sound/soc/codecs/rt1308.h | 6 ++---- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c index cf3d72f99705..6f2ee6809dbb 100644 --- a/sound/soc/codecs/rt1308.c +++ b/sound/soc/codecs/rt1308.c @@ -1,13 +1,10 @@ -/* - * rt1308.c -- RT1308 ALSA SoC amplifier component driver - * - * Copyright 2019 Realtek Semiconductor Corp. - * Author: Derek Fang <derek.fang(a)realtek.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. - */ +// SPDX-License-Identifier: GPL-2.0 +// +// rt1308.c -- RT1308 ALSA SoC amplifier component driver +// +// Copyright 2019 Realtek Semiconductor Corp. +// Author: Derek Fang <derek.fang(a)realtek.com> +// #include <linux/module.h> #include <linux/moduleparam.h> diff --git a/sound/soc/codecs/rt1308.h b/sound/soc/codecs/rt1308.h index c330aae1d527..ff7c423e879e 100644 --- a/sound/soc/codecs/rt1308.h +++ b/sound/soc/codecs/rt1308.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* - * RT1308.h -- RT1308 ALSA SoC amplifier component driver + * rt1308.h -- RT1308 ALSA SoC amplifier component driver * * Copyright 2019 Realtek Semiconductor Corp. * Author: Derek Fang <derek.fang(a)realtek.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. */ #ifndef _RT1308_H_ -- 2.22.0

2 1

[alsa-devel] [PATCH v2 1/4] ALSA: compress: Fix regression on compressed capture streams
by Charles Keepax 23 Jul '19

23 Jul '19

A previous fix to the stop handling on compressed capture streams causes some knock on issues. The previous fix updated snd_compr_drain_notify to set the state back to PREPARED for capture streams. This causes some issues however as the handling for snd_compr_poll differs between the two states and some user-space applications were relying on the poll failing after the stream had been stopped. To correct this regression whilst still fixing the original problem the patch was addressing, update the capture handling to skip the PREPARED state rather than skipping the SETUP state as it has done until now. Fixes: 4f2ab5e1d13d ("ALSA: compress: Fix stop handling on compressed capture streams") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- No changes since v1. Thanks, Charles include/sound/compress_driver.h | 5 +---- sound/core/compress_offload.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index c5188ff724d12..bc88d6f964da9 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -173,10 +173,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - if (stream->direction == SND_COMPRESS_PLAYBACK) - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - else - stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + stream->runtime->state = SNDRV_PCM_STATE_SETUP; wake_up(&stream->runtime->sleep); } diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 99b8821587053..d79aee6b9edd2 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -574,10 +574,7 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) stream->metadata_set = false; stream->next_track = false; - if (stream->direction == SND_COMPRESS_PLAYBACK) - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - else - stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + stream->runtime->state = SNDRV_PCM_STATE_SETUP; } else { return -EPERM; } @@ -693,8 +690,17 @@ static int snd_compr_start(struct snd_compr_stream *stream) { int retval; - if (stream->runtime->state != SNDRV_PCM_STATE_PREPARED) + switch (stream->runtime->state) { + case SNDRV_PCM_STATE_SETUP: + if (stream->direction != SND_COMPRESS_CAPTURE) + return -EPERM; + break; + case SNDRV_PCM_STATE_PREPARED: + break; + default: return -EPERM; + } + retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_START); if (!retval) stream->runtime->state = SNDRV_PCM_STATE_RUNNING; -- 2.11.0

3 8

[alsa-devel] [PATCH] ASoC: dapm: fix a memory leak bug
by Wenwen Wang 23 Jul '19

23 Jul '19

From: Wenwen Wang <wenwen(a)cs.uga.edu> In snd_soc_dapm_new_control_unlocked(), a kernel buffer is allocated in dapm_cnew_widget() to hold the new dapm widget. Then, different actions are taken according to the id of the widget, i.e., 'w->id'. If any failure occurs during this process, snd_soc_dapm_new_control_unlocked() should be terminated by going to the 'request_failed' label. However, the allocated kernel buffer is not freed on this code path, leading to a memory leak bug. To fix the above issue, free the buffer before returning from snd_soc_dapm_new_control_unlocked() through the 'request_failed' label. Signed-off-by: Wenwen Wang <wenwen(a)cs.uga.edu> --- sound/soc/soc-dapm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f013b24..23b9b25 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3706,6 +3706,8 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", w->name, ret); + kfree_const(w->sname); + kfree(w); return ERR_PTR(ret); } -- 2.7.4

2 1

[alsa-devel] [PATCH 0/6] ASoC: Add support to WCD9340/WCD9341 codec
by Srinivas Kandagatla 23 Jul '19

23 Jul '19

This patchset adds support to Qualcomm WCD9340/WCD9341 Codec which is a standalone Hi-Fi audio codec IC. This codec supports both I2S/I2C and SLIMbus audio interfaces. On slimbus interface it supports two data lanes; 16 Tx ports and 8 Rx ports. It has Five DACs and seven dedicated interpolators, Multibutton headset control (MBHC), Active noise cancellation, Sidetone paths, MAD (mic activity detection) and codec processing engine. It supports Class-H differential earpiece out and stereo single ended headphones out. This codec also has integrated SoundWire controller. Patchset for this is already sent for review at https://lwn.net/Articles/790651/ This patchset has been tested on SDM845 based DragonBoard DB845c with WSA881x smart speaker amplifiers via soundwire and 4 DMICs. Thanks, srini Srinivas Kandagatla (6): ASoC: dt-bindings: add dt bindings for WCD9340/WCD9341 audio codec ASoC: wcd934x: add support to wcd9340/wcd9341 codec ASoC: wcd934x: add basic controls ASoC: wcd934x: add playback dapm widgets ASoC: wcd934x: add capture dapm widgets ASoC: wcd934x: add audio routings .../bindings/sound/qcom,wcd934x.txt | 188 + sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wcd934x.c | 5979 +++++++++++++++++ sound/soc/codecs/wcd934x.h | 426 ++ 5 files changed, 6605 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd934x.txt create mode 100644 sound/soc/codecs/wcd934x.c create mode 100644 sound/soc/codecs/wcd934x.h -- 2.21.0

3 16

[alsa-devel] [PATCH] ASoC: intel: Add Broadwell rt5650 machine driver
by Jon Flatley 23 Jul '19

23 Jul '19

From: Ben Zhang <benzh(a)chromium.org> Add machine driver for Broadwell + rt5650. Signed-off-by: Jon Flatley <jflat(a)chromium.org> Signed-off-by: Ben Zhang <benzh(a)chromium.org> --- sound/soc/intel/boards/Kconfig | 11 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bdw-rt5650.c | 305 ++++++++++++++++++ .../common/soc-acpi-intel-hsw-bdw-match.c | 5 + 4 files changed, 323 insertions(+) create mode 100644 sound/soc/intel/boards/bdw-rt5650.c diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 50bf149818b5..c111ae177b4a 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -31,6 +31,17 @@ endif ## SND_SOC_INTEL_HASWELL if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +config SND_SOC_INTEL_BDW_RT5650_MACH + tristate "Broadwell with RT5650 codec" + depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && DW_DMAC + select SND_COMPRESS_OFFLOAD + select SND_SOC_RT5645 + help + This adds the ASoC machine driver for Intel Broadwell platforms with + the RT5650 codec. + Say Y if you have such a device + If unsure select "N". + config SND_SOC_INTEL_BDW_RT5677_MACH tristate "Broadwell with RT5677 codec" depends on I2C diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index 6445f90ea542..b5e2619607be 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -2,6 +2,7 @@ snd-soc-sst-haswell-objs := haswell.o snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o +snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o snd-soc-sst-broadwell-objs := broadwell.o snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o @@ -36,6 +37,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_ obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o +obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c new file mode 100644 index 000000000000..cb875eeab055 --- /dev/null +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -0,0 +1,305 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ASoC machine driver for Intel Broadwell platforms with RT5650 codec + * + * Copyright 2019, The Chromium OS Authors. All rights reserved. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/gpio/consumer.h> +#include <linux/delay.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include <sound/jack.h> + +#include "../common/sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h" + +#include "../../codecs/rt5645.h" + +struct bdw_rt5650_priv { + struct gpio_desc *gpio_hp_en; + struct snd_soc_component *component; +}; + +static const struct snd_soc_dapm_widget bdw_rt5650_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("DMIC Pair1", NULL), + SND_SOC_DAPM_MIC("DMIC Pair2", NULL), +}; + +static const struct snd_soc_dapm_route bdw_rt5650_map[] = { + /* Speakers */ + {"Speaker", NULL, "SPOL"}, + {"Speaker", NULL, "SPOR"}, + + /* Headset jack connectors */ + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, + + /* Digital MICs + * DMIC Pair1 are the two DMICs connected on the DMICN1 connector. + * DMIC Pair2 are the two DMICs connected on the DMICN2 connector. + * Facing the camera, DMIC Pair1 are on the left side, DMIC Pair2 + * are on the right side. + */ + {"DMIC L1", NULL, "DMIC Pair1"}, + {"DMIC R1", NULL, "DMIC Pair1"}, + {"DMIC L2", NULL, "DMIC Pair2"}, + {"DMIC R2", NULL, "DMIC Pair2"}, + + /* CODEC BE connections */ + {"SSP0 CODEC IN", NULL, "AIF1 Capture"}, + {"AIF1 Playback", NULL, "SSP0 CODEC OUT"}, +}; + +static const struct snd_kcontrol_new bdw_rt5650_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("DMIC Pair1"), + SOC_DAPM_PIN_SWITCH("DMIC Pair2"), +}; + + +static struct snd_soc_jack headphone_jack; +static struct snd_soc_jack mic_jack; + +static struct snd_soc_jack_pin headphone_jack_pin = { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, +}; + +static struct snd_soc_jack_pin mic_jack_pin = { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, +}; + +static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The ADSP will covert the FE rate to 48k, max 4-channels */ + rate->min = rate->max = 48000; + channels->min = 2; + channels->max = 4; + + /* set SSP0 to 24 bit */ + snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT - + SNDRV_PCM_HW_PARAM_FIRST_MASK], + SNDRV_PCM_FORMAT_S24_LE); + return 0; +} + +static int bdw_rt5650_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Workaround: set codec PLL to 19.2MHz that PLL source is + * from MCLK(24MHz) to conform 2.4MHz DMIC clock. + */ + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_MCLK, + 24000000, 19200000); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); + return ret; + } + + /* The actual MCLK freq is 24MHz. The codec is told that MCLK is + * 24.576MHz to satisfy the requirement of rl6231_get_clk_info. + * ASRC is enabled on AD and DA filters to ensure good audio quality. + */ + ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1, 24576000, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec sysclk configuration\n"); + return ret; + } + + return ret; +} + +static struct snd_soc_ops bdw_rt5650_ops = { + .hw_params = bdw_rt5650_hw_params, +}; + +static int bdw_rt5650_rtd_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *component = + snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct sst_pdata *pdata = dev_get_platdata(component->dev); + struct sst_hsw *broadwell = pdata->dsp; + int ret; + + /* Set ADSP SSP port settings + * clock_divider = 4 means BCLK = MCLK/5 = 24MHz/5 = 4.8MHz + */ + ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0, + SST_HSW_DEVICE_MCLK_FREQ_24_MHZ, + SST_HSW_DEVICE_TDM_CLOCK_MASTER, 4); + if (ret < 0) { + dev_err(rtd->dev, "error: failed to set device config\n"); + return ret; + } + + return 0; +} + +static int bdw_rt5650_init(struct snd_soc_pcm_runtime *rtd) +{ + struct bdw_rt5650_priv *bdw_rt5650 = + snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *component = rtd->codec_dai->component; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. + * The ASRC clock source is clk_i2s1_asrc. + */ + rt5645_sel_asrc_clk_src(component, + RT5645_DA_STEREO_FILTER | + RT5645_DA_MONO_L_FILTER | + RT5645_DA_MONO_R_FILTER | + RT5645_AD_STEREO_FILTER | + RT5645_AD_MONO_L_FILTER | + RT5645_AD_MONO_R_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + + /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0xF, 4, 24); + + if (ret < 0) { + dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret); + return ret; + } + + /* Create and initialize headphone jack */ + if (snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &headphone_jack, + &headphone_jack_pin, 1)) { + dev_err(component->dev, "Can't create headphone jack\n"); + } + + /* Create and initialize mic jack */ + if (snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE, + &mic_jack, &mic_jack_pin, 1)) { + dev_err(component->dev, "Can't create mic jack\n"); + } + + rt5645_set_jack_detect(component, &headphone_jack, &mic_jack, NULL); + + bdw_rt5650->component = component; + + return 0; +} + +/* broadwell digital audio interface glue - connects codec <--> CPU */ +SND_SOC_DAILINK_DEF(dummy, DAILINK_COMP_ARRAY(COMP_DUMMY())); +SND_SOC_DAILINK_DEF(fe, DAILINK_COMP_ARRAY(COMP_CPU("System Pin"))); +SND_SOC_DAILINK_DEF(platform, + DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio"))); +SND_SOC_DAILINK_DEF(be, + DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1"))); + +static struct snd_soc_dai_link bdw_rt5650_dais[] = { + /* Front End DAI links */ + { + .name = "System PCM", + .stream_name = "System Playback", + .dynamic = 1, + .init = bdw_rt5650_rtd_init, + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(fe, dummy, platform), + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "Codec", + .id = 0, + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = broadwell_ssp0_fixup, + .ops = &bdw_rt5650_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + .init = bdw_rt5650_init, + SND_SOC_DAILINK_REG(dummy, be, dummy) + }, +}; + +/* ASoC machine driver for Broadwell DSP + RT5650 */ +static struct snd_soc_card bdw_rt5650_card = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + .dai_link = bdw_rt5650_dais, + .num_links = ARRAY_SIZE(bdw_rt5650_dais), + .dapm_widgets = bdw_rt5650_widgets, + .num_dapm_widgets = ARRAY_SIZE(bdw_rt5650_widgets), + .dapm_routes = bdw_rt5650_map, + .num_dapm_routes = ARRAY_SIZE(bdw_rt5650_map), + .controls = bdw_rt5650_controls, + .num_controls = ARRAY_SIZE(bdw_rt5650_controls), + .fully_routed = true, +}; + +static int bdw_rt5650_probe(struct platform_device *pdev) +{ + struct bdw_rt5650_priv *bdw_rt5650; + + bdw_rt5650_card.dev = &pdev->dev; + + /* Allocate driver private struct */ + bdw_rt5650 = devm_kzalloc(&pdev->dev, sizeof(struct bdw_rt5650_priv), + GFP_KERNEL); + if (!bdw_rt5650) + return -ENOMEM; + snd_soc_card_set_drvdata(&bdw_rt5650_card, bdw_rt5650); + + return snd_soc_register_card(&bdw_rt5650_card); +} + +static int bdw_rt5650_remove(struct platform_device *pdev) +{ + snd_soc_unregister_card(&bdw_rt5650_card); + return 0; +} + +static struct platform_driver bdw_rt5650_audio = { + .probe = bdw_rt5650_probe, + .remove = bdw_rt5650_remove, + .driver = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + }, +}; + +module_platform_driver(bdw_rt5650_audio) + +/* Module information */ +MODULE_AUTHOR("Ben Zhang <benzh(a)chromium.org>"); +MODULE_DESCRIPTION("Intel Broadwell RT5650 machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:bdw-rt5650"); diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c index d27853e7a369..ba3d25658436 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c @@ -29,6 +29,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = { .sof_fw_filename = "sof-bdw.ri", .sof_tplg_filename = "sof-bdw-rt286.tplg", }, + { + .id = "10EC5650", + .drv_name = "bdw-rt5650", + .fw_filename = "intel/IntcSST2.bin", + }, { .id = "RT5677CE", .drv_name = "bdw-rt5677", -- 2.22.0.657.g960e92d24f-goog

2 3

[alsa-devel] [PATCH] ASoC: rt5677: remove superfluous set
by Curtis Malainey 22 Jul '19

22 Jul '19

We define this variable with the same value, no need to set it twice Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- sound/soc/codecs/rt5677.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index c779dc3474f9e..deaed5132dc95 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -5098,7 +5098,6 @@ static irqreturn_t rt5677_irq(int unused, void *data) goto exit; } - irq_fired = false; for (i = 0; i < RT5677_IRQ_NUM; i++) { if (reg_irq & rt5677_irq_descs[i].status_mask) { irq_fired = true; -- 2.22.0.410.gd8fdbe21b5-goog

3 3

[alsa-devel] [PATCH] ASoC: SOF: use __u32 instead of uint32_t in uapi headers
by Masahiro Yamada 22 Jul '19

22 Jul '19

When CONFIG_UAPI_HEADER_TEST=y, exported headers are compile-tested to make sure they can be included from user-space. Currently, header.h and fw.h are excluded from the test coverage. To make them join the compile-test, we need to fix the build errors attached below. For a case like this, we decided to use __u{8,16,32,64} variable types in this discussion: https://lkml.org/lkml/2019/6/5/18 Build log: CC usr/include/sound/sof/header.h.s CC usr/include/sound/sof/fw.h.s In file included from <command-line>:32:0: ./usr/include/sound/sof/header.h:19:2: error: unknown type name ‘uint32_t’ uint32_t magic; /**< 'S', 'O', 'F', '\0' */ ^~~~~~~~ ./usr/include/sound/sof/header.h:20:2: error: unknown type name ‘uint32_t’ uint32_t type; /**< component specific type */ ^~~~~~~~ ./usr/include/sound/sof/header.h:21:2: error: unknown type name ‘uint32_t’ uint32_t size; /**< size in bytes of data excl. this struct */ ^~~~~~~~ ./usr/include/sound/sof/header.h:22:2: error: unknown type name ‘uint32_t’ uint32_t abi; /**< SOF ABI version */ ^~~~~~~~ ./usr/include/sound/sof/header.h:23:2: error: unknown type name ‘uint32_t’ uint32_t reserved[4]; /**< reserved for future use */ ^~~~~~~~ ./usr/include/sound/sof/header.h:24:2: error: unknown type name ‘uint32_t’ uint32_t data[0]; /**< Component data - opaque to core */ ^~~~~~~~ In file included from <command-line>:32:0: ./usr/include/sound/sof/fw.h:49:2: error: unknown type name ‘uint32_t’ uint32_t size; /* bytes minus this header */ ^~~~~~~~ ./usr/include/sound/sof/fw.h:50:2: error: unknown type name ‘uint32_t’ uint32_t offset; /* offset from base */ ^~~~~~~~ ./usr/include/sound/sof/fw.h:64:2: error: unknown type name ‘uint32_t’ uint32_t size; /* bytes minus this header */ ^~~~~~~~ ./usr/include/sound/sof/fw.h:65:2: error: unknown type name ‘uint32_t’ uint32_t num_blocks; /* number of blocks */ ^~~~~~~~ ./usr/include/sound/sof/fw.h:73:2: error: unknown type name ‘uint32_t’ uint32_t file_size; /* size of file minus this header */ ^~~~~~~~ ./usr/include/sound/sof/fw.h:74:2: error: unknown type name ‘uint32_t’ uint32_t num_modules; /* number of modules */ ^~~~~~~~ ./usr/include/sound/sof/fw.h:75:2: error: unknown type name ‘uint32_t’ uint32_t abi; /* version of header format */ ^~~~~~~~ Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- include/uapi/sound/sof/fw.h | 16 +++++++++------- include/uapi/sound/sof/header.h | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/include/uapi/sound/sof/fw.h b/include/uapi/sound/sof/fw.h index 1afca973eb09..e9f697467a86 100644 --- a/include/uapi/sound/sof/fw.h +++ b/include/uapi/sound/sof/fw.h @@ -13,6 +13,8 @@ #ifndef __INCLUDE_UAPI_SOF_FW_H__ #define __INCLUDE_UAPI_SOF_FW_H__ +#include <linux/types.h> + #define SND_SOF_FW_SIG_SIZE 4 #define SND_SOF_FW_ABI 1 #define SND_SOF_FW_SIG "Reef" @@ -46,8 +48,8 @@ enum snd_sof_fw_blk_type { struct snd_sof_blk_hdr { enum snd_sof_fw_blk_type type; - uint32_t size; /* bytes minus this header */ - uint32_t offset; /* offset from base */ + __u32 size; /* bytes minus this header */ + __u32 offset; /* offset from base */ } __packed; /* @@ -61,8 +63,8 @@ enum snd_sof_fw_mod_type { struct snd_sof_mod_hdr { enum snd_sof_fw_mod_type type; - uint32_t size; /* bytes minus this header */ - uint32_t num_blocks; /* number of blocks */ + __u32 size; /* bytes minus this header */ + __u32 num_blocks; /* number of blocks */ } __packed; /* @@ -70,9 +72,9 @@ struct snd_sof_mod_hdr { */ struct snd_sof_fw_header { unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */ - uint32_t file_size; /* size of file minus this header */ - uint32_t num_modules; /* number of modules */ - uint32_t abi; /* version of header format */ + __u32 file_size; /* size of file minus this header */ + __u32 num_modules; /* number of modules */ + __u32 abi; /* version of header format */ } __packed; #endif diff --git a/include/uapi/sound/sof/header.h b/include/uapi/sound/sof/header.h index 7868990b0d6f..5f4518e7a972 100644 --- a/include/uapi/sound/sof/header.h +++ b/include/uapi/sound/sof/header.h @@ -9,6 +9,8 @@ #ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__ #define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__ +#include <linux/types.h> + /* * Header for all non IPC ABI data. * @@ -16,12 +18,12 @@ * Used by any bespoke component data structures or binary blobs. */ struct sof_abi_hdr { - uint32_t magic; /**< 'S', 'O', 'F', '\0' */ - uint32_t type; /**< component specific type */ - uint32_t size; /**< size in bytes of data excl. this struct */ - uint32_t abi; /**< SOF ABI version */ - uint32_t reserved[4]; /**< reserved for future use */ - uint32_t data[0]; /**< Component data - opaque to core */ + __u32 magic; /**< 'S', 'O', 'F', '\0' */ + __u32 type; /**< component specific type */ + __u32 size; /**< size in bytes of data excl. this struct */ + __u32 abi; /**< SOF ABI version */ + __u32 reserved[4]; /**< reserved for future use */ + __u32 data[0]; /**< Component data - opaque to core */ } __packed; #endif -- 2.17.1

5 10

[alsa-devel] [PATCH 00/20] ALSA: firewire-lib: use packet descriptor to represent sequence of packet
by Takashi Sakamoto 22 Jul '19

22 Jul '19

Hi, This patchset is for Linux kernel v5.4. In current implementation of ALSA IEC 61883-1/6 packet streaming engine, one callback of isochronous context consists three steps to process an isochronous packet: Callback of isochronous context - For each of packets 1.parse context header and decide the amount of PCM frames 2.process data blocks (in each unit driver) 3.queue packet The result of step 1 affects the rest, thus the above steps can be changed for below process: Callback of isochronous context 1.parse context header and decide the amount of PCM frames - For each of packets 2.process data blocks (in each unit driver) - For each of packets 3.queue packet - For each of packets Especially it's convenient to decide the amount of PCM frames multiplexed into each packet as batch calculation before processing payloads of these packets. Additionally it allows each unit driver to process data blocks for these packet by one call. This patchset uses list of 'struct pkt_desc' as an intermediate representation of packet parameters between these three steps. Here, I note my future plan for ALSA firewire stack for your motivation to review this patchset: * v5.4 * Handle several IT/IR context in one callback of IT context. This idea will introduce AMDTP domain structure with relationship of IRQ master/slave between the IT/IR contexts. * As a result, both of playback/capture PCM substreams run on the same hardware interrupt. Thus the drivers just support batch PCM operation and irq-based programming model[1]. * v5.5 * Some (p.s. not all) supported devices don't follow packet sequences transferred by the drivers. They require clock recovery in driver side to reduce playback noise. Enhance the AMDTP domain structure to have clock recovery target and fill list of 'struct pkt_desc' according to the result of clock recovery. My work for libhinoko[2] allows me to sniff actual packet transmission between devices and drivers in Windows/Mac OS for long period (e.g. 1 hour). Then I can classify some cases and some devices for the requirement of clock recovery. (I note that no specification describes this mechanism as long as I know. In the specification, clock recovery is one-way from transmitter to receivers, thus recovered clock is not necessarily used for transmission from the receiver to the transmitter.) [1] https://git.alsa-project.org/?p=alsa-utils.git;a=blob;f=axfer/axfer-transfe… [2] https://github.com/takaswie/libhinoko Takashi Sakamoto (20): ALSA: firewire-lib: obsolete ctx_data.tx.first_dbc with CIP_UNALIGHED_DBC flag ALSA: firewire-lib: pass data block count as an argument to tracepoints event ALSA: firewire-lib: pass data block counter to data block processing layer ALSA: firewire-lib: operate data block counter in top level of processing for IT context ALSA: firewire-lib: operate data block counter in top level of processing for IR context ALSA: firewire-lib: add syt_override member for some protocols ALSA: firewire-lib: pass no syt information to data block processing layer ALSA: firewire-lib: add list of packet descriptor ALSA: firewire-lib: use packet descriptor for IT context ALSA: firewire-lib: use packet descriptor for IR context ALSA: firewire-lib: code refactoring to process PCM substream ALSA: firewire-lib: code refactoring to process context payloads ALSA: firewire-lib: pass packet descriptor to data block processing layer ALSA: firewire-lib: code refactoring for AM824 data block processing layer ALSA: firewire-digi00x: code refactoring for DOT data block processing layer ALSA: firewire-tascam: code refactoring for TASCAM data block processing layer ALSA: firewire-motu: code refactoring for MOTU data block processing layer ALSA: fireface: code refactoring for FF data block processing layer ALSA: firewire-lib: process payload of isoc context according to packet descriptors ALSA: firewire-motu: more code refactoring for MOTU data block processing layer sound/firewire/amdtp-am824.c | 134 ++++++---- sound/firewire/amdtp-stream-trace.h | 6 +- sound/firewire/amdtp-stream.c | 264 ++++++++++++-------- sound/firewire/amdtp-stream.h | 27 +- sound/firewire/digi00x/amdtp-dot.c | 112 +++++---- sound/firewire/fireface/amdtp-ff.c | 105 ++++---- sound/firewire/fireworks/fireworks_stream.c | 2 +- sound/firewire/motu/amdtp-motu.c | 155 ++++++++---- sound/firewire/tascam/amdtp-tascam.c | 115 +++++---- 9 files changed, 570 insertions(+), 350 deletions(-) -- 2.20.1

2 21

[alsa-devel] [PATCH 0/3] i.MX8M support for FSL SAI
by Lucas Stach 22 Jul '19

22 Jul '19

Hi all, those are the changes that are absolutely needed to support the i.MX8M SAI block. The most noticable difference is the moved register layout, due to the hardware guys adding two version registers at the start of the register map and considerable bigger FIFO sizes. Downstream has a lot more changes to support new features, but those 3 patches at least allows me to play back audio on i.MX8M based systems. Regards, Lucas Lucas Stach (3): ASoC: fsl_sai: add of_match data ASoC: fsl_sai: derive TX FIFO watermark from FIFO depth ASoC: fsl_sai: add i.MX8M support .../devicetree/bindings/sound/fsl-sai.txt | 2 +- sound/soc/fsl/fsl_sai.c | 45 +++++++++++++++---- sound/soc/fsl/fsl_sai.h | 8 +++- 3 files changed, 44 insertions(+), 11 deletions(-) -- 2.20.1

5 19

[alsa-devel] [PATCH] ASoC: cs42xx8: Fix MFREQ selection issue for async mode
by shengjiu.wang＠nxp.com 22 Jul '19

22 Jul '19

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> When sample rate of TX is different with sample rate of RX in async mode, the MFreq selection will be wrong. For example, sysclk = 24.576MHz, TX rate = 96000Hz, RX rate = 48000Hz. Then ratio of TX = 256, ratio of RX = 512, For MFreq is shared by TX and RX instance, the correct value of MFreq is 2 for both TX and RX. But original method will cause MFreq = 0 for TX, MFreq = 2 for RX. If TX is started after RX, RX will be impacted, RX work abnormal with MFreq = 0. This patch is to select proper MFreq value according to TX rate and RX rate. Fixes: 0c516b4ff85c ("ASoC: cs42xx8: Add codec driver support for CS42448/CS42888") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/codecs/cs42xx8.c | 116 +++++++++++++++++++++++++++++++------ 1 file changed, 97 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index b377cddaf2e6..804969495754 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -47,6 +47,7 @@ struct cs42xx8_priv { unsigned long sysclk; u32 tx_channels; struct gpio_desc *gpiod_reset; + u32 rate[2]; }; /* -127.5dB to 0dB with step of 0.5dB */ @@ -176,21 +177,27 @@ static const struct snd_soc_dapm_route cs42xx8_adc3_dapm_routes[] = { }; struct cs42xx8_ratios { - unsigned int ratio; - unsigned char speed; - unsigned char mclk; + unsigned int mfreq; + unsigned int min_mclk; + unsigned int max_mclk; + unsigned int ratio[3]; }; +/* + * According to reference mannual, define the cs42xx8_ratio struct + * MFreq2 | MFreq1 | MFreq0 | Description | SSM | DSM | QSM | + * 0 | 0 | 0 |1.029MHz to 12.8MHz | 256 | 128 | 64 | + * 0 | 0 | 1 |1.536MHz to 19.2MHz | 384 | 192 | 96 | + * 0 | 1 | 0 |2.048MHz to 25.6MHz | 512 | 256 | 128 | + * 0 | 1 | 1 |3.072MHz to 38.4MHz | 768 | 384 | 192 | + * 1 | x | x |4.096MHz to 51.2MHz |1024 | 512 | 256 | + */ static const struct cs42xx8_ratios cs42xx8_ratios[] = { - { 64, CS42XX8_FM_QUAD, CS42XX8_FUNCMOD_MFREQ_256(4) }, - { 96, CS42XX8_FM_QUAD, CS42XX8_FUNCMOD_MFREQ_384(4) }, - { 128, CS42XX8_FM_QUAD, CS42XX8_FUNCMOD_MFREQ_512(4) }, - { 192, CS42XX8_FM_QUAD, CS42XX8_FUNCMOD_MFREQ_768(4) }, - { 256, CS42XX8_FM_SINGLE, CS42XX8_FUNCMOD_MFREQ_256(1) }, - { 384, CS42XX8_FM_SINGLE, CS42XX8_FUNCMOD_MFREQ_384(1) }, - { 512, CS42XX8_FM_SINGLE, CS42XX8_FUNCMOD_MFREQ_512(1) }, - { 768, CS42XX8_FM_SINGLE, CS42XX8_FUNCMOD_MFREQ_768(1) }, - { 1024, CS42XX8_FM_SINGLE, CS42XX8_FUNCMOD_MFREQ_1024(1) } + { 0, 1029000, 12800000, {256, 128, 64} }, + { 2, 1536000, 19200000, {384, 192, 96} }, + { 4, 2048000, 25600000, {512, 256, 128} }, + { 6, 3072000, 38400000, {768, 384, 192} }, + { 8, 4096000, 51200000, {1024, 512, 256} }, }; static int cs42xx8_set_dai_sysclk(struct snd_soc_dai *codec_dai, @@ -257,14 +264,68 @@ static int cs42xx8_hw_params(struct snd_pcm_substream *substream, struct snd_soc_component *component = dai->component; struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; - u32 ratio = cs42xx8->sysclk / params_rate(params); - u32 i, fm, val, mask; + u32 ratio[2]; + u32 rate[2]; + u32 fm[2]; + u32 i, val, mask; + bool condition1, condition2; if (tx) cs42xx8->tx_channels = params_channels(params); + rate[tx] = params_rate(params); + rate[!tx] = cs42xx8->rate[!tx]; + + ratio[tx] = rate[tx] > 0 ? cs42xx8->sysclk / rate[tx] : 0; + ratio[!tx] = rate[!tx] > 0 ? cs42xx8->sysclk / rate[!tx] : 0; + + /* Get functional mode for tx and rx according to rate */ + for (i = 0; i < 2; i++) { + if (cs42xx8->slave_mode) { + fm[i] = CS42XX8_FM_AUTO; + } else { + if (rate[i] < 50000) { + fm[i] = CS42XX8_FM_SINGLE; + } else if (rate[i] > 50000 && rate[i] < 100000) { + fm[i] = CS42XX8_FM_DOUBLE; + } else if (rate[i] > 100000 && rate[i] < 200000) { + fm[i] = CS42XX8_FM_QUAD; + } else { + dev_err(component->dev, + "unsupported sample rate\n"); + return -EINVAL; + } + } + } + for (i = 0; i < ARRAY_SIZE(cs42xx8_ratios); i++) { - if (cs42xx8_ratios[i].ratio == ratio) + /* Is the ratio[tx] valid ? */ + condition1 = ((fm[tx] == CS42XX8_FM_AUTO) ? + (cs42xx8_ratios[i].ratio[0] == ratio[tx] || + cs42xx8_ratios[i].ratio[1] == ratio[tx] || + cs42xx8_ratios[i].ratio[2] == ratio[tx]) : + (cs42xx8_ratios[i].ratio[fm[tx]] == ratio[tx])) && + cs42xx8->sysclk >= cs42xx8_ratios[i].min_mclk && + cs42xx8->sysclk <= cs42xx8_ratios[i].max_mclk; + + if (!ratio[tx]) + condition1 = true; + + /* Is the ratio[!tx] valid ? */ + condition2 = ((fm[!tx] == CS42XX8_FM_AUTO) ? + (cs42xx8_ratios[i].ratio[0] == ratio[!tx] || + cs42xx8_ratios[i].ratio[1] == ratio[!tx] || + cs42xx8_ratios[i].ratio[2] == ratio[!tx]) : + (cs42xx8_ratios[i].ratio[fm[!tx]] == ratio[!tx])); + + if (!ratio[!tx]) + condition2 = true; + + /* + * Both ratio[tx] and ratio[!tx] is valid, then we get + * a proper MFreq. + */ + if (condition1 && condition2) break; } @@ -273,15 +334,31 @@ static int cs42xx8_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - mask = CS42XX8_FUNCMOD_MFREQ_MASK; - val = cs42xx8_ratios[i].mclk; + cs42xx8->rate[tx] = params_rate(params); - fm = cs42xx8->slave_mode ? CS42XX8_FM_AUTO : cs42xx8_ratios[i].speed; + mask = CS42XX8_FUNCMOD_MFREQ_MASK; + val = cs42xx8_ratios[i].mfreq; regmap_update_bits(cs42xx8->regmap, CS42XX8_FUNCMOD, CS42XX8_FUNCMOD_xC_FM_MASK(tx) | mask, - CS42XX8_FUNCMOD_xC_FM(tx, fm) | val); + CS42XX8_FUNCMOD_xC_FM(tx, fm[tx]) | val); + + return 0; +} + +static int cs42xx8_hw_free(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component); + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + /* Clear stored rate */ + cs42xx8->rate[tx] = 0; + + regmap_update_bits(cs42xx8->regmap, CS42XX8_FUNCMOD, + CS42XX8_FUNCMOD_xC_FM_MASK(tx), + CS42XX8_FUNCMOD_xC_FM(tx, CS42XX8_FM_AUTO)); return 0; } @@ -302,6 +379,7 @@ static const struct snd_soc_dai_ops cs42xx8_dai_ops = { .set_fmt = cs42xx8_set_dai_fmt, .set_sysclk = cs42xx8_set_dai_sysclk, .hw_params = cs42xx8_hw_params, + .hw_free = cs42xx8_hw_free, .digital_mute = cs42xx8_digital_mute, }; -- 2.21.0

2 1

[alsa-devel] [PATCH] ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks
by Charles Keepax 22 Jul '19

22 Jul '19

DPCM uses snd_soc_dapm_dai_get_connected_widgets to build a list of the widgets connected to a specific front end DAI so it can search through this list for available back end DAIs. The custom_stop_condition was added to is_connected_ep to facilitate this list not containing more widgets than is necessary. Doing so both speeds up the DPCM handling as less widgets need to be searched and avoids issues with CODEC to CODEC links as these would be confused with back end DAIs if they appeared in the list of available widgets. custom_stop_condition was implemented by aborting the graph walk when the condition is triggered, however there is an issue with this approach. Whilst walking the graph is_connected_ep should update the endpoints cache on each widget, if the walk is aborted the number of attached end points is unknown for that sub-graph. When the stop condition triggered, the original patch ignored the triggering widget and returned zero connected end points; a later patch updated this to set the triggering widget's cache to 1 and return that. Both of these approaches result in inaccurate values being stored in various end point caches as the values propagate back through the graph, which can result in later issues with widgets powering/not powering unexpectedly. As the original goal was to reduce the size of the widget list passed to the DPCM code, the simplest solution is to limit the functionality of the custom_stop_condition to the widget list. This means the rest of the graph will still be processed resulting in correct end point caches, but only widgets up to the stop condition will be added to the returned widget list. Fixes: 6742064aef7f ("ASoC: dapm: support user-defined stop condition in dai_get_connected_widgets") Fixes: 5fdd022c2026 ("ASoC: dpcm: play nice with CODEC<->CODEC links") Fixes: 09464974eaa8 ("ASoC: dapm: Fix to return correct path list in is_connected_ep.") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/soc-dapm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f013b24c050a1..f73882cf0031d 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1157,8 +1157,8 @@ static __always_inline int is_connected_ep(struct snd_soc_dapm_widget *widget, list_add_tail(&widget->work_list, list); if (custom_stop_condition && custom_stop_condition(widget, dir)) { - widget->endpoints[dir] = 1; - return widget->endpoints[dir]; + list = NULL; + custom_stop_condition = NULL; } if ((widget->is_ep & SND_SOC_DAPM_DIR_TO_EP(dir)) && widget->connected) { @@ -1195,8 +1195,8 @@ static __always_inline int is_connected_ep(struct snd_soc_dapm_widget *widget, * * Optionally, can be supplied with a function acting as a stopping condition. * This function takes the dapm widget currently being examined and the walk - * direction as an arguments, it should return true if the walk should be - * stopped and false otherwise. + * direction as an arguments, it should return true if widgets from that point + * in the graph onwards should not be added to the widget list. */ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, struct list_head *list, -- 2.11.0

2 1

[alsa-devel] [PATCH] SoC: rockchip: rockchip_max98090: Enable MICBIAS for headset keypress detection
by Enric Balletbo i Serra 22 Jul '19

22 Jul '19

The TS3A227E says that the headset keypress detection needs the MICBIAS power in order to report the key events to ensure proper operation The headset keypress detection needs the MICBIAS power in order to report the key events all the time as long as MIC is present. So MICBIAS pin is forced on when a MICROPHONE is detected. On Veyron Minnie I observed that if the MICBIAS power is not present and the key press detection is activated (just because it is enabled when you insert a headset), it randomly reports a keypress on insert. E.g. (KEY_PLAYPAUSE) Event: (SW_HEADPHONE_INSERT), value 1 Event: (SW_MICROPHONE_INSERT), value 1 Event: -------------- SYN_REPORT ------------ Event: (KEY_PLAYPAUSE), value 1 Userspace thinks that KEY_PLAYPAUSE is pressed and produces the annoying effect that the media player starts a play/pause loop. Note that, although most of the time the key reported is the one associated with BTN_0, not always this is true. On my tests I also saw different keys reported Signed-off-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com> --- Some notes about the patch Steps to test (userspace GNOME3): 1. Play audio using a media player 2. Make sure the Internal MIC is selected as audio input device and doesn't switches when you insert the headset. 3. Insert a headset (with buttons) Audio switches to headphones and you can hear that enters on a loop play/pause if the KEY_PLAYPAUSE was reported. Also you can check that press to any headset button doesn't work. The part where the datasheet says that power must be supplied in order to have keypress detection work is in page 44 of [1] " The TS3A227E can monitor the microphone line of a 4-pole headset to detect up to 4 key presses/releases and report the key press events back to the host. The key press detection must be activated manually by setting the KP Enable bit of the Device Settings 2 register. To ensure proper operation the MICBIAS voltage must be applied to MICP before enabling key press detection. " [1] http://www.ti.com/lit/ds/symlink/ts3a227e.pdf sound/soc/rockchip/rockchip_max98090.c | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index c5fc24675a33..782e534d4c0d 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -61,6 +61,37 @@ static const struct snd_kcontrol_new rk_mc_controls[] = { SOC_DAPM_PIN_SWITCH("Speaker"), }; +static int rk_jack_event(struct notifier_block *nb, unsigned long event, + void *data) +{ + struct snd_soc_jack *jack = (struct snd_soc_jack *)data; + struct snd_soc_dapm_context *dapm = &jack->card->dapm; + + if (event & SND_JACK_MICROPHONE) + snd_soc_dapm_force_enable_pin(dapm, "MICBIAS"); + else + snd_soc_dapm_disable_pin(dapm, "MICBIAS"); + + snd_soc_dapm_sync(dapm); + + return 0; +} + +static struct notifier_block rk_jack_nb = { + .notifier_call = rk_jack_event, +}; + +static int rk_init(struct snd_soc_pcm_runtime *runtime) +{ + /* + * The jack has already been created in the rk_98090_headset_init() + * function. + */ + snd_soc_jack_notifier_register(&headset_jack, &rk_jack_nb); + + return 0; +} + static int rk_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -119,6 +150,7 @@ SND_SOC_DAILINK_DEFS(hifi, static struct snd_soc_dai_link rk_dailink = { .name = "max98090", .stream_name = "Audio", + .init = rk_init, .ops = &rk_aif1_ops, /* set max98090 as slave */ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | -- 2.20.1

2 1

[alsa-devel] [PATCH 00/12] treewide: Fix GENMASK misuses
by Joe Perches 22 Jul '19

22 Jul '19

These GENMASK uses are inverted argument order and the actual masks produced are incorrect. Fix them. Add checkpatch tests to help avoid more misuses too. Joe Perches (12): checkpatch: Add GENMASK tests clocksource/drivers/npcm: Fix misuse of GENMASK macro drm: aspeed_gfx: Fix misuse of GENMASK macro iio: adc: max9611: Fix misuse of GENMASK macro irqchip/gic-v3-its: Fix misuse of GENMASK macro mmc: meson-mx-sdio: Fix misuse of GENMASK macro net: ethernet: mediatek: Fix misuses of GENMASK macro net: stmmac: Fix misuses of GENMASK macro rtw88: Fix misuse of GENMASK macro phy: amlogic: G12A: Fix misuse of GENMASK macro staging: media: cedrus: Fix misuse of GENMASK macro ASoC: wcd9335: Fix misuse of GENMASK macro drivers/clocksource/timer-npcm7xx.c | 2 +- drivers/gpu/drm/aspeed/aspeed_gfx.h | 2 +- drivers/iio/adc/max9611.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 2 +- drivers/mmc/host/meson-mx-sdio.c | 2 +- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +- drivers/net/ethernet/mediatek/mtk_sgmii.c | 2 +- drivers/net/ethernet/stmicro/stmmac/descs.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 4 ++-- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +- drivers/phy/amlogic/phy-meson-g12a-usb2.c | 2 +- drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 +- scripts/checkpatch.pl | 15 +++++++++++++++ sound/soc/codecs/wcd-clsh-v2.c | 2 +- 14 files changed, 29 insertions(+), 14 deletions(-) -- 2.15.0

6 8

[alsa-devel] [PATCH] ASoC: codecs: ad193x: Use regmap_multi_reg_write() when initializing
by Codrin Ciubotariu 22 Jul '19

22 Jul '19

Using regmap_multi_reg_write() when we set the default values for our registers makes the code smaller and easier to read. Suggested-by: Tzung-Bi Shih <tzungbi(a)google.com> Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> --- sound/soc/codecs/ad193x.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 80dab5df9633..fb04c9379b71 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -413,15 +413,10 @@ static struct snd_soc_dai_driver ad193x_no_adc_dai = { .ops = &ad193x_dai_ops, }; -struct ad193x_reg_default { - unsigned int reg; - unsigned int val; -}; - /* codec register values to set after reset */ static void ad193x_reg_default_init(struct ad193x_priv *ad193x) { - const struct ad193x_reg_default reg_init[] = { + const struct reg_sequence reg_init[] = { { 0, 0x99 }, /* PLL_CLK_CTRL0: pll input: mclki/xi 12.288Mhz */ { 1, 0x04 }, /* PLL_CLK_CTRL1: no on-chip Vref */ { 2, 0x40 }, /* DAC_CTRL0: TDM mode */ @@ -437,21 +432,17 @@ static void ad193x_reg_default_init(struct ad193x_priv *ad193x) { 12, 0x00 }, /* DAC_L4_VOL: no attenuation */ { 13, 0x00 }, /* DAC_R4_VOL: no attenuation */ }; - const struct ad193x_reg_default reg_adc_init[] = { + const struct reg_sequence reg_adc_init[] = { { 14, 0x03 }, /* ADC_CTRL0: high-pass filter enable */ { 15, 0x43 }, /* ADC_CTRL1: sata delay=1, adc aux mode */ { 16, 0x00 }, /* ADC_CTRL2: reset */ }; - int i; - for (i = 0; i < ARRAY_SIZE(reg_init); i++) - regmap_write(ad193x->regmap, reg_init[i].reg, reg_init[i].val); + regmap_multi_reg_write(ad193x->regmap, reg_init, ARRAY_SIZE(reg_init)); if (ad193x_has_adc(ad193x)) { - for (i = 0; i < ARRAY_SIZE(reg_adc_init); i++) { - regmap_write(ad193x->regmap, reg_adc_init[i].reg, - reg_adc_init[i].val); - } + regmap_multi_reg_write(ad193x->regmap, reg_adc_init, + ARRAY_SIZE(reg_adc_init)); } } -- 2.20.1

3 2

[alsa-devel] [PATCH v2] ASoC: SOF: Intel: hda: Make hdac_device device-managed
by Ranjani Sridharan 22 Jul '19

22 Jul '19

snd_hdac_ext_bus_device_exit() has been recently modified to no longer free the hdac device. SOF allocates memory for hdac_device and hda_hda_priv with kzalloc. Make them device-managed instead so that they will be freed when the SOF driver is unloaded. Because of the above change, hda_codec is device-managed and it will be freed when the ASoC device is removed. Freeing the codec in snd_hda_codec_dev_release() leads to kernel panic while unloading and reloading the ASoC driver. So, avoid freeing the hda_codec for ASoC driver. This is done in the same patch to avoid bisect failure. Signed-off-by: Libin Yang <libin.yang(a)intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/pci/hda/hda_codec.c | 8 +++++++- sound/soc/sof/intel/hda-codec.c | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 6c51b8363f8b..a2e23d7e768f 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -846,7 +846,13 @@ static void snd_hda_codec_dev_release(struct device *dev) snd_hda_sysfs_clear(codec); kfree(codec->modelname); kfree(codec->wcaps); - kfree(codec); + + /* + * In the case of ASoC HD-audio, hda_codec is device managed. + * It will be freed when the ASoC device is removed. + */ + if (codec->core.type == HDA_DEV_LEGACY) + kfree(codec); } #define DEV_NAME_LEN 31 diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index b8b37f082309..0d8437b080bf 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -62,8 +62,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address) address, resp); #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) - /* snd_hdac_ext_bus_device_exit will use kfree to free hdev */ - hda_priv = kzalloc(sizeof(*hda_priv), GFP_KERNEL); + hda_priv = devm_kzalloc(sdev->dev, sizeof(*hda_priv), GFP_KERNEL); if (!hda_priv) return -ENOMEM; @@ -82,8 +81,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address) return 0; #else - /* snd_hdac_ext_bus_device_exit will use kfree to free hdev */ - hdev = kzalloc(sizeof(*hdev), GFP_KERNEL); + hdev = devm_kzalloc(sdev->dev, sizeof(*hdev), GFP_KERNEL); if (!hdev) return -ENOMEM; -- 2.17.1

3 2

[alsa-devel] [PATCH] sound: soc: codecs: mt6358: change return type of mt6358_codec_init_reg
by Hariprasad Kelam 22 Jul '19

22 Jul '19

As mt6358_codec_init_reg function always returns 0 , change return type from int to void. fixes below issue reported by coccicheck sound/soc/codecs/mt6358.c:2260:5-8: Unneeded variable: "ret". Return "0" on line 2289 Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/soc/codecs/mt6358.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c index 50b3fc5..c17250a 100644 --- a/sound/soc/codecs/mt6358.c +++ b/sound/soc/codecs/mt6358.c @@ -2255,10 +2255,8 @@ static struct snd_soc_dai_driver mt6358_dai_driver[] = { }, }; -static int mt6358_codec_init_reg(struct mt6358_priv *priv) +static void mt6358_codec_init_reg(struct mt6358_priv *priv) { - int ret = 0; - /* Disable HeadphoneL/HeadphoneR short circuit protection */ regmap_update_bits(priv->regmap, MT6358_AUDDEC_ANA_CON0, RG_AUDHPLSCDISABLE_VAUDP15_MASK_SFT, @@ -2285,8 +2283,6 @@ static int mt6358_codec_init_reg(struct mt6358_priv *priv) /* set gpio */ playback_gpio_reset(priv); capture_gpio_reset(priv); - - return ret; } static int mt6358_codec_probe(struct snd_soc_component *cmpnt) -- 2.7.4

3 3

[alsa-devel] [PATCH] sound: soc: bcm: cygnus-pcm: Unneeded variable: "ret".
by Hariprasad Kelam 22 Jul '19

22 Jul '19

This patch fixes below issues reported by coccicheck sound/soc/bcm/cygnus-pcm.c:642:5-8: Unneeded variable: "ret". Return "0" on line 650 sound/soc/bcm/cygnus-pcm.c:671:5-8: Unneeded variable: "ret". Return "0" on line 696 We cannot change return type of these functions as they are callback functions of snd_pcm_ops Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/soc/bcm/cygnus-pcm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/bcm/cygnus-pcm.c b/sound/soc/bcm/cygnus-pcm.c index 123ecf5..8966b02 100644 --- a/sound/soc/bcm/cygnus-pcm.c +++ b/sound/soc/bcm/cygnus-pcm.c @@ -639,7 +639,6 @@ static int cygnus_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_pcm_runtime *runtime = substream->runtime; struct cygnus_aio_port *aio; - int ret = 0; aio = cygnus_dai_get_dma_data(substream); dev_dbg(rtd->cpu_dai->dev, "%s port %d\n", __func__, aio->portnum); @@ -647,7 +646,7 @@ static int cygnus_pcm_hw_params(struct snd_pcm_substream *substream, snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); runtime->dma_bytes = params_buffer_bytes(params); - return ret; + return 0; } static int cygnus_pcm_hw_free(struct snd_pcm_substream *substream) @@ -668,7 +667,6 @@ static int cygnus_pcm_prepare(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct cygnus_aio_port *aio; unsigned long bufsize, periodsize; - int ret = 0; bool is_play; u32 start; struct ringbuf_regs *p_rbuf = NULL; @@ -693,7 +691,7 @@ static int cygnus_pcm_prepare(struct snd_pcm_substream *substream) ringbuf_set_initial(aio->cygaud->audio, p_rbuf, is_play, start, periodsize, bufsize); - return ret; + return 0; } static snd_pcm_uframes_t cygnus_pcm_pointer(struct snd_pcm_substream *substream) -- 2.7.4

2 1

[alsa-devel] [Patch v2] sound: soc: codecs: wcd9335: add irqflag IRQF_ONESHOT flag
by Hariprasad Kelam 22 Jul '19

22 Jul '19

Add IRQF_ONESHOT to ensure "Interrupt is not reenabled after the hardirq handler finished". fixes below issue reported by coccicheck sound/soc/codecs/wcd9335.c:4068:8-33: ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- v1 : add IRQF_ONESHOT and introduce irqflags variable v2 : remove irqflags variable sound/soc/codecs/wcd9335.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 1bbbe42..9566027 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -4062,7 +4062,8 @@ static int wcd9335_setup_irqs(struct wcd9335_codec *wcd) ret = devm_request_threaded_irq(wcd->dev, irq, NULL, wcd9335_irqs[i].handler, - IRQF_TRIGGER_RISING, + IRQF_TRIGGER_RISING | + IRQF_ONESHOT, wcd9335_irqs[i].name, wcd); if (ret) { dev_err(wcd->dev, "Failed to request %s\n", -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: mediatek: mt8183: make headset codec optional
by Tzung-Bi Shih 22 Jul '19

22 Jul '19

Make headset codec optional because some variant machines may not have an audio jack. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- .../soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 887c932229d0..4c816c86844b 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -352,8 +352,6 @@ static struct snd_soc_card mt8183_mt6358_ts3a227_max98357_card = { .owner = THIS_MODULE, .dai_link = mt8183_mt6358_ts3a227_max98357_dai_links, .num_links = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_dai_links), - .aux_dev = &mt8183_mt6358_ts3a227_max98357_headset_dev, - .num_aux_devs = 1, }; static int @@ -404,10 +402,9 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) mt8183_mt6358_ts3a227_max98357_headset_dev.codec_of_node = of_parse_phandle(pdev->dev.of_node, "mediatek,headset-codec", 0); - if (!mt8183_mt6358_ts3a227_max98357_headset_dev.codec_of_node) { - dev_err(&pdev->dev, - "Property 'mediatek,headset-codec' missing/invalid\n"); - return -EINVAL; + if (mt8183_mt6358_ts3a227_max98357_headset_dev.codec_of_node) { + card->aux_dev = &mt8183_mt6358_ts3a227_max98357_headset_dev; + card->num_aux_devs = 1; } default_pins = -- 2.22.0.510.g264f2c817a-goog

2 1

[alsa-devel] [PATCH] ASoC: fsl_sai: mark regmap as fast_io
by Lucas Stach 22 Jul '19

22 Jul '19

The regmap is only ever used to access MMIO registers, so it's fair to say that register access is fast. Signed-off-by: Lucas Stach <l.stach(a)pengutronix.de> --- sound/soc/fsl/fsl_sai.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 8593269156bd..812c94fbb160 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -771,6 +771,7 @@ static const struct regmap_config fsl_sai_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, + .fast_io = true, .max_register = FSL_SAI_RMR, .reg_defaults = fsl_sai_reg_defaults, -- 2.20.1

2 3

[alsa-devel] [PATCH] ASoC: max98383: fix i2c probe failure
by chunguo feng 22 Jul '19

22 Jul '19

From: fengchunguo <chunguo.feng(a)amlogic.com> Added reset_gpio configuration for i2c probe successfully. If not,i2c address can't be found rightly. Error information: max98373 3-0031: Failed to read: 0x21FF Fixed: [3.761299@3] max98373 3-0031: MAX98373 revisionID: 0x43 [3.828911@3] asoc-aml-card auge_sound: max98373-aif1 <-> TDM-B mapping ok Signed-off-by: fengchunguo <chunguo.feng(a)amlogic.com> --- sound/soc/codecs/max98373.c | 34 ++++++++++++++++++++++++++++++---- sound/soc/codecs/max98373.h | 1 + 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index 528695cd6a1c..9a1eb7222357 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -12,6 +12,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <linux/gpio.h> +#include <linux/of.h> #include <linux/of_gpio.h> #include <sound/tlv.h> #include "max98373.h" @@ -895,6 +896,17 @@ static void max98373_slot_config(struct i2c_client *i2c, else max98373->i_slot = 1; + max98373->reset_gpio = of_get_named_gpio(dev->of_node, + "maxim,reset-gpio", 0); + if (!gpio_is_valid(max98373->reset_gpio)) { + dev_err(dev, "Looking up %s property in node %s failed %d\n", + "maxim,reset-gpio", dev->of_node->full_name, + max98373->reset_gpio); + } else { + dev_dbg(dev, "maxim,reset-gpio=%d", + max98373->reset_gpio); + } + if (!device_property_read_u32(dev, "maxim,spkfb-slot-no", &value)) max98373->spkfb_slot = value & 0xF; else @@ -923,7 +935,6 @@ static int max98373_i2c_probe(struct i2c_client *i2c, else max98373->interleave_mode = false; - /* regmap initialization */ max98373->regmap = devm_regmap_init_i2c(i2c, &max98373_regmap); @@ -934,6 +945,24 @@ static int max98373_i2c_probe(struct i2c_client *i2c, return ret; } + /* voltage/current slot & gpio configuration */ + max98373_slot_config(i2c, max98373); + + /* Power on device */ + if (gpio_is_valid(max98373->reset_gpio)) { + ret = gpio_request(max98373->reset_gpio, "MAX98373_RESET"); + if (ret) { + dev_err(&i2c->dev, "%s: Failed to request gpio %d\n", + __func__, max98373->reset_gpio); + gpio_free(max98373->reset_gpio); + return -EINVAL; + } + gpio_direction_output(max98373->reset_gpio, 0); + msleep(50); + gpio_direction_output(max98373->reset_gpio, 1); + msleep(20); + } + /* Check Revision ID */ ret = regmap_read(max98373->regmap, MAX98373_R21FF_REV_ID, &reg); @@ -944,9 +973,6 @@ static int max98373_i2c_probe(struct i2c_client *i2c, } dev_info(&i2c->dev, "MAX98373 revisionID: 0x%02X\n", reg); - /* voltage/current slot configuration */ - max98373_slot_config(i2c, max98373); - /* codec registeration */ ret = devm_snd_soc_register_component(&i2c->dev, &soc_codec_dev_max98373, max98373_dai, ARRAY_SIZE(max98373_dai)); diff --git a/sound/soc/codecs/max98373.h b/sound/soc/codecs/max98373.h index f6a37aa02f26..533d2053f608 100644 --- a/sound/soc/codecs/max98373.h +++ b/sound/soc/codecs/max98373.h @@ -203,6 +203,7 @@ struct max98373_priv { struct regmap *regmap; + int reset_gpio; unsigned int v_slot; unsigned int i_slot; unsigned int spkfb_slot; -- 2.18.0

2 1

[alsa-devel] [PATCH 1/3] ASoC: rt1308: simplify the EFUSE read function
by shumingf＠realtek.com 22 Jul '19

22 Jul '19

From: Shuming Fan <shumingf(a)realtek.com> The rt1308_efuse function contains many redundant settings. We remove the redundant settings and the function still works. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1308.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c index d673506c7c39..19d255e01827 100644 --- a/sound/soc/codecs/rt1308.c +++ b/sound/soc/codecs/rt1308.c @@ -808,33 +808,11 @@ static void rt1308_efuse(struct rt1308_priv *rt1308) { regmap_write(rt1308->regmap, RT1308_RESET, 0); - regmap_write(rt1308->regmap, RT1308_POWER, 0xff371600); - regmap_write(rt1308->regmap, RT1308_CLK_1, 0x52100000); - regmap_write(rt1308->regmap, RT1308_I2C_I2S_SDW_SET, 0x01014005); - regmap_write(rt1308->regmap, RT1308_CLASS_D_SET_2, 0x227f5501); - regmap_write(rt1308->regmap, RT1308_PADS_1, 0x50150505); - regmap_write(rt1308->regmap, RT1308_VREF, 0x18100000); - regmap_write(rt1308->regmap, RT1308_IV_SENSE, 0x87010000); - regmap_write(rt1308->regmap, RT1308_DUMMY_REG, 0x00000200); - regmap_write(rt1308->regmap, RT1308_SIL_DET, 0x61c30000); - regmap_write(rt1308->regmap, RT1308_CLK_DET, 0x03700000); - regmap_write(rt1308->regmap, RT1308_SINE_TONE_GEN_1, 0x50022f00); regmap_write(rt1308->regmap, RT1308_POWER_STATUS, 0x01800000); - regmap_write(rt1308->regmap, RT1308_DC_CAL_2, 0x00ffff00); - regmap_write(rt1308->regmap, RT1308_CLASS_D_SET_2, 0x607e5501); - - regmap_write(rt1308->regmap, RT1308_CLK_2, 0x0060e000); - regmap_write(rt1308->regmap, RT1308_EFUSE_1, 0x04fe0f00); msleep(100); regmap_write(rt1308->regmap, RT1308_EFUSE_1, 0x44fe0f00); msleep(20); regmap_write(rt1308->regmap, RT1308_PVDD_OFFSET_CTL, 0x10000000); - - regmap_write(rt1308->regmap, RT1308_POWER_STATUS, 0x00800000); - regmap_write(rt1308->regmap, RT1308_POWER, 0x0); - regmap_write(rt1308->regmap, RT1308_CLK_1, 0x52000000); - regmap_write(rt1308->regmap, RT1308_CLASS_D_SET_2, 0x227f5501); - regmap_write(rt1308->regmap, RT1308_SINE_TONE_GEN_1, 0x10022f00); } static int rt1308_i2c_probe(struct i2c_client *i2c, -- 2.22.0

2 1

[alsa-devel] [PATCH 2/3] ASoC: rt1308: add silence detection and manual PDB control
by shumingf＠realtek.com 22 Jul '19

22 Jul '19

From: Shuming Fan <shumingf(a)realtek.com> We enable the silence detection function in initial settings. PDB control changes to manual mode, hence the driver could fully control the AMP output on/off. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1308.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c index 19d255e01827..cf3d72f99705 100644 --- a/sound/soc/codecs/rt1308.c +++ b/sound/soc/codecs/rt1308.c @@ -40,10 +40,10 @@ static const struct reg_sequence init_list[] = { { RT1308_VREF, 0x18100000 }, { RT1308_IV_SENSE, 0x87010000 }, { RT1308_DUMMY_REG, 0x00000200 }, - { RT1308_SIL_DET, 0x61c30000 }, + { RT1308_SIL_DET, 0xe1c30000 }, { RT1308_DC_CAL_2, 0x00ffff00 }, { RT1308_CLK_DET, 0x01000000 }, - { RT1308_POWER_STATUS, 0x00800000 }, + { RT1308_POWER_STATUS, 0x08800000 }, { RT1308_DAC_SET, 0xafaf0700 }, }; @@ -308,12 +308,13 @@ static int rt1308_classd_event(struct snd_soc_dapm_widget *w, case SND_SOC_DAPM_POST_PMU: msleep(30); snd_soc_component_update_bits(component, RT1308_POWER_STATUS, - RT1308_POW_PDB_REG_BIT, RT1308_POW_PDB_REG_BIT); + RT1308_POW_PDB_REG_BIT | RT1308_POW_PDB_MN_BIT, + RT1308_POW_PDB_REG_BIT | RT1308_POW_PDB_MN_BIT); msleep(40); break; case SND_SOC_DAPM_PRE_PMD: snd_soc_component_update_bits(component, RT1308_POWER_STATUS, - RT1308_POW_PDB_REG_BIT, 0); + RT1308_POW_PDB_REG_BIT | RT1308_POW_PDB_MN_BIT, 0); usleep_range(150000, 200000); break; -- 2.22.0

2 1

[alsa-devel] [PATCH] ASoC: tlv320aic31xx: suppress error message for EPROBE_DEFER
by Lucas Stach 22 Jul '19

22 Jul '19

Both the supplies and reset GPIO might need a probe deferral for the resource to be available. Don't print a error message in that case, as it is a normal operating condition. Signed-off-by: Lucas Stach <l.stach(a)pengutronix.de> --- sound/soc/codecs/tlv320aic31xx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 9b37e98da0db..26a4f6cd3288 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1553,7 +1553,8 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, aic31xx->gpio_reset = devm_gpiod_get_optional(aic31xx->dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(aic31xx->gpio_reset)) { - dev_err(aic31xx->dev, "not able to acquire gpio\n"); + if (PTR_ERR(aic31xx->gpio_reset) != -EPROBE_DEFER) + dev_err(aic31xx->dev, "not able to acquire gpio\n"); return PTR_ERR(aic31xx->gpio_reset); } @@ -1564,7 +1565,9 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, ARRAY_SIZE(aic31xx->supplies), aic31xx->supplies); if (ret) { - dev_err(aic31xx->dev, "Failed to request supplies: %d\n", ret); + if (ret != -EPROBE_DEFER) + dev_err(aic31xx->dev, + "Failed to request supplies: %d\n", ret); return ret; } -- 2.20.1

3 2

[alsa-devel] [PATCH] SoC: rockchip-max98090: Remove MICBIAS as supply of input pin IN34
by Enric Balletbo i Serra 22 Jul '19

22 Jul '19

Commit ec0d23b295b9 ("ASoC: rockchip-max98090: Fix the Headset Mic route.") moved the MICBIAS widget to supply Headset Mic but forget to remove the MICBIAS widget to supply IN34 which is not really needed, so remove that path so we have: IN34 <==== Headset MIC <==== MICBIAS Signed-off-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com> --- sound/soc/rockchip/rockchip_max98090.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 782e534d4c0d..1af1147c3da3 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -45,7 +45,6 @@ static const struct snd_soc_dapm_widget rk_dapm_widgets[] = { static const struct snd_soc_dapm_route rk_audio_map[] = { {"IN34", NULL, "Headset Mic"}, - {"IN34", NULL, "MICBIAS"}, {"Headset Mic", NULL, "MICBIAS"}, {"DMICL", NULL, "Int Mic"}, {"Headphone", NULL, "HPL"}, -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: cs47l35: Use define for DSPCLK enable bit
by Charles Keepax 22 Jul '19

22 Jul '19

Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/cs47l35.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c index e3585c1dab3d7..d396a8545d518 100644 --- a/sound/soc/codecs/cs47l35.c +++ b/sound/soc/codecs/cs47l35.c @@ -524,7 +524,7 @@ SND_SOC_DAPM_SUPPLY("SYSCLK", MADERA_SYSTEM_CLOCK_1, MADERA_SYSCLK_ENA_SHIFT, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_SUPPLY("OPCLK", MADERA_OUTPUT_SYSTEM_CLOCK, MADERA_OPCLK_ENA_SHIFT, 0, NULL, 0), -SND_SOC_DAPM_SUPPLY("DSPCLK", MADERA_DSP_CLOCK_1, 6, +SND_SOC_DAPM_SUPPLY("DSPCLK", MADERA_DSP_CLOCK_1, MADERA_DSP_CLK_ENA_SHIFT, 0, NULL, 0), SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0, 0), -- 2.11.0

2 1

Re: [alsa-devel] [PATCH 3/3] ASoC: rt1308: Convert headers to SPDX
by Mark Brown 22 Jul '19

22 Jul '19

On Mon, Jul 22, 2019 at 02:07:47AM +0000, Shuming [范書銘] wrote: > > On Fri, Jul 19, 2019 at 02:33:02PM +0800, shumingf(a)realtek.com wrote: > > > @@ -1,12 +1,10 @@ > > > +// SPDX-License-Identifier: GPL-2.0 > > > /* > > > * rt1308.c -- RT1308 ALSA SoC amplifier component driver > > > * > > Please convert the entire comment block to a C++ one so this looks more > > intentional. > I convert the comment like below. > -// SPDX-License-Identifier: GPL-2.0 > +/* SPDX-License-Identifier: GPL-2.0 */ That's a C comment, not a C++ comment. I'm saying convert the whole block there to C++ rather than add one random line that's C++ next to some C comments.

2 3

[alsa-devel] [PATCH] ALSA: line6: Fix a typo
by Christophe JAILLET 22 Jul '19

22 Jul '19

s/Vairax/Variax/ Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/usb/line6/variax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/line6/variax.c b/sound/usb/line6/variax.c index 0d24c72c155f..ed158f04de80 100644 --- a/sound/usb/line6/variax.c +++ b/sound/usb/line6/variax.c @@ -244,5 +244,5 @@ static struct usb_driver variax_driver = { module_usb_driver(variax_driver); -MODULE_DESCRIPTION("Vairax Workbench USB driver"); +MODULE_DESCRIPTION("Variax Workbench USB driver"); MODULE_LICENSE("GPL"); -- 2.20.1

2 1

[alsa-devel] [PATCH] slimbus: fix duplicated argument to ||
by Hariprasad Kelam 21 Jul '19

21 Jul '19

Remove duplicate argument SLIM_MSG_MC_REQUEST_CLEAR_INFORMATION. fix below issue reported by coccicheck ./drivers/slimbus/slimbus.h:440:3-46: duplicated argument to && or || Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- drivers/slimbus/slimbus.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/slimbus/slimbus.h b/drivers/slimbus/slimbus.h index 9be4108..46a6441 100644 --- a/drivers/slimbus/slimbus.h +++ b/drivers/slimbus/slimbus.h @@ -438,8 +438,7 @@ static inline bool slim_tid_txn(u8 mt, u8 mc) return (mt == SLIM_MSG_MT_CORE && (mc == SLIM_MSG_MC_REQUEST_INFORMATION || mc == SLIM_MSG_MC_REQUEST_CLEAR_INFORMATION || - mc == SLIM_MSG_MC_REQUEST_VALUE || - mc == SLIM_MSG_MC_REQUEST_CLEAR_INFORMATION)); + mc == SLIM_MSG_MC_REQUEST_VALUE)); } static inline bool slim_ec_txn(u8 mt, u8 mc) -- 2.7.4

2 1

[alsa-devel] [PATCH 0/6] ALSA/HDA: abort probe when DMICs are detected
by Pierre-Louis Bossart 19 Jul '19

19 Jul '19

This is the second take on same problem of detecting when the HDaudio legacy driver can be used and when the SST or SOF drivers are required. The previous attempt based on a the PCI Class information was a resounding failure and broke audio on Linus' laptop, so we need additional information to avoid enabling a DSP-based driver without a good reason to do so. This patchset suggests the use of the NHLT information which *in theory* exposes DMIC endpoints. The legacy HDaudio driver cannot handle DMICs and will not provide any capture capabilities. Since it's typically the first one to probe due to the Makefile order, aborting the probe will let the PCI subsystem look for the next driver which hopefully will support this capability. I tested this patch on 5 devices (SKL, KBL, APL, GLK, WHL), three without DMICs and two with, and the detection seems to work as planned. Additional testing by Canonical and Endless folks did not expose any issues. Changes since RFC: Cosmetic code improvements Moved intel-nhlt.h to include/sound Moved intel-nhlt.c to sound/hda Removed SOC prefixes Added full-support for vendor-defined geometries Added Kconfig and kernel module parameter to opt-in Pierre-Louis Bossart (6): ASoC: Intel: Skylake: move NHLT header to common directory ALSA: hda: move parts of NHLT code to new module ALSA: hda: intel-nhlt: remove useless OR operation ALSA: hda: intel-nhlt: handle NHLT VENDOR_DEFINED DMIC geometry ASoC: Intel: Skylake: use common NHLT module ALSA: hda/intel: stop probe if DMICS are detected on Skylake+ platforms .../skl-nhlt.h => include/sound/intel-nhlt.h | 51 +++++++-- sound/hda/Kconfig | 3 + sound/hda/Makefile | 3 + sound/hda/intel-nhlt.c | 102 ++++++++++++++++++ sound/pci/hda/Kconfig | 10 ++ sound/pci/hda/hda_intel.c | 34 ++++++ sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/skl-nhlt.c | 91 +--------------- sound/soc/intel/skylake/skl-ssp-clk.c | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl.c | 12 ++- sound/soc/intel/skylake/skl.h | 4 - 12 files changed, 205 insertions(+), 108 deletions(-) rename sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h (65%) create mode 100644 sound/hda/intel-nhlt.c -- 2.20.1

2 13

[alsa-devel] [PATCH 3/3] ASoC: rt1308: Convert headers to SPDX
by shumingf＠realtek.com 19 Jul '19

19 Jul '19

From: Shuming Fan <shumingf(a)realtek.com> Convert include and source files to SPDX. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1308.c | 4 +--- sound/soc/codecs/rt1308.h | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c index cf3d72f99705..694ea22f25a8 100644 --- a/sound/soc/codecs/rt1308.c +++ b/sound/soc/codecs/rt1308.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * rt1308.c -- RT1308 ALSA SoC amplifier component driver * * Copyright 2019 Realtek Semiconductor Corp. * Author: Derek Fang <derek.fang(a)realtek.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 <linux/module.h> diff --git a/sound/soc/codecs/rt1308.h b/sound/soc/codecs/rt1308.h index c330aae1d527..ff7c423e879e 100644 --- a/sound/soc/codecs/rt1308.h +++ b/sound/soc/codecs/rt1308.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* - * RT1308.h -- RT1308 ALSA SoC amplifier component driver + * rt1308.h -- RT1308 ALSA SoC amplifier component driver * * Copyright 2019 Realtek Semiconductor Corp. * Author: Derek Fang <derek.fang(a)realtek.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. */ #ifndef _RT1308_H_ -- 2.22.0

2 1

[alsa-devel] [PATCH V6 RESEND] ALSA: usb-audio: Scarlett Gen 2 mixer interface
by Geoffrey D. Bennett 19 Jul '19

19 Jul '19

Add mixer quirk for the Focusrite Scarlett 6i6, 18i8, and 18i20 Gen 2 audio interfaces. Although the interfaces are USB compliant, additional input/output level controls and hardware routing/mixing functionality are available using proprietary USB requests. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- Hi all, This patch adds the following controls for the Scarlett 6i6, 18i8, and 18i20 Gen 2: - Master volume knob indicator (18i20 only) - Mute and dim switches (18i20 only) - Volume controls for the analogue HW outputs - HW/SW volume switches for the 10 analogue HW outputs (18i20 only) - Line Level/Instrument Level and Pad controls (6i6 and 18i8 only) - Output mux (where the sound for the HW outputs comes from; defaults to PCM outputs) - Capture mux (where the sound for PCM recording comes from; defaults to HW inputs) - Matrix mux (where the sound going into the mixer comes from; 18 inputs default off) - Mixer matrix (18 inputs * 10 outputs = 180 controls) - Level meters Changes since v1: - Add support for the Scarlett 18i8 Gen 2 - Save configuration parameters to NVRAM - Implemented feedback from Takashi's email 24/Apr/2019 - Moved private field from struct snd_usb_audio to struct usb_mixer_interface - Added timer and buffer fields to struct usb_mixer_interface - Other small code fixes/cleanups/improvements Changes since v2: - Add support for the Scarlett 6i6 Gen 2 - Add support for controlling the mute/dim switches (18i20 only) - Implemented feedback from Takashi's email 29/Apr/2019: One pointer field private_data and one function pointer private_free. Replaced timer with delayed work (thanks for that suggestion; it makes the code a *lot* simpler!). - The new functionality is disabled by default as there were reports of some Gen 2 devices not responding to the initialisation sequence and hanging. Added module parameter "scarlett_gen2_mixer_enable". If this parameter is not set, logs a message "Focusrite Scarlett Gen 2 Mixer Driver disabled; use options snd_usb_audio scarlett_gen2_mixer_enable=1 to enable and report any issues to g(a)b4.vu". Changes since v3: - No functional changes; fix checkpatch.pl error and typo in declaration. Changes since v4: - Implemented feedback from Takashi's email 9/Jul/2019: cancel delayed work on suspend, drop copyright texts, remove unnecessary blank lines, and run kmalloc outside the mutex. Changes since v5: - Implemented feedback from Takashi's emails 9-10/Jul/2019: use chip->setup value (device_setup option) instead of the scarlett_gen2_mixer_enable option and sync config to NVRAM immediately on suspend. - Fixed issue where the config save delayed work would be cancelled and not restarted if a scarlett2_*_ctl_put() function was called and the parameter value was not changed. - Renaming definitions and functions for consistency and move private free/suspend functions above their use so pre-declaration isn't necessary. diff --git a/sound/usb/Makefile b/sound/usb/Makefile index e1ce257ab705..f4b7384caa9d 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -11,6 +11,7 @@ snd-usb-audio-objs := card.o \ mixer.o \ mixer_quirks.o \ mixer_scarlett.o \ + mixer_scarlett_gen2.o \ mixer_us16x08.o \ pcm.o \ power.o \ diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c703f8534b07..734846faee7a 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3505,6 +3505,8 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) usb_kill_urb(mixer->urb); if (mixer->rc_urb) usb_kill_urb(mixer->rc_urb); + if (mixer->private_free) + mixer->private_free(mixer); mixer->disconnected = true; } @@ -3532,6 +3534,8 @@ static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer) int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer) { snd_usb_mixer_inactivate(mixer); + if (mixer->private_suspend) + mixer->private_suspend(mixer); return 0; } diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 394cd9107507..37e1b234c802 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -28,6 +28,10 @@ struct usb_mixer_interface { struct media_mixer_ctl *media_mixer_ctl; bool disconnected; + + void *private_data; + void (*private_free)(struct usb_mixer_interface *mixer); + void (*private_suspend)(struct usb_mixer_interface *mixer); }; #define MAX_CHANNELS 16 /* max logical channels */ diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 199fa157a411..70805c15b0b5 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -32,6 +32,7 @@ #include "mixer.h" #include "mixer_quirks.h" #include "mixer_scarlett.h" +#include "mixer_scarlett_gen2.h" #include "mixer_us16x08.h" #include "helper.h" @@ -2258,6 +2259,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_scarlett_controls_create(mixer); break; + case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */ + case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */ + case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */ + err = snd_scarlett_gen2_controls_create(mixer); + break; + case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ err = snd_soundblaster_e1_switch_create(mixer); break; diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c new file mode 100644 index 000000000000..a772e21bddaa --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.c @@ -0,0 +1,2076 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Focusrite Scarlett 6i6/18i8/18i20 Gen 2 Driver for ALSA + * + * Copyright (c) 2018-2019 by Geoffrey D. Bennett <g at b4.vu> + * + * Based on the Scarlett (Gen 1) Driver for ALSA: + * + * Copyright (c) 2013 by Tobias Hoffmann + * Copyright (c) 2013 by Robin Gareus <robin at gareus.org> + * Copyright (c) 2002 by Takashi Iwai <tiwai at suse.de> + * Copyright (c) 2014 by Chris J Arges <chris.j.arges at canonical.com> + * + * Many codes borrowed from audio.c by + * Alan Cox (alan at lxorguk.ukuu.org.uk) + * Thomas Sailer (sailer at ife.ee.ethz.ch) + * + * Code cleanup: + * David Henningsson <david.henningsson at canonical.com> + */ + +/* Mixer Interface for the Focusrite Scarlett 6i6/18i8/18i20 Gen 2 audio + * interface. Based on the Gen 1 driver and rewritten. + */ + +/* The protocol was reverse engineered by looking at the communication + * between Focusrite Control 2.3.4 and the Focusrite(R) Scarlett 18i20 + * (firmware 1083) using usbmon in July-August 2018. + * + * Scarlett 18i8 support added in April 2019. + * + * Scarlett 6i6 support added in June 2019 (thanks to Martin Wittmann + * for providing usbmon output and testing). + * + * This ALSA mixer gives access to: + * - input, output, mixer-matrix muxes + * - 18x10 mixer-matrix gain stages + * - gain/volume controls + * - level meters + * - line/inst level and pad controls + * + * <ditaa> + * /--------------\ 18chn 20chn /--------------\ + * | Hardware in +--+------\ /-------------+--+ ALSA PCM out | + * \--------------/ | | | | \--------------/ + * | | | /-----\ | + * | | | | | | + * | v v v | | + * | +---------------+ | | + * | \ Matrix Mux / | | + * | +-----+-----+ | | + * | | | | + * | |18chn | | + * | | | | + * | | 10chn| | + * | v | | + * | +------------+ | | + * | | Mixer | | | + * | | Matrix | | | + * | | | | | + * | | 18x10 Gain | | | + * | | stages | | | + * | +-----+------+ | | + * | | | | + * |18chn |10chn | |20chn + * | | | | + * | +----------/ | + * | | | + * v v v + * =========================== + * +---------------+ +--—------------+ + * \ Output Mux / \ Capture Mux / + * +---+---+---+ +-----+-----+ + * | | | + * 10chn| | |18chn + * | | | + * /--------------\ | | | /--------------\ + * | S/PDIF, ADAT |<--/ |10chn \-->| ALSA PCM in | + * | Hardware out | | \--------------/ + * \--------------/ | + * v + * +-------------+ Software gain per channel. + * | Master Gain |<-- 18i20 only: Switch per channel + * +------+------+ to select HW or SW gain control. + * | + * |10chn + * /--------------\ | + * | Analogue |<------/ + * | Hardware out | + * \--------------/ + * </ditaa> + * + */ + +#include <linux/slab.h> +#include <linux/usb.h> +#include <linux/moduleparam.h> + +#include <sound/control.h> +#include <sound/tlv.h> + +#include "usbaudio.h" +#include "mixer.h" +#include "helper.h" + +#include "mixer_scarlett_gen2.h" + +/* device_setup value to enable */ +#define SCARLETT2_ENABLE 0x01 + +/* some gui mixers can't handle negative ctl values */ +#define SCARLETT2_VOLUME_BIAS 127 + +/* mixer range from -80dB to +6dB in 0.5dB steps */ +#define SCARLETT2_MIXER_MIN_DB -80 +#define SCARLETT2_MIXER_BIAS (-SCARLETT2_MIXER_MIN_DB * 2) +#define SCARLETT2_MIXER_MAX_DB 6 +#define SCARLETT2_MIXER_MAX_VALUE \ + ((SCARLETT2_MIXER_MAX_DB - SCARLETT2_MIXER_MIN_DB) * 2) + +/* map from (dB + 80) * 2 to mixer value + * for dB in 0 .. 172: int(8192 * pow(10, ((dB - 160) / 2 / 20))) + */ +static const u16 scarlett2_mixer_values[173] = { + 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 23, 24, 25, 27, 29, 30, 32, 34, 36, 38, 41, 43, 46, 48, 51, + 54, 57, 61, 65, 68, 73, 77, 81, 86, 91, 97, 103, 109, 115, + 122, 129, 137, 145, 154, 163, 173, 183, 194, 205, 217, 230, + 244, 259, 274, 290, 307, 326, 345, 365, 387, 410, 434, 460, + 487, 516, 547, 579, 614, 650, 689, 730, 773, 819, 867, 919, + 973, 1031, 1092, 1157, 1225, 1298, 1375, 1456, 1543, 1634, + 1731, 1833, 1942, 2057, 2179, 2308, 2445, 2590, 2744, 2906, + 3078, 3261, 3454, 3659, 3876, 4105, 4349, 4606, 4879, 5168, + 5475, 5799, 6143, 6507, 6892, 7301, 7733, 8192, 8677, 9191, + 9736, 10313, 10924, 11571, 12257, 12983, 13752, 14567, 15430, + 16345 +}; + +/* Maximum number of analogue outputs */ +#define SCARLETT2_ANALOGUE_MAX 10 + +/* Maximum number of level and pad switches */ +#define SCARLETT2_LEVEL_SWITCH_MAX 2 +#define SCARLETT2_PAD_SWITCH_MAX 4 + +/* Maximum number of inputs to the mixer */ +#define SCARLETT2_INPUT_MIX_MAX 18 + +/* Maximum number of outputs from the mixer */ +#define SCARLETT2_OUTPUT_MIX_MAX 10 + +/* Maximum size of the data in the USB mux assignment message: + * 18 inputs, 20 outputs, 18 matrix inputs, 8 spare + */ +#define SCARLETT2_MUX_MAX 64 + +/* Number of meters: + * 18 inputs, 20 outputs, 18 matrix inputs + */ +#define SCARLETT2_NUM_METERS 56 + +/* Hardware port types: + * - None (no input to mux) + * - Analogue I/O + * - S/PDIF I/O + * - ADAT I/O + * - Mixer I/O + * - PCM I/O + */ +enum { + SCARLETT2_PORT_TYPE_NONE = 0, + SCARLETT2_PORT_TYPE_ANALOGUE = 1, + SCARLETT2_PORT_TYPE_SPDIF = 2, + SCARLETT2_PORT_TYPE_ADAT = 3, + SCARLETT2_PORT_TYPE_MIX = 4, + SCARLETT2_PORT_TYPE_PCM = 5, + SCARLETT2_PORT_TYPE_COUNT = 6, +}; + +/* Count of total I/O and number available at each sample rate */ +enum { + SCARLETT2_PORT_IN = 0, + SCARLETT2_PORT_OUT = 1, + SCARLETT2_PORT_OUT_44 = 2, + SCARLETT2_PORT_OUT_88 = 3, + SCARLETT2_PORT_OUT_176 = 4, + SCARLETT2_PORT_DIRECTIONS = 5, +}; + +/* Hardware buttons on the 18i20 */ +#define SCARLETT2_BUTTON_MAX 2 + +static const char *const scarlett2_button_names[SCARLETT2_BUTTON_MAX] = { + "Mute", "Dim" +}; + +/* Description of each hardware port type: + * - id: hardware ID for this port type + * - num: number of sources/destinations of this port type + * - src_descr: printf format string for mux input selections + * - src_num_offset: added to channel number for the fprintf + * - dst_descr: printf format string for mixer controls + */ +struct scarlett2_ports { + u16 id; + int num[SCARLETT2_PORT_DIRECTIONS]; + const char * const src_descr; + int src_num_offset; + const char * const dst_descr; +}; + +struct scarlett2_device_info { + u8 line_out_hw_vol; /* line out hw volume is sw controlled */ + u8 button_count; /* number of buttons */ + u8 level_input_count; /* inputs with level selectable */ + u8 pad_input_count; /* inputs with pad selectable */ + const char * const line_out_descrs[SCARLETT2_ANALOGUE_MAX]; + struct scarlett2_ports ports[SCARLETT2_PORT_TYPE_COUNT]; +}; + +struct scarlett2_mixer_data { + struct usb_mixer_interface *mixer; + struct mutex usb_mutex; /* prevent sending concurrent USB requests */ + struct mutex data_mutex; /* lock access to this data */ + struct delayed_work work; + const struct scarlett2_device_info *info; + int num_mux_srcs; + u16 scarlett2_seq; + u8 vol_updated; + u8 master_vol; + u8 vol[SCARLETT2_ANALOGUE_MAX]; + u8 vol_sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + u8 level_switch[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switch[SCARLETT2_PAD_SWITCH_MAX]; + u8 buttons[SCARLETT2_BUTTON_MAX]; + struct snd_kcontrol *master_vol_ctl; + struct snd_kcontrol *vol_ctls[SCARLETT2_ANALOGUE_MAX]; + struct snd_kcontrol *button_ctls[SCARLETT2_BUTTON_MAX]; + u8 mux[SCARLETT2_MUX_MAX]; + u8 mix[SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX]; +}; + +/*** Model-specific data ***/ + +static const struct scarlett2_device_info s6i6_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first two analogue inputs have an optional pad. */ + .pad_input_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones L", + "Headphones R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 8 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 4, 4, 4, 4, 4 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 6, 6, 6, 6, 6 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i8_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first four analogue inputs have an optional pad. */ + .pad_input_count = 4, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 4 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 6, 6, 6, 6 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 0, 0, 0, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i20_gen2_info = { + /* The analogue line outputs on the 18i20 can be switched + * between software and hardware volume control + */ + .line_out_hw_vol = 1, + + /* Mute and dim buttons */ + .button_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + NULL, + NULL, + NULL, + NULL, + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 6 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 10, 10, 10, 10 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 8, 8, 4, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + .dst_descr = "ADAT Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +/* get the starting port index number for a given port type/direction */ +static int scarlett2_get_port_start_num(const struct scarlett2_ports *ports, + int direction, int port_type) +{ + int i, num = 0; + + for (i = 0; i < port_type; i++) + num += ports[i].num[direction]; + + return num; +} + +/*** USB Interactions ***/ + +/* Vendor-Specific Interface, Endpoint, MaxPacketSize, Interval */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE 5 +#define SCARLETT2_USB_INTERRUPT_ENDPOINT 4 +#define SCARLETT2_USB_INTERRUPT_MAX_DATA 64 +#define SCARLETT2_USB_INTERRUPT_INTERVAL 3 + +/* Interrupt flags for volume and mute/dim button changes */ +#define SCARLETT2_USB_INTERRUPT_VOL_CHANGE 0x400000 +#define SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE 0x200000 + +/* Commands for sending/receiving requests/responses */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ 2 +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP 3 + +#define SCARLETT2_USB_INIT_SEQ 0x00000000 +#define SCARLETT2_USB_GET_METER_LEVELS 0x00001001 +#define SCARLETT2_USB_SET_MIX 0x00002002 +#define SCARLETT2_USB_SET_MUX 0x00003002 +#define SCARLETT2_USB_GET_DATA 0x00800000 +#define SCARLETT2_USB_SET_DATA 0x00800001 +#define SCARLETT2_USB_DATA_CMD 0x00800002 +#define SCARLETT2_USB_CONFIG_SAVE 6 + +#define SCARLETT2_USB_VOLUME_STATUS_OFFSET 0x31 +#define SCARLETT2_USB_METER_LEVELS_GET_MAGIC 1 + +/* volume status is read together (matches scarlett2_config_items[]) */ +struct scarlett2_usb_volume_status { + /* mute & dim buttons */ + u8 buttons[SCARLETT2_BUTTON_MAX]; + + u8 pad1; + + /* software volume setting */ + s16 sw_vol[SCARLETT2_ANALOGUE_MAX]; + + /* actual volume of output inc. dim (-18dB) */ + s16 hw_vol[SCARLETT2_ANALOGUE_MAX]; + + u8 pad2[SCARLETT2_ANALOGUE_MAX]; + + /* sw (0) or hw (1) controlled */ + u8 sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + + u8 pad3[6]; + + /* front panel volume knob */ + s16 master_vol; +} __packed; + +/* Configuration parameters that can be read and written */ +enum { + SCARLETT2_CONFIG_BUTTONS = 0, + SCARLETT2_CONFIG_LINE_OUT_VOLUME = 1, + SCARLETT2_CONFIG_SW_HW_SWITCH = 2, + SCARLETT2_CONFIG_LEVEL_SWITCH = 3, + SCARLETT2_CONFIG_PAD_SWITCH = 4, + SCARLETT2_CONFIG_COUNT = 5 +}; + +/* Location, size, and activation command number for the configuration + * parameters + */ +struct scarlett2_config { + u8 offset; + u8 size; + u8 activate; +}; + +static const struct scarlett2_config + scarlett2_config_items[SCARLETT2_CONFIG_COUNT] = { + /* Mute/Dim Buttons */ + { + .offset = 0x31, + .size = 1, + .activate = 2 + }, + + /* Line Out Volume */ + { + .offset = 0x34, + .size = 2, + .activate = 1 + }, + + /* SW/HW Volume Switch */ + { + .offset = 0x66, + .size = 1, + .activate = 3 + }, + + /* Level Switch */ + { + .offset = 0x7c, + .size = 1, + .activate = 7 + }, + + /* Pad Switch */ + { + .offset = 0x84, + .size = 1, + .activate = 8 + } +}; + +/* proprietary request/response format */ +struct scarlett2_usb_packet { + u32 cmd; + u16 size; + u16 seq; + u32 error; + u32 pad; + u8 data[]; +}; + +#define SCARLETT2_USB_PACKET_LEN (sizeof(struct scarlett2_usb_packet)) + +static void scarlett2_fill_request_header(struct scarlett2_mixer_data *private, + struct scarlett2_usb_packet *req, + u32 cmd, u16 req_size) +{ + /* sequence must go up by 1 for each request */ + u16 seq = private->scarlett2_seq++; + + req->cmd = cpu_to_le32(cmd); + req->size = cpu_to_le16(req_size); + req->seq = cpu_to_le16(seq); + req->error = 0; + req->pad = 0; +} + +/* Send a proprietary format request to the Scarlett interface */ +static int scarlett2_usb( + struct usb_mixer_interface *mixer, u32 cmd, + void *req_data, u16 req_size, void *resp_data, u16 resp_size) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + u16 req_buf_size = sizeof(struct scarlett2_usb_packet) + req_size; + u16 resp_buf_size = sizeof(struct scarlett2_usb_packet) + resp_size; + struct scarlett2_usb_packet *req = 0, *resp = 0; + int err = 0; + + req = kmalloc(req_buf_size, GFP_KERNEL); + if (!req) { + err = -ENOMEM; + goto error; + } + + resp = kmalloc(resp_buf_size, GFP_KERNEL); + if (!resp) { + err = -ENOMEM; + goto error; + } + + mutex_lock(&private->usb_mutex); + + /* build request message and send it */ + + scarlett2_fill_request_header(private, req, cmd, req_size); + + if (req_size) + memcpy(req->data, req_data, req_size); + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + req, + req_buf_size); + + if (err != req_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB request result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + /* send a second message to get the response */ + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + resp, + resp_buf_size); + + /* validate the response */ + + if (err != resp_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB response result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + if (resp->cmd != req->cmd || + resp->seq != req->seq || + resp_size != le16_to_cpu(resp->size) || + resp->error || + resp->pad) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB invalid response; " + "cmd tx/rx %d/%d seq %d/%d size %d/%d " + "error %d pad %d\n", + le16_to_cpu(req->cmd), le16_to_cpu(resp->cmd), + le16_to_cpu(req->seq), le16_to_cpu(resp->seq), + resp_size, le16_to_cpu(resp->size), + le16_to_cpu(resp->error), + le16_to_cpu(resp->pad)); + err = -EINVAL; + goto unlock; + } + + if (resp_size > 0) + memcpy(resp_data, resp->data, resp_size); + +unlock: + mutex_unlock(&private->usb_mutex); +error: + kfree(req); + kfree(resp); + return err; +} + +/* Send SCARLETT2_USB_DATA_CMD SCARLETT2_USB_CONFIG_SAVE */ +static void scarlett2_config_save(struct usb_mixer_interface *mixer) +{ + u32 req = cpu_to_le32(SCARLETT2_USB_CONFIG_SAVE); + + scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req, sizeof(u32), + NULL, 0); +} + +/* Delayed work to save config */ +static void scarlett2_config_save_work(struct work_struct *work) +{ + struct scarlett2_mixer_data *private = + container_of(work, struct scarlett2_mixer_data, work.work); + + scarlett2_config_save(private->mixer); +} + +/* Send a USB message to set a configuration parameter (volume level, + * sw/hw volume switch, line/inst level switch, or pad switch) + */ +static int scarlett2_usb_set_config( + struct usb_mixer_interface *mixer, + int config_item_num, int index, int value) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + struct { + u32 offset; + u32 bytes; + s32 value; + } __packed req; + u32 req2; + int err; + struct scarlett2_mixer_data *private = mixer->private_data; + + /* Cancel any pending NVRAM save */ + cancel_delayed_work_sync(&private->work); + + /* Send the configuration parameter data */ + req.offset = cpu_to_le32(config_item.offset + index * config_item.size); + req.bytes = cpu_to_le32(config_item.size); + req.value = cpu_to_le32(value); + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_DATA, + &req, sizeof(u32) * 2 + config_item.size, + NULL, 0); + if (err < 0) + return err; + + /* Activate the change */ + req2 = cpu_to_le32(config_item.activate); + err = scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req2, sizeof(req2), NULL, 0); + if (err < 0) + return err; + + /* Schedule the change to be written to NVRAM */ + schedule_delayed_work(&private->work, msecs_to_jiffies(2000)); + + return 0; +} + +/* Send a USB message to get data; result placed in *buf */ +static int scarlett2_usb_get( + struct usb_mixer_interface *mixer, + int offset, void *buf, int size) +{ + struct { + u32 offset; + u32 size; + } __packed req; + + req.offset = cpu_to_le32(offset); + req.size = cpu_to_le32(size); + return scarlett2_usb(mixer, SCARLETT2_USB_GET_DATA, + &req, sizeof(req), buf, size); +} + +/* Send a USB message to get configuration parameters; result placed in *buf */ +static int scarlett2_usb_get_config( + struct usb_mixer_interface *mixer, + int config_item_num, int count, void *buf) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + int size = config_item.size * count; + + return scarlett2_usb_get(mixer, config_item.offset, buf, size); +} + +/* Send a USB message to get volume status; result placed in *buf */ +static int scarlett2_usb_get_volume_status( + struct usb_mixer_interface *mixer, + struct scarlett2_usb_volume_status *buf) +{ + return scarlett2_usb_get(mixer, SCARLETT2_USB_VOLUME_STATUS_OFFSET, + buf, sizeof(*buf)); +} + +/* Send a USB message to set the volumes for all inputs of one mix + * (values obtained from private->mix[]) + */ +static int scarlett2_usb_set_mix(struct usb_mixer_interface *mixer, + int mix_num) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + + struct { + u16 mix_num; + u16 data[SCARLETT2_INPUT_MIX_MAX]; + } __packed req; + + int i, j; + int num_mixer_in = + info->ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + + req.mix_num = cpu_to_le16(mix_num); + + for (i = 0, j = mix_num * num_mixer_in; i < num_mixer_in; i++, j++) + req.data[i] = cpu_to_le16( + scarlett2_mixer_values[private->mix[j]] + ); + + return scarlett2_usb(mixer, SCARLETT2_USB_SET_MIX, + &req, (num_mixer_in + 1) * sizeof(u16), + NULL, 0); +} + +/* Convert a port number index (per info->ports) to a hardware ID */ +static u32 scarlett2_mux_src_num_to_id(const struct scarlett2_ports *ports, + int num) +{ + int port_type; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (num < ports[port_type].num[SCARLETT2_PORT_IN]) + return ports[port_type].id | num; + num -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + /* Oops */ + return 0; +} + +/* Send USB messages to set mux inputs */ +static int scarlett2_usb_set_mux(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int rate, port_dir_rate; + + static const int assignment_order[SCARLETT2_PORT_TYPE_COUNT] = { + SCARLETT2_PORT_TYPE_PCM, + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + SCARLETT2_PORT_TYPE_MIX, + SCARLETT2_PORT_TYPE_NONE, + }; + + struct { + u16 pad; + u16 num; + u32 data[SCARLETT2_MUX_MAX]; + } __packed req; + + req.pad = 0; + + /* mux settings for each rate */ + for (rate = 0, port_dir_rate = SCARLETT2_PORT_OUT_44; + port_dir_rate <= SCARLETT2_PORT_OUT_176; + rate++, port_dir_rate++) { + int order_num, i, err; + + req.num = cpu_to_le16(rate); + + for (order_num = 0, i = 0; + order_num < SCARLETT2_PORT_TYPE_COUNT; + order_num++) { + int port_type = assignment_order[order_num]; + int j = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + port_type); + int port_id = ports[port_type].id; + int channel; + + for (channel = 0; + channel < ports[port_type].num[port_dir_rate]; + channel++, i++, j++) + /* lower 12 bits for the destination and + * next 12 bits for the source + */ + req.data[i] = !port_id + ? 0 + : cpu_to_le32( + port_id | + channel | + scarlett2_mux_src_num_to_id( + ports, private->mux[j] + ) << 12 + ); + + /* skip private->mux[j] entries not output */ + j += ports[port_type].num[SCARLETT2_PORT_OUT] - + ports[port_type].num[port_dir_rate]; + } + + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_MUX, + &req, (i + 1) * sizeof(u32), + NULL, 0); + if (err < 0) + return err; + } + + return 0; +} + +/* Send USB message to get meter levels */ +static int scarlett2_usb_get_meter_levels(struct usb_mixer_interface *mixer, + u16 *levels) +{ + struct { + u16 pad; + u16 num_meters; + u32 magic; + } __packed req; + u32 resp[SCARLETT2_NUM_METERS]; + int i, err; + + req.pad = 0; + req.num_meters = cpu_to_le16(SCARLETT2_NUM_METERS); + req.magic = cpu_to_le32(SCARLETT2_USB_METER_LEVELS_GET_MAGIC); + err = scarlett2_usb(mixer, SCARLETT2_USB_GET_METER_LEVELS, + &req, sizeof(req), resp, sizeof(resp)); + if (err < 0) + return err; + + /* copy, convert to u16 */ + for (i = 0; i < SCARLETT2_NUM_METERS; i++) + levels[i] = resp[i]; + + return 0; +} + +/*** Control Functions ***/ + +/* helper function to create a new control */ +static int scarlett2_add_new_ctl(struct usb_mixer_interface *mixer, + const struct snd_kcontrol_new *ncontrol, + int index, int channels, const char *name, + struct snd_kcontrol **kctl_return) +{ + struct snd_kcontrol *kctl; + struct usb_mixer_elem_info *elem; + int err; + + elem = kzalloc(sizeof(*elem), GFP_KERNEL); + if (!elem) + return -ENOMEM; + + elem->head.mixer = mixer; + elem->control = index; + elem->head.id = index; + elem->channels = channels; + + kctl = snd_ctl_new1(ncontrol, elem); + if (!kctl) { + kfree(elem); + return -ENOMEM; + } + kctl->private_free = snd_usb_mixer_elem_free; + + strlcpy(kctl->id.name, name, sizeof(kctl->id.name)); + + err = snd_usb_mixer_add_control(&elem->head, kctl); + if (err < 0) + return err; + + if (kctl_return) + *kctl_return = kctl; + + return 0; +} + +/*** Analogue Line Out Volume Controls ***/ + +/* Update hardware volume controls after receiving notification that + * they have changed + */ +static int scarlett2_update_volumes(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + struct scarlett2_usb_volume_status volume_status; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + + private->vol_updated = 0; + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + if (private->vol_sw_hw_switch[i]) + private->vol[i] = private->master_vol; + } + + for (i = 0; i < private->info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +static int scarlett2_volume_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT2_VOLUME_BIAS; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->master_vol; + return 0; +} + +static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->vol[index]; + return 0; +} + +static int scarlett2_volume_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->vol[index]; + val = ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol[index] = val; + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, val - SCARLETT2_VOLUME_BIAS); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett2_gain, -SCARLETT2_VOLUME_BIAS * 100, 0 +); + +static const struct snd_kcontrol_new scarlett2_master_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READ | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_master_volume_ctl_get, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett2_gain } +}; + +static const struct snd_kcontrol_new scarlett2_line_out_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_volume_ctl_get, + .put = scarlett2_volume_ctl_put, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett2_gain } +}; + +/*** HW/SW Volume Switch Controls ***/ + +static int scarlett2_sw_hw_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "SW", "HW" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_sw_hw_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->vol_sw_hw_switch[elem->control]; + return 0; +} + +static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->vol_sw_hw_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol_sw_hw_switch[index] = val; + + /* Change access mode to RO (hardware controlled volume) + * or RW (software controlled volume) + */ + if (val) + private->vol_ctls[index]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + else + private->vol_ctls[index]->vd[0].access |= + SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* Reset volume to master volume */ + private->vol[index] = private->master_vol; + + /* Set SW volume to current HW volume */ + err = scarlett2_usb_set_config( + mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, private->master_vol - SCARLETT2_VOLUME_BIAS); + if (err < 0) + goto unlock; + + /* Notify of RO/RW change */ + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_INFO, + &private->vol_ctls[index]->id); + + /* Send SW/HW switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_SW_HW_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_sw_hw_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_sw_hw_enum_ctl_info, + .get = scarlett2_sw_hw_enum_ctl_get, + .put = scarlett2_sw_hw_enum_ctl_put, +}; + +/*** Line Level/Instrument Level Switch Controls ***/ + +static int scarlett2_level_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "Line", "Inst" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_level_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->level_switch[elem->control]; + return 0; +} + +static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->level_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->level_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LEVEL_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_level_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_level_enum_ctl_info, + .get = scarlett2_level_enum_ctl_get, + .put = scarlett2_level_enum_ctl_put, +}; + +/*** Pad Switch Controls ***/ + +static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->pad_switch[elem->control]; + return 0; +} + +static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->pad_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->pad_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_PAD_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_pad_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_pad_ctl_get, + .put = scarlett2_pad_ctl_put, +}; + +/*** Mute/Dim Controls ***/ + +static int scarlett2_button_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.enumerated.item[0] = private->buttons[elem->control]; + return 0; +} + +static int scarlett2_button_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->buttons[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->buttons[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_BUTTONS, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_button_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_button_ctl_get, + .put = scarlett2_button_ctl_put +}; + +/*** Create the analogue output controls ***/ + +static int scarlett2_add_line_out_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add R/O HW volume control */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), "Master HW Playback Volume"); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_master_volume_ctl, + 0, 1, s, &private->master_vol_ctl); + if (err < 0) + return err; + } + + /* Add volume controls */ + for (i = 0; i < num_line_out; i++) { + + /* Fader */ + if (info->line_out_descrs[i]) + snprintf(s, sizeof(s), + "Line %02d (%s) Playback Volume", + i + 1, info->line_out_descrs[i]); + else + snprintf(s, sizeof(s), + "Line %02d Playback Volume", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_line_out_volume_ctl, + i, 1, s, &private->vol_ctls[i]); + if (err < 0) + return err; + + /* Make the fader read-only if the SW/HW switch is set to HW */ + if (private->vol_sw_hw_switch[i]) + private->vol_ctls[i]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* SW/HW Switch */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), + "Line Out %02d Volume Control Playback Enum", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_sw_hw_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + /* Add HW button controls */ + for (i = 0; i < private->info->button_count; i++) { + err = scarlett2_add_new_ctl(mixer, &scarlett2_button_ctl, + i, 1, scarlett2_button_names[i], + &private->button_ctls[i]); + if (err < 0) + return err; + } + + return 0; +} + +/*** Create the analogue input controls ***/ + +static int scarlett2_add_line_in_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add input level (line/inst) controls */ + for (i = 0; i < info->level_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Level Capture Enum", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_level_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + /* Add input pad controls */ + for (i = 0; i < info->pad_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Pad Capture Switch", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_pad_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + return 0; +} + +/*** Mixer Volume Controls ***/ + +static int scarlett2_mixer_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT2_MIXER_MAX_VALUE; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_mixer_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.integer.value[0] = private->mix[elem->control]; + return 0; +} + +static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int oval, val, num_mixer_in, mix_num, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mix[elem->control]; + val = ucontrol->value.integer.value[0]; + num_mixer_in = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + mix_num = elem->control / num_mixer_in; + + if (oval == val) + goto unlock; + + private->mix[elem->control] = val; + err = scarlett2_usb_set_mix(mixer, mix_num); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett2_mixer, + SCARLETT2_MIXER_MIN_DB * 100, + SCARLETT2_MIXER_MAX_DB * 100 +); + +static const struct snd_kcontrol_new scarlett2_mixer_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_mixer_ctl_info, + .get = scarlett2_mixer_ctl_get, + .put = scarlett2_mixer_ctl_put, + .private_value = SCARLETT2_MIXER_MAX_DB, /* max value */ + .tlv = { .p = db_scale_scarlett2_mixer } +}; + +static int scarlett2_add_mixer_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int err, i, j; + int index; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + int num_inputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + int num_outputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_IN]; + + for (i = 0, index = 0; i < num_outputs; i++) { + for (j = 0; j < num_inputs; j++, index++) { + snprintf(s, sizeof(s), + "Mix %c Input %02d Playback Volume", + 'A' + i, j + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_mixer_ctl, + index, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Mux Source Selection Controls ***/ + +static int scarlett2_mux_src_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + unsigned int item = uinfo->value.enumerated.item; + int items = private->num_mux_srcs; + int port_type; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->count = elem->channels; + uinfo->value.enumerated.items = items; + + if (item >= items) + item = uinfo->value.enumerated.item = items - 1; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (item < ports[port_type].num[SCARLETT2_PORT_IN]) { + sprintf(uinfo->value.enumerated.name, + ports[port_type].src_descr, + item + ports[port_type].src_num_offset); + return 0; + } + item -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + return -EINVAL; +} + +static int scarlett2_mux_src_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = private->mux[elem->control]; + return 0; +} + +static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mux[index]; + val = clamp(ucontrol->value.integer.value[0], + 0L, private->num_mux_srcs - 1L); + + if (oval == val) + goto unlock; + + private->mux[index] = val; + err = scarlett2_usb_set_mux(mixer); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_mux_src_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_mux_src_enum_ctl_info, + .get = scarlett2_mux_src_enum_ctl_get, + .put = scarlett2_mux_src_enum_ctl_put, +}; + +static int scarlett2_add_mux_enums(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int port_type, channel, i; + + for (i = 0, port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + for (channel = 0; + channel < ports[port_type].num[SCARLETT2_PORT_OUT]; + channel++, i++) { + int err; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + const char *const descr = ports[port_type].dst_descr; + + snprintf(s, sizeof(s) - 5, descr, channel + 1); + strcat(s, " Enum"); + + err = scarlett2_add_new_ctl(mixer, + &scarlett2_mux_src_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Meter Controls ***/ + +static int scarlett2_meter_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 4095; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + u16 meter_levels[SCARLETT2_NUM_METERS]; + int i, err; + + err = scarlett2_usb_get_meter_levels(elem->head.mixer, meter_levels); + if (err < 0) + return err; + + for (i = 0; i < elem->channels; i++) + ucontrol->value.integer.value[i] = meter_levels[i]; + + return 0; +} + +static const struct snd_kcontrol_new scarlett2_meter_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, + .name = "", + .info = scarlett2_meter_ctl_info, + .get = scarlett2_meter_ctl_get +}; + +static int scarlett2_add_meter_ctl(struct usb_mixer_interface *mixer) +{ + return scarlett2_add_new_ctl(mixer, &scarlett2_meter_ctl, + 0, SCARLETT2_NUM_METERS, + "Level Meter", NULL); +} + +/*** Cleanup/Suspend Callbacks ***/ + +static void scarlett2_private_free(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + cancel_delayed_work_sync(&private->work); + kfree(private); + mixer->private_data = NULL; +} + +static void scarlett2_private_suspend(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + if (cancel_delayed_work_sync(&private->work)) + scarlett2_config_save(private->mixer); +} + +/*** Initialisation ***/ + +static int scarlett2_count_mux_srcs(const struct scarlett2_ports *ports) +{ + int port_type, count = 0; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) + count += ports[port_type].num[SCARLETT2_PORT_IN]; + + return count; +} + +/* Default routing connects PCM outputs and inputs to Analogue, + * S/PDIF, then ADAT + */ +static void scarlett2_init_routing(u8 *mux, + const struct scarlett2_ports *ports) +{ + int i, input_num, input_count, port_type; + int output_num, output_count, port_type_connect_num; + + static const int connect_order[] = { + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + -1 + }; + + /* Assign PCM inputs (routing outputs) */ + output_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + SCARLETT2_PORT_TYPE_PCM); + output_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_OUT]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + input_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_IN, port_type); + input_count = ports[port_type].num[SCARLETT2_PORT_IN]; + for (i = 0; + i < input_count && output_count; + i++, output_count--) + mux[output_num++] = input_num++; + } + + /* Assign PCM outputs (routing inputs) */ + input_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_IN, + SCARLETT2_PORT_TYPE_PCM); + input_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_IN]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + output_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_OUT, port_type); + output_count = ports[port_type].num[SCARLETT2_PORT_OUT]; + for (i = 0; + i < output_count && input_count; + i++, input_count--) + mux[output_num++] = input_num++; + } +} + +/* Initialise private data, routing, sequence number */ +static int scarlett2_init_private(struct usb_mixer_interface *mixer, + const struct scarlett2_device_info *info) +{ + struct scarlett2_mixer_data *private = + kzalloc(sizeof(struct scarlett2_mixer_data), GFP_KERNEL); + + if (!private) + return -ENOMEM; + + mutex_init(&private->usb_mutex); + mutex_init(&private->data_mutex); + INIT_DELAYED_WORK(&private->work, scarlett2_config_save_work); + private->info = info; + private->num_mux_srcs = scarlett2_count_mux_srcs(info->ports); + private->scarlett2_seq = 0; + private->mixer = mixer; + mixer->private_data = private; + mixer->private_free = scarlett2_private_free; + mixer->private_suspend = scarlett2_private_suspend; + + /* Setup default routing */ + scarlett2_init_routing(private->mux, info->ports); + + /* Initialise the sequence number used for the proprietary commands */ + return scarlett2_usb(mixer, SCARLETT2_USB_INIT_SEQ, + NULL, 0, NULL, 0); +} + +/* Read line-in config and line-out volume settings on start */ +static int scarlett2_read_configs(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + u8 level_switches[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switches[SCARLETT2_PAD_SWITCH_MAX]; + struct scarlett2_usb_volume_status volume_status; + int err, i; + + if (info->level_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_LEVEL_SWITCH, + info->level_input_count, + level_switches); + if (err < 0) + return err; + for (i = 0; i < info->level_input_count; i++) + private->level_switch[i] = level_switches[i]; + } + + if (info->pad_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_PAD_SWITCH, + info->pad_input_count, + pad_switches); + if (err < 0) + return err; + for (i = 0; i < info->pad_input_count; i++) + private->pad_switch[i] = pad_switches[i]; + } + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + int volume; + + private->vol_sw_hw_switch[i] = + info->line_out_hw_vol + && volume_status.sw_hw_switch[i]; + + volume = private->vol_sw_hw_switch[i] + ? volume_status.master_vol + : volume_status.sw_vol[i]; + volume = clamp(volume + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + private->vol[i] = volume; + } + + for (i = 0; i < info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +/* Notify on volume change */ +static void scarlett2_mixer_interrupt_vol_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int i; + + private->vol_updated = 1; + + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->master_vol_ctl->id); + + for (i = 0; i < num_line_out; i++) { + if (!private->vol_sw_hw_switch[i]) + continue; + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->vol_ctls[i]->id); + } +} + +/* Notify on button change */ +static void scarlett2_mixer_interrupt_button_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + int i; + + private->vol_updated = 1; + + for (i = 0; i < private->info->button_count; i++) + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->button_ctls[i]->id); +} + +/* Interrupt callback */ +static void scarlett2_mixer_interrupt(struct urb *urb) +{ + struct usb_mixer_interface *mixer = urb->context; + int len = urb->actual_length; + int ustatus = urb->status; + u32 data; + + if (ustatus != 0) + goto requeue; + + if (len == 8) { + data = le32_to_cpu(*(u32 *)urb->transfer_buffer); + if (data & SCARLETT2_USB_INTERRUPT_VOL_CHANGE) + scarlett2_mixer_interrupt_vol_change(mixer); + if (data & SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE) + scarlett2_mixer_interrupt_button_change(mixer); + } else { + usb_audio_err(mixer->chip, + "scarlett mixer interrupt length %d\n", len); + } + +requeue: + if (ustatus != -ENOENT && + ustatus != -ECONNRESET && + ustatus != -ESHUTDOWN) { + urb->dev = mixer->chip->dev; + usb_submit_urb(urb, GFP_ATOMIC); + } +} + +static int scarlett2_mixer_status_create(struct usb_mixer_interface *mixer) +{ + void *transfer_buffer; + + if (mixer->urb) { + usb_audio_err(mixer->chip, + "%s: mixer urb already in use!\n", __func__); + return 0; + } + + mixer->urb = usb_alloc_urb(0, GFP_KERNEL); + if (!mixer->urb) + return -ENOMEM; + + transfer_buffer = kmalloc(SCARLETT2_USB_INTERRUPT_MAX_DATA, GFP_KERNEL); + if (!transfer_buffer) + return -ENOMEM; + + usb_fill_int_urb( + mixer->urb, + mixer->chip->dev, + usb_rcvintpipe(mixer->chip->dev, + SCARLETT2_USB_INTERRUPT_ENDPOINT), + transfer_buffer, + SCARLETT2_USB_INTERRUPT_MAX_DATA, + scarlett2_mixer_interrupt, + mixer, + SCARLETT2_USB_INTERRUPT_INTERVAL); + + return usb_submit_urb(mixer->urb, GFP_KERNEL); +} + +/* Entry point */ +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) +{ + const struct scarlett2_device_info *info; + int err; + + /* only use UAC_VERSION_2 */ + if (!mixer->protocol) + return 0; + + switch (mixer->chip->usb_id) { + case USB_ID(0x1235, 0x8203): + info = &s6i6_gen2_info; + break; + case USB_ID(0x1235, 0x8204): + info = &s18i8_gen2_info; + break; + case USB_ID(0x1235, 0x8201): + info = &s18i20_gen2_info; + break; + default: /* device not (yet) supported */ + return -EINVAL; + } + + if (!(mixer->chip->setup & SCARLETT2_ENABLE)) { + usb_audio_err(mixer->chip, + "Focusrite Scarlett Gen 2 Mixer Driver disabled; " + "use options snd_usb_audio device_setup=1 " + "to enable and report any issues to g(a)b4.vu"); + return 0; + } + + /* Initialise private data, routing, sequence number */ + err = scarlett2_init_private(mixer, info); + if (err < 0) + return err; + + /* Read volume levels and controls from the interface */ + err = scarlett2_read_configs(mixer); + if (err < 0) + return err; + + /* Create the analogue output controls */ + err = scarlett2_add_line_out_ctls(mixer); + if (err < 0) + return err; + + /* Create the analogue input controls */ + err = scarlett2_add_line_in_ctls(mixer); + if (err < 0) + return err; + + /* Create the input, output, and mixer mux input selections */ + err = scarlett2_add_mux_enums(mixer); + if (err < 0) + return err; + + /* Create the matrix mixer controls */ + err = scarlett2_add_mixer_ctls(mixer); + if (err < 0) + return err; + + /* Create the level meter controls */ + err = scarlett2_add_meter_ctl(mixer); + if (err < 0) + return err; + + /* Set up the interrupt polling if there are hardware buttons */ + if (info->button_count) { + err = scarlett2_mixer_status_create(mixer); + if (err < 0) + return err; + } + + return 0; +} diff --git a/sound/usb/mixer_scarlett_gen2.h b/sound/usb/mixer_scarlett_gen2.h new file mode 100644 index 000000000000..52e1dad77afd --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __USB_MIXER_SCARLETT_GEN2_H +#define __USB_MIXER_SCARLETT_GEN2_H + +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer); + +#endif /* __USB_MIXER_SCARLETT_GEN2_H */

2 3

[alsa-devel] [PATCH v3 1/2] ASoC: SOF: add flag for position update ipc
by Keyon Jie 19 Jul '19

19 Jul '19

From: Marcin Rajwa <marcin.rajwa(a)linux.intel.com> In some cases, FW might need to use the host_period_bytes field to synchronize the DMA copying (with host side) but the driver does not need any position information returned over the IPC channel by the firmware. The current IPC definition prevents this capability, so add new field. Signed-off-by: Marcin Rajwa <marcin.rajwa(a)linux.intel.com> Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- include/sound/sof/stream.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/sof/stream.h b/include/sound/sof/stream.h index 643f175cb479..06af4ecb2584 100644 --- a/include/sound/sof/stream.h +++ b/include/sound/sof/stream.h @@ -83,10 +83,10 @@ struct sof_ipc_stream_params { uint16_t sample_valid_bytes; uint16_t sample_container_bytes; - /* for notifying host period has completed - 0 means no period IRQ */ uint32_t host_period_bytes; + uint32_t no_position_ipc; /* 1 means no IPC for position upadte */ - uint32_t reserved[2]; + uint16_t reserved[3]; uint16_t chmap[SOF_IPC_MAX_CHANNELS]; /**< channel map - SOF_CHMAP_ */ } __packed; -- 2.20.1

3 8

[alsa-devel] [PATCH] ALSA: pcm: Fix refcount_inc() on zero usage
by Takashi Iwai 19 Jul '19

19 Jul '19

The recent rewrite of PCM link lock management introduced the refcount in snd_pcm_group object, managed by the kernel refcount_t API. This caused unexpected kernel warnings when the kernel is built with CONFIG_REFCOUNT_FULL=y. As the warning line indicates, the problem is obviously that we start with refcount=0 and do refcount_inc() for adding each PCM link, while refcount_t API doesn't like refcount_inc() performed on zero. For adapting the proper refcount_t usage, this patch changes the logic slightly: - The initial refcount is 1, assuming the single list entry - The refcount is incremented / decremented at each PCM link addition and deletion - ... which allows us concentrating only on the refcount as a release condition Fixes: f57f3df03a8e ("ALSA: pcm: More fine-grained PCM link locking") BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204221 Reported-and-tested-by: Duncan Overbruck <kernel(a)duncano.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_native.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 860543a4c840..12dd9b318db1 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -77,7 +77,7 @@ void snd_pcm_group_init(struct snd_pcm_group *group) spin_lock_init(&group->lock); mutex_init(&group->mutex); INIT_LIST_HEAD(&group->substreams); - refcount_set(&group->refs, 0); + refcount_set(&group->refs, 1); } /* define group lock helpers */ @@ -1096,8 +1096,7 @@ static void snd_pcm_group_unref(struct snd_pcm_group *group, if (!group) return; - do_free = refcount_dec_and_test(&group->refs) && - list_empty(&group->substreams); + do_free = refcount_dec_and_test(&group->refs); snd_pcm_group_unlock(group, substream->pcm->nonatomic); if (do_free) kfree(group); @@ -2020,6 +2019,7 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd) snd_pcm_group_lock_irq(target_group, nonatomic); snd_pcm_stream_lock(substream1); snd_pcm_group_assign(substream1, target_group); + refcount_inc(&target_group->refs); snd_pcm_stream_unlock(substream1); snd_pcm_group_unlock_irq(target_group, nonatomic); _end: @@ -2056,13 +2056,14 @@ static int snd_pcm_unlink(struct snd_pcm_substream *substream) snd_pcm_group_lock_irq(group, nonatomic); relink_to_local(substream); + refcount_dec(&group->refs); /* detach the last stream, too */ if (list_is_singular(&group->substreams)) { relink_to_local(list_first_entry(&group->substreams, struct snd_pcm_substream, link_list)); - do_free = !refcount_read(&group->refs); + do_free = refcount_dec_and_test(&group->refs); } snd_pcm_group_unlock_irq(group, nonatomic); -- 2.16.4

1 0

[alsa-devel] [PATCH v6 0/6] VAG power control improvement for sgtl5000 codec
by Oleksandr Suvorov 19 Jul '19

19 Jul '19

VAG power control is improved to fit the manual [1]. This patchset fixes as minimum one bug: if customer muxes Headphone to Line-In right after boot, the VAG power remains off that leads to poor sound quality from line-in. I.e. after boot: - Connect sound source to Line-In jack; - Connect headphone to HP jack; - Run following commands: $ amixer set 'Headphone' 80% $ amixer set 'Headphone Mux' LINE_IN Also this series includes fixes of non-important bugs in sgtl5000 codec driver. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Changes in v6: - Code optimization Changes in v5: - Add explicit stable tag - Improve commit message Changes in v4: - CC the patch to kernel-stable - Code optimization, simplify function signature (thanks to Cezary Rojewski <cezary.rojewski(a)intel.com> for an idea) - Add a Fixes tag Changes in v3: - Add the reference to NXP SGTL5000 data sheet to commit message - Fix multi-line comment format Changes in v2: - Fix patch formatting Oleksandr Suvorov (6): ASoC: Define a set of DAPM pre/post-up events ASoC: sgtl5000: Improve VAG power and mute control ASoC: sgtl5000: Fix definition of VAG Ramp Control ASoC: sgtl5000: add ADC mute control ASoC: sgtl5000: Fix of unmute outputs on probe ASoC: sgtl5000: Fix charge pump source assignment include/sound/soc-dapm.h | 2 + sound/soc/codecs/sgtl5000.c | 250 ++++++++++++++++++++++++++++++------ sound/soc/codecs/sgtl5000.h | 2 +- 3 files changed, 213 insertions(+), 41 deletions(-) -- 2.20.1

2 7

[alsa-devel] [PATCH v5 0/6] VAG power control improvement for sgtl5000 codec
by Oleksandr Suvorov 19 Jul '19

19 Jul '19

VAG power control is improved to fit the manual [1]. This patchset fixes as minimum one bug: if customer muxes Headphone to Line-In right after boot, the VAG power remains off that leads to poor sound quality from line-in. I.e. after boot: - Connect sound source to Line-In jack; - Connect headphone to HP jack; - Run following commands: $ amixer set 'Headphone' 80% $ amixer set 'Headphone Mux' LINE_IN Also this series includes fixes of non-important bugs in sgtl5000 codec driver. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Changes in v5: - Add explicit stable tag - Improve commit message - Add explicit stable tag Changes in v4: - CC the patch to kernel-stable - Code optimization, simplify function signature (thanks to Cezary Rojewski <cezary.rojewski(a)intel.com> for an idea) - CC the patch to kernel-stable - Add a Fixes tag Changes in v3: - Add the reference to NXP SGTL5000 data sheet to commit message - Add the reference to NXP SGTL5000 data sheet to commit message - Fix multi-line comment format Changes in v2: - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting Oleksandr Suvorov (6): ASoC: Define a set of DAPM pre/post-up events ASoC: sgtl5000: Improve VAG power and mute control ASoC: sgtl5000: Fix definition of VAG Ramp Control ASoC: sgtl5000: add ADC mute control ASoC: sgtl5000: Fix of unmute outputs on probe ASoC: sgtl5000: Fix charge pump source assignment include/sound/soc-dapm.h | 2 + sound/soc/codecs/sgtl5000.c | 240 ++++++++++++++++++++++++++++++------ sound/soc/codecs/sgtl5000.h | 2 +- 3 files changed, 203 insertions(+), 41 deletions(-) -- 2.20.1

3 11

[alsa-devel] [RFC PATCH] Docs: move more driver, device related docs into drivers dir follows kernel source
by Alex Shi 19 Jul '19

19 Jul '19

Could I have a proposal to move the following driver/devices dirs which under Documentation/ into Documentation/drivers/, follows kernel source acpi backlight bus cpu-freq device-mapper driver-model gpio hid ide leds md memory mmc nfc nvmem pcmcia scsi sound watchdog auxdisplay blockdev cdrom crypto driver-api fpga gpu i2c infiniband lightnvm media misc mtd nvdimm PCI apidio serial usb More docs and dirs could move into this dir later, that could make Documenation dir much more clear, and don't cause trouble to find them. If it's acceptable, we could do docs pointer redirect further. Signed-off-by: Alex Shi <alex.shi(a)linux.alibaba.com> Cc: linux-pci(a)vger.kernel.org Cc: linux-doc(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: drbd-dev(a)lists.linbit.com Cc: linux-block(a)vger.kernel.org Cc: nbd(a)other.debian.org Cc: linux-ide(a)vger.kernel.org Cc: linux-pm(a)vger.kernel.org Cc: linux-crypto(a)vger.kernel.org Cc: keyrings(a)vger.kernel.org Cc: linux-wireless(a)vger.kernel.org Cc: linux-media(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: dmaengine(a)vger.kernel.org Cc: linux-edac(a)vger.kernel.org Cc: linux-fpga(a)vger.kernel.org Cc: linux-iio(a)vger.kernel.org Cc: linux-gpio(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: linux-s390(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org Cc: linux-usb(a)vger.kernel.org Cc: devel(a)driverdev.osuosl.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-amlogic(a)lists.infradead.org Cc: linux-tegra(a)vger.kernel.org Cc: intel-gfx(a)lists.freedesktop.org Cc: xen-devel(a)lists.xenproject.org Cc: linux-input(a)vger.kernel.org Cc: linux-i2c(a)vger.kernel.org Cc: linux-rdma(a)vger.kernel.org Cc: linux-leds(a)vger.kernel.org Cc: linux-scsi(a)vger.kernel.org Cc: dc395x(a)twibble.org Cc: esc.storagedev(a)microsemi.com Cc: megaraidlinux.pdl(a)broadcom.com Cc: osst-users(a)lists.sourceforge.net Cc: linux-watchdog(a)vger.kernel.org --- Documentation/{ => drivers}/PCI/MSI-HOWTO.txt | 0 Documentation/{ => drivers}/PCI/PCIEBUS-HOWTO.txt | 0 Documentation/{ => drivers}/PCI/acpi-info.txt | 0 .../{ => drivers}/PCI/endpoint/function/binding/pci-test.txt | 0 Documentation/{ => drivers}/PCI/endpoint/pci-endpoint-cfs.txt | 0 Documentation/{ => drivers}/PCI/endpoint/pci-endpoint.txt | 0 Documentation/{ => drivers}/PCI/endpoint/pci-test-function.txt | 0 Documentation/{ => drivers}/PCI/endpoint/pci-test-howto.txt | 0 Documentation/{ => drivers}/PCI/pci-error-recovery.txt | 0 Documentation/{ => drivers}/PCI/pci-iov-howto.txt | 0 Documentation/{ => drivers}/PCI/pci.txt | 0 Documentation/{ => drivers}/PCI/pcieaer-howto.txt | 0 Documentation/{ => drivers}/acpi/dsd/leds.txt | 0 Documentation/{ => drivers}/auxdisplay/cfag12864b | 0 Documentation/{ => drivers}/auxdisplay/ks0108 | 0 Documentation/{ => drivers}/auxdisplay/lcd-panel-cgram.txt | 0 Documentation/{ => drivers}/backlight/lp855x-driver.txt | 0 .../{ => drivers}/blockdev/drbd/DRBD-8.3-data-packets.svg | 0 Documentation/{ => drivers}/blockdev/drbd/DRBD-data-packets.svg | 0 Documentation/{ => drivers}/blockdev/drbd/README.txt | 0 Documentation/{ => drivers}/blockdev/drbd/conn-states-8.dot | 0 Documentation/{ => drivers}/blockdev/drbd/data-structure-v9.txt | 0 Documentation/{ => drivers}/blockdev/drbd/disk-states-8.dot | 0 .../blockdev/drbd/drbd-connection-state-overview.dot | 0 Documentation/{ => drivers}/blockdev/drbd/node-states-8.dot | 0 Documentation/{ => drivers}/blockdev/floppy.txt | 0 Documentation/{ => drivers}/blockdev/nbd.txt | 0 Documentation/{ => drivers}/blockdev/paride.txt | 0 Documentation/{ => drivers}/blockdev/ramdisk.txt | 0 Documentation/{ => drivers}/blockdev/zram.txt | 0 Documentation/{bus-devices => drivers/bus}/ti-gpmc.txt | 0 Documentation/{ => drivers}/cdrom/cdrom-standard.rst | 0 Documentation/{ => drivers}/cdrom/ide-cd.rst | 0 Documentation/{ => drivers}/cdrom/index.rst | 0 Documentation/{ => drivers}/cdrom/packet-writing.rst | 0 Documentation/{ => drivers}/cpu-freq/amd-powernow.txt | 0 Documentation/{ => drivers}/cpu-freq/core.txt | 0 Documentation/{ => drivers}/cpu-freq/cpu-drivers.txt | 0 Documentation/{ => drivers}/cpu-freq/cpufreq-nforce2.txt | 0 Documentation/{ => drivers}/cpu-freq/cpufreq-stats.txt | 0 Documentation/{ => drivers}/cpu-freq/index.txt | 0 Documentation/{ => drivers}/cpu-freq/pcc-cpufreq.txt | 0 Documentation/{ => drivers}/crypto/api-aead.rst | 0 Documentation/{ => drivers}/crypto/api-akcipher.rst | 0 Documentation/{ => drivers}/crypto/api-digest.rst | 0 Documentation/{ => drivers}/crypto/api-intro.txt | 0 Documentation/{ => drivers}/crypto/api-kpp.rst | 0 Documentation/{ => drivers}/crypto/api-rng.rst | 0 Documentation/{ => drivers}/crypto/api-samples.rst | 0 Documentation/{ => drivers}/crypto/api-skcipher.rst | 0 Documentation/{ => drivers}/crypto/api.rst | 0 Documentation/{ => drivers}/crypto/architecture.rst | 0 Documentation/{ => drivers}/crypto/asymmetric-keys.txt | 0 Documentation/{ => drivers}/crypto/async-tx-api.txt | 0 Documentation/{ => drivers}/crypto/conf.py | 0 Documentation/{ => drivers}/crypto/crypto_engine.rst | 0 Documentation/{ => drivers}/crypto/descore-readme.txt | 0 Documentation/{ => drivers}/crypto/devel-algos.rst | 0 Documentation/{ => drivers}/crypto/index.rst | 0 Documentation/{ => drivers}/crypto/intro.rst | 0 Documentation/{ => drivers}/crypto/userspace-if.rst | 0 Documentation/{ => drivers}/device-mapper/cache-policies.rst | 0 Documentation/{ => drivers}/device-mapper/cache.rst | 0 Documentation/{ => drivers}/device-mapper/delay.rst | 0 Documentation/{ => drivers}/device-mapper/dm-crypt.rst | 0 Documentation/{ => drivers}/device-mapper/dm-dust.txt | 0 Documentation/{ => drivers}/device-mapper/dm-flakey.rst | 0 Documentation/{ => drivers}/device-mapper/dm-init.rst | 0 Documentation/{ => drivers}/device-mapper/dm-integrity.rst | 0 Documentation/{ => drivers}/device-mapper/dm-io.rst | 0 Documentation/{ => drivers}/device-mapper/dm-log.rst | 0 Documentation/{ => drivers}/device-mapper/dm-queue-length.rst | 0 Documentation/{ => drivers}/device-mapper/dm-raid.rst | 0 Documentation/{ => drivers}/device-mapper/dm-service-time.rst | 0 Documentation/{ => drivers}/device-mapper/dm-uevent.rst | 0 Documentation/{ => drivers}/device-mapper/dm-zoned.rst | 0 Documentation/{ => drivers}/device-mapper/era.rst | 0 Documentation/{ => drivers}/device-mapper/index.rst | 0 Documentation/{ => drivers}/device-mapper/kcopyd.rst | 0 Documentation/{ => drivers}/device-mapper/linear.rst | 0 Documentation/{ => drivers}/device-mapper/log-writes.rst | 0 Documentation/{ => drivers}/device-mapper/persistent-data.rst | 0 Documentation/{ => drivers}/device-mapper/snapshot.rst | 0 Documentation/{ => drivers}/device-mapper/statistics.rst | 0 Documentation/{ => drivers}/device-mapper/striped.rst | 0 Documentation/{ => drivers}/device-mapper/switch.rst | 0 Documentation/{ => drivers}/device-mapper/thin-provisioning.rst | 0 Documentation/{ => drivers}/device-mapper/unstriped.rst | 0 Documentation/{ => drivers}/device-mapper/verity.rst | 0 Documentation/{ => drivers}/device-mapper/writecache.rst | 0 Documentation/{ => drivers}/device-mapper/zero.rst | 0 Documentation/{ => drivers}/driver-api/80211/cfg80211.rst | 0 Documentation/{ => drivers}/driver-api/80211/conf.py | 0 Documentation/{ => drivers}/driver-api/80211/index.rst | 0 Documentation/{ => drivers}/driver-api/80211/introduction.rst | 0 .../{ => drivers}/driver-api/80211/mac80211-advanced.rst | 0 Documentation/{ => drivers}/driver-api/80211/mac80211.rst | 0 Documentation/{ => drivers}/driver-api/acpi/index.rst | 0 Documentation/{ => drivers}/driver-api/acpi/linuxized-acpica.rst | 0 Documentation/{ => drivers}/driver-api/acpi/scan_handlers.rst | 0 Documentation/{ => drivers}/driver-api/basics.rst | 0 Documentation/{ => drivers}/driver-api/clk.rst | 0 Documentation/{ => drivers}/driver-api/component.rst | 0 Documentation/{ => drivers}/driver-api/conf.py | 0 Documentation/{ => drivers}/driver-api/device-io.rst | 0 Documentation/{ => drivers}/driver-api/device_connection.rst | 0 Documentation/{ => drivers}/driver-api/device_link.rst | 0 Documentation/{ => drivers}/driver-api/dma-buf.rst | 0 Documentation/{ => drivers}/driver-api/dmaengine/client.rst | 0 Documentation/{ => drivers}/driver-api/dmaengine/dmatest.rst | 0 Documentation/{ => drivers}/driver-api/dmaengine/index.rst | 0 Documentation/{ => drivers}/driver-api/dmaengine/provider.rst | 0 Documentation/{ => drivers}/driver-api/dmaengine/pxa_dma.rst | 0 Documentation/{ => drivers}/driver-api/edac.rst | 0 Documentation/{ => drivers}/driver-api/firewire.rst | 0 Documentation/{ => drivers}/driver-api/firmware/built-in-fw.rst | 0 Documentation/{ => drivers}/driver-api/firmware/core.rst | 0 .../{ => drivers}/driver-api/firmware/direct-fs-lookup.rst | 0 .../{ => drivers}/driver-api/firmware/fallback-mechanisms.rst | 0 .../{ => drivers}/driver-api/firmware/firmware_cache.rst | 0 .../{ => drivers}/driver-api/firmware/fw_search_path.rst | 0 Documentation/{ => drivers}/driver-api/firmware/index.rst | 0 Documentation/{ => drivers}/driver-api/firmware/introduction.rst | 0 Documentation/{ => drivers}/driver-api/firmware/lookup-order.rst | 0 .../{ => drivers}/driver-api/firmware/other_interfaces.rst | 0 .../{ => drivers}/driver-api/firmware/request_firmware.rst | 0 Documentation/{ => drivers}/driver-api/fpga/fpga-bridge.rst | 0 Documentation/{ => drivers}/driver-api/fpga/fpga-mgr.rst | 0 Documentation/{ => drivers}/driver-api/fpga/fpga-programming.rst | 0 Documentation/{ => drivers}/driver-api/fpga/fpga-region.rst | 0 Documentation/{ => drivers}/driver-api/fpga/index.rst | 0 Documentation/{ => drivers}/driver-api/fpga/intro.rst | 0 Documentation/{ => drivers}/driver-api/frame-buffer.rst | 0 Documentation/{ => drivers}/driver-api/generic-counter.rst | 0 Documentation/{ => drivers}/driver-api/gpio/board.rst | 0 Documentation/{ => drivers}/driver-api/gpio/consumer.rst | 0 Documentation/{ => drivers}/driver-api/gpio/driver.rst | 0 Documentation/{ => drivers}/driver-api/gpio/drivers-on-gpio.rst | 0 Documentation/{ => drivers}/driver-api/gpio/index.rst | 0 Documentation/{ => drivers}/driver-api/gpio/intro.rst | 0 Documentation/{ => drivers}/driver-api/gpio/legacy.rst | 0 Documentation/{ => drivers}/driver-api/hsi.rst | 0 Documentation/{ => drivers}/driver-api/i2c.rst | 0 Documentation/{ => drivers}/driver-api/i3c/device-driver-api.rst | 0 Documentation/{ => drivers}/driver-api/i3c/index.rst | 0 Documentation/{ => drivers}/driver-api/i3c/master-driver-api.rst | 0 Documentation/{ => drivers}/driver-api/i3c/protocol.rst | 0 Documentation/{ => drivers}/driver-api/iio/buffers.rst | 0 Documentation/{ => drivers}/driver-api/iio/core.rst | 0 Documentation/{ => drivers}/driver-api/iio/hw-consumer.rst | 0 Documentation/{ => drivers}/driver-api/iio/index.rst | 0 Documentation/{ => drivers}/driver-api/iio/intro.rst | 0 Documentation/{ => drivers}/driver-api/iio/triggered-buffers.rst | 0 Documentation/{ => drivers}/driver-api/iio/triggers.rst | 0 Documentation/{ => drivers}/driver-api/index.rst | 0 Documentation/{ => drivers}/driver-api/infrastructure.rst | 0 Documentation/{ => drivers}/driver-api/input.rst | 0 Documentation/{ => drivers}/driver-api/libata.rst | 0 Documentation/{ => drivers}/driver-api/message-based.rst | 0 Documentation/{ => drivers}/driver-api/misc_devices.rst | 0 Documentation/{ => drivers}/driver-api/miscellaneous.rst | 0 Documentation/{ => drivers}/driver-api/mtdnand.rst | 0 Documentation/{ => drivers}/driver-api/pci/index.rst | 0 Documentation/{ => drivers}/driver-api/pci/p2pdma.rst | 0 Documentation/{ => drivers}/driver-api/pci/pci.rst | 0 Documentation/{ => drivers}/driver-api/pinctl.rst | 0 Documentation/{ => drivers}/driver-api/pm/conf.py | 0 Documentation/{ => drivers}/driver-api/pm/cpuidle.rst | 0 Documentation/{ => drivers}/driver-api/pm/devices.rst | 0 Documentation/{ => drivers}/driver-api/pm/index.rst | 0 Documentation/{ => drivers}/driver-api/pm/notifiers.rst | 0 Documentation/{ => drivers}/driver-api/pm/types.rst | 0 Documentation/{ => drivers}/driver-api/pps.rst | 0 Documentation/{ => drivers}/driver-api/ptp.rst | 0 Documentation/{ => drivers}/driver-api/rapidio.rst | 0 Documentation/{ => drivers}/driver-api/regulator.rst | 0 Documentation/{ => drivers}/driver-api/s390-drivers.rst | 0 Documentation/{ => drivers}/driver-api/scsi.rst | 0 Documentation/{ => drivers}/driver-api/slimbus.rst | 0 Documentation/{ => drivers}/driver-api/sound.rst | 0 .../{ => drivers}/driver-api/soundwire/error_handling.rst | 0 Documentation/{ => drivers}/driver-api/soundwire/index.rst | 0 Documentation/{ => drivers}/driver-api/soundwire/locking.rst | 0 Documentation/{ => drivers}/driver-api/soundwire/stream.rst | 0 Documentation/{ => drivers}/driver-api/soundwire/summary.rst | 0 Documentation/{ => drivers}/driver-api/spi.rst | 0 Documentation/{ => drivers}/driver-api/target.rst | 0 Documentation/{ => drivers}/driver-api/uio-howto.rst | 0 Documentation/{ => drivers}/driver-api/usb/URB.rst | 0 Documentation/{ => drivers}/driver-api/usb/anchors.rst | 0 Documentation/{ => drivers}/driver-api/usb/bulk-streams.rst | 0 Documentation/{ => drivers}/driver-api/usb/callbacks.rst | 0 Documentation/{ => drivers}/driver-api/usb/dma.rst | 0 Documentation/{ => drivers}/driver-api/usb/dwc3.rst | 0 Documentation/{ => drivers}/driver-api/usb/error-codes.rst | 0 Documentation/{ => drivers}/driver-api/usb/gadget.rst | 0 Documentation/{ => drivers}/driver-api/usb/hotplug.rst | 0 Documentation/{ => drivers}/driver-api/usb/index.rst | 0 Documentation/{ => drivers}/driver-api/usb/persist.rst | 0 Documentation/{ => drivers}/driver-api/usb/power-management.rst | 0 Documentation/{ => drivers}/driver-api/usb/typec.rst | 0 Documentation/{ => drivers}/driver-api/usb/typec_bus.rst | 0 Documentation/{ => drivers}/driver-api/usb/usb.rst | 0 Documentation/{ => drivers}/driver-api/usb/usb3-debug-port.rst | 0 .../{ => drivers}/driver-api/usb/writing_musb_glue_layer.rst | 0 Documentation/{ => drivers}/driver-api/usb/writing_usb_driver.rst | 0 Documentation/{ => drivers}/driver-api/vme.rst | 0 Documentation/{ => drivers}/driver-api/w1.rst | 0 Documentation/{ => drivers}/driver-model/binding.txt | 0 Documentation/{ => drivers}/driver-model/bus.txt | 0 Documentation/{ => drivers}/driver-model/class.txt | 0 Documentation/{ => drivers}/driver-model/design-patterns.txt | 0 Documentation/{ => drivers}/driver-model/device.txt | 0 Documentation/{ => drivers}/driver-model/devres.txt | 0 Documentation/{ => drivers}/driver-model/driver.txt | 0 Documentation/{ => drivers}/driver-model/overview.txt | 0 Documentation/{ => drivers}/driver-model/platform.txt | 0 Documentation/{ => drivers}/driver-model/porting.txt | 0 Documentation/{ => drivers}/fpga/dfl.rst | 0 Documentation/{ => drivers}/fpga/index.rst | 0 Documentation/{ => drivers}/gpio/index.rst | 0 Documentation/{ => drivers}/gpio/sysfs.rst | 0 Documentation/{ => drivers}/gpu/afbc.rst | 0 Documentation/{ => drivers}/gpu/amdgpu-dc.rst | 0 Documentation/{ => drivers}/gpu/amdgpu.rst | 0 Documentation/{ => drivers}/gpu/bridge/dw-hdmi.rst | 0 Documentation/{ => drivers}/gpu/conf.py | 0 Documentation/{ => drivers}/gpu/dp-mst/topology-figure-1.dot | 0 Documentation/{ => drivers}/gpu/dp-mst/topology-figure-2.dot | 0 Documentation/{ => drivers}/gpu/dp-mst/topology-figure-3.dot | 0 Documentation/{ => drivers}/gpu/drivers.rst | 0 Documentation/{ => drivers}/gpu/drm-client.rst | 0 Documentation/{ => drivers}/gpu/drm-internals.rst | 0 Documentation/{ => drivers}/gpu/drm-kms-helpers.rst | 0 Documentation/{ => drivers}/gpu/drm-kms.rst | 0 Documentation/{ => drivers}/gpu/drm-mm.rst | 0 Documentation/{ => drivers}/gpu/drm-uapi.rst | 0 Documentation/{ => drivers}/gpu/i915.rst | 0 Documentation/{ => drivers}/gpu/index.rst | 0 Documentation/{ => drivers}/gpu/introduction.rst | 0 Documentation/{ => drivers}/gpu/kms-properties.csv | 0 Documentation/{ => drivers}/gpu/komeda-kms.rst | 0 Documentation/{ => drivers}/gpu/meson.rst | 0 Documentation/{ => drivers}/gpu/msm-crash-dump.rst | 0 Documentation/{ => drivers}/gpu/pl111.rst | 0 Documentation/{ => drivers}/gpu/tegra.rst | 0 Documentation/{ => drivers}/gpu/tinydrm.rst | 0 Documentation/{ => drivers}/gpu/todo.rst | 0 Documentation/{ => drivers}/gpu/tve200.rst | 0 Documentation/{ => drivers}/gpu/v3d.rst | 0 Documentation/{ => drivers}/gpu/vc4.rst | 0 Documentation/{ => drivers}/gpu/vga-switcheroo.rst | 0 Documentation/{ => drivers}/gpu/vgaarbiter.rst | 0 Documentation/{ => drivers}/gpu/vkms.rst | 0 Documentation/{ => drivers}/gpu/xen-front.rst | 0 Documentation/{ => drivers}/hid/hid-alps.txt | 0 Documentation/{ => drivers}/hid/hid-sensor.txt | 0 Documentation/{ => drivers}/hid/hid-transport.txt | 0 Documentation/{ => drivers}/hid/hiddev.txt | 0 Documentation/{ => drivers}/hid/hidraw.txt | 0 Documentation/{ => drivers}/hid/intel-ish-hid.txt | 0 Documentation/{ => drivers}/hid/uhid.txt | 0 Documentation/{ => drivers}/i2c/DMA-considerations | 0 Documentation/{ => drivers}/i2c/busses/i2c-ali1535 | 0 Documentation/{ => drivers}/i2c/busses/i2c-ali1563 | 0 Documentation/{ => drivers}/i2c/busses/i2c-ali15x3 | 0 Documentation/{ => drivers}/i2c/busses/i2c-amd-mp2 | 0 Documentation/{ => drivers}/i2c/busses/i2c-amd756 | 0 Documentation/{ => drivers}/i2c/busses/i2c-amd8111 | 0 Documentation/{ => drivers}/i2c/busses/i2c-diolan-u2c | 0 Documentation/{ => drivers}/i2c/busses/i2c-i801 | 0 Documentation/{ => drivers}/i2c/busses/i2c-ismt | 0 Documentation/{ => drivers}/i2c/busses/i2c-mlxcpld | 0 Documentation/{ => drivers}/i2c/busses/i2c-nforce2 | 0 Documentation/{ => drivers}/i2c/busses/i2c-nvidia-gpu | 0 Documentation/{ => drivers}/i2c/busses/i2c-ocores | 0 Documentation/{ => drivers}/i2c/busses/i2c-parport | 0 Documentation/{ => drivers}/i2c/busses/i2c-parport-light | 0 Documentation/{ => drivers}/i2c/busses/i2c-pca-isa | 0 Documentation/{ => drivers}/i2c/busses/i2c-piix4 | 0 Documentation/{ => drivers}/i2c/busses/i2c-sis5595 | 0 Documentation/{ => drivers}/i2c/busses/i2c-sis630 | 0 Documentation/{ => drivers}/i2c/busses/i2c-sis96x | 0 Documentation/{ => drivers}/i2c/busses/i2c-taos-evm | 0 Documentation/{ => drivers}/i2c/busses/i2c-via | 0 Documentation/{ => drivers}/i2c/busses/i2c-viapro | 0 Documentation/{ => drivers}/i2c/busses/scx200_acb | 0 Documentation/{ => drivers}/i2c/dev-interface | 0 Documentation/{ => drivers}/i2c/fault-codes | 0 Documentation/{ => drivers}/i2c/functionality | 0 Documentation/{ => drivers}/i2c/gpio-fault-injection | 0 Documentation/{ => drivers}/i2c/i2c-protocol | 0 Documentation/{ => drivers}/i2c/i2c-stub | 0 Documentation/{ => drivers}/i2c/i2c-topology | 0 Documentation/{ => drivers}/i2c/instantiating-devices | 0 Documentation/{ => drivers}/i2c/muxes/i2c-mux-gpio | 0 Documentation/{ => drivers}/i2c/old-module-parameters | 0 Documentation/{ => drivers}/i2c/slave-eeprom-backend | 0 Documentation/{ => drivers}/i2c/slave-interface | 0 Documentation/{ => drivers}/i2c/smbus-protocol | 0 Documentation/{ => drivers}/i2c/summary | 0 Documentation/{ => drivers}/i2c/ten-bit-addresses | 0 Documentation/{ => drivers}/i2c/upgrading-clients | 0 Documentation/{ => drivers}/i2c/writing-clients | 0 Documentation/{ => drivers}/ide/ChangeLog.ide-cd.1994-2004 | 0 Documentation/{ => drivers}/ide/ChangeLog.ide-floppy.1996-2002 | 0 Documentation/{ => drivers}/ide/ChangeLog.ide-tape.1995-2002 | 0 Documentation/{ => drivers}/ide/changelogs.rst | 0 Documentation/{ => drivers}/ide/ide-tape.rst | 0 Documentation/{ => drivers}/ide/ide.rst | 0 Documentation/{ => drivers}/ide/index.rst | 0 Documentation/{ => drivers}/ide/warm-plug-howto.rst | 0 Documentation/{ => drivers}/infiniband/core_locking.txt | 0 Documentation/{ => drivers}/infiniband/ipoib.txt | 0 Documentation/{ => drivers}/infiniband/opa_vnic.txt | 0 Documentation/{ => drivers}/infiniband/sysfs.txt | 0 Documentation/{ => drivers}/infiniband/tag_matching.txt | 0 Documentation/{ => drivers}/infiniband/user_mad.txt | 0 Documentation/{ => drivers}/infiniband/user_verbs.txt | 0 Documentation/{ => drivers}/leds/index.rst | 0 Documentation/{ => drivers}/leds/leds-blinkm.rst | 0 Documentation/{ => drivers}/leds/leds-class-flash.rst | 0 Documentation/{ => drivers}/leds/leds-class.rst | 0 Documentation/{ => drivers}/leds/leds-lm3556.rst | 0 Documentation/{ => drivers}/leds/leds-lp3944.rst | 0 Documentation/{ => drivers}/leds/leds-lp5521.rst | 0 Documentation/{ => drivers}/leds/leds-lp5523.rst | 0 Documentation/{ => drivers}/leds/leds-lp5562.rst | 0 Documentation/{ => drivers}/leds/leds-lp55xx.rst | 0 Documentation/{ => drivers}/leds/leds-mlxcpld.rst | 0 Documentation/{ => drivers}/leds/ledtrig-oneshot.rst | 0 Documentation/{ => drivers}/leds/ledtrig-transient.rst | 0 Documentation/{ => drivers}/leds/ledtrig-usbport.rst | 0 Documentation/{ => drivers}/leds/uleds.rst | 0 Documentation/{ => drivers}/lightnvm/pblk.txt | 0 Documentation/{ => drivers}/md/md-cluster.txt | 0 Documentation/{ => drivers}/md/raid5-cache.txt | 0 Documentation/{ => drivers}/md/raid5-ppl.txt | 0 Documentation/{ => drivers}/media/.gitignore | 0 Documentation/{ => drivers}/media/Makefile | 0 Documentation/{ => drivers}/media/audio.h.rst.exceptions | 0 Documentation/{ => drivers}/media/ca.h.rst.exceptions | 0 Documentation/{ => drivers}/media/cec-drivers/index.rst | 0 Documentation/{ => drivers}/media/cec-drivers/pulse8-cec.rst | 0 Documentation/{ => drivers}/media/cec.h.rst.exceptions | 0 Documentation/{ => drivers}/media/conf.py | 0 Documentation/{ => drivers}/media/conf_nitpick.py | 0 Documentation/{ => drivers}/media/dmx.h.rst.exceptions | 0 Documentation/{ => drivers}/media/dvb-drivers/avermedia.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/bt8xx.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/cards.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/ci.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/contributors.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/dvb-usb.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/faq.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/frontends.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/index.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/intro.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/lmedm04.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/opera-firmware.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/technisat.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/ttusb-dec.rst | 0 Documentation/{ => drivers}/media/dvb-drivers/udev.rst | 0 Documentation/{ => drivers}/media/frontend.h.rst.exceptions | 0 Documentation/{ => drivers}/media/index.rst | 0 Documentation/{ => drivers}/media/intro.rst | 0 Documentation/{ => drivers}/media/kapi/cec-core.rst | 0 Documentation/{ => drivers}/media/kapi/csi2.rst | 0 Documentation/{ => drivers}/media/kapi/dtv-ca.rst | 0 Documentation/{ => drivers}/media/kapi/dtv-common.rst | 0 Documentation/{ => drivers}/media/kapi/dtv-core.rst | 0 Documentation/{ => drivers}/media/kapi/dtv-demux.rst | 0 Documentation/{ => drivers}/media/kapi/dtv-frontend.rst | 0 Documentation/{ => drivers}/media/kapi/dtv-net.rst | 0 Documentation/{ => drivers}/media/kapi/mc-core.rst | 0 Documentation/{ => drivers}/media/kapi/rc-core.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-async.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-clocks.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-common.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-controls.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-core.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-dev.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-device.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-dv-timings.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-event.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-fh.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-flash-led-class.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-fwnode.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-intro.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-mc.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-mediabus.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-mem2mem.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-rect.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-subdev.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-tuner.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-tveeprom.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-videobuf.rst | 0 Documentation/{ => drivers}/media/kapi/v4l2-videobuf2.rst | 0 Documentation/{ => drivers}/media/lirc.h.rst.exceptions | 0 Documentation/{ => drivers}/media/media.h.rst.exceptions | 0 Documentation/{ => drivers}/media/media_kapi.rst | 0 Documentation/{ => drivers}/media/media_uapi.rst | 0 Documentation/{ => drivers}/media/net.h.rst.exceptions | 0 Documentation/{ => drivers}/media/typical_media_device.svg | 0 Documentation/{ => drivers}/media/uapi/cec/cec-api.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-func-close.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-func-ioctl.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-func-open.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-func-poll.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-funcs.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-header.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-intro.rst | 0 .../{ => drivers}/media/uapi/cec/cec-ioc-adap-g-caps.rst | 0 .../{ => drivers}/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 0 .../{ => drivers}/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-ioc-dqevent.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-ioc-g-mode.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-ioc-receive.rst | 0 Documentation/{ => drivers}/media/uapi/cec/cec-pin-error-inj.rst | 0 .../media/uapi/dvb/audio-bilingual-channel-select.rst | 0 .../{ => drivers}/media/uapi/dvb/audio-channel-select.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-clear-buffer.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-continue.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-fclose.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-fopen.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-fwrite.rst | 0 .../{ => drivers}/media/uapi/dvb/audio-get-capabilities.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-get-status.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-pause.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-play.rst | 0 .../{ => drivers}/media/uapi/dvb/audio-select-source.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-set-av-sync.rst | 0 .../{ => drivers}/media/uapi/dvb/audio-set-bypass-mode.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-set-id.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-set-mixer.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-set-mute.rst | 0 .../{ => drivers}/media/uapi/dvb/audio-set-streamtype.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio-stop.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/audio_data_types.rst | 0 .../{ => drivers}/media/uapi/dvb/audio_function_calls.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-fclose.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-fopen.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-get-cap.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-get-descr-info.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-get-msg.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-get-slot-info.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-reset.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-send-msg.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca-set-descr.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca_data_types.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/ca_function_calls.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/demux.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-add-pid.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-expbuf.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-fclose.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-fopen.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-fread.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-fwrite.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-get-pes-pids.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-get-stc.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-mmap.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-munmap.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-qbuf.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-querybuf.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-remove-pid.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-reqbufs.rst | 0 .../{ => drivers}/media/uapi/dvb/dmx-set-buffer-size.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-set-filter.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-set-pes-filter.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-start.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx-stop.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx_fcalls.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dmx_types.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dvb-fe-read-status.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dvb-frontend-event.rst | 0 .../{ => drivers}/media/uapi/dvb/dvb-frontend-parameters.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dvbapi.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dvbproperty.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/dvbstb.svg | 0 Documentation/{ => drivers}/media/uapi/dvb/examples.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-bandwidth-t.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-diseqc-reset-overload.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-diseqc-send-burst.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-diseqc-send-master-cmd.rst | 0 .../media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-enable-high-lnb-voltage.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-get-event.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-get-frontend.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-get-info.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-get-property.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-read-ber.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-read-signal-strength.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-read-snr.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-read-status.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-read-uncorrected-blocks.rst | 0 .../{ => drivers}/media/uapi/dvb/fe-set-frontend-tune-mode.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-set-frontend.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-set-tone.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-set-voltage.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/fe-type-t.rst | 0 .../{ => drivers}/media/uapi/dvb/fe_property_parameters.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/frontend-header.rst | 0 .../media/uapi/dvb/frontend-property-cable-systems.rst | 0 .../media/uapi/dvb/frontend-property-satellite-systems.rst | 0 .../media/uapi/dvb/frontend-property-terrestrial-systems.rst | 0 .../{ => drivers}/media/uapi/dvb/frontend-stat-properties.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/frontend.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/frontend_f_close.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/frontend_f_open.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/frontend_fcalls.rst | 0 .../{ => drivers}/media/uapi/dvb/frontend_legacy_api.rst | 0 .../{ => drivers}/media/uapi/dvb/frontend_legacy_dvbv3_api.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/headers.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/intro.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/legacy_dvb_apis.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/net-add-if.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/net-get-if.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/net-remove-if.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/net-types.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/net.rst | 0 .../{ => drivers}/media/uapi/dvb/query-dvb-frontend-info.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-clear-buffer.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-command.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-continue.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-fast-forward.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-fclose.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-fopen.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-freeze.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-fwrite.rst | 0 .../{ => drivers}/media/uapi/dvb/video-get-capabilities.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-get-event.rst | 0 .../{ => drivers}/media/uapi/dvb/video-get-frame-count.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-get-pts.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-get-size.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-get-status.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-play.rst | 0 .../{ => drivers}/media/uapi/dvb/video-select-source.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-set-blank.rst | 0 .../{ => drivers}/media/uapi/dvb/video-set-display-format.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-set-format.rst | 0 .../{ => drivers}/media/uapi/dvb/video-set-streamtype.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-slowmotion.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-stillpicture.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-stop.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video-try-command.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video.rst | 0 .../{ => drivers}/media/uapi/dvb/video_function_calls.rst | 0 Documentation/{ => drivers}/media/uapi/dvb/video_types.rst | 0 Documentation/{ => drivers}/media/uapi/fdl-appendix.rst | 0 Documentation/{ => drivers}/media/uapi/gen-errors.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-controller-intro.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-controller-model.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-controller.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-func-close.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-func-ioctl.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-func-open.rst | 0 Documentation/{ => drivers}/media/uapi/mediactl/media-funcs.rst | 0 Documentation/{ => drivers}/media/uapi/mediactl/media-header.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-ioc-device-info.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-ioc-enum-entities.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-ioc-enum-links.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-ioc-g-topology.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-ioc-request-alloc.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-ioc-setup-link.rst | 0 .../{ => drivers}/media/uapi/mediactl/media-request-ioc-queue.rst | 0 .../media/uapi/mediactl/media-request-ioc-reinit.rst | 0 Documentation/{ => drivers}/media/uapi/mediactl/media-types.rst | 0 Documentation/{ => drivers}/media/uapi/mediactl/request-api.rst | 0 .../{ => drivers}/media/uapi/mediactl/request-func-close.rst | 0 .../{ => drivers}/media/uapi/mediactl/request-func-ioctl.rst | 0 .../{ => drivers}/media/uapi/mediactl/request-func-poll.rst | 0 Documentation/{ => drivers}/media/uapi/rc/keytable.c.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-dev-intro.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-dev.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-func.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-get-features.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-get-rec-mode.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-get-rec-resolution.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-get-send-mode.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-get-timeout.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-header.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-read.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-measure-carrier-mode.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-rec-carrier-range.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-rec-carrier.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-rec-timeout-reports.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-rec-timeout.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-send-carrier.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-send-duty-cycle.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-transmitter-mask.rst | 0 .../{ => drivers}/media/uapi/rc/lirc-set-wideband-receiver.rst | 0 Documentation/{ => drivers}/media/uapi/rc/lirc-write.rst | 0 Documentation/{ => drivers}/media/uapi/rc/rc-intro.rst | 0 Documentation/{ => drivers}/media/uapi/rc/rc-sysfs-nodes.rst | 0 Documentation/{ => drivers}/media/uapi/rc/rc-table-change.rst | 0 Documentation/{ => drivers}/media/uapi/rc/rc-tables.rst | 0 Documentation/{ => drivers}/media/uapi/rc/remote_controllers.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/app-pri.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/async.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/audio.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/bayer.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/biblio.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/buffer.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/capture-example.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/capture.c.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/colorspaces-defs.rst | 0 .../{ => drivers}/media/uapi/v4l/colorspaces-details.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/colorspaces.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/common-defs.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/common.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/compat.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/constraints.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/control.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/crop.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/crop.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/depth-formats.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-capture.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-event.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-mem2mem.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-meta.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-osd.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-output.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-overlay.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-radio.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-raw-vbi.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-rds.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-sdr.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-sliced-vbi.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-subdev.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dev-touch.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/devices.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/diff-v4l.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dmabuf.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/dv-timings.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-camera.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-codec.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-detect.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-dv.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-flash.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-fm-rx.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-fm-tx.rst | 0 .../{ => drivers}/media/uapi/v4l/ext-ctrls-image-process.rst | 0 .../{ => drivers}/media/uapi/v4l/ext-ctrls-image-source.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-jpeg.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-rf-tuner.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/extended-controls.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/field-order.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/fieldseq_bt.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/fieldseq_tb.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/format.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-close.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-ioctl.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-mmap.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-munmap.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-open.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-poll.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-read.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-select.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/func-write.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/hist-v4l2.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/hsv-formats.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/io.rst | 0 .../{ => drivers}/media/uapi/v4l/libv4l-introduction.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/libv4l.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/meta-formats.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/mmap.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/nv12mt.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/nv12mt_example.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/open.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pipeline.dot | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-cnf4.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-compressed.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-grey.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-indexed.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-intro.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-inzi.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-m420.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-meta-d4xx.rst | 0 .../{ => drivers}/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-meta-uvc.rst | 0 .../{ => drivers}/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst | 0 .../{ => drivers}/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv12.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv12m.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv12mt.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv16.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv16m.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv24.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-packed-hsv.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-packed-rgb.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-packed-yuv.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-reserved.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-rgb.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cs08.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cs14le.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cu08.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cu16le.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-pcu16be.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-pcu18be.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-pcu20be.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-ru12le.rst | 0 .../{ => drivers}/media/uapi/v4l/pixfmt-srggb10-ipu3.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb10.rst | 0 .../{ => drivers}/media/uapi/v4l/pixfmt-srggb10alaw8.rst | 0 .../{ => drivers}/media/uapi/v4l/pixfmt-srggb10dpcm8.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb10p.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb12.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb12p.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb14p.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb16.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb8.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-td08.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-td16.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-tu08.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-tu16.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-uv8.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-uyvy.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-v4l2-mplane.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-v4l2.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-vyuy.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y10.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y10b.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y10p.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y12.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y12i.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y16-be.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y16.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y41p.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y8i.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv410.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv411p.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv420.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv420m.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv422m.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv422p.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv444m.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuyv.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yvyu.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt-z16.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/pixfmt.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/planar-apis.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/querycap.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/rw.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/sdr-formats.rst | 0 .../{ => drivers}/media/uapi/v4l/selection-api-configuration.rst | 0 .../{ => drivers}/media/uapi/v4l/selection-api-examples.rst | 0 .../{ => drivers}/media/uapi/v4l/selection-api-intro.rst | 0 .../{ => drivers}/media/uapi/v4l/selection-api-targets.rst | 0 .../{ => drivers}/media/uapi/v4l/selection-api-vs-crop-api.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/selection-api.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/selection.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/selections-common.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/standard.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/streaming-par.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/subdev-formats.rst | 0 .../{ => drivers}/media/uapi/v4l/subdev-image-processing-crop.svg | 0 .../{ => drivers}/media/uapi/v4l/subdev-image-processing-full.svg | 0 .../uapi/v4l/subdev-image-processing-scaling-multi-source.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/tch-formats.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/tuner.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/user-func.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/userp.rst | 0 .../{ => drivers}/media/uapi/v4l/v4l2-selection-flags.rst | 0 .../{ => drivers}/media/uapi/v4l/v4l2-selection-targets.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/v4l2.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/v4l2grab-example.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/v4l2grab.c.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vbi_525.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/vbi_625.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/vbi_hsync.svg | 0 Documentation/{ => drivers}/media/uapi/v4l/video.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/videodev.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-create-bufs.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-cropcap.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-dbg-g-register.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-decoder-cmd.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-dqevent.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-dv-timings-cap.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-encoder-cmd.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-enum-dv-timings.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-enum-fmt.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-enum-frameintervals.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-enum-framesizes.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-enum-freq-bands.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-enumaudio.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-enumaudioout.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-enuminput.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-enumoutput.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-enumstd.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-expbuf.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-audio.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-audioout.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-crop.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-ctrl.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-g-dv-timings.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-edid.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-enc-index.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-ext-ctrls.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-fbuf.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-fmt.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-frequency.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-input.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-jpegcomp.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-modulator.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-output.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-parm.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-priority.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-selection.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-std.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-tuner.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-log-status.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-overlay.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-prepare-buf.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-qbuf.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-query-dv-timings.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-querybuf.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-querycap.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-queryctrl.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-querystd.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-reqbufs.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-s-hw-freq-seek.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/vidioc-streamon.rst | 0 .../media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst | 0 .../media/uapi/v4l/vidioc-subdev-enum-frame-size.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-subdev-g-crop.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-subdev-g-fmt.rst | 0 .../media/uapi/v4l/vidioc-subdev-g-frame-interval.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-subdev-g-selection.rst | 0 .../{ => drivers}/media/uapi/v4l/vidioc-subscribe-event.rst | 0 Documentation/{ => drivers}/media/uapi/v4l/yuv-formats.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/au0828-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/bttv-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/bttv.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/cafe_ccic.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/cpia2.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/cx18.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/cx2341x.rst | 0 .../{ => drivers}/media/v4l-drivers/cx23885-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/cx88-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/cx88.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/davinci-vpbe.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/em28xx-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/fimc.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/fourcc.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/gspca-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/imx.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/imx7.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/index.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/ipu3.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/ivtv-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/ivtv.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/max2175.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/meye.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/omap3isp.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/omap4_camera.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/philips.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/pvrusb2.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/pxa_camera.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/qcom_camss.rst | 0 .../{ => drivers}/media/v4l-drivers/qcom_camss_8x96_graph.dot | 0 .../{ => drivers}/media/v4l-drivers/qcom_camss_graph.dot | 0 Documentation/{ => drivers}/media/v4l-drivers/radiotrack.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/rcar-fdp1.rst | 0 .../{ => drivers}/media/v4l-drivers/saa7134-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/saa7134.rst | 0 .../{ => drivers}/media/v4l-drivers/saa7164-cardlist.rst | 0 .../{ => drivers}/media/v4l-drivers/sh_mobile_ceu_camera.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/si470x.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/si4713.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/si476x.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/soc-camera.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/tm6000-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/tuner-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/tuners.rst | 0 .../{ => drivers}/media/v4l-drivers/usbvision-cardlist.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/uvcvideo.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/v4l-with-ir.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/vimc.dot | 0 Documentation/{ => drivers}/media/v4l-drivers/vimc.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/vivid.rst | 0 Documentation/{ => drivers}/media/v4l-drivers/zr364xx.rst | 0 Documentation/{ => drivers}/media/video.h.rst.exceptions | 0 Documentation/{ => drivers}/media/videodev2.h.rst.exceptions | 0 Documentation/{memory-devices => drivers/memory}/ti-emif.txt | 0 Documentation/{misc-devices => drivers/misc}/ad525x_dpot.txt | 0 Documentation/{misc-devices => drivers/misc}/apds990x.txt | 0 Documentation/{misc-devices => drivers/misc}/bh1770glc.txt | 0 Documentation/{misc-devices => drivers/misc}/c2port.txt | 0 Documentation/{misc-devices => drivers/misc}/eeprom | 0 Documentation/{misc-devices => drivers/misc}/ibmvmc.rst | 0 Documentation/{misc-devices => drivers/misc}/ics932s401 | 0 Documentation/{misc-devices => drivers/misc}/index.rst | 0 Documentation/{misc-devices => drivers/misc}/isl29003 | 0 Documentation/{misc-devices => drivers/misc}/lis3lv02d | 0 Documentation/{misc-devices => drivers/misc}/max6875 | 0 .../{misc-devices => drivers/misc}/mei/mei-client-bus.txt | 0 Documentation/{misc-devices => drivers/misc}/mei/mei.txt | 0 .../{misc-devices => drivers/misc}/pci-endpoint-test.txt | 0 .../{misc-devices => drivers/misc}/spear-pcie-gadget.txt | 0 Documentation/{ => drivers}/mmc/mmc-async-req.txt | 0 Documentation/{ => drivers}/mmc/mmc-dev-attrs.txt | 0 Documentation/{ => drivers}/mmc/mmc-dev-parts.txt | 0 Documentation/{ => drivers}/mmc/mmc-tools.txt | 0 Documentation/{ => drivers}/mtd/intel-spi.txt | 0 Documentation/{ => drivers}/mtd/nand_ecc.txt | 0 Documentation/{ => drivers}/mtd/spi-nor.txt | 0 Documentation/{ => drivers}/nfc/nfc-hci.txt | 0 Documentation/{ => drivers}/nfc/nfc-pn544.txt | 0 Documentation/{ => drivers}/nvdimm/btt.txt | 0 Documentation/{ => drivers}/nvdimm/nvdimm.txt | 0 Documentation/{ => drivers}/nvdimm/security.txt | 0 Documentation/{ => drivers}/nvmem/nvmem.txt | 0 Documentation/{ => drivers}/pcmcia/devicetable.rst | 0 Documentation/{ => drivers}/pcmcia/driver-changes.rst | 0 Documentation/{ => drivers}/pcmcia/driver.rst | 0 Documentation/{ => drivers}/pcmcia/index.rst | 0 Documentation/{ => drivers}/pcmcia/locking.rst | 0 Documentation/{ => drivers}/rapidio/mport_cdev.txt | 0 Documentation/{ => drivers}/rapidio/rapidio.txt | 0 Documentation/{ => drivers}/rapidio/rio_cm.txt | 0 Documentation/{ => drivers}/rapidio/sysfs.txt | 0 Documentation/{ => drivers}/rapidio/tsi721.txt | 0 Documentation/{ => drivers}/scsi/53c700.txt | 0 Documentation/{ => drivers}/scsi/BusLogic.txt | 0 Documentation/{ => drivers}/scsi/ChangeLog.arcmsr | 0 Documentation/{ => drivers}/scsi/ChangeLog.ips | 0 Documentation/{ => drivers}/scsi/ChangeLog.lpfc | 0 Documentation/{ => drivers}/scsi/ChangeLog.megaraid | 0 Documentation/{ => drivers}/scsi/ChangeLog.megaraid_sas | 0 Documentation/{ => drivers}/scsi/ChangeLog.ncr53c8xx | 0 Documentation/{ => drivers}/scsi/ChangeLog.sym53c8xx | 0 Documentation/{ => drivers}/scsi/ChangeLog.sym53c8xx_2 | 0 Documentation/{ => drivers}/scsi/FlashPoint.txt | 0 Documentation/{ => drivers}/scsi/LICENSE.FlashPoint | 0 Documentation/{ => drivers}/scsi/LICENSE.qla2xxx | 0 Documentation/{ => drivers}/scsi/LICENSE.qla4xxx | 0 Documentation/{ => drivers}/scsi/NinjaSCSI.txt | 0 Documentation/{ => drivers}/scsi/aacraid.txt | 0 Documentation/{ => drivers}/scsi/advansys.txt | 0 Documentation/{ => drivers}/scsi/aha152x.txt | 0 Documentation/{ => drivers}/scsi/aic79xx.txt | 0 Documentation/{ => drivers}/scsi/aic7xxx.txt | 0 Documentation/{ => drivers}/scsi/arcmsr_spec.txt | 0 Documentation/{ => drivers}/scsi/bfa.txt | 0 Documentation/{ => drivers}/scsi/bnx2fc.txt | 0 Documentation/{ => drivers}/scsi/cxgb3i.txt | 0 Documentation/{ => drivers}/scsi/dc395x.txt | 0 Documentation/{ => drivers}/scsi/dpti.txt | 0 Documentation/{ => drivers}/scsi/g_NCR5380.txt | 0 Documentation/{ => drivers}/scsi/hpsa.txt | 0 Documentation/{ => drivers}/scsi/hptiop.txt | 0 Documentation/{ => drivers}/scsi/libsas.txt | 0 Documentation/{ => drivers}/scsi/link_power_management_policy.txt | 0 Documentation/{ => drivers}/scsi/lpfc.txt | 0 Documentation/{ => drivers}/scsi/megaraid.txt | 0 Documentation/{ => drivers}/scsi/ncr53c8xx.txt | 0 Documentation/{ => drivers}/scsi/osst.txt | 0 Documentation/{ => drivers}/scsi/ppa.txt | 0 Documentation/{ => drivers}/scsi/qlogicfas.txt | 0 Documentation/{ => drivers}/scsi/scsi-changer.txt | 0 Documentation/{ => drivers}/scsi/scsi-generic.txt | 0 Documentation/{ => drivers}/scsi/scsi-parameters.txt | 0 Documentation/{ => drivers}/scsi/scsi.txt | 0 Documentation/{ => drivers}/scsi/scsi_eh.txt | 0 Documentation/{ => drivers}/scsi/scsi_fc_transport.txt | 0 Documentation/{ => drivers}/scsi/scsi_mid_low_api.txt | 0 Documentation/{ => drivers}/scsi/scsi_transport_srp/Makefile | 0 .../{ => drivers}/scsi/scsi_transport_srp/rport_state_diagram.dot | 0 Documentation/{ => drivers}/scsi/sd-parameters.txt | 0 Documentation/{ => drivers}/scsi/smartpqi.txt | 0 Documentation/{ => drivers}/scsi/st.txt | 0 Documentation/{ => drivers}/scsi/sym53c500_cs.txt | 0 Documentation/{ => drivers}/scsi/sym53c8xx_2.txt | 0 Documentation/{ => drivers}/scsi/tcm_qla2xxx.txt | 0 Documentation/{ => drivers}/scsi/ufs.txt | 0 Documentation/{ => drivers}/scsi/wd719x.txt | 0 Documentation/{ => drivers}/serial/cyclades_z.rst | 0 Documentation/{ => drivers}/serial/driver.rst | 0 Documentation/{ => drivers}/serial/index.rst | 0 Documentation/{ => drivers}/serial/moxa-smartio.rst | 0 Documentation/{ => drivers}/serial/n_gsm.rst | 0 Documentation/{ => drivers}/serial/rocket.rst | 0 Documentation/{ => drivers}/serial/serial-iso7816.rst | 0 Documentation/{ => drivers}/serial/serial-rs485.rst | 0 Documentation/{ => drivers}/serial/tty.rst | 0 Documentation/{ => drivers}/sound/alsa-configuration.rst | 0 Documentation/{ => drivers}/sound/cards/audigy-mixer.rst | 0 Documentation/{ => drivers}/sound/cards/audiophile-usb.rst | 0 Documentation/{ => drivers}/sound/cards/bt87x.rst | 0 Documentation/{ => drivers}/sound/cards/cmipci.rst | 0 Documentation/{ => drivers}/sound/cards/emu10k1-jack.rst | 0 Documentation/{ => drivers}/sound/cards/hdspm.rst | 0 Documentation/{ => drivers}/sound/cards/img-spdif-in.rst | 0 Documentation/{ => drivers}/sound/cards/index.rst | 0 Documentation/{ => drivers}/sound/cards/joystick.rst | 0 Documentation/{ => drivers}/sound/cards/maya44.rst | 0 Documentation/{ => drivers}/sound/cards/mixart.rst | 0 Documentation/{ => drivers}/sound/cards/multisound.sh | 0 Documentation/{ => drivers}/sound/cards/sb-live-mixer.rst | 0 Documentation/{ => drivers}/sound/cards/serial-u16550.rst | 0 Documentation/{ => drivers}/sound/cards/via82xx-mixer.rst | 0 Documentation/{ => drivers}/sound/conf.py | 0 Documentation/{ => drivers}/sound/designs/channel-mapping-api.rst | 0 Documentation/{ => drivers}/sound/designs/compress-offload.rst | 0 Documentation/{ => drivers}/sound/designs/control-names.rst | 0 Documentation/{ => drivers}/sound/designs/index.rst | 0 Documentation/{ => drivers}/sound/designs/jack-controls.rst | 0 Documentation/{ => drivers}/sound/designs/oss-emulation.rst | 0 Documentation/{ => drivers}/sound/designs/powersave.rst | 0 Documentation/{ => drivers}/sound/designs/procfile.rst | 0 Documentation/{ => drivers}/sound/designs/seq-oss.rst | 0 Documentation/{ => drivers}/sound/designs/timestamping.rst | 0 Documentation/{ => drivers}/sound/designs/tracepoints.rst | 0 Documentation/{ => drivers}/sound/hd-audio/controls.rst | 0 Documentation/{ => drivers}/sound/hd-audio/dp-mst.rst | 0 Documentation/{ => drivers}/sound/hd-audio/index.rst | 0 Documentation/{ => drivers}/sound/hd-audio/models.rst | 0 Documentation/{ => drivers}/sound/hd-audio/notes.rst | 0 Documentation/{ => drivers}/sound/index.rst | 0 Documentation/{ => drivers}/sound/kernel-api/alsa-driver-api.rst | 0 Documentation/{ => drivers}/sound/kernel-api/index.rst | 0 .../{ => drivers}/sound/kernel-api/writing-an-alsa-driver.rst | 0 Documentation/{ => drivers}/sound/soc/clocking.rst | 0 Documentation/{ => drivers}/sound/soc/codec-to-codec.rst | 0 Documentation/{ => drivers}/sound/soc/codec.rst | 0 Documentation/{ => drivers}/sound/soc/dai.rst | 0 Documentation/{ => drivers}/sound/soc/dapm.rst | 0 Documentation/{ => drivers}/sound/soc/dpcm.rst | 0 Documentation/{ => drivers}/sound/soc/index.rst | 0 Documentation/{ => drivers}/sound/soc/jack.rst | 0 Documentation/{ => drivers}/sound/soc/machine.rst | 0 Documentation/{ => drivers}/sound/soc/overview.rst | 0 Documentation/{ => drivers}/sound/soc/platform.rst | 0 Documentation/{ => drivers}/sound/soc/pops-clicks.rst | 0 Documentation/{ => drivers}/usb/CREDITS | 0 Documentation/{ => drivers}/usb/WUSB-Design-overview.txt | 0 Documentation/{ => drivers}/usb/acm.txt | 0 Documentation/{ => drivers}/usb/authorization.txt | 0 Documentation/{ => drivers}/usb/chipidea.txt | 0 Documentation/{ => drivers}/usb/dwc3.txt | 0 Documentation/{ => drivers}/usb/ehci.txt | 0 Documentation/{ => drivers}/usb/functionfs.txt | 0 Documentation/{ => drivers}/usb/gadget-testing.txt | 0 Documentation/{ => drivers}/usb/gadget_configfs.txt | 0 Documentation/{ => drivers}/usb/gadget_hid.txt | 0 Documentation/{ => drivers}/usb/gadget_multi.txt | 0 Documentation/{ => drivers}/usb/gadget_printer.txt | 0 Documentation/{ => drivers}/usb/gadget_serial.txt | 0 Documentation/{ => drivers}/usb/iuu_phoenix.txt | 0 Documentation/{ => drivers}/usb/linux-cdc-acm.inf | 0 Documentation/{ => drivers}/usb/linux.inf | 0 Documentation/{ => drivers}/usb/mass-storage.txt | 0 Documentation/{ => drivers}/usb/misc_usbsevseg.txt | 0 Documentation/{ => drivers}/usb/mtouchusb.txt | 0 Documentation/{ => drivers}/usb/ohci.txt | 0 Documentation/{ => drivers}/usb/rio.txt | 0 Documentation/{ => drivers}/usb/usb-help.txt | 0 Documentation/{ => drivers}/usb/usb-serial.txt | 0 Documentation/{ => drivers}/usb/usbdevfs-drop-permissions.c | 0 Documentation/{ => drivers}/usb/usbip_protocol.txt | 0 Documentation/{ => drivers}/usb/usbmon.txt | 0 Documentation/{ => drivers}/usb/wusb-cbaf | 0 .../{ => drivers}/watchdog/convert_drivers_to_kernel_api.rst | 0 Documentation/{ => drivers}/watchdog/hpwdt.rst | 0 Documentation/{ => drivers}/watchdog/index.rst | 0 Documentation/{ => drivers}/watchdog/mlx-wdt.rst | 0 Documentation/{ => drivers}/watchdog/pcwd-watchdog.rst | 0 Documentation/{ => drivers}/watchdog/watchdog-api.rst | 0 Documentation/{ => drivers}/watchdog/watchdog-kernel-api.rst | 0 Documentation/{ => drivers}/watchdog/watchdog-parameters.rst | 0 Documentation/{ => drivers}/watchdog/watchdog-pm.rst | 0 Documentation/{ => drivers}/watchdog/wdt.rst | 0 1079 files changed, 0 insertions(+), 0 deletions(-) rename Documentation/{ => drivers}/PCI/MSI-HOWTO.txt (100%) rename Documentation/{ => drivers}/PCI/PCIEBUS-HOWTO.txt (100%) rename Documentation/{ => drivers}/PCI/acpi-info.txt (100%) rename Documentation/{ => drivers}/PCI/endpoint/function/binding/pci-test.txt (100%) rename Documentation/{ => drivers}/PCI/endpoint/pci-endpoint-cfs.txt (100%) rename Documentation/{ => drivers}/PCI/endpoint/pci-endpoint.txt (100%) rename Documentation/{ => drivers}/PCI/endpoint/pci-test-function.txt (100%) rename Documentation/{ => drivers}/PCI/endpoint/pci-test-howto.txt (100%) rename Documentation/{ => drivers}/PCI/pci-error-recovery.txt (100%) rename Documentation/{ => drivers}/PCI/pci-iov-howto.txt (100%) rename Documentation/{ => drivers}/PCI/pci.txt (100%) rename Documentation/{ => drivers}/PCI/pcieaer-howto.txt (100%) rename Documentation/{ => drivers}/acpi/dsd/leds.txt (100%) rename Documentation/{ => drivers}/auxdisplay/cfag12864b (100%) rename Documentation/{ => drivers}/auxdisplay/ks0108 (100%) rename Documentation/{ => drivers}/auxdisplay/lcd-panel-cgram.txt (100%) rename Documentation/{ => drivers}/backlight/lp855x-driver.txt (100%) rename Documentation/{ => drivers}/blockdev/drbd/DRBD-8.3-data-packets.svg (100%) rename Documentation/{ => drivers}/blockdev/drbd/DRBD-data-packets.svg (100%) rename Documentation/{ => drivers}/blockdev/drbd/README.txt (100%) rename Documentation/{ => drivers}/blockdev/drbd/conn-states-8.dot (100%) rename Documentation/{ => drivers}/blockdev/drbd/data-structure-v9.txt (100%) rename Documentation/{ => drivers}/blockdev/drbd/disk-states-8.dot (100%) rename Documentation/{ => drivers}/blockdev/drbd/drbd-connection-state-overview.dot (100%) rename Documentation/{ => drivers}/blockdev/drbd/node-states-8.dot (100%) rename Documentation/{ => drivers}/blockdev/floppy.txt (100%) rename Documentation/{ => drivers}/blockdev/nbd.txt (100%) rename Documentation/{ => drivers}/blockdev/paride.txt (100%) rename Documentation/{ => drivers}/blockdev/ramdisk.txt (100%) rename Documentation/{ => drivers}/blockdev/zram.txt (100%) rename Documentation/{bus-devices => drivers/bus}/ti-gpmc.txt (100%) rename Documentation/{ => drivers}/cdrom/cdrom-standard.rst (100%) rename Documentation/{ => drivers}/cdrom/ide-cd.rst (100%) rename Documentation/{ => drivers}/cdrom/index.rst (100%) rename Documentation/{ => drivers}/cdrom/packet-writing.rst (100%) rename Documentation/{ => drivers}/cpu-freq/amd-powernow.txt (100%) rename Documentation/{ => drivers}/cpu-freq/core.txt (100%) rename Documentation/{ => drivers}/cpu-freq/cpu-drivers.txt (100%) rename Documentation/{ => drivers}/cpu-freq/cpufreq-nforce2.txt (100%) rename Documentation/{ => drivers}/cpu-freq/cpufreq-stats.txt (100%) rename Documentation/{ => drivers}/cpu-freq/index.txt (100%) rename Documentation/{ => drivers}/cpu-freq/pcc-cpufreq.txt (100%) rename Documentation/{ => drivers}/crypto/api-aead.rst (100%) rename Documentation/{ => drivers}/crypto/api-akcipher.rst (100%) rename Documentation/{ => drivers}/crypto/api-digest.rst (100%) rename Documentation/{ => drivers}/crypto/api-intro.txt (100%) rename Documentation/{ => drivers}/crypto/api-kpp.rst (100%) rename Documentation/{ => drivers}/crypto/api-rng.rst (100%) rename Documentation/{ => drivers}/crypto/api-samples.rst (100%) rename Documentation/{ => drivers}/crypto/api-skcipher.rst (100%) rename Documentation/{ => drivers}/crypto/api.rst (100%) rename Documentation/{ => drivers}/crypto/architecture.rst (100%) rename Documentation/{ => drivers}/crypto/asymmetric-keys.txt (100%) rename Documentation/{ => drivers}/crypto/async-tx-api.txt (100%) rename Documentation/{ => drivers}/crypto/conf.py (100%) rename Documentation/{ => drivers}/crypto/crypto_engine.rst (100%) rename Documentation/{ => drivers}/crypto/descore-readme.txt (100%) rename Documentation/{ => drivers}/crypto/devel-algos.rst (100%) rename Documentation/{ => drivers}/crypto/index.rst (100%) rename Documentation/{ => drivers}/crypto/intro.rst (100%) rename Documentation/{ => drivers}/crypto/userspace-if.rst (100%) rename Documentation/{ => drivers}/device-mapper/cache-policies.rst (100%) rename Documentation/{ => drivers}/device-mapper/cache.rst (100%) rename Documentation/{ => drivers}/device-mapper/delay.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-crypt.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-dust.txt (100%) rename Documentation/{ => drivers}/device-mapper/dm-flakey.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-init.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-integrity.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-io.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-log.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-queue-length.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-raid.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-service-time.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-uevent.rst (100%) rename Documentation/{ => drivers}/device-mapper/dm-zoned.rst (100%) rename Documentation/{ => drivers}/device-mapper/era.rst (100%) rename Documentation/{ => drivers}/device-mapper/index.rst (100%) rename Documentation/{ => drivers}/device-mapper/kcopyd.rst (100%) rename Documentation/{ => drivers}/device-mapper/linear.rst (100%) rename Documentation/{ => drivers}/device-mapper/log-writes.rst (100%) rename Documentation/{ => drivers}/device-mapper/persistent-data.rst (100%) rename Documentation/{ => drivers}/device-mapper/snapshot.rst (100%) rename Documentation/{ => drivers}/device-mapper/statistics.rst (100%) rename Documentation/{ => drivers}/device-mapper/striped.rst (100%) rename Documentation/{ => drivers}/device-mapper/switch.rst (100%) rename Documentation/{ => drivers}/device-mapper/thin-provisioning.rst (100%) rename Documentation/{ => drivers}/device-mapper/unstriped.rst (100%) rename Documentation/{ => drivers}/device-mapper/verity.rst (100%) rename Documentation/{ => drivers}/device-mapper/writecache.rst (100%) rename Documentation/{ => drivers}/device-mapper/zero.rst (100%) rename Documentation/{ => drivers}/driver-api/80211/cfg80211.rst (100%) rename Documentation/{ => drivers}/driver-api/80211/conf.py (100%) rename Documentation/{ => drivers}/driver-api/80211/index.rst (100%) rename Documentation/{ => drivers}/driver-api/80211/introduction.rst (100%) rename Documentation/{ => drivers}/driver-api/80211/mac80211-advanced.rst (100%) rename Documentation/{ => drivers}/driver-api/80211/mac80211.rst (100%) rename Documentation/{ => drivers}/driver-api/acpi/index.rst (100%) rename Documentation/{ => drivers}/driver-api/acpi/linuxized-acpica.rst (100%) rename Documentation/{ => drivers}/driver-api/acpi/scan_handlers.rst (100%) rename Documentation/{ => drivers}/driver-api/basics.rst (100%) rename Documentation/{ => drivers}/driver-api/clk.rst (100%) rename Documentation/{ => drivers}/driver-api/component.rst (100%) rename Documentation/{ => drivers}/driver-api/conf.py (100%) rename Documentation/{ => drivers}/driver-api/device-io.rst (100%) rename Documentation/{ => drivers}/driver-api/device_connection.rst (100%) rename Documentation/{ => drivers}/driver-api/device_link.rst (100%) rename Documentation/{ => drivers}/driver-api/dma-buf.rst (100%) rename Documentation/{ => drivers}/driver-api/dmaengine/client.rst (100%) rename Documentation/{ => drivers}/driver-api/dmaengine/dmatest.rst (100%) rename Documentation/{ => drivers}/driver-api/dmaengine/index.rst (100%) rename Documentation/{ => drivers}/driver-api/dmaengine/provider.rst (100%) rename Documentation/{ => drivers}/driver-api/dmaengine/pxa_dma.rst (100%) rename Documentation/{ => drivers}/driver-api/edac.rst (100%) rename Documentation/{ => drivers}/driver-api/firewire.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/built-in-fw.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/core.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/direct-fs-lookup.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/fallback-mechanisms.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/firmware_cache.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/fw_search_path.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/index.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/introduction.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/lookup-order.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/other_interfaces.rst (100%) rename Documentation/{ => drivers}/driver-api/firmware/request_firmware.rst (100%) rename Documentation/{ => drivers}/driver-api/fpga/fpga-bridge.rst (100%) rename Documentation/{ => drivers}/driver-api/fpga/fpga-mgr.rst (100%) rename Documentation/{ => drivers}/driver-api/fpga/fpga-programming.rst (100%) rename Documentation/{ => drivers}/driver-api/fpga/fpga-region.rst (100%) rename Documentation/{ => drivers}/driver-api/fpga/index.rst (100%) rename Documentation/{ => drivers}/driver-api/fpga/intro.rst (100%) rename Documentation/{ => drivers}/driver-api/frame-buffer.rst (100%) rename Documentation/{ => drivers}/driver-api/generic-counter.rst (100%) rename Documentation/{ => drivers}/driver-api/gpio/board.rst (100%) rename Documentation/{ => drivers}/driver-api/gpio/consumer.rst (100%) rename Documentation/{ => drivers}/driver-api/gpio/driver.rst (100%) rename Documentation/{ => drivers}/driver-api/gpio/drivers-on-gpio.rst (100%) rename Documentation/{ => drivers}/driver-api/gpio/index.rst (100%) rename Documentation/{ => drivers}/driver-api/gpio/intro.rst (100%) rename Documentation/{ => drivers}/driver-api/gpio/legacy.rst (100%) rename Documentation/{ => drivers}/driver-api/hsi.rst (100%) rename Documentation/{ => drivers}/driver-api/i2c.rst (100%) rename Documentation/{ => drivers}/driver-api/i3c/device-driver-api.rst (100%) rename Documentation/{ => drivers}/driver-api/i3c/index.rst (100%) rename Documentation/{ => drivers}/driver-api/i3c/master-driver-api.rst (100%) rename Documentation/{ => drivers}/driver-api/i3c/protocol.rst (100%) rename Documentation/{ => drivers}/driver-api/iio/buffers.rst (100%) rename Documentation/{ => drivers}/driver-api/iio/core.rst (100%) rename Documentation/{ => drivers}/driver-api/iio/hw-consumer.rst (100%) rename Documentation/{ => drivers}/driver-api/iio/index.rst (100%) rename Documentation/{ => drivers}/driver-api/iio/intro.rst (100%) rename Documentation/{ => drivers}/driver-api/iio/triggered-buffers.rst (100%) rename Documentation/{ => drivers}/driver-api/iio/triggers.rst (100%) rename Documentation/{ => drivers}/driver-api/index.rst (100%) rename Documentation/{ => drivers}/driver-api/infrastructure.rst (100%) rename Documentation/{ => drivers}/driver-api/input.rst (100%) rename Documentation/{ => drivers}/driver-api/libata.rst (100%) rename Documentation/{ => drivers}/driver-api/message-based.rst (100%) rename Documentation/{ => drivers}/driver-api/misc_devices.rst (100%) rename Documentation/{ => drivers}/driver-api/miscellaneous.rst (100%) rename Documentation/{ => drivers}/driver-api/mtdnand.rst (100%) rename Documentation/{ => drivers}/driver-api/pci/index.rst (100%) rename Documentation/{ => drivers}/driver-api/pci/p2pdma.rst (100%) rename Documentation/{ => drivers}/driver-api/pci/pci.rst (100%) rename Documentation/{ => drivers}/driver-api/pinctl.rst (100%) rename Documentation/{ => drivers}/driver-api/pm/conf.py (100%) rename Documentation/{ => drivers}/driver-api/pm/cpuidle.rst (100%) rename Documentation/{ => drivers}/driver-api/pm/devices.rst (100%) rename Documentation/{ => drivers}/driver-api/pm/index.rst (100%) rename Documentation/{ => drivers}/driver-api/pm/notifiers.rst (100%) rename Documentation/{ => drivers}/driver-api/pm/types.rst (100%) rename Documentation/{ => drivers}/driver-api/pps.rst (100%) rename Documentation/{ => drivers}/driver-api/ptp.rst (100%) rename Documentation/{ => drivers}/driver-api/rapidio.rst (100%) rename Documentation/{ => drivers}/driver-api/regulator.rst (100%) rename Documentation/{ => drivers}/driver-api/s390-drivers.rst (100%) rename Documentation/{ => drivers}/driver-api/scsi.rst (100%) rename Documentation/{ => drivers}/driver-api/slimbus.rst (100%) rename Documentation/{ => drivers}/driver-api/sound.rst (100%) rename Documentation/{ => drivers}/driver-api/soundwire/error_handling.rst (100%) rename Documentation/{ => drivers}/driver-api/soundwire/index.rst (100%) rename Documentation/{ => drivers}/driver-api/soundwire/locking.rst (100%) rename Documentation/{ => drivers}/driver-api/soundwire/stream.rst (100%) rename Documentation/{ => drivers}/driver-api/soundwire/summary.rst (100%) rename Documentation/{ => drivers}/driver-api/spi.rst (100%) rename Documentation/{ => drivers}/driver-api/target.rst (100%) rename Documentation/{ => drivers}/driver-api/uio-howto.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/URB.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/anchors.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/bulk-streams.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/callbacks.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/dma.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/dwc3.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/error-codes.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/gadget.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/hotplug.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/index.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/persist.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/power-management.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/typec.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/typec_bus.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/usb.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/usb3-debug-port.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/writing_musb_glue_layer.rst (100%) rename Documentation/{ => drivers}/driver-api/usb/writing_usb_driver.rst (100%) rename Documentation/{ => drivers}/driver-api/vme.rst (100%) rename Documentation/{ => drivers}/driver-api/w1.rst (100%) rename Documentation/{ => drivers}/driver-model/binding.txt (100%) rename Documentation/{ => drivers}/driver-model/bus.txt (100%) rename Documentation/{ => drivers}/driver-model/class.txt (100%) rename Documentation/{ => drivers}/driver-model/design-patterns.txt (100%) rename Documentation/{ => drivers}/driver-model/device.txt (100%) rename Documentation/{ => drivers}/driver-model/devres.txt (100%) rename Documentation/{ => drivers}/driver-model/driver.txt (100%) rename Documentation/{ => drivers}/driver-model/overview.txt (100%) rename Documentation/{ => drivers}/driver-model/platform.txt (100%) rename Documentation/{ => drivers}/driver-model/porting.txt (100%) rename Documentation/{ => drivers}/fpga/dfl.rst (100%) rename Documentation/{ => drivers}/fpga/index.rst (100%) rename Documentation/{ => drivers}/gpio/index.rst (100%) rename Documentation/{ => drivers}/gpio/sysfs.rst (100%) rename Documentation/{ => drivers}/gpu/afbc.rst (100%) rename Documentation/{ => drivers}/gpu/amdgpu-dc.rst (100%) rename Documentation/{ => drivers}/gpu/amdgpu.rst (100%) rename Documentation/{ => drivers}/gpu/bridge/dw-hdmi.rst (100%) rename Documentation/{ => drivers}/gpu/conf.py (100%) rename Documentation/{ => drivers}/gpu/dp-mst/topology-figure-1.dot (100%) rename Documentation/{ => drivers}/gpu/dp-mst/topology-figure-2.dot (100%) rename Documentation/{ => drivers}/gpu/dp-mst/topology-figure-3.dot (100%) rename Documentation/{ => drivers}/gpu/drivers.rst (100%) rename Documentation/{ => drivers}/gpu/drm-client.rst (100%) rename Documentation/{ => drivers}/gpu/drm-internals.rst (100%) rename Documentation/{ => drivers}/gpu/drm-kms-helpers.rst (100%) rename Documentation/{ => drivers}/gpu/drm-kms.rst (100%) rename Documentation/{ => drivers}/gpu/drm-mm.rst (100%) rename Documentation/{ => drivers}/gpu/drm-uapi.rst (100%) rename Documentation/{ => drivers}/gpu/i915.rst (100%) rename Documentation/{ => drivers}/gpu/index.rst (100%) rename Documentation/{ => drivers}/gpu/introduction.rst (100%) rename Documentation/{ => drivers}/gpu/kms-properties.csv (100%) rename Documentation/{ => drivers}/gpu/komeda-kms.rst (100%) rename Documentation/{ => drivers}/gpu/meson.rst (100%) rename Documentation/{ => drivers}/gpu/msm-crash-dump.rst (100%) rename Documentation/{ => drivers}/gpu/pl111.rst (100%) rename Documentation/{ => drivers}/gpu/tegra.rst (100%) rename Documentation/{ => drivers}/gpu/tinydrm.rst (100%) rename Documentation/{ => drivers}/gpu/todo.rst (100%) rename Documentation/{ => drivers}/gpu/tve200.rst (100%) rename Documentation/{ => drivers}/gpu/v3d.rst (100%) rename Documentation/{ => drivers}/gpu/vc4.rst (100%) rename Documentation/{ => drivers}/gpu/vga-switcheroo.rst (100%) rename Documentation/{ => drivers}/gpu/vgaarbiter.rst (100%) rename Documentation/{ => drivers}/gpu/vkms.rst (100%) rename Documentation/{ => drivers}/gpu/xen-front.rst (100%) rename Documentation/{ => drivers}/hid/hid-alps.txt (100%) rename Documentation/{ => drivers}/hid/hid-sensor.txt (100%) rename Documentation/{ => drivers}/hid/hid-transport.txt (100%) rename Documentation/{ => drivers}/hid/hiddev.txt (100%) rename Documentation/{ => drivers}/hid/hidraw.txt (100%) rename Documentation/{ => drivers}/hid/intel-ish-hid.txt (100%) rename Documentation/{ => drivers}/hid/uhid.txt (100%) rename Documentation/{ => drivers}/i2c/DMA-considerations (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-ali1535 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-ali1563 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-ali15x3 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-amd-mp2 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-amd756 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-amd8111 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-diolan-u2c (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-i801 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-ismt (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-mlxcpld (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-nforce2 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-nvidia-gpu (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-ocores (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-parport (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-parport-light (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-pca-isa (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-piix4 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-sis5595 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-sis630 (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-sis96x (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-taos-evm (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-via (100%) rename Documentation/{ => drivers}/i2c/busses/i2c-viapro (100%) rename Documentation/{ => drivers}/i2c/busses/scx200_acb (100%) rename Documentation/{ => drivers}/i2c/dev-interface (100%) rename Documentation/{ => drivers}/i2c/fault-codes (100%) rename Documentation/{ => drivers}/i2c/functionality (100%) rename Documentation/{ => drivers}/i2c/gpio-fault-injection (100%) rename Documentation/{ => drivers}/i2c/i2c-protocol (100%) rename Documentation/{ => drivers}/i2c/i2c-stub (100%) rename Documentation/{ => drivers}/i2c/i2c-topology (100%) rename Documentation/{ => drivers}/i2c/instantiating-devices (100%) rename Documentation/{ => drivers}/i2c/muxes/i2c-mux-gpio (100%) rename Documentation/{ => drivers}/i2c/old-module-parameters (100%) rename Documentation/{ => drivers}/i2c/slave-eeprom-backend (100%) rename Documentation/{ => drivers}/i2c/slave-interface (100%) rename Documentation/{ => drivers}/i2c/smbus-protocol (100%) rename Documentation/{ => drivers}/i2c/summary (100%) rename Documentation/{ => drivers}/i2c/ten-bit-addresses (100%) rename Documentation/{ => drivers}/i2c/upgrading-clients (100%) rename Documentation/{ => drivers}/i2c/writing-clients (100%) rename Documentation/{ => drivers}/ide/ChangeLog.ide-cd.1994-2004 (100%) rename Documentation/{ => drivers}/ide/ChangeLog.ide-floppy.1996-2002 (100%) rename Documentation/{ => drivers}/ide/ChangeLog.ide-tape.1995-2002 (100%) rename Documentation/{ => drivers}/ide/changelogs.rst (100%) rename Documentation/{ => drivers}/ide/ide-tape.rst (100%) rename Documentation/{ => drivers}/ide/ide.rst (100%) rename Documentation/{ => drivers}/ide/index.rst (100%) rename Documentation/{ => drivers}/ide/warm-plug-howto.rst (100%) rename Documentation/{ => drivers}/infiniband/core_locking.txt (100%) rename Documentation/{ => drivers}/infiniband/ipoib.txt (100%) rename Documentation/{ => drivers}/infiniband/opa_vnic.txt (100%) rename Documentation/{ => drivers}/infiniband/sysfs.txt (100%) rename Documentation/{ => drivers}/infiniband/tag_matching.txt (100%) rename Documentation/{ => drivers}/infiniband/user_mad.txt (100%) rename Documentation/{ => drivers}/infiniband/user_verbs.txt (100%) rename Documentation/{ => drivers}/leds/index.rst (100%) rename Documentation/{ => drivers}/leds/leds-blinkm.rst (100%) rename Documentation/{ => drivers}/leds/leds-class-flash.rst (100%) rename Documentation/{ => drivers}/leds/leds-class.rst (100%) rename Documentation/{ => drivers}/leds/leds-lm3556.rst (100%) rename Documentation/{ => drivers}/leds/leds-lp3944.rst (100%) rename Documentation/{ => drivers}/leds/leds-lp5521.rst (100%) rename Documentation/{ => drivers}/leds/leds-lp5523.rst (100%) rename Documentation/{ => drivers}/leds/leds-lp5562.rst (100%) rename Documentation/{ => drivers}/leds/leds-lp55xx.rst (100%) rename Documentation/{ => drivers}/leds/leds-mlxcpld.rst (100%) rename Documentation/{ => drivers}/leds/ledtrig-oneshot.rst (100%) rename Documentation/{ => drivers}/leds/ledtrig-transient.rst (100%) rename Documentation/{ => drivers}/leds/ledtrig-usbport.rst (100%) rename Documentation/{ => drivers}/leds/uleds.rst (100%) rename Documentation/{ => drivers}/lightnvm/pblk.txt (100%) rename Documentation/{ => drivers}/md/md-cluster.txt (100%) rename Documentation/{ => drivers}/md/raid5-cache.txt (100%) rename Documentation/{ => drivers}/md/raid5-ppl.txt (100%) rename Documentation/{ => drivers}/media/.gitignore (100%) rename Documentation/{ => drivers}/media/Makefile (100%) rename Documentation/{ => drivers}/media/audio.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/ca.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/cec-drivers/index.rst (100%) rename Documentation/{ => drivers}/media/cec-drivers/pulse8-cec.rst (100%) rename Documentation/{ => drivers}/media/cec.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/conf.py (100%) rename Documentation/{ => drivers}/media/conf_nitpick.py (100%) rename Documentation/{ => drivers}/media/dmx.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/dvb-drivers/avermedia.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/bt8xx.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/cards.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/ci.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/contributors.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/dvb-usb.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/faq.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/frontends.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/index.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/intro.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/lmedm04.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/opera-firmware.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/technisat.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/ttusb-dec.rst (100%) rename Documentation/{ => drivers}/media/dvb-drivers/udev.rst (100%) rename Documentation/{ => drivers}/media/frontend.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/index.rst (100%) rename Documentation/{ => drivers}/media/intro.rst (100%) rename Documentation/{ => drivers}/media/kapi/cec-core.rst (100%) rename Documentation/{ => drivers}/media/kapi/csi2.rst (100%) rename Documentation/{ => drivers}/media/kapi/dtv-ca.rst (100%) rename Documentation/{ => drivers}/media/kapi/dtv-common.rst (100%) rename Documentation/{ => drivers}/media/kapi/dtv-core.rst (100%) rename Documentation/{ => drivers}/media/kapi/dtv-demux.rst (100%) rename Documentation/{ => drivers}/media/kapi/dtv-frontend.rst (100%) rename Documentation/{ => drivers}/media/kapi/dtv-net.rst (100%) rename Documentation/{ => drivers}/media/kapi/mc-core.rst (100%) rename Documentation/{ => drivers}/media/kapi/rc-core.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-async.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-clocks.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-common.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-controls.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-core.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-dev.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-device.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-dv-timings.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-event.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-fh.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-flash-led-class.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-fwnode.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-intro.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-mc.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-mediabus.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-mem2mem.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-rect.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-subdev.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-tuner.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-tveeprom.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-videobuf.rst (100%) rename Documentation/{ => drivers}/media/kapi/v4l2-videobuf2.rst (100%) rename Documentation/{ => drivers}/media/lirc.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/media.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/media_kapi.rst (100%) rename Documentation/{ => drivers}/media/media_uapi.rst (100%) rename Documentation/{ => drivers}/media/net.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/typical_media_device.svg (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-api.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-func-close.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-func-ioctl.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-func-open.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-func-poll.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-funcs.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-header.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-intro.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-ioc-adap-g-caps.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-ioc-dqevent.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-ioc-g-mode.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-ioc-receive.rst (100%) rename Documentation/{ => drivers}/media/uapi/cec/cec-pin-error-inj.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-bilingual-channel-select.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-channel-select.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-clear-buffer.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-continue.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-fclose.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-fopen.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-fwrite.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-get-capabilities.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-get-status.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-pause.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-play.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-select-source.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-set-av-sync.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-set-bypass-mode.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-set-id.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-set-mixer.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-set-mute.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-set-streamtype.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio-stop.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio_data_types.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/audio_function_calls.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-fclose.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-fopen.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-get-cap.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-get-descr-info.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-get-msg.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-get-slot-info.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-reset.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-send-msg.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca-set-descr.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca_data_types.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/ca_function_calls.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/demux.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-add-pid.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-expbuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-fclose.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-fopen.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-fread.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-fwrite.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-get-pes-pids.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-get-stc.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-mmap.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-munmap.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-qbuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-querybuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-remove-pid.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-reqbufs.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-set-buffer-size.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-set-filter.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-set-pes-filter.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-start.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx-stop.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx_fcalls.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dmx_types.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dvb-fe-read-status.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dvb-frontend-event.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dvb-frontend-parameters.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dvbapi.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dvbproperty.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/dvbstb.svg (100%) rename Documentation/{ => drivers}/media/uapi/dvb/examples.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-bandwidth-t.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-diseqc-reset-overload.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-diseqc-send-burst.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-diseqc-send-master-cmd.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-enable-high-lnb-voltage.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-get-event.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-get-frontend.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-get-info.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-get-property.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-read-ber.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-read-signal-strength.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-read-snr.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-read-status.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-read-uncorrected-blocks.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-set-frontend-tune-mode.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-set-frontend.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-set-tone.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-set-voltage.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe-type-t.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/fe_property_parameters.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend-header.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend-property-cable-systems.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend-property-satellite-systems.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend-property-terrestrial-systems.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend-stat-properties.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend_f_close.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend_f_open.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend_fcalls.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend_legacy_api.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/frontend_legacy_dvbv3_api.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/headers.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/intro.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/legacy_dvb_apis.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/net-add-if.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/net-get-if.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/net-remove-if.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/net-types.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/net.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/query-dvb-frontend-info.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-clear-buffer.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-command.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-continue.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-fast-forward.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-fclose.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-fopen.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-freeze.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-fwrite.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-get-capabilities.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-get-event.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-get-frame-count.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-get-pts.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-get-size.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-get-status.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-play.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-select-source.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-set-blank.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-set-display-format.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-set-format.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-set-streamtype.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-slowmotion.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-stillpicture.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-stop.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video-try-command.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video_function_calls.rst (100%) rename Documentation/{ => drivers}/media/uapi/dvb/video_types.rst (100%) rename Documentation/{ => drivers}/media/uapi/fdl-appendix.rst (100%) rename Documentation/{ => drivers}/media/uapi/gen-errors.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-controller-intro.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-controller-model.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-controller.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-func-close.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-func-ioctl.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-func-open.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-funcs.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-header.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-ioc-device-info.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-ioc-enum-entities.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-ioc-enum-links.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-ioc-g-topology.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-ioc-request-alloc.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-ioc-setup-link.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-request-ioc-queue.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-request-ioc-reinit.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/media-types.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/request-api.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/request-func-close.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/request-func-ioctl.rst (100%) rename Documentation/{ => drivers}/media/uapi/mediactl/request-func-poll.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/keytable.c.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-dev-intro.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-dev.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-func.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-get-features.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-get-rec-mode.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-get-rec-resolution.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-get-send-mode.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-get-timeout.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-header.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-read.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-measure-carrier-mode.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-rec-carrier-range.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-rec-carrier.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-rec-timeout-reports.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-rec-timeout.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-send-carrier.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-send-duty-cycle.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-transmitter-mask.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-set-wideband-receiver.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/lirc-write.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/rc-intro.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/rc-sysfs-nodes.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/rc-table-change.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/rc-tables.rst (100%) rename Documentation/{ => drivers}/media/uapi/rc/remote_controllers.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/app-pri.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/async.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/audio.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/bayer.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/biblio.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/buffer.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/capture-example.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/capture.c.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/colorspaces-defs.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/colorspaces-details.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/colorspaces.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/common-defs.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/common.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/compat.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/constraints.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/control.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/crop.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/crop.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/depth-formats.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-capture.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-event.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-mem2mem.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-meta.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-osd.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-output.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-overlay.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-radio.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-raw-vbi.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-rds.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-sdr.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-sliced-vbi.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-subdev.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dev-touch.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/devices.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/diff-v4l.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dmabuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/dv-timings.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-camera.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-codec.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-detect.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-dv.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-flash.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-fm-rx.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-fm-tx.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-image-process.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-image-source.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-jpeg.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/ext-ctrls-rf-tuner.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/extended-controls.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/field-order.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/fieldseq_bt.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/fieldseq_tb.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/format.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-close.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-ioctl.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-mmap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-munmap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-open.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-poll.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-read.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-select.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/func-write.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/hist-v4l2.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/hsv-formats.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/io.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/libv4l-introduction.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/libv4l.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/meta-formats.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/mmap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/nv12mt.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/nv12mt_example.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/open.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pipeline.dot (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-cnf4.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-compressed.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-grey.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-indexed.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-intro.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-inzi.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-m420.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-meta-d4xx.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-meta-uvc.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv12.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv12m.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv12mt.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv16.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv16m.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-nv24.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-packed-hsv.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-packed-rgb.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-packed-yuv.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-reserved.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-rgb.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cs08.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cs14le.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cu08.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-cu16le.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-pcu16be.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-pcu18be.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-pcu20be.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-sdr-ru12le.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb10-ipu3.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb10.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb10alaw8.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb10dpcm8.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb10p.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb12.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb12p.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb14p.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb16.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-srggb8.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-td08.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-td16.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-tu08.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-tch-tu16.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-uv8.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-uyvy.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-v4l2-mplane.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-v4l2.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-vyuy.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y10.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y10b.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y10p.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y12.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y12i.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y16-be.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y16.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y41p.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-y8i.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv410.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv411p.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv420.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv420m.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv422m.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv422p.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuv444m.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yuyv.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-yvyu.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt-z16.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/pixfmt.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/planar-apis.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/querycap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/rw.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/sdr-formats.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selection-api-configuration.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selection-api-examples.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selection-api-intro.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selection-api-targets.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selection-api-vs-crop-api.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selection-api.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selection.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/selections-common.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/standard.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/streaming-par.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/subdev-formats.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/subdev-image-processing-crop.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/subdev-image-processing-full.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/tch-formats.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/tuner.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/user-func.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/userp.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/v4l2-selection-flags.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/v4l2-selection-targets.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/v4l2.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/v4l2grab-example.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/v4l2grab.c.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vbi_525.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vbi_625.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vbi_hsync.svg (100%) rename Documentation/{ => drivers}/media/uapi/v4l/video.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/videodev.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-create-bufs.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-cropcap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-dbg-g-chip-info.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-dbg-g-register.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-decoder-cmd.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-dqevent.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-dv-timings-cap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-encoder-cmd.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enum-dv-timings.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enum-fmt.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enum-frameintervals.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enum-framesizes.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enum-freq-bands.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enumaudio.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enumaudioout.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enuminput.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enumoutput.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-enumstd.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-expbuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-audio.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-audioout.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-crop.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-ctrl.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-dv-timings.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-edid.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-enc-index.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-ext-ctrls.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-fbuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-fmt.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-frequency.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-input.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-jpegcomp.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-modulator.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-output.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-parm.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-priority.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-selection.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-std.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-g-tuner.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-log-status.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-overlay.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-prepare-buf.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-qbuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-query-dv-timings.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-querybuf.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-querycap.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-queryctrl.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-querystd.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-reqbufs.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-s-hw-freq-seek.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-streamon.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subdev-g-crop.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subdev-g-fmt.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subdev-g-selection.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/vidioc-subscribe-event.rst (100%) rename Documentation/{ => drivers}/media/uapi/v4l/yuv-formats.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/au0828-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/bttv-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/bttv.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cafe_ccic.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cpia2.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cx18.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cx2341x.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cx23885-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cx88-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/cx88.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/davinci-vpbe.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/em28xx-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/fimc.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/fourcc.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/gspca-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/imx.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/imx7.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/index.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/ipu3.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/ivtv-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/ivtv.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/max2175.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/meye.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/omap3isp.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/omap4_camera.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/philips.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/pvrusb2.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/pxa_camera.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/qcom_camss.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/qcom_camss_8x96_graph.dot (100%) rename Documentation/{ => drivers}/media/v4l-drivers/qcom_camss_graph.dot (100%) rename Documentation/{ => drivers}/media/v4l-drivers/radiotrack.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/rcar-fdp1.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/saa7134-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/saa7134.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/saa7164-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/sh_mobile_ceu_camera.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/si470x.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/si4713.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/si476x.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/soc-camera.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/tm6000-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/tuner-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/tuners.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/usbvision-cardlist.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/uvcvideo.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/v4l-with-ir.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/vimc.dot (100%) rename Documentation/{ => drivers}/media/v4l-drivers/vimc.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/vivid.rst (100%) rename Documentation/{ => drivers}/media/v4l-drivers/zr364xx.rst (100%) rename Documentation/{ => drivers}/media/video.h.rst.exceptions (100%) rename Documentation/{ => drivers}/media/videodev2.h.rst.exceptions (100%) rename Documentation/{memory-devices => drivers/memory}/ti-emif.txt (100%) rename Documentation/{misc-devices => drivers/misc}/ad525x_dpot.txt (100%) rename Documentation/{misc-devices => drivers/misc}/apds990x.txt (100%) rename Documentation/{misc-devices => drivers/misc}/bh1770glc.txt (100%) rename Documentation/{misc-devices => drivers/misc}/c2port.txt (100%) rename Documentation/{misc-devices => drivers/misc}/eeprom (100%) rename Documentation/{misc-devices => drivers/misc}/ibmvmc.rst (100%) rename Documentation/{misc-devices => drivers/misc}/ics932s401 (100%) rename Documentation/{misc-devices => drivers/misc}/index.rst (100%) rename Documentation/{misc-devices => drivers/misc}/isl29003 (100%) rename Documentation/{misc-devices => drivers/misc}/lis3lv02d (100%) rename Documentation/{misc-devices => drivers/misc}/max6875 (100%) rename Documentation/{misc-devices => drivers/misc}/mei/mei-client-bus.txt (100%) rename Documentation/{misc-devices => drivers/misc}/mei/mei.txt (100%) rename Documentation/{misc-devices => drivers/misc}/pci-endpoint-test.txt (100%) rename Documentation/{misc-devices => drivers/misc}/spear-pcie-gadget.txt (100%) rename Documentation/{ => drivers}/mmc/mmc-async-req.txt (100%) rename Documentation/{ => drivers}/mmc/mmc-dev-attrs.txt (100%) rename Documentation/{ => drivers}/mmc/mmc-dev-parts.txt (100%) rename Documentation/{ => drivers}/mmc/mmc-tools.txt (100%) rename Documentation/{ => drivers}/mtd/intel-spi.txt (100%) rename Documentation/{ => drivers}/mtd/nand_ecc.txt (100%) rename Documentation/{ => drivers}/mtd/spi-nor.txt (100%) rename Documentation/{ => drivers}/nfc/nfc-hci.txt (100%) rename Documentation/{ => drivers}/nfc/nfc-pn544.txt (100%) rename Documentation/{ => drivers}/nvdimm/btt.txt (100%) rename Documentation/{ => drivers}/nvdimm/nvdimm.txt (100%) rename Documentation/{ => drivers}/nvdimm/security.txt (100%) rename Documentation/{ => drivers}/nvmem/nvmem.txt (100%) rename Documentation/{ => drivers}/pcmcia/devicetable.rst (100%) rename Documentation/{ => drivers}/pcmcia/driver-changes.rst (100%) rename Documentation/{ => drivers}/pcmcia/driver.rst (100%) rename Documentation/{ => drivers}/pcmcia/index.rst (100%) rename Documentation/{ => drivers}/pcmcia/locking.rst (100%) rename Documentation/{ => drivers}/rapidio/mport_cdev.txt (100%) rename Documentation/{ => drivers}/rapidio/rapidio.txt (100%) rename Documentation/{ => drivers}/rapidio/rio_cm.txt (100%) rename Documentation/{ => drivers}/rapidio/sysfs.txt (100%) rename Documentation/{ => drivers}/rapidio/tsi721.txt (100%) rename Documentation/{ => drivers}/scsi/53c700.txt (100%) rename Documentation/{ => drivers}/scsi/BusLogic.txt (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.arcmsr (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.ips (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.lpfc (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.megaraid (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.megaraid_sas (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.ncr53c8xx (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.sym53c8xx (100%) rename Documentation/{ => drivers}/scsi/ChangeLog.sym53c8xx_2 (100%) rename Documentation/{ => drivers}/scsi/FlashPoint.txt (100%) rename Documentation/{ => drivers}/scsi/LICENSE.FlashPoint (100%) rename Documentation/{ => drivers}/scsi/LICENSE.qla2xxx (100%) rename Documentation/{ => drivers}/scsi/LICENSE.qla4xxx (100%) rename Documentation/{ => drivers}/scsi/NinjaSCSI.txt (100%) rename Documentation/{ => drivers}/scsi/aacraid.txt (100%) rename Documentation/{ => drivers}/scsi/advansys.txt (100%) rename Documentation/{ => drivers}/scsi/aha152x.txt (100%) rename Documentation/{ => drivers}/scsi/aic79xx.txt (100%) rename Documentation/{ => drivers}/scsi/aic7xxx.txt (100%) rename Documentation/{ => drivers}/scsi/arcmsr_spec.txt (100%) rename Documentation/{ => drivers}/scsi/bfa.txt (100%) rename Documentation/{ => drivers}/scsi/bnx2fc.txt (100%) rename Documentation/{ => drivers}/scsi/cxgb3i.txt (100%) rename Documentation/{ => drivers}/scsi/dc395x.txt (100%) rename Documentation/{ => drivers}/scsi/dpti.txt (100%) rename Documentation/{ => drivers}/scsi/g_NCR5380.txt (100%) rename Documentation/{ => drivers}/scsi/hpsa.txt (100%) rename Documentation/{ => drivers}/scsi/hptiop.txt (100%) rename Documentation/{ => drivers}/scsi/libsas.txt (100%) rename Documentation/{ => drivers}/scsi/link_power_management_policy.txt (100%) rename Documentation/{ => drivers}/scsi/lpfc.txt (100%) rename Documentation/{ => drivers}/scsi/megaraid.txt (100%) rename Documentation/{ => drivers}/scsi/ncr53c8xx.txt (100%) rename Documentation/{ => drivers}/scsi/osst.txt (100%) rename Documentation/{ => drivers}/scsi/ppa.txt (100%) rename Documentation/{ => drivers}/scsi/qlogicfas.txt (100%) rename Documentation/{ => drivers}/scsi/scsi-changer.txt (100%) rename Documentation/{ => drivers}/scsi/scsi-generic.txt (100%) rename Documentation/{ => drivers}/scsi/scsi-parameters.txt (100%) rename Documentation/{ => drivers}/scsi/scsi.txt (100%) rename Documentation/{ => drivers}/scsi/scsi_eh.txt (100%) rename Documentation/{ => drivers}/scsi/scsi_fc_transport.txt (100%) rename Documentation/{ => drivers}/scsi/scsi_mid_low_api.txt (100%) rename Documentation/{ => drivers}/scsi/scsi_transport_srp/Makefile (100%) rename Documentation/{ => drivers}/scsi/scsi_transport_srp/rport_state_diagram.dot (100%) rename Documentation/{ => drivers}/scsi/sd-parameters.txt (100%) rename Documentation/{ => drivers}/scsi/smartpqi.txt (100%) rename Documentation/{ => drivers}/scsi/st.txt (100%) rename Documentation/{ => drivers}/scsi/sym53c500_cs.txt (100%) rename Documentation/{ => drivers}/scsi/sym53c8xx_2.txt (100%) rename Documentation/{ => drivers}/scsi/tcm_qla2xxx.txt (100%) rename Documentation/{ => drivers}/scsi/ufs.txt (100%) rename Documentation/{ => drivers}/scsi/wd719x.txt (100%) rename Documentation/{ => drivers}/serial/cyclades_z.rst (100%) rename Documentation/{ => drivers}/serial/driver.rst (100%) rename Documentation/{ => drivers}/serial/index.rst (100%) rename Documentation/{ => drivers}/serial/moxa-smartio.rst (100%) rename Documentation/{ => drivers}/serial/n_gsm.rst (100%) rename Documentation/{ => drivers}/serial/rocket.rst (100%) rename Documentation/{ => drivers}/serial/serial-iso7816.rst (100%) rename Documentation/{ => drivers}/serial/serial-rs485.rst (100%) rename Documentation/{ => drivers}/serial/tty.rst (100%) rename Documentation/{ => drivers}/sound/alsa-configuration.rst (100%) rename Documentation/{ => drivers}/sound/cards/audigy-mixer.rst (100%) rename Documentation/{ => drivers}/sound/cards/audiophile-usb.rst (100%) rename Documentation/{ => drivers}/sound/cards/bt87x.rst (100%) rename Documentation/{ => drivers}/sound/cards/cmipci.rst (100%) rename Documentation/{ => drivers}/sound/cards/emu10k1-jack.rst (100%) rename Documentation/{ => drivers}/sound/cards/hdspm.rst (100%) rename Documentation/{ => drivers}/sound/cards/img-spdif-in.rst (100%) rename Documentation/{ => drivers}/sound/cards/index.rst (100%) rename Documentation/{ => drivers}/sound/cards/joystick.rst (100%) rename Documentation/{ => drivers}/sound/cards/maya44.rst (100%) rename Documentation/{ => drivers}/sound/cards/mixart.rst (100%) rename Documentation/{ => drivers}/sound/cards/multisound.sh (100%) rename Documentation/{ => drivers}/sound/cards/sb-live-mixer.rst (100%) rename Documentation/{ => drivers}/sound/cards/serial-u16550.rst (100%) rename Documentation/{ => drivers}/sound/cards/via82xx-mixer.rst (100%) rename Documentation/{ => drivers}/sound/conf.py (100%) rename Documentation/{ => drivers}/sound/designs/channel-mapping-api.rst (100%) rename Documentation/{ => drivers}/sound/designs/compress-offload.rst (100%) rename Documentation/{ => drivers}/sound/designs/control-names.rst (100%) rename Documentation/{ => drivers}/sound/designs/index.rst (100%) rename Documentation/{ => drivers}/sound/designs/jack-controls.rst (100%) rename Documentation/{ => drivers}/sound/designs/oss-emulation.rst (100%) rename Documentation/{ => drivers}/sound/designs/powersave.rst (100%) rename Documentation/{ => drivers}/sound/designs/procfile.rst (100%) rename Documentation/{ => drivers}/sound/designs/seq-oss.rst (100%) rename Documentation/{ => drivers}/sound/designs/timestamping.rst (100%) rename Documentation/{ => drivers}/sound/designs/tracepoints.rst (100%) rename Documentation/{ => drivers}/sound/hd-audio/controls.rst (100%) rename Documentation/{ => drivers}/sound/hd-audio/dp-mst.rst (100%) rename Documentation/{ => drivers}/sound/hd-audio/index.rst (100%) rename Documentation/{ => drivers}/sound/hd-audio/models.rst (100%) rename Documentation/{ => drivers}/sound/hd-audio/notes.rst (100%) rename Documentation/{ => drivers}/sound/index.rst (100%) rename Documentation/{ => drivers}/sound/kernel-api/alsa-driver-api.rst (100%) rename Documentation/{ => drivers}/sound/kernel-api/index.rst (100%) rename Documentation/{ => drivers}/sound/kernel-api/writing-an-alsa-driver.rst (100%) rename Documentation/{ => drivers}/sound/soc/clocking.rst (100%) rename Documentation/{ => drivers}/sound/soc/codec-to-codec.rst (100%) rename Documentation/{ => drivers}/sound/soc/codec.rst (100%) rename Documentation/{ => drivers}/sound/soc/dai.rst (100%) rename Documentation/{ => drivers}/sound/soc/dapm.rst (100%) rename Documentation/{ => drivers}/sound/soc/dpcm.rst (100%) rename Documentation/{ => drivers}/sound/soc/index.rst (100%) rename Documentation/{ => drivers}/sound/soc/jack.rst (100%) rename Documentation/{ => drivers}/sound/soc/machine.rst (100%) rename Documentation/{ => drivers}/sound/soc/overview.rst (100%) rename Documentation/{ => drivers}/sound/soc/platform.rst (100%) rename Documentation/{ => drivers}/sound/soc/pops-clicks.rst (100%) rename Documentation/{ => drivers}/usb/CREDITS (100%) rename Documentation/{ => drivers}/usb/WUSB-Design-overview.txt (100%) rename Documentation/{ => drivers}/usb/acm.txt (100%) rename Documentation/{ => drivers}/usb/authorization.txt (100%) rename Documentation/{ => drivers}/usb/chipidea.txt (100%) rename Documentation/{ => drivers}/usb/dwc3.txt (100%) rename Documentation/{ => drivers}/usb/ehci.txt (100%) rename Documentation/{ => drivers}/usb/functionfs.txt (100%) rename Documentation/{ => drivers}/usb/gadget-testing.txt (100%) rename Documentation/{ => drivers}/usb/gadget_configfs.txt (100%) rename Documentation/{ => drivers}/usb/gadget_hid.txt (100%) rename Documentation/{ => drivers}/usb/gadget_multi.txt (100%) rename Documentation/{ => drivers}/usb/gadget_printer.txt (100%) rename Documentation/{ => drivers}/usb/gadget_serial.txt (100%) rename Documentation/{ => drivers}/usb/iuu_phoenix.txt (100%) rename Documentation/{ => drivers}/usb/linux-cdc-acm.inf (100%) rename Documentation/{ => drivers}/usb/linux.inf (100%) rename Documentation/{ => drivers}/usb/mass-storage.txt (100%) rename Documentation/{ => drivers}/usb/misc_usbsevseg.txt (100%) rename Documentation/{ => drivers}/usb/mtouchusb.txt (100%) rename Documentation/{ => drivers}/usb/ohci.txt (100%) rename Documentation/{ => drivers}/usb/rio.txt (100%) rename Documentation/{ => drivers}/usb/usb-help.txt (100%) rename Documentation/{ => drivers}/usb/usb-serial.txt (100%) rename Documentation/{ => drivers}/usb/usbdevfs-drop-permissions.c (100%) rename Documentation/{ => drivers}/usb/usbip_protocol.txt (100%) rename Documentation/{ => drivers}/usb/usbmon.txt (100%) rename Documentation/{ => drivers}/usb/wusb-cbaf (100%) rename Documentation/{ => drivers}/watchdog/convert_drivers_to_kernel_api.rst (100%) rename Documentation/{ => drivers}/watchdog/hpwdt.rst (100%) rename Documentation/{ => drivers}/watchdog/index.rst (100%) rename Documentation/{ => drivers}/watchdog/mlx-wdt.rst (100%) rename Documentation/{ => drivers}/watchdog/pcwd-watchdog.rst (100%) rename Documentation/{ => drivers}/watchdog/watchdog-api.rst (100%) rename Documentation/{ => drivers}/watchdog/watchdog-kernel-api.rst (100%) rename Documentation/{ => drivers}/watchdog/watchdog-parameters.rst (100%) rename Documentation/{ => drivers}/watchdog/watchdog-pm.rst (100%) rename Documentation/{ => drivers}/watchdog/wdt.rst (100%) diff --git a/Documentation/PCI/MSI-HOWTO.txt b/Documentation/drivers/PCI/MSI-HOWTO.txt similarity index 100% rename from Documentation/PCI/MSI-HOWTO.txt rename to Documentation/drivers/PCI/MSI-HOWTO.txt diff --git a/Documentation/PCI/PCIEBUS-HOWTO.txt b/Documentation/drivers/PCI/PCIEBUS-HOWTO.txt similarity index 100% rename from Documentation/PCI/PCIEBUS-HOWTO.txt rename to Documentation/drivers/PCI/PCIEBUS-HOWTO.txt diff --git a/Documentation/PCI/acpi-info.txt b/Documentation/drivers/PCI/acpi-info.txt similarity index 100% rename from Documentation/PCI/acpi-info.txt rename to Documentation/drivers/PCI/acpi-info.txt diff --git a/Documentation/PCI/endpoint/function/binding/pci-test.txt b/Documentation/drivers/PCI/endpoint/function/binding/pci-test.txt similarity index 100% rename from Documentation/PCI/endpoint/function/binding/pci-test.txt rename to Documentation/drivers/PCI/endpoint/function/binding/pci-test.txt diff --git a/Documentation/PCI/endpoint/pci-endpoint-cfs.txt b/Documentation/drivers/PCI/endpoint/pci-endpoint-cfs.txt similarity index 100% rename from Documentation/PCI/endpoint/pci-endpoint-cfs.txt rename to Documentation/drivers/PCI/endpoint/pci-endpoint-cfs.txt diff --git a/Documentation/PCI/endpoint/pci-endpoint.txt b/Documentation/drivers/PCI/endpoint/pci-endpoint.txt similarity index 100% rename from Documentation/PCI/endpoint/pci-endpoint.txt rename to Documentation/drivers/PCI/endpoint/pci-endpoint.txt diff --git a/Documentation/PCI/endpoint/pci-test-function.txt b/Documentation/drivers/PCI/endpoint/pci-test-function.txt similarity index 100% rename from Documentation/PCI/endpoint/pci-test-function.txt rename to Documentation/drivers/PCI/endpoint/pci-test-function.txt diff --git a/Documentation/PCI/endpoint/pci-test-howto.txt b/Documentation/drivers/PCI/endpoint/pci-test-howto.txt similarity index 100% rename from Documentation/PCI/endpoint/pci-test-howto.txt rename to Documentation/drivers/PCI/endpoint/pci-test-howto.txt diff --git a/Documentation/PCI/pci-error-recovery.txt b/Documentation/drivers/PCI/pci-error-recovery.txt similarity index 100% rename from Documentation/PCI/pci-error-recovery.txt rename to Documentation/drivers/PCI/pci-error-recovery.txt diff --git a/Documentation/PCI/pci-iov-howto.txt b/Documentation/drivers/PCI/pci-iov-howto.txt similarity index 100% rename from Documentation/PCI/pci-iov-howto.txt rename to Documentation/drivers/PCI/pci-iov-howto.txt diff --git a/Documentation/PCI/pci.txt b/Documentation/drivers/PCI/pci.txt similarity index 100% rename from Documentation/PCI/pci.txt rename to Documentation/drivers/PCI/pci.txt diff --git a/Documentation/PCI/pcieaer-howto.txt b/Documentation/drivers/PCI/pcieaer-howto.txt similarity index 100% rename from Documentation/PCI/pcieaer-howto.txt rename to Documentation/drivers/PCI/pcieaer-howto.txt diff --git a/Documentation/acpi/dsd/leds.txt b/Documentation/drivers/acpi/dsd/leds.txt similarity index 100% rename from Documentation/acpi/dsd/leds.txt rename to Documentation/drivers/acpi/dsd/leds.txt diff --git a/Documentation/auxdisplay/cfag12864b b/Documentation/drivers/auxdisplay/cfag12864b similarity index 100% rename from Documentation/auxdisplay/cfag12864b rename to Documentation/drivers/auxdisplay/cfag12864b diff --git a/Documentation/auxdisplay/ks0108 b/Documentation/drivers/auxdisplay/ks0108 similarity index 100% rename from Documentation/auxdisplay/ks0108 rename to Documentation/drivers/auxdisplay/ks0108 diff --git a/Documentation/auxdisplay/lcd-panel-cgram.txt b/Documentation/drivers/auxdisplay/lcd-panel-cgram.txt similarity index 100% rename from Documentation/auxdisplay/lcd-panel-cgram.txt rename to Documentation/drivers/auxdisplay/lcd-panel-cgram.txt diff --git a/Documentation/backlight/lp855x-driver.txt b/Documentation/drivers/backlight/lp855x-driver.txt similarity index 100% rename from Documentation/backlight/lp855x-driver.txt rename to Documentation/drivers/backlight/lp855x-driver.txt diff --git a/Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg b/Documentation/drivers/blockdev/drbd/DRBD-8.3-data-packets.svg similarity index 100% rename from Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg rename to Documentation/drivers/blockdev/drbd/DRBD-8.3-data-packets.svg diff --git a/Documentation/blockdev/drbd/DRBD-data-packets.svg b/Documentation/drivers/blockdev/drbd/DRBD-data-packets.svg similarity index 100% rename from Documentation/blockdev/drbd/DRBD-data-packets.svg rename to Documentation/drivers/blockdev/drbd/DRBD-data-packets.svg diff --git a/Documentation/blockdev/drbd/README.txt b/Documentation/drivers/blockdev/drbd/README.txt similarity index 100% rename from Documentation/blockdev/drbd/README.txt rename to Documentation/drivers/blockdev/drbd/README.txt diff --git a/Documentation/blockdev/drbd/conn-states-8.dot b/Documentation/drivers/blockdev/drbd/conn-states-8.dot similarity index 100% rename from Documentation/blockdev/drbd/conn-states-8.dot rename to Documentation/drivers/blockdev/drbd/conn-states-8.dot diff --git a/Documentation/blockdev/drbd/data-structure-v9.txt b/Documentation/drivers/blockdev/drbd/data-structure-v9.txt similarity index 100% rename from Documentation/blockdev/drbd/data-structure-v9.txt rename to Documentation/drivers/blockdev/drbd/data-structure-v9.txt diff --git a/Documentation/blockdev/drbd/disk-states-8.dot b/Documentation/drivers/blockdev/drbd/disk-states-8.dot similarity index 100% rename from Documentation/blockdev/drbd/disk-states-8.dot rename to Documentation/drivers/blockdev/drbd/disk-states-8.dot diff --git a/Documentation/blockdev/drbd/drbd-connection-state-overview.dot b/Documentation/drivers/blockdev/drbd/drbd-connection-state-overview.dot similarity index 100% rename from Documentation/blockdev/drbd/drbd-connection-state-overview.dot rename to Documentation/drivers/blockdev/drbd/drbd-connection-state-overview.dot diff --git a/Documentation/blockdev/drbd/node-states-8.dot b/Documentation/drivers/blockdev/drbd/node-states-8.dot similarity index 100% rename from Documentation/blockdev/drbd/node-states-8.dot rename to Documentation/drivers/blockdev/drbd/node-states-8.dot diff --git a/Documentation/blockdev/floppy.txt b/Documentation/drivers/blockdev/floppy.txt similarity index 100% rename from Documentation/blockdev/floppy.txt rename to Documentation/drivers/blockdev/floppy.txt diff --git a/Documentation/blockdev/nbd.txt b/Documentation/drivers/blockdev/nbd.txt similarity index 100% rename from Documentation/blockdev/nbd.txt rename to Documentation/drivers/blockdev/nbd.txt diff --git a/Documentation/blockdev/paride.txt b/Documentation/drivers/blockdev/paride.txt similarity index 100% rename from Documentation/blockdev/paride.txt rename to Documentation/drivers/blockdev/paride.txt diff --git a/Documentation/blockdev/ramdisk.txt b/Documentation/drivers/blockdev/ramdisk.txt similarity index 100% rename from Documentation/blockdev/ramdisk.txt rename to Documentation/drivers/blockdev/ramdisk.txt diff --git a/Documentation/blockdev/zram.txt b/Documentation/drivers/blockdev/zram.txt similarity index 100% rename from Documentation/blockdev/zram.txt rename to Documentation/drivers/blockdev/zram.txt diff --git a/Documentation/bus-devices/ti-gpmc.txt b/Documentation/drivers/bus/ti-gpmc.txt similarity index 100% rename from Documentation/bus-devices/ti-gpmc.txt rename to Documentation/drivers/bus/ti-gpmc.txt diff --git a/Documentation/cdrom/cdrom-standard.rst b/Documentation/drivers/cdrom/cdrom-standard.rst similarity index 100% rename from Documentation/cdrom/cdrom-standard.rst rename to Documentation/drivers/cdrom/cdrom-standard.rst diff --git a/Documentation/cdrom/ide-cd.rst b/Documentation/drivers/cdrom/ide-cd.rst similarity index 100% rename from Documentation/cdrom/ide-cd.rst rename to Documentation/drivers/cdrom/ide-cd.rst diff --git a/Documentation/cdrom/index.rst b/Documentation/drivers/cdrom/index.rst similarity index 100% rename from Documentation/cdrom/index.rst rename to Documentation/drivers/cdrom/index.rst diff --git a/Documentation/cdrom/packet-writing.rst b/Documentation/drivers/cdrom/packet-writing.rst similarity index 100% rename from Documentation/cdrom/packet-writing.rst rename to Documentation/drivers/cdrom/packet-writing.rst diff --git a/Documentation/cpu-freq/amd-powernow.txt b/Documentation/drivers/cpu-freq/amd-powernow.txt similarity index 100% rename from Documentation/cpu-freq/amd-powernow.txt rename to Documentation/drivers/cpu-freq/amd-powernow.txt diff --git a/Documentation/cpu-freq/core.txt b/Documentation/drivers/cpu-freq/core.txt similarity index 100% rename from Documentation/cpu-freq/core.txt rename to Documentation/drivers/cpu-freq/core.txt diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/drivers/cpu-freq/cpu-drivers.txt similarity index 100% rename from Documentation/cpu-freq/cpu-drivers.txt rename to Documentation/drivers/cpu-freq/cpu-drivers.txt diff --git a/Documentation/cpu-freq/cpufreq-nforce2.txt b/Documentation/drivers/cpu-freq/cpufreq-nforce2.txt similarity index 100% rename from Documentation/cpu-freq/cpufreq-nforce2.txt rename to Documentation/drivers/cpu-freq/cpufreq-nforce2.txt diff --git a/Documentation/cpu-freq/cpufreq-stats.txt b/Documentation/drivers/cpu-freq/cpufreq-stats.txt similarity index 100% rename from Documentation/cpu-freq/cpufreq-stats.txt rename to Documentation/drivers/cpu-freq/cpufreq-stats.txt diff --git a/Documentation/cpu-freq/index.txt b/Documentation/drivers/cpu-freq/index.txt similarity index 100% rename from Documentation/cpu-freq/index.txt rename to Documentation/drivers/cpu-freq/index.txt diff --git a/Documentation/cpu-freq/pcc-cpufreq.txt b/Documentation/drivers/cpu-freq/pcc-cpufreq.txt similarity index 100% rename from Documentation/cpu-freq/pcc-cpufreq.txt rename to Documentation/drivers/cpu-freq/pcc-cpufreq.txt diff --git a/Documentation/crypto/api-aead.rst b/Documentation/drivers/crypto/api-aead.rst similarity index 100% rename from Documentation/crypto/api-aead.rst rename to Documentation/drivers/crypto/api-aead.rst diff --git a/Documentation/crypto/api-akcipher.rst b/Documentation/drivers/crypto/api-akcipher.rst similarity index 100% rename from Documentation/crypto/api-akcipher.rst rename to Documentation/drivers/crypto/api-akcipher.rst diff --git a/Documentation/crypto/api-digest.rst b/Documentation/drivers/crypto/api-digest.rst similarity index 100% rename from Documentation/crypto/api-digest.rst rename to Documentation/drivers/crypto/api-digest.rst diff --git a/Documentation/crypto/api-intro.txt b/Documentation/drivers/crypto/api-intro.txt similarity index 100% rename from Documentation/crypto/api-intro.txt rename to Documentation/drivers/crypto/api-intro.txt diff --git a/Documentation/crypto/api-kpp.rst b/Documentation/drivers/crypto/api-kpp.rst similarity index 100% rename from Documentation/crypto/api-kpp.rst rename to Documentation/drivers/crypto/api-kpp.rst diff --git a/Documentation/crypto/api-rng.rst b/Documentation/drivers/crypto/api-rng.rst similarity index 100% rename from Documentation/crypto/api-rng.rst rename to Documentation/drivers/crypto/api-rng.rst diff --git a/Documentation/crypto/api-samples.rst b/Documentation/drivers/crypto/api-samples.rst similarity index 100% rename from Documentation/crypto/api-samples.rst rename to Documentation/drivers/crypto/api-samples.rst diff --git a/Documentation/crypto/api-skcipher.rst b/Documentation/drivers/crypto/api-skcipher.rst similarity index 100% rename from Documentation/crypto/api-skcipher.rst rename to Documentation/drivers/crypto/api-skcipher.rst diff --git a/Documentation/crypto/api.rst b/Documentation/drivers/crypto/api.rst similarity index 100% rename from Documentation/crypto/api.rst rename to Documentation/drivers/crypto/api.rst diff --git a/Documentation/crypto/architecture.rst b/Documentation/drivers/crypto/architecture.rst similarity index 100% rename from Documentation/crypto/architecture.rst rename to Documentation/drivers/crypto/architecture.rst diff --git a/Documentation/crypto/asymmetric-keys.txt b/Documentation/drivers/crypto/asymmetric-keys.txt similarity index 100% rename from Documentation/crypto/asymmetric-keys.txt rename to Documentation/drivers/crypto/asymmetric-keys.txt diff --git a/Documentation/crypto/async-tx-api.txt b/Documentation/drivers/crypto/async-tx-api.txt similarity index 100% rename from Documentation/crypto/async-tx-api.txt rename to Documentation/drivers/crypto/async-tx-api.txt diff --git a/Documentation/crypto/conf.py b/Documentation/drivers/crypto/conf.py similarity index 100% rename from Documentation/crypto/conf.py rename to Documentation/drivers/crypto/conf.py diff --git a/Documentation/crypto/crypto_engine.rst b/Documentation/drivers/crypto/crypto_engine.rst similarity index 100% rename from Documentation/crypto/crypto_engine.rst rename to Documentation/drivers/crypto/crypto_engine.rst diff --git a/Documentation/crypto/descore-readme.txt b/Documentation/drivers/crypto/descore-readme.txt similarity index 100% rename from Documentation/crypto/descore-readme.txt rename to Documentation/drivers/crypto/descore-readme.txt diff --git a/Documentation/crypto/devel-algos.rst b/Documentation/drivers/crypto/devel-algos.rst similarity index 100% rename from Documentation/crypto/devel-algos.rst rename to Documentation/drivers/crypto/devel-algos.rst diff --git a/Documentation/crypto/index.rst b/Documentation/drivers/crypto/index.rst similarity index 100% rename from Documentation/crypto/index.rst rename to Documentation/drivers/crypto/index.rst diff --git a/Documentation/crypto/intro.rst b/Documentation/drivers/crypto/intro.rst similarity index 100% rename from Documentation/crypto/intro.rst rename to Documentation/drivers/crypto/intro.rst diff --git a/Documentation/crypto/userspace-if.rst b/Documentation/drivers/crypto/userspace-if.rst similarity index 100% rename from Documentation/crypto/userspace-if.rst rename to Documentation/drivers/crypto/userspace-if.rst diff --git a/Documentation/device-mapper/cache-policies.rst b/Documentation/drivers/device-mapper/cache-policies.rst similarity index 100% rename from Documentation/device-mapper/cache-policies.rst rename to Documentation/drivers/device-mapper/cache-policies.rst diff --git a/Documentation/device-mapper/cache.rst b/Documentation/drivers/device-mapper/cache.rst similarity index 100% rename from Documentation/device-mapper/cache.rst rename to Documentation/drivers/device-mapper/cache.rst diff --git a/Documentation/device-mapper/delay.rst b/Documentation/drivers/device-mapper/delay.rst similarity index 100% rename from Documentation/device-mapper/delay.rst rename to Documentation/drivers/device-mapper/delay.rst diff --git a/Documentation/device-mapper/dm-crypt.rst b/Documentation/drivers/device-mapper/dm-crypt.rst similarity index 100% rename from Documentation/device-mapper/dm-crypt.rst rename to Documentation/drivers/device-mapper/dm-crypt.rst diff --git a/Documentation/device-mapper/dm-dust.txt b/Documentation/drivers/device-mapper/dm-dust.txt similarity index 100% rename from Documentation/device-mapper/dm-dust.txt rename to Documentation/drivers/device-mapper/dm-dust.txt diff --git a/Documentation/device-mapper/dm-flakey.rst b/Documentation/drivers/device-mapper/dm-flakey.rst similarity index 100% rename from Documentation/device-mapper/dm-flakey.rst rename to Documentation/drivers/device-mapper/dm-flakey.rst diff --git a/Documentation/device-mapper/dm-init.rst b/Documentation/drivers/device-mapper/dm-init.rst similarity index 100% rename from Documentation/device-mapper/dm-init.rst rename to Documentation/drivers/device-mapper/dm-init.rst diff --git a/Documentation/device-mapper/dm-integrity.rst b/Documentation/drivers/device-mapper/dm-integrity.rst similarity index 100% rename from Documentation/device-mapper/dm-integrity.rst rename to Documentation/drivers/device-mapper/dm-integrity.rst diff --git a/Documentation/device-mapper/dm-io.rst b/Documentation/drivers/device-mapper/dm-io.rst similarity index 100% rename from Documentation/device-mapper/dm-io.rst rename to Documentation/drivers/device-mapper/dm-io.rst diff --git a/Documentation/device-mapper/dm-log.rst b/Documentation/drivers/device-mapper/dm-log.rst similarity index 100% rename from Documentation/device-mapper/dm-log.rst rename to Documentation/drivers/device-mapper/dm-log.rst diff --git a/Documentation/device-mapper/dm-queue-length.rst b/Documentation/drivers/device-mapper/dm-queue-length.rst similarity index 100% rename from Documentation/device-mapper/dm-queue-length.rst rename to Documentation/drivers/device-mapper/dm-queue-length.rst diff --git a/Documentation/device-mapper/dm-raid.rst b/Documentation/drivers/device-mapper/dm-raid.rst similarity index 100% rename from Documentation/device-mapper/dm-raid.rst rename to Documentation/drivers/device-mapper/dm-raid.rst diff --git a/Documentation/device-mapper/dm-service-time.rst b/Documentation/drivers/device-mapper/dm-service-time.rst similarity index 100% rename from Documentation/device-mapper/dm-service-time.rst rename to Documentation/drivers/device-mapper/dm-service-time.rst diff --git a/Documentation/device-mapper/dm-uevent.rst b/Documentation/drivers/device-mapper/dm-uevent.rst similarity index 100% rename from Documentation/device-mapper/dm-uevent.rst rename to Documentation/drivers/device-mapper/dm-uevent.rst diff --git a/Documentation/device-mapper/dm-zoned.rst b/Documentation/drivers/device-mapper/dm-zoned.rst similarity index 100% rename from Documentation/device-mapper/dm-zoned.rst rename to Documentation/drivers/device-mapper/dm-zoned.rst diff --git a/Documentation/device-mapper/era.rst b/Documentation/drivers/device-mapper/era.rst similarity index 100% rename from Documentation/device-mapper/era.rst rename to Documentation/drivers/device-mapper/era.rst diff --git a/Documentation/device-mapper/index.rst b/Documentation/drivers/device-mapper/index.rst similarity index 100% rename from Documentation/device-mapper/index.rst rename to Documentation/drivers/device-mapper/index.rst diff --git a/Documentation/device-mapper/kcopyd.rst b/Documentation/drivers/device-mapper/kcopyd.rst similarity index 100% rename from Documentation/device-mapper/kcopyd.rst rename to Documentation/drivers/device-mapper/kcopyd.rst diff --git a/Documentation/device-mapper/linear.rst b/Documentation/drivers/device-mapper/linear.rst similarity index 100% rename from Documentation/device-mapper/linear.rst rename to Documentation/drivers/device-mapper/linear.rst diff --git a/Documentation/device-mapper/log-writes.rst b/Documentation/drivers/device-mapper/log-writes.rst similarity index 100% rename from Documentation/device-mapper/log-writes.rst rename to Documentation/drivers/device-mapper/log-writes.rst diff --git a/Documentation/device-mapper/persistent-data.rst b/Documentation/drivers/device-mapper/persistent-data.rst similarity index 100% rename from Documentation/device-mapper/persistent-data.rst rename to Documentation/drivers/device-mapper/persistent-data.rst diff --git a/Documentation/device-mapper/snapshot.rst b/Documentation/drivers/device-mapper/snapshot.rst similarity index 100% rename from Documentation/device-mapper/snapshot.rst rename to Documentation/drivers/device-mapper/snapshot.rst diff --git a/Documentation/device-mapper/statistics.rst b/Documentation/drivers/device-mapper/statistics.rst similarity index 100% rename from Documentation/device-mapper/statistics.rst rename to Documentation/drivers/device-mapper/statistics.rst diff --git a/Documentation/device-mapper/striped.rst b/Documentation/drivers/device-mapper/striped.rst similarity index 100% rename from Documentation/device-mapper/striped.rst rename to Documentation/drivers/device-mapper/striped.rst diff --git a/Documentation/device-mapper/switch.rst b/Documentation/drivers/device-mapper/switch.rst similarity index 100% rename from Documentation/device-mapper/switch.rst rename to Documentation/drivers/device-mapper/switch.rst diff --git a/Documentation/device-mapper/thin-provisioning.rst b/Documentation/drivers/device-mapper/thin-provisioning.rst similarity index 100% rename from Documentation/device-mapper/thin-provisioning.rst rename to Documentation/drivers/device-mapper/thin-provisioning.rst diff --git a/Documentation/device-mapper/unstriped.rst b/Documentation/drivers/device-mapper/unstriped.rst similarity index 100% rename from Documentation/device-mapper/unstriped.rst rename to Documentation/drivers/device-mapper/unstriped.rst diff --git a/Documentation/device-mapper/verity.rst b/Documentation/drivers/device-mapper/verity.rst similarity index 100% rename from Documentation/device-mapper/verity.rst rename to Documentation/drivers/device-mapper/verity.rst diff --git a/Documentation/device-mapper/writecache.rst b/Documentation/drivers/device-mapper/writecache.rst similarity index 100% rename from Documentation/device-mapper/writecache.rst rename to Documentation/drivers/device-mapper/writecache.rst diff --git a/Documentation/device-mapper/zero.rst b/Documentation/drivers/device-mapper/zero.rst similarity index 100% rename from Documentation/device-mapper/zero.rst rename to Documentation/drivers/device-mapper/zero.rst diff --git a/Documentation/driver-api/80211/cfg80211.rst b/Documentation/drivers/driver-api/80211/cfg80211.rst similarity index 100% rename from Documentation/driver-api/80211/cfg80211.rst rename to Documentation/drivers/driver-api/80211/cfg80211.rst diff --git a/Documentation/driver-api/80211/conf.py b/Documentation/drivers/driver-api/80211/conf.py similarity index 100% rename from Documentation/driver-api/80211/conf.py rename to Documentation/drivers/driver-api/80211/conf.py diff --git a/Documentation/driver-api/80211/index.rst b/Documentation/drivers/driver-api/80211/index.rst similarity index 100% rename from Documentation/driver-api/80211/index.rst rename to Documentation/drivers/driver-api/80211/index.rst diff --git a/Documentation/driver-api/80211/introduction.rst b/Documentation/drivers/driver-api/80211/introduction.rst similarity index 100% rename from Documentation/driver-api/80211/introduction.rst rename to Documentation/drivers/driver-api/80211/introduction.rst diff --git a/Documentation/driver-api/80211/mac80211-advanced.rst b/Documentation/drivers/driver-api/80211/mac80211-advanced.rst similarity index 100% rename from Documentation/driver-api/80211/mac80211-advanced.rst rename to Documentation/drivers/driver-api/80211/mac80211-advanced.rst diff --git a/Documentation/driver-api/80211/mac80211.rst b/Documentation/drivers/driver-api/80211/mac80211.rst similarity index 100% rename from Documentation/driver-api/80211/mac80211.rst rename to Documentation/drivers/driver-api/80211/mac80211.rst diff --git a/Documentation/driver-api/acpi/index.rst b/Documentation/drivers/driver-api/acpi/index.rst similarity index 100% rename from Documentation/driver-api/acpi/index.rst rename to Documentation/drivers/driver-api/acpi/index.rst diff --git a/Documentation/driver-api/acpi/linuxized-acpica.rst b/Documentation/drivers/driver-api/acpi/linuxized-acpica.rst similarity index 100% rename from Documentation/driver-api/acpi/linuxized-acpica.rst rename to Documentation/drivers/driver-api/acpi/linuxized-acpica.rst diff --git a/Documentation/driver-api/acpi/scan_handlers.rst b/Documentation/drivers/driver-api/acpi/scan_handlers.rst similarity index 100% rename from Documentation/driver-api/acpi/scan_handlers.rst rename to Documentation/drivers/driver-api/acpi/scan_handlers.rst diff --git a/Documentation/driver-api/basics.rst b/Documentation/drivers/driver-api/basics.rst similarity index 100% rename from Documentation/driver-api/basics.rst rename to Documentation/drivers/driver-api/basics.rst diff --git a/Documentation/driver-api/clk.rst b/Documentation/drivers/driver-api/clk.rst similarity index 100% rename from Documentation/driver-api/clk.rst rename to Documentation/drivers/driver-api/clk.rst diff --git a/Documentation/driver-api/component.rst b/Documentation/drivers/driver-api/component.rst similarity index 100% rename from Documentation/driver-api/component.rst rename to Documentation/drivers/driver-api/component.rst diff --git a/Documentation/driver-api/conf.py b/Documentation/drivers/driver-api/conf.py similarity index 100% rename from Documentation/driver-api/conf.py rename to Documentation/drivers/driver-api/conf.py diff --git a/Documentation/driver-api/device-io.rst b/Documentation/drivers/driver-api/device-io.rst similarity index 100% rename from Documentation/driver-api/device-io.rst rename to Documentation/drivers/driver-api/device-io.rst diff --git a/Documentation/driver-api/device_connection.rst b/Documentation/drivers/driver-api/device_connection.rst similarity index 100% rename from Documentation/driver-api/device_connection.rst rename to Documentation/drivers/driver-api/device_connection.rst diff --git a/Documentation/driver-api/device_link.rst b/Documentation/drivers/driver-api/device_link.rst similarity index 100% rename from Documentation/driver-api/device_link.rst rename to Documentation/drivers/driver-api/device_link.rst diff --git a/Documentation/driver-api/dma-buf.rst b/Documentation/drivers/driver-api/dma-buf.rst similarity index 100% rename from Documentation/driver-api/dma-buf.rst rename to Documentation/drivers/driver-api/dma-buf.rst diff --git a/Documentation/driver-api/dmaengine/client.rst b/Documentation/drivers/driver-api/dmaengine/client.rst similarity index 100% rename from Documentation/driver-api/dmaengine/client.rst rename to Documentation/drivers/driver-api/dmaengine/client.rst diff --git a/Documentation/driver-api/dmaengine/dmatest.rst b/Documentation/drivers/driver-api/dmaengine/dmatest.rst similarity index 100% rename from Documentation/driver-api/dmaengine/dmatest.rst rename to Documentation/drivers/driver-api/dmaengine/dmatest.rst diff --git a/Documentation/driver-api/dmaengine/index.rst b/Documentation/drivers/driver-api/dmaengine/index.rst similarity index 100% rename from Documentation/driver-api/dmaengine/index.rst rename to Documentation/drivers/driver-api/dmaengine/index.rst diff --git a/Documentation/driver-api/dmaengine/provider.rst b/Documentation/drivers/driver-api/dmaengine/provider.rst similarity index 100% rename from Documentation/driver-api/dmaengine/provider.rst rename to Documentation/drivers/driver-api/dmaengine/provider.rst diff --git a/Documentation/driver-api/dmaengine/pxa_dma.rst b/Documentation/drivers/driver-api/dmaengine/pxa_dma.rst similarity index 100% rename from Documentation/driver-api/dmaengine/pxa_dma.rst rename to Documentation/drivers/driver-api/dmaengine/pxa_dma.rst diff --git a/Documentation/driver-api/edac.rst b/Documentation/drivers/driver-api/edac.rst similarity index 100% rename from Documentation/driver-api/edac.rst rename to Documentation/drivers/driver-api/edac.rst diff --git a/Documentation/driver-api/firewire.rst b/Documentation/drivers/driver-api/firewire.rst similarity index 100% rename from Documentation/driver-api/firewire.rst rename to Documentation/drivers/driver-api/firewire.rst diff --git a/Documentation/driver-api/firmware/built-in-fw.rst b/Documentation/drivers/driver-api/firmware/built-in-fw.rst similarity index 100% rename from Documentation/driver-api/firmware/built-in-fw.rst rename to Documentation/drivers/driver-api/firmware/built-in-fw.rst diff --git a/Documentation/driver-api/firmware/core.rst b/Documentation/drivers/driver-api/firmware/core.rst similarity index 100% rename from Documentation/driver-api/firmware/core.rst rename to Documentation/drivers/driver-api/firmware/core.rst diff --git a/Documentation/driver-api/firmware/direct-fs-lookup.rst b/Documentation/drivers/driver-api/firmware/direct-fs-lookup.rst similarity index 100% rename from Documentation/driver-api/firmware/direct-fs-lookup.rst rename to Documentation/drivers/driver-api/firmware/direct-fs-lookup.rst diff --git a/Documentation/driver-api/firmware/fallback-mechanisms.rst b/Documentation/drivers/driver-api/firmware/fallback-mechanisms.rst similarity index 100% rename from Documentation/driver-api/firmware/fallback-mechanisms.rst rename to Documentation/drivers/driver-api/firmware/fallback-mechanisms.rst diff --git a/Documentation/driver-api/firmware/firmware_cache.rst b/Documentation/drivers/driver-api/firmware/firmware_cache.rst similarity index 100% rename from Documentation/driver-api/firmware/firmware_cache.rst rename to Documentation/drivers/driver-api/firmware/firmware_cache.rst diff --git a/Documentation/driver-api/firmware/fw_search_path.rst b/Documentation/drivers/driver-api/firmware/fw_search_path.rst similarity index 100% rename from Documentation/driver-api/firmware/fw_search_path.rst rename to Documentation/drivers/driver-api/firmware/fw_search_path.rst diff --git a/Documentation/driver-api/firmware/index.rst b/Documentation/drivers/driver-api/firmware/index.rst similarity index 100% rename from Documentation/driver-api/firmware/index.rst rename to Documentation/drivers/driver-api/firmware/index.rst diff --git a/Documentation/driver-api/firmware/introduction.rst b/Documentation/drivers/driver-api/firmware/introduction.rst similarity index 100% rename from Documentation/driver-api/firmware/introduction.rst rename to Documentation/drivers/driver-api/firmware/introduction.rst diff --git a/Documentation/driver-api/firmware/lookup-order.rst b/Documentation/drivers/driver-api/firmware/lookup-order.rst similarity index 100% rename from Documentation/driver-api/firmware/lookup-order.rst rename to Documentation/drivers/driver-api/firmware/lookup-order.rst diff --git a/Documentation/driver-api/firmware/other_interfaces.rst b/Documentation/drivers/driver-api/firmware/other_interfaces.rst similarity index 100% rename from Documentation/driver-api/firmware/other_interfaces.rst rename to Documentation/drivers/driver-api/firmware/other_interfaces.rst diff --git a/Documentation/driver-api/firmware/request_firmware.rst b/Documentation/drivers/driver-api/firmware/request_firmware.rst similarity index 100% rename from Documentation/driver-api/firmware/request_firmware.rst rename to Documentation/drivers/driver-api/firmware/request_firmware.rst diff --git a/Documentation/driver-api/fpga/fpga-bridge.rst b/Documentation/drivers/driver-api/fpga/fpga-bridge.rst similarity index 100% rename from Documentation/driver-api/fpga/fpga-bridge.rst rename to Documentation/drivers/driver-api/fpga/fpga-bridge.rst diff --git a/Documentation/driver-api/fpga/fpga-mgr.rst b/Documentation/drivers/driver-api/fpga/fpga-mgr.rst similarity index 100% rename from Documentation/driver-api/fpga/fpga-mgr.rst rename to Documentation/drivers/driver-api/fpga/fpga-mgr.rst diff --git a/Documentation/driver-api/fpga/fpga-programming.rst b/Documentation/drivers/driver-api/fpga/fpga-programming.rst similarity index 100% rename from Documentation/driver-api/fpga/fpga-programming.rst rename to Documentation/drivers/driver-api/fpga/fpga-programming.rst diff --git a/Documentation/driver-api/fpga/fpga-region.rst b/Documentation/drivers/driver-api/fpga/fpga-region.rst similarity index 100% rename from Documentation/driver-api/fpga/fpga-region.rst rename to Documentation/drivers/driver-api/fpga/fpga-region.rst diff --git a/Documentation/driver-api/fpga/index.rst b/Documentation/drivers/driver-api/fpga/index.rst similarity index 100% rename from Documentation/driver-api/fpga/index.rst rename to Documentation/drivers/driver-api/fpga/index.rst diff --git a/Documentation/driver-api/fpga/intro.rst b/Documentation/drivers/driver-api/fpga/intro.rst similarity index 100% rename from Documentation/driver-api/fpga/intro.rst rename to Documentation/drivers/driver-api/fpga/intro.rst diff --git a/Documentation/driver-api/frame-buffer.rst b/Documentation/drivers/driver-api/frame-buffer.rst similarity index 100% rename from Documentation/driver-api/frame-buffer.rst rename to Documentation/drivers/driver-api/frame-buffer.rst diff --git a/Documentation/driver-api/generic-counter.rst b/Documentation/drivers/driver-api/generic-counter.rst similarity index 100% rename from Documentation/driver-api/generic-counter.rst rename to Documentation/drivers/driver-api/generic-counter.rst diff --git a/Documentation/driver-api/gpio/board.rst b/Documentation/drivers/driver-api/gpio/board.rst similarity index 100% rename from Documentation/driver-api/gpio/board.rst rename to Documentation/drivers/driver-api/gpio/board.rst diff --git a/Documentation/driver-api/gpio/consumer.rst b/Documentation/drivers/driver-api/gpio/consumer.rst similarity index 100% rename from Documentation/driver-api/gpio/consumer.rst rename to Documentation/drivers/driver-api/gpio/consumer.rst diff --git a/Documentation/driver-api/gpio/driver.rst b/Documentation/drivers/driver-api/gpio/driver.rst similarity index 100% rename from Documentation/driver-api/gpio/driver.rst rename to Documentation/drivers/driver-api/gpio/driver.rst diff --git a/Documentation/driver-api/gpio/drivers-on-gpio.rst b/Documentation/drivers/driver-api/gpio/drivers-on-gpio.rst similarity index 100% rename from Documentation/driver-api/gpio/drivers-on-gpio.rst rename to Documentation/drivers/driver-api/gpio/drivers-on-gpio.rst diff --git a/Documentation/driver-api/gpio/index.rst b/Documentation/drivers/driver-api/gpio/index.rst similarity index 100% rename from Documentation/driver-api/gpio/index.rst rename to Documentation/drivers/driver-api/gpio/index.rst diff --git a/Documentation/driver-api/gpio/intro.rst b/Documentation/drivers/driver-api/gpio/intro.rst similarity index 100% rename from Documentation/driver-api/gpio/intro.rst rename to Documentation/drivers/driver-api/gpio/intro.rst diff --git a/Documentation/driver-api/gpio/legacy.rst b/Documentation/drivers/driver-api/gpio/legacy.rst similarity index 100% rename from Documentation/driver-api/gpio/legacy.rst rename to Documentation/drivers/driver-api/gpio/legacy.rst diff --git a/Documentation/driver-api/hsi.rst b/Documentation/drivers/driver-api/hsi.rst similarity index 100% rename from Documentation/driver-api/hsi.rst rename to Documentation/drivers/driver-api/hsi.rst diff --git a/Documentation/driver-api/i2c.rst b/Documentation/drivers/driver-api/i2c.rst similarity index 100% rename from Documentation/driver-api/i2c.rst rename to Documentation/drivers/driver-api/i2c.rst diff --git a/Documentation/driver-api/i3c/device-driver-api.rst b/Documentation/drivers/driver-api/i3c/device-driver-api.rst similarity index 100% rename from Documentation/driver-api/i3c/device-driver-api.rst rename to Documentation/drivers/driver-api/i3c/device-driver-api.rst diff --git a/Documentation/driver-api/i3c/index.rst b/Documentation/drivers/driver-api/i3c/index.rst similarity index 100% rename from Documentation/driver-api/i3c/index.rst rename to Documentation/drivers/driver-api/i3c/index.rst diff --git a/Documentation/driver-api/i3c/master-driver-api.rst b/Documentation/drivers/driver-api/i3c/master-driver-api.rst similarity index 100% rename from Documentation/driver-api/i3c/master-driver-api.rst rename to Documentation/drivers/driver-api/i3c/master-driver-api.rst diff --git a/Documentation/driver-api/i3c/protocol.rst b/Documentation/drivers/driver-api/i3c/protocol.rst similarity index 100% rename from Documentation/driver-api/i3c/protocol.rst rename to Documentation/drivers/driver-api/i3c/protocol.rst diff --git a/Documentation/driver-api/iio/buffers.rst b/Documentation/drivers/driver-api/iio/buffers.rst similarity index 100% rename from Documentation/driver-api/iio/buffers.rst rename to Documentation/drivers/driver-api/iio/buffers.rst diff --git a/Documentation/driver-api/iio/core.rst b/Documentation/drivers/driver-api/iio/core.rst similarity index 100% rename from Documentation/driver-api/iio/core.rst rename to Documentation/drivers/driver-api/iio/core.rst diff --git a/Documentation/driver-api/iio/hw-consumer.rst b/Documentation/drivers/driver-api/iio/hw-consumer.rst similarity index 100% rename from Documentation/driver-api/iio/hw-consumer.rst rename to Documentation/drivers/driver-api/iio/hw-consumer.rst diff --git a/Documentation/driver-api/iio/index.rst b/Documentation/drivers/driver-api/iio/index.rst similarity index 100% rename from Documentation/driver-api/iio/index.rst rename to Documentation/drivers/driver-api/iio/index.rst diff --git a/Documentation/driver-api/iio/intro.rst b/Documentation/drivers/driver-api/iio/intro.rst similarity index 100% rename from Documentation/driver-api/iio/intro.rst rename to Documentation/drivers/driver-api/iio/intro.rst diff --git a/Documentation/driver-api/iio/triggered-buffers.rst b/Documentation/drivers/driver-api/iio/triggered-buffers.rst similarity index 100% rename from Documentation/driver-api/iio/triggered-buffers.rst rename to Documentation/drivers/driver-api/iio/triggered-buffers.rst diff --git a/Documentation/driver-api/iio/triggers.rst b/Documentation/drivers/driver-api/iio/triggers.rst similarity index 100% rename from Documentation/driver-api/iio/triggers.rst rename to Documentation/drivers/driver-api/iio/triggers.rst diff --git a/Documentation/driver-api/index.rst b/Documentation/drivers/driver-api/index.rst similarity index 100% rename from Documentation/driver-api/index.rst rename to Documentation/drivers/driver-api/index.rst diff --git a/Documentation/driver-api/infrastructure.rst b/Documentation/drivers/driver-api/infrastructure.rst similarity index 100% rename from Documentation/driver-api/infrastructure.rst rename to Documentation/drivers/driver-api/infrastructure.rst diff --git a/Documentation/driver-api/input.rst b/Documentation/drivers/driver-api/input.rst similarity index 100% rename from Documentation/driver-api/input.rst rename to Documentation/drivers/driver-api/input.rst diff --git a/Documentation/driver-api/libata.rst b/Documentation/drivers/driver-api/libata.rst similarity index 100% rename from Documentation/driver-api/libata.rst rename to Documentation/drivers/driver-api/libata.rst diff --git a/Documentation/driver-api/message-based.rst b/Documentation/drivers/driver-api/message-based.rst similarity index 100% rename from Documentation/driver-api/message-based.rst rename to Documentation/drivers/driver-api/message-based.rst diff --git a/Documentation/driver-api/misc_devices.rst b/Documentation/drivers/driver-api/misc_devices.rst similarity index 100% rename from Documentation/driver-api/misc_devices.rst rename to Documentation/drivers/driver-api/misc_devices.rst diff --git a/Documentation/driver-api/miscellaneous.rst b/Documentation/drivers/driver-api/miscellaneous.rst similarity index 100% rename from Documentation/driver-api/miscellaneous.rst rename to Documentation/drivers/driver-api/miscellaneous.rst diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/drivers/driver-api/mtdnand.rst similarity index 100% rename from Documentation/driver-api/mtdnand.rst rename to Documentation/drivers/driver-api/mtdnand.rst diff --git a/Documentation/driver-api/pci/index.rst b/Documentation/drivers/driver-api/pci/index.rst similarity index 100% rename from Documentation/driver-api/pci/index.rst rename to Documentation/drivers/driver-api/pci/index.rst diff --git a/Documentation/driver-api/pci/p2pdma.rst b/Documentation/drivers/driver-api/pci/p2pdma.rst similarity index 100% rename from Documentation/driver-api/pci/p2pdma.rst rename to Documentation/drivers/driver-api/pci/p2pdma.rst diff --git a/Documentation/driver-api/pci/pci.rst b/Documentation/drivers/driver-api/pci/pci.rst similarity index 100% rename from Documentation/driver-api/pci/pci.rst rename to Documentation/drivers/driver-api/pci/pci.rst diff --git a/Documentation/driver-api/pinctl.rst b/Documentation/drivers/driver-api/pinctl.rst similarity index 100% rename from Documentation/driver-api/pinctl.rst rename to Documentation/drivers/driver-api/pinctl.rst diff --git a/Documentation/driver-api/pm/conf.py b/Documentation/drivers/driver-api/pm/conf.py similarity index 100% rename from Documentation/driver-api/pm/conf.py rename to Documentation/drivers/driver-api/pm/conf.py diff --git a/Documentation/driver-api/pm/cpuidle.rst b/Documentation/drivers/driver-api/pm/cpuidle.rst similarity index 100% rename from Documentation/driver-api/pm/cpuidle.rst rename to Documentation/drivers/driver-api/pm/cpuidle.rst diff --git a/Documentation/driver-api/pm/devices.rst b/Documentation/drivers/driver-api/pm/devices.rst similarity index 100% rename from Documentation/driver-api/pm/devices.rst rename to Documentation/drivers/driver-api/pm/devices.rst diff --git a/Documentation/driver-api/pm/index.rst b/Documentation/drivers/driver-api/pm/index.rst similarity index 100% rename from Documentation/driver-api/pm/index.rst rename to Documentation/drivers/driver-api/pm/index.rst diff --git a/Documentation/driver-api/pm/notifiers.rst b/Documentation/drivers/driver-api/pm/notifiers.rst similarity index 100% rename from Documentation/driver-api/pm/notifiers.rst rename to Documentation/drivers/driver-api/pm/notifiers.rst diff --git a/Documentation/driver-api/pm/types.rst b/Documentation/drivers/driver-api/pm/types.rst similarity index 100% rename from Documentation/driver-api/pm/types.rst rename to Documentation/drivers/driver-api/pm/types.rst diff --git a/Documentation/driver-api/pps.rst b/Documentation/drivers/driver-api/pps.rst similarity index 100% rename from Documentation/driver-api/pps.rst rename to Documentation/drivers/driver-api/pps.rst diff --git a/Documentation/driver-api/ptp.rst b/Documentation/drivers/driver-api/ptp.rst similarity index 100% rename from Documentation/driver-api/ptp.rst rename to Documentation/drivers/driver-api/ptp.rst diff --git a/Documentation/driver-api/rapidio.rst b/Documentation/drivers/driver-api/rapidio.rst similarity index 100% rename from Documentation/driver-api/rapidio.rst rename to Documentation/drivers/driver-api/rapidio.rst diff --git a/Documentation/driver-api/regulator.rst b/Documentation/drivers/driver-api/regulator.rst similarity index 100% rename from Documentation/driver-api/regulator.rst rename to Documentation/drivers/driver-api/regulator.rst diff --git a/Documentation/driver-api/s390-drivers.rst b/Documentation/drivers/driver-api/s390-drivers.rst similarity index 100% rename from Documentation/driver-api/s390-drivers.rst rename to Documentation/drivers/driver-api/s390-drivers.rst diff --git a/Documentation/driver-api/scsi.rst b/Documentation/drivers/driver-api/scsi.rst similarity index 100% rename from Documentation/driver-api/scsi.rst rename to Documentation/drivers/driver-api/scsi.rst diff --git a/Documentation/driver-api/slimbus.rst b/Documentation/drivers/driver-api/slimbus.rst similarity index 100% rename from Documentation/driver-api/slimbus.rst rename to Documentation/drivers/driver-api/slimbus.rst diff --git a/Documentation/driver-api/sound.rst b/Documentation/drivers/driver-api/sound.rst similarity index 100% rename from Documentation/driver-api/sound.rst rename to Documentation/drivers/driver-api/sound.rst diff --git a/Documentation/driver-api/soundwire/error_handling.rst b/Documentation/drivers/driver-api/soundwire/error_handling.rst similarity index 100% rename from Documentation/driver-api/soundwire/error_handling.rst rename to Documentation/drivers/driver-api/soundwire/error_handling.rst diff --git a/Documentation/driver-api/soundwire/index.rst b/Documentation/drivers/driver-api/soundwire/index.rst similarity index 100% rename from Documentation/driver-api/soundwire/index.rst rename to Documentation/drivers/driver-api/soundwire/index.rst diff --git a/Documentation/driver-api/soundwire/locking.rst b/Documentation/drivers/driver-api/soundwire/locking.rst similarity index 100% rename from Documentation/driver-api/soundwire/locking.rst rename to Documentation/drivers/driver-api/soundwire/locking.rst diff --git a/Documentation/driver-api/soundwire/stream.rst b/Documentation/drivers/driver-api/soundwire/stream.rst similarity index 100% rename from Documentation/driver-api/soundwire/stream.rst rename to Documentation/drivers/driver-api/soundwire/stream.rst diff --git a/Documentation/driver-api/soundwire/summary.rst b/Documentation/drivers/driver-api/soundwire/summary.rst similarity index 100% rename from Documentation/driver-api/soundwire/summary.rst rename to Documentation/drivers/driver-api/soundwire/summary.rst diff --git a/Documentation/driver-api/spi.rst b/Documentation/drivers/driver-api/spi.rst similarity index 100% rename from Documentation/driver-api/spi.rst rename to Documentation/drivers/driver-api/spi.rst diff --git a/Documentation/driver-api/target.rst b/Documentation/drivers/driver-api/target.rst similarity index 100% rename from Documentation/driver-api/target.rst rename to Documentation/drivers/driver-api/target.rst diff --git a/Documentation/driver-api/uio-howto.rst b/Documentation/drivers/driver-api/uio-howto.rst similarity index 100% rename from Documentation/driver-api/uio-howto.rst rename to Documentation/drivers/driver-api/uio-howto.rst diff --git a/Documentation/driver-api/usb/URB.rst b/Documentation/drivers/driver-api/usb/URB.rst similarity index 100% rename from Documentation/driver-api/usb/URB.rst rename to Documentation/drivers/driver-api/usb/URB.rst diff --git a/Documentation/driver-api/usb/anchors.rst b/Documentation/drivers/driver-api/usb/anchors.rst similarity index 100% rename from Documentation/driver-api/usb/anchors.rst rename to Documentation/drivers/driver-api/usb/anchors.rst diff --git a/Documentation/driver-api/usb/bulk-streams.rst b/Documentation/drivers/driver-api/usb/bulk-streams.rst similarity index 100% rename from Documentation/driver-api/usb/bulk-streams.rst rename to Documentation/drivers/driver-api/usb/bulk-streams.rst diff --git a/Documentation/driver-api/usb/callbacks.rst b/Documentation/drivers/driver-api/usb/callbacks.rst similarity index 100% rename from Documentation/driver-api/usb/callbacks.rst rename to Documentation/drivers/driver-api/usb/callbacks.rst diff --git a/Documentation/driver-api/usb/dma.rst b/Documentation/drivers/driver-api/usb/dma.rst similarity index 100% rename from Documentation/driver-api/usb/dma.rst rename to Documentation/drivers/driver-api/usb/dma.rst diff --git a/Documentation/driver-api/usb/dwc3.rst b/Documentation/drivers/driver-api/usb/dwc3.rst similarity index 100% rename from Documentation/driver-api/usb/dwc3.rst rename to Documentation/drivers/driver-api/usb/dwc3.rst diff --git a/Documentation/driver-api/usb/error-codes.rst b/Documentation/drivers/driver-api/usb/error-codes.rst similarity index 100% rename from Documentation/driver-api/usb/error-codes.rst rename to Documentation/drivers/driver-api/usb/error-codes.rst diff --git a/Documentation/driver-api/usb/gadget.rst b/Documentation/drivers/driver-api/usb/gadget.rst similarity index 100% rename from Documentation/driver-api/usb/gadget.rst rename to Documentation/drivers/driver-api/usb/gadget.rst diff --git a/Documentation/driver-api/usb/hotplug.rst b/Documentation/drivers/driver-api/usb/hotplug.rst similarity index 100% rename from Documentation/driver-api/usb/hotplug.rst rename to Documentation/drivers/driver-api/usb/hotplug.rst diff --git a/Documentation/driver-api/usb/index.rst b/Documentation/drivers/driver-api/usb/index.rst similarity index 100% rename from Documentation/driver-api/usb/index.rst rename to Documentation/drivers/driver-api/usb/index.rst diff --git a/Documentation/driver-api/usb/persist.rst b/Documentation/drivers/driver-api/usb/persist.rst similarity index 100% rename from Documentation/driver-api/usb/persist.rst rename to Documentation/drivers/driver-api/usb/persist.rst diff --git a/Documentation/driver-api/usb/power-management.rst b/Documentation/drivers/driver-api/usb/power-management.rst similarity index 100% rename from Documentation/driver-api/usb/power-management.rst rename to Documentation/drivers/driver-api/usb/power-management.rst diff --git a/Documentation/driver-api/usb/typec.rst b/Documentation/drivers/driver-api/usb/typec.rst similarity index 100% rename from Documentation/driver-api/usb/typec.rst rename to Documentation/drivers/driver-api/usb/typec.rst diff --git a/Documentation/driver-api/usb/typec_bus.rst b/Documentation/drivers/driver-api/usb/typec_bus.rst similarity index 100% rename from Documentation/driver-api/usb/typec_bus.rst rename to Documentation/drivers/driver-api/usb/typec_bus.rst diff --git a/Documentation/driver-api/usb/usb.rst b/Documentation/drivers/driver-api/usb/usb.rst similarity index 100% rename from Documentation/driver-api/usb/usb.rst rename to Documentation/drivers/driver-api/usb/usb.rst diff --git a/Documentation/driver-api/usb/usb3-debug-port.rst b/Documentation/drivers/driver-api/usb/usb3-debug-port.rst similarity index 100% rename from Documentation/driver-api/usb/usb3-debug-port.rst rename to Documentation/drivers/driver-api/usb/usb3-debug-port.rst diff --git a/Documentation/driver-api/usb/writing_musb_glue_layer.rst b/Documentation/drivers/driver-api/usb/writing_musb_glue_layer.rst similarity index 100% rename from Documentation/driver-api/usb/writing_musb_glue_layer.rst rename to Documentation/drivers/driver-api/usb/writing_musb_glue_layer.rst diff --git a/Documentation/driver-api/usb/writing_usb_driver.rst b/Documentation/drivers/driver-api/usb/writing_usb_driver.rst similarity index 100% rename from Documentation/driver-api/usb/writing_usb_driver.rst rename to Documentation/drivers/driver-api/usb/writing_usb_driver.rst diff --git a/Documentation/driver-api/vme.rst b/Documentation/drivers/driver-api/vme.rst similarity index 100% rename from Documentation/driver-api/vme.rst rename to Documentation/drivers/driver-api/vme.rst diff --git a/Documentation/driver-api/w1.rst b/Documentation/drivers/driver-api/w1.rst similarity index 100% rename from Documentation/driver-api/w1.rst rename to Documentation/drivers/driver-api/w1.rst diff --git a/Documentation/driver-model/binding.txt b/Documentation/drivers/driver-model/binding.txt similarity index 100% rename from Documentation/driver-model/binding.txt rename to Documentation/drivers/driver-model/binding.txt diff --git a/Documentation/driver-model/bus.txt b/Documentation/drivers/driver-model/bus.txt similarity index 100% rename from Documentation/driver-model/bus.txt rename to Documentation/drivers/driver-model/bus.txt diff --git a/Documentation/driver-model/class.txt b/Documentation/drivers/driver-model/class.txt similarity index 100% rename from Documentation/driver-model/class.txt rename to Documentation/drivers/driver-model/class.txt diff --git a/Documentation/driver-model/design-patterns.txt b/Documentation/drivers/driver-model/design-patterns.txt similarity index 100% rename from Documentation/driver-model/design-patterns.txt rename to Documentation/drivers/driver-model/design-patterns.txt diff --git a/Documentation/driver-model/device.txt b/Documentation/drivers/driver-model/device.txt similarity index 100% rename from Documentation/driver-model/device.txt rename to Documentation/drivers/driver-model/device.txt diff --git a/Documentation/driver-model/devres.txt b/Documentation/drivers/driver-model/devres.txt similarity index 100% rename from Documentation/driver-model/devres.txt rename to Documentation/drivers/driver-model/devres.txt diff --git a/Documentation/driver-model/driver.txt b/Documentation/drivers/driver-model/driver.txt similarity index 100% rename from Documentation/driver-model/driver.txt rename to Documentation/drivers/driver-model/driver.txt diff --git a/Documentation/driver-model/overview.txt b/Documentation/drivers/driver-model/overview.txt similarity index 100% rename from Documentation/driver-model/overview.txt rename to Documentation/drivers/driver-model/overview.txt diff --git a/Documentation/driver-model/platform.txt b/Documentation/drivers/driver-model/platform.txt similarity index 100% rename from Documentation/driver-model/platform.txt rename to Documentation/drivers/driver-model/platform.txt diff --git a/Documentation/driver-model/porting.txt b/Documentation/drivers/driver-model/porting.txt similarity index 100% rename from Documentation/driver-model/porting.txt rename to Documentation/drivers/driver-model/porting.txt diff --git a/Documentation/fpga/dfl.rst b/Documentation/drivers/fpga/dfl.rst similarity index 100% rename from Documentation/fpga/dfl.rst rename to Documentation/drivers/fpga/dfl.rst diff --git a/Documentation/fpga/index.rst b/Documentation/drivers/fpga/index.rst similarity index 100% rename from Documentation/fpga/index.rst rename to Documentation/drivers/fpga/index.rst diff --git a/Documentation/gpio/index.rst b/Documentation/drivers/gpio/index.rst similarity index 100% rename from Documentation/gpio/index.rst rename to Documentation/drivers/gpio/index.rst diff --git a/Documentation/gpio/sysfs.rst b/Documentation/drivers/gpio/sysfs.rst similarity index 100% rename from Documentation/gpio/sysfs.rst rename to Documentation/drivers/gpio/sysfs.rst diff --git a/Documentation/gpu/afbc.rst b/Documentation/drivers/gpu/afbc.rst similarity index 100% rename from Documentation/gpu/afbc.rst rename to Documentation/drivers/gpu/afbc.rst diff --git a/Documentation/gpu/amdgpu-dc.rst b/Documentation/drivers/gpu/amdgpu-dc.rst similarity index 100% rename from Documentation/gpu/amdgpu-dc.rst rename to Documentation/drivers/gpu/amdgpu-dc.rst diff --git a/Documentation/gpu/amdgpu.rst b/Documentation/drivers/gpu/amdgpu.rst similarity index 100% rename from Documentation/gpu/amdgpu.rst rename to Documentation/drivers/gpu/amdgpu.rst diff --git a/Documentation/gpu/bridge/dw-hdmi.rst b/Documentation/drivers/gpu/bridge/dw-hdmi.rst similarity index 100% rename from Documentation/gpu/bridge/dw-hdmi.rst rename to Documentation/drivers/gpu/bridge/dw-hdmi.rst diff --git a/Documentation/gpu/conf.py b/Documentation/drivers/gpu/conf.py similarity index 100% rename from Documentation/gpu/conf.py rename to Documentation/drivers/gpu/conf.py diff --git a/Documentation/gpu/dp-mst/topology-figure-1.dot b/Documentation/drivers/gpu/dp-mst/topology-figure-1.dot similarity index 100% rename from Documentation/gpu/dp-mst/topology-figure-1.dot rename to Documentation/drivers/gpu/dp-mst/topology-figure-1.dot diff --git a/Documentation/gpu/dp-mst/topology-figure-2.dot b/Documentation/drivers/gpu/dp-mst/topology-figure-2.dot similarity index 100% rename from Documentation/gpu/dp-mst/topology-figure-2.dot rename to Documentation/drivers/gpu/dp-mst/topology-figure-2.dot diff --git a/Documentation/gpu/dp-mst/topology-figure-3.dot b/Documentation/drivers/gpu/dp-mst/topology-figure-3.dot similarity index 100% rename from Documentation/gpu/dp-mst/topology-figure-3.dot rename to Documentation/drivers/gpu/dp-mst/topology-figure-3.dot diff --git a/Documentation/gpu/drivers.rst b/Documentation/drivers/gpu/drivers.rst similarity index 100% rename from Documentation/gpu/drivers.rst rename to Documentation/drivers/gpu/drivers.rst diff --git a/Documentation/gpu/drm-client.rst b/Documentation/drivers/gpu/drm-client.rst similarity index 100% rename from Documentation/gpu/drm-client.rst rename to Documentation/drivers/gpu/drm-client.rst diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/drivers/gpu/drm-internals.rst similarity index 100% rename from Documentation/gpu/drm-internals.rst rename to Documentation/drivers/gpu/drm-internals.rst diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/drivers/gpu/drm-kms-helpers.rst similarity index 100% rename from Documentation/gpu/drm-kms-helpers.rst rename to Documentation/drivers/gpu/drm-kms-helpers.rst diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/drivers/gpu/drm-kms.rst similarity index 100% rename from Documentation/gpu/drm-kms.rst rename to Documentation/drivers/gpu/drm-kms.rst diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/drivers/gpu/drm-mm.rst similarity index 100% rename from Documentation/gpu/drm-mm.rst rename to Documentation/drivers/gpu/drm-mm.rst diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/drivers/gpu/drm-uapi.rst similarity index 100% rename from Documentation/gpu/drm-uapi.rst rename to Documentation/drivers/gpu/drm-uapi.rst diff --git a/Documentation/gpu/i915.rst b/Documentation/drivers/gpu/i915.rst similarity index 100% rename from Documentation/gpu/i915.rst rename to Documentation/drivers/gpu/i915.rst diff --git a/Documentation/gpu/index.rst b/Documentation/drivers/gpu/index.rst similarity index 100% rename from Documentation/gpu/index.rst rename to Documentation/drivers/gpu/index.rst diff --git a/Documentation/gpu/introduction.rst b/Documentation/drivers/gpu/introduction.rst similarity index 100% rename from Documentation/gpu/introduction.rst rename to Documentation/drivers/gpu/introduction.rst diff --git a/Documentation/gpu/kms-properties.csv b/Documentation/drivers/gpu/kms-properties.csv similarity index 100% rename from Documentation/gpu/kms-properties.csv rename to Documentation/drivers/gpu/kms-properties.csv diff --git a/Documentation/gpu/komeda-kms.rst b/Documentation/drivers/gpu/komeda-kms.rst similarity index 100% rename from Documentation/gpu/komeda-kms.rst rename to Documentation/drivers/gpu/komeda-kms.rst diff --git a/Documentation/gpu/meson.rst b/Documentation/drivers/gpu/meson.rst similarity index 100% rename from Documentation/gpu/meson.rst rename to Documentation/drivers/gpu/meson.rst diff --git a/Documentation/gpu/msm-crash-dump.rst b/Documentation/drivers/gpu/msm-crash-dump.rst similarity index 100% rename from Documentation/gpu/msm-crash-dump.rst rename to Documentation/drivers/gpu/msm-crash-dump.rst diff --git a/Documentation/gpu/pl111.rst b/Documentation/drivers/gpu/pl111.rst similarity index 100% rename from Documentation/gpu/pl111.rst rename to Documentation/drivers/gpu/pl111.rst diff --git a/Documentation/gpu/tegra.rst b/Documentation/drivers/gpu/tegra.rst similarity index 100% rename from Documentation/gpu/tegra.rst rename to Documentation/drivers/gpu/tegra.rst diff --git a/Documentation/gpu/tinydrm.rst b/Documentation/drivers/gpu/tinydrm.rst similarity index 100% rename from Documentation/gpu/tinydrm.rst rename to Documentation/drivers/gpu/tinydrm.rst diff --git a/Documentation/gpu/todo.rst b/Documentation/drivers/gpu/todo.rst similarity index 100% rename from Documentation/gpu/todo.rst rename to Documentation/drivers/gpu/todo.rst diff --git a/Documentation/gpu/tve200.rst b/Documentation/drivers/gpu/tve200.rst similarity index 100% rename from Documentation/gpu/tve200.rst rename to Documentation/drivers/gpu/tve200.rst diff --git a/Documentation/gpu/v3d.rst b/Documentation/drivers/gpu/v3d.rst similarity index 100% rename from Documentation/gpu/v3d.rst rename to Documentation/drivers/gpu/v3d.rst diff --git a/Documentation/gpu/vc4.rst b/Documentation/drivers/gpu/vc4.rst similarity index 100% rename from Documentation/gpu/vc4.rst rename to Documentation/drivers/gpu/vc4.rst diff --git a/Documentation/gpu/vga-switcheroo.rst b/Documentation/drivers/gpu/vga-switcheroo.rst similarity index 100% rename from Documentation/gpu/vga-switcheroo.rst rename to Documentation/drivers/gpu/vga-switcheroo.rst diff --git a/Documentation/gpu/vgaarbiter.rst b/Documentation/drivers/gpu/vgaarbiter.rst similarity index 100% rename from Documentation/gpu/vgaarbiter.rst rename to Documentation/drivers/gpu/vgaarbiter.rst diff --git a/Documentation/gpu/vkms.rst b/Documentation/drivers/gpu/vkms.rst similarity index 100% rename from Documentation/gpu/vkms.rst rename to Documentation/drivers/gpu/vkms.rst diff --git a/Documentation/gpu/xen-front.rst b/Documentation/drivers/gpu/xen-front.rst similarity index 100% rename from Documentation/gpu/xen-front.rst rename to Documentation/drivers/gpu/xen-front.rst diff --git a/Documentation/hid/hid-alps.txt b/Documentation/drivers/hid/hid-alps.txt similarity index 100% rename from Documentation/hid/hid-alps.txt rename to Documentation/drivers/hid/hid-alps.txt diff --git a/Documentation/hid/hid-sensor.txt b/Documentation/drivers/hid/hid-sensor.txt similarity index 100% rename from Documentation/hid/hid-sensor.txt rename to Documentation/drivers/hid/hid-sensor.txt diff --git a/Documentation/hid/hid-transport.txt b/Documentation/drivers/hid/hid-transport.txt similarity index 100% rename from Documentation/hid/hid-transport.txt rename to Documentation/drivers/hid/hid-transport.txt diff --git a/Documentation/hid/hiddev.txt b/Documentation/drivers/hid/hiddev.txt similarity index 100% rename from Documentation/hid/hiddev.txt rename to Documentation/drivers/hid/hiddev.txt diff --git a/Documentation/hid/hidraw.txt b/Documentation/drivers/hid/hidraw.txt similarity index 100% rename from Documentation/hid/hidraw.txt rename to Documentation/drivers/hid/hidraw.txt diff --git a/Documentation/hid/intel-ish-hid.txt b/Documentation/drivers/hid/intel-ish-hid.txt similarity index 100% rename from Documentation/hid/intel-ish-hid.txt rename to Documentation/drivers/hid/intel-ish-hid.txt diff --git a/Documentation/hid/uhid.txt b/Documentation/drivers/hid/uhid.txt similarity index 100% rename from Documentation/hid/uhid.txt rename to Documentation/drivers/hid/uhid.txt diff --git a/Documentation/i2c/DMA-considerations b/Documentation/drivers/i2c/DMA-considerations similarity index 100% rename from Documentation/i2c/DMA-considerations rename to Documentation/drivers/i2c/DMA-considerations diff --git a/Documentation/i2c/busses/i2c-ali1535 b/Documentation/drivers/i2c/busses/i2c-ali1535 similarity index 100% rename from Documentation/i2c/busses/i2c-ali1535 rename to Documentation/drivers/i2c/busses/i2c-ali1535 diff --git a/Documentation/i2c/busses/i2c-ali1563 b/Documentation/drivers/i2c/busses/i2c-ali1563 similarity index 100% rename from Documentation/i2c/busses/i2c-ali1563 rename to Documentation/drivers/i2c/busses/i2c-ali1563 diff --git a/Documentation/i2c/busses/i2c-ali15x3 b/Documentation/drivers/i2c/busses/i2c-ali15x3 similarity index 100% rename from Documentation/i2c/busses/i2c-ali15x3 rename to Documentation/drivers/i2c/busses/i2c-ali15x3 diff --git a/Documentation/i2c/busses/i2c-amd-mp2 b/Documentation/drivers/i2c/busses/i2c-amd-mp2 similarity index 100% rename from Documentation/i2c/busses/i2c-amd-mp2 rename to Documentation/drivers/i2c/busses/i2c-amd-mp2 diff --git a/Documentation/i2c/busses/i2c-amd756 b/Documentation/drivers/i2c/busses/i2c-amd756 similarity index 100% rename from Documentation/i2c/busses/i2c-amd756 rename to Documentation/drivers/i2c/busses/i2c-amd756 diff --git a/Documentation/i2c/busses/i2c-amd8111 b/Documentation/drivers/i2c/busses/i2c-amd8111 similarity index 100% rename from Documentation/i2c/busses/i2c-amd8111 rename to Documentation/drivers/i2c/busses/i2c-amd8111 diff --git a/Documentation/i2c/busses/i2c-diolan-u2c b/Documentation/drivers/i2c/busses/i2c-diolan-u2c similarity index 100% rename from Documentation/i2c/busses/i2c-diolan-u2c rename to Documentation/drivers/i2c/busses/i2c-diolan-u2c diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/drivers/i2c/busses/i2c-i801 similarity index 100% rename from Documentation/i2c/busses/i2c-i801 rename to Documentation/drivers/i2c/busses/i2c-i801 diff --git a/Documentation/i2c/busses/i2c-ismt b/Documentation/drivers/i2c/busses/i2c-ismt similarity index 100% rename from Documentation/i2c/busses/i2c-ismt rename to Documentation/drivers/i2c/busses/i2c-ismt diff --git a/Documentation/i2c/busses/i2c-mlxcpld b/Documentation/drivers/i2c/busses/i2c-mlxcpld similarity index 100% rename from Documentation/i2c/busses/i2c-mlxcpld rename to Documentation/drivers/i2c/busses/i2c-mlxcpld diff --git a/Documentation/i2c/busses/i2c-nforce2 b/Documentation/drivers/i2c/busses/i2c-nforce2 similarity index 100% rename from Documentation/i2c/busses/i2c-nforce2 rename to Documentation/drivers/i2c/busses/i2c-nforce2 diff --git a/Documentation/i2c/busses/i2c-nvidia-gpu b/Documentation/drivers/i2c/busses/i2c-nvidia-gpu similarity index 100% rename from Documentation/i2c/busses/i2c-nvidia-gpu rename to Documentation/drivers/i2c/busses/i2c-nvidia-gpu diff --git a/Documentation/i2c/busses/i2c-ocores b/Documentation/drivers/i2c/busses/i2c-ocores similarity index 100% rename from Documentation/i2c/busses/i2c-ocores rename to Documentation/drivers/i2c/busses/i2c-ocores diff --git a/Documentation/i2c/busses/i2c-parport b/Documentation/drivers/i2c/busses/i2c-parport similarity index 100% rename from Documentation/i2c/busses/i2c-parport rename to Documentation/drivers/i2c/busses/i2c-parport diff --git a/Documentation/i2c/busses/i2c-parport-light b/Documentation/drivers/i2c/busses/i2c-parport-light similarity index 100% rename from Documentation/i2c/busses/i2c-parport-light rename to Documentation/drivers/i2c/busses/i2c-parport-light diff --git a/Documentation/i2c/busses/i2c-pca-isa b/Documentation/drivers/i2c/busses/i2c-pca-isa similarity index 100% rename from Documentation/i2c/busses/i2c-pca-isa rename to Documentation/drivers/i2c/busses/i2c-pca-isa diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/drivers/i2c/busses/i2c-piix4 similarity index 100% rename from Documentation/i2c/busses/i2c-piix4 rename to Documentation/drivers/i2c/busses/i2c-piix4 diff --git a/Documentation/i2c/busses/i2c-sis5595 b/Documentation/drivers/i2c/busses/i2c-sis5595 similarity index 100% rename from Documentation/i2c/busses/i2c-sis5595 rename to Documentation/drivers/i2c/busses/i2c-sis5595 diff --git a/Documentation/i2c/busses/i2c-sis630 b/Documentation/drivers/i2c/busses/i2c-sis630 similarity index 100% rename from Documentation/i2c/busses/i2c-sis630 rename to Documentation/drivers/i2c/busses/i2c-sis630 diff --git a/Documentation/i2c/busses/i2c-sis96x b/Documentation/drivers/i2c/busses/i2c-sis96x similarity index 100% rename from Documentation/i2c/busses/i2c-sis96x rename to Documentation/drivers/i2c/busses/i2c-sis96x diff --git a/Documentation/i2c/busses/i2c-taos-evm b/Documentation/drivers/i2c/busses/i2c-taos-evm similarity index 100% rename from Documentation/i2c/busses/i2c-taos-evm rename to Documentation/drivers/i2c/busses/i2c-taos-evm diff --git a/Documentation/i2c/busses/i2c-via b/Documentation/drivers/i2c/busses/i2c-via similarity index 100% rename from Documentation/i2c/busses/i2c-via rename to Documentation/drivers/i2c/busses/i2c-via diff --git a/Documentation/i2c/busses/i2c-viapro b/Documentation/drivers/i2c/busses/i2c-viapro similarity index 100% rename from Documentation/i2c/busses/i2c-viapro rename to Documentation/drivers/i2c/busses/i2c-viapro diff --git a/Documentation/i2c/busses/scx200_acb b/Documentation/drivers/i2c/busses/scx200_acb similarity index 100% rename from Documentation/i2c/busses/scx200_acb rename to Documentation/drivers/i2c/busses/scx200_acb diff --git a/Documentation/i2c/dev-interface b/Documentation/drivers/i2c/dev-interface similarity index 100% rename from Documentation/i2c/dev-interface rename to Documentation/drivers/i2c/dev-interface diff --git a/Documentation/i2c/fault-codes b/Documentation/drivers/i2c/fault-codes similarity index 100% rename from Documentation/i2c/fault-codes rename to Documentation/drivers/i2c/fault-codes diff --git a/Documentation/i2c/functionality b/Documentation/drivers/i2c/functionality similarity index 100% rename from Documentation/i2c/functionality rename to Documentation/drivers/i2c/functionality diff --git a/Documentation/i2c/gpio-fault-injection b/Documentation/drivers/i2c/gpio-fault-injection similarity index 100% rename from Documentation/i2c/gpio-fault-injection rename to Documentation/drivers/i2c/gpio-fault-injection diff --git a/Documentation/i2c/i2c-protocol b/Documentation/drivers/i2c/i2c-protocol similarity index 100% rename from Documentation/i2c/i2c-protocol rename to Documentation/drivers/i2c/i2c-protocol diff --git a/Documentation/i2c/i2c-stub b/Documentation/drivers/i2c/i2c-stub similarity index 100% rename from Documentation/i2c/i2c-stub rename to Documentation/drivers/i2c/i2c-stub diff --git a/Documentation/i2c/i2c-topology b/Documentation/drivers/i2c/i2c-topology similarity index 100% rename from Documentation/i2c/i2c-topology rename to Documentation/drivers/i2c/i2c-topology diff --git a/Documentation/i2c/instantiating-devices b/Documentation/drivers/i2c/instantiating-devices similarity index 100% rename from Documentation/i2c/instantiating-devices rename to Documentation/drivers/i2c/instantiating-devices diff --git a/Documentation/i2c/muxes/i2c-mux-gpio b/Documentation/drivers/i2c/muxes/i2c-mux-gpio similarity index 100% rename from Documentation/i2c/muxes/i2c-mux-gpio rename to Documentation/drivers/i2c/muxes/i2c-mux-gpio diff --git a/Documentation/i2c/old-module-parameters b/Documentation/drivers/i2c/old-module-parameters similarity index 100% rename from Documentation/i2c/old-module-parameters rename to Documentation/drivers/i2c/old-module-parameters diff --git a/Documentation/i2c/slave-eeprom-backend b/Documentation/drivers/i2c/slave-eeprom-backend similarity index 100% rename from Documentation/i2c/slave-eeprom-backend rename to Documentation/drivers/i2c/slave-eeprom-backend diff --git a/Documentation/i2c/slave-interface b/Documentation/drivers/i2c/slave-interface similarity index 100% rename from Documentation/i2c/slave-interface rename to Documentation/drivers/i2c/slave-interface diff --git a/Documentation/i2c/smbus-protocol b/Documentation/drivers/i2c/smbus-protocol similarity index 100% rename from Documentation/i2c/smbus-protocol rename to Documentation/drivers/i2c/smbus-protocol diff --git a/Documentation/i2c/summary b/Documentation/drivers/i2c/summary similarity index 100% rename from Documentation/i2c/summary rename to Documentation/drivers/i2c/summary diff --git a/Documentation/i2c/ten-bit-addresses b/Documentation/drivers/i2c/ten-bit-addresses similarity index 100% rename from Documentation/i2c/ten-bit-addresses rename to Documentation/drivers/i2c/ten-bit-addresses diff --git a/Documentation/i2c/upgrading-clients b/Documentation/drivers/i2c/upgrading-clients similarity index 100% rename from Documentation/i2c/upgrading-clients rename to Documentation/drivers/i2c/upgrading-clients diff --git a/Documentation/i2c/writing-clients b/Documentation/drivers/i2c/writing-clients similarity index 100% rename from Documentation/i2c/writing-clients rename to Documentation/drivers/i2c/writing-clients diff --git a/Documentation/ide/ChangeLog.ide-cd.1994-2004 b/Documentation/drivers/ide/ChangeLog.ide-cd.1994-2004 similarity index 100% rename from Documentation/ide/ChangeLog.ide-cd.1994-2004 rename to Documentation/drivers/ide/ChangeLog.ide-cd.1994-2004 diff --git a/Documentation/ide/ChangeLog.ide-floppy.1996-2002 b/Documentation/drivers/ide/ChangeLog.ide-floppy.1996-2002 similarity index 100% rename from Documentation/ide/ChangeLog.ide-floppy.1996-2002 rename to Documentation/drivers/ide/ChangeLog.ide-floppy.1996-2002 diff --git a/Documentation/ide/ChangeLog.ide-tape.1995-2002 b/Documentation/drivers/ide/ChangeLog.ide-tape.1995-2002 similarity index 100% rename from Documentation/ide/ChangeLog.ide-tape.1995-2002 rename to Documentation/drivers/ide/ChangeLog.ide-tape.1995-2002 diff --git a/Documentation/ide/changelogs.rst b/Documentation/drivers/ide/changelogs.rst similarity index 100% rename from Documentation/ide/changelogs.rst rename to Documentation/drivers/ide/changelogs.rst diff --git a/Documentation/ide/ide-tape.rst b/Documentation/drivers/ide/ide-tape.rst similarity index 100% rename from Documentation/ide/ide-tape.rst rename to Documentation/drivers/ide/ide-tape.rst diff --git a/Documentation/ide/ide.rst b/Documentation/drivers/ide/ide.rst similarity index 100% rename from Documentation/ide/ide.rst rename to Documentation/drivers/ide/ide.rst diff --git a/Documentation/ide/index.rst b/Documentation/drivers/ide/index.rst similarity index 100% rename from Documentation/ide/index.rst rename to Documentation/drivers/ide/index.rst diff --git a/Documentation/ide/warm-plug-howto.rst b/Documentation/drivers/ide/warm-plug-howto.rst similarity index 100% rename from Documentation/ide/warm-plug-howto.rst rename to Documentation/drivers/ide/warm-plug-howto.rst diff --git a/Documentation/infiniband/core_locking.txt b/Documentation/drivers/infiniband/core_locking.txt similarity index 100% rename from Documentation/infiniband/core_locking.txt rename to Documentation/drivers/infiniband/core_locking.txt diff --git a/Documentation/infiniband/ipoib.txt b/Documentation/drivers/infiniband/ipoib.txt similarity index 100% rename from Documentation/infiniband/ipoib.txt rename to Documentation/drivers/infiniband/ipoib.txt diff --git a/Documentation/infiniband/opa_vnic.txt b/Documentation/drivers/infiniband/opa_vnic.txt similarity index 100% rename from Documentation/infiniband/opa_vnic.txt rename to Documentation/drivers/infiniband/opa_vnic.txt diff --git a/Documentation/infiniband/sysfs.txt b/Documentation/drivers/infiniband/sysfs.txt similarity index 100% rename from Documentation/infiniband/sysfs.txt rename to Documentation/drivers/infiniband/sysfs.txt diff --git a/Documentation/infiniband/tag_matching.txt b/Documentation/drivers/infiniband/tag_matching.txt similarity index 100% rename from Documentation/infiniband/tag_matching.txt rename to Documentation/drivers/infiniband/tag_matching.txt diff --git a/Documentation/infiniband/user_mad.txt b/Documentation/drivers/infiniband/user_mad.txt similarity index 100% rename from Documentation/infiniband/user_mad.txt rename to Documentation/drivers/infiniband/user_mad.txt diff --git a/Documentation/infiniband/user_verbs.txt b/Documentation/drivers/infiniband/user_verbs.txt similarity index 100% rename from Documentation/infiniband/user_verbs.txt rename to Documentation/drivers/infiniband/user_verbs.txt diff --git a/Documentation/leds/index.rst b/Documentation/drivers/leds/index.rst similarity index 100% rename from Documentation/leds/index.rst rename to Documentation/drivers/leds/index.rst diff --git a/Documentation/leds/leds-blinkm.rst b/Documentation/drivers/leds/leds-blinkm.rst similarity index 100% rename from Documentation/leds/leds-blinkm.rst rename to Documentation/drivers/leds/leds-blinkm.rst diff --git a/Documentation/leds/leds-class-flash.rst b/Documentation/drivers/leds/leds-class-flash.rst similarity index 100% rename from Documentation/leds/leds-class-flash.rst rename to Documentation/drivers/leds/leds-class-flash.rst diff --git a/Documentation/leds/leds-class.rst b/Documentation/drivers/leds/leds-class.rst similarity index 100% rename from Documentation/leds/leds-class.rst rename to Documentation/drivers/leds/leds-class.rst diff --git a/Documentation/leds/leds-lm3556.rst b/Documentation/drivers/leds/leds-lm3556.rst similarity index 100% rename from Documentation/leds/leds-lm3556.rst rename to Documentation/drivers/leds/leds-lm3556.rst diff --git a/Documentation/leds/leds-lp3944.rst b/Documentation/drivers/leds/leds-lp3944.rst similarity index 100% rename from Documentation/leds/leds-lp3944.rst rename to Documentation/drivers/leds/leds-lp3944.rst diff --git a/Documentation/leds/leds-lp5521.rst b/Documentation/drivers/leds/leds-lp5521.rst similarity index 100% rename from Documentation/leds/leds-lp5521.rst rename to Documentation/drivers/leds/leds-lp5521.rst diff --git a/Documentation/leds/leds-lp5523.rst b/Documentation/drivers/leds/leds-lp5523.rst similarity index 100% rename from Documentation/leds/leds-lp5523.rst rename to Documentation/drivers/leds/leds-lp5523.rst diff --git a/Documentation/leds/leds-lp5562.rst b/Documentation/drivers/leds/leds-lp5562.rst similarity index 100% rename from Documentation/leds/leds-lp5562.rst rename to Documentation/drivers/leds/leds-lp5562.rst diff --git a/Documentation/leds/leds-lp55xx.rst b/Documentation/drivers/leds/leds-lp55xx.rst similarity index 100% rename from Documentation/leds/leds-lp55xx.rst rename to Documentation/drivers/leds/leds-lp55xx.rst diff --git a/Documentation/leds/leds-mlxcpld.rst b/Documentation/drivers/leds/leds-mlxcpld.rst similarity index 100% rename from Documentation/leds/leds-mlxcpld.rst rename to Documentation/drivers/leds/leds-mlxcpld.rst diff --git a/Documentation/leds/ledtrig-oneshot.rst b/Documentation/drivers/leds/ledtrig-oneshot.rst similarity index 100% rename from Documentation/leds/ledtrig-oneshot.rst rename to Documentation/drivers/leds/ledtrig-oneshot.rst diff --git a/Documentation/leds/ledtrig-transient.rst b/Documentation/drivers/leds/ledtrig-transient.rst similarity index 100% rename from Documentation/leds/ledtrig-transient.rst rename to Documentation/drivers/leds/ledtrig-transient.rst diff --git a/Documentation/leds/ledtrig-usbport.rst b/Documentation/drivers/leds/ledtrig-usbport.rst similarity index 100% rename from Documentation/leds/ledtrig-usbport.rst rename to Documentation/drivers/leds/ledtrig-usbport.rst diff --git a/Documentation/leds/uleds.rst b/Documentation/drivers/leds/uleds.rst similarity index 100% rename from Documentation/leds/uleds.rst rename to Documentation/drivers/leds/uleds.rst diff --git a/Documentation/lightnvm/pblk.txt b/Documentation/drivers/lightnvm/pblk.txt similarity index 100% rename from Documentation/lightnvm/pblk.txt rename to Documentation/drivers/lightnvm/pblk.txt diff --git a/Documentation/md/md-cluster.txt b/Documentation/drivers/md/md-cluster.txt similarity index 100% rename from Documentation/md/md-cluster.txt rename to Documentation/drivers/md/md-cluster.txt diff --git a/Documentation/md/raid5-cache.txt b/Documentation/drivers/md/raid5-cache.txt similarity index 100% rename from Documentation/md/raid5-cache.txt rename to Documentation/drivers/md/raid5-cache.txt diff --git a/Documentation/md/raid5-ppl.txt b/Documentation/drivers/md/raid5-ppl.txt similarity index 100% rename from Documentation/md/raid5-ppl.txt rename to Documentation/drivers/md/raid5-ppl.txt diff --git a/Documentation/media/.gitignore b/Documentation/drivers/media/.gitignore similarity index 100% rename from Documentation/media/.gitignore rename to Documentation/drivers/media/.gitignore diff --git a/Documentation/media/Makefile b/Documentation/drivers/media/Makefile similarity index 100% rename from Documentation/media/Makefile rename to Documentation/drivers/media/Makefile diff --git a/Documentation/media/audio.h.rst.exceptions b/Documentation/drivers/media/audio.h.rst.exceptions similarity index 100% rename from Documentation/media/audio.h.rst.exceptions rename to Documentation/drivers/media/audio.h.rst.exceptions diff --git a/Documentation/media/ca.h.rst.exceptions b/Documentation/drivers/media/ca.h.rst.exceptions similarity index 100% rename from Documentation/media/ca.h.rst.exceptions rename to Documentation/drivers/media/ca.h.rst.exceptions diff --git a/Documentation/media/cec-drivers/index.rst b/Documentation/drivers/media/cec-drivers/index.rst similarity index 100% rename from Documentation/media/cec-drivers/index.rst rename to Documentation/drivers/media/cec-drivers/index.rst diff --git a/Documentation/media/cec-drivers/pulse8-cec.rst b/Documentation/drivers/media/cec-drivers/pulse8-cec.rst similarity index 100% rename from Documentation/media/cec-drivers/pulse8-cec.rst rename to Documentation/drivers/media/cec-drivers/pulse8-cec.rst diff --git a/Documentation/media/cec.h.rst.exceptions b/Documentation/drivers/media/cec.h.rst.exceptions similarity index 100% rename from Documentation/media/cec.h.rst.exceptions rename to Documentation/drivers/media/cec.h.rst.exceptions diff --git a/Documentation/media/conf.py b/Documentation/drivers/media/conf.py similarity index 100% rename from Documentation/media/conf.py rename to Documentation/drivers/media/conf.py diff --git a/Documentation/media/conf_nitpick.py b/Documentation/drivers/media/conf_nitpick.py similarity index 100% rename from Documentation/media/conf_nitpick.py rename to Documentation/drivers/media/conf_nitpick.py diff --git a/Documentation/media/dmx.h.rst.exceptions b/Documentation/drivers/media/dmx.h.rst.exceptions similarity index 100% rename from Documentation/media/dmx.h.rst.exceptions rename to Documentation/drivers/media/dmx.h.rst.exceptions diff --git a/Documentation/media/dvb-drivers/avermedia.rst b/Documentation/drivers/media/dvb-drivers/avermedia.rst similarity index 100% rename from Documentation/media/dvb-drivers/avermedia.rst rename to Documentation/drivers/media/dvb-drivers/avermedia.rst diff --git a/Documentation/media/dvb-drivers/bt8xx.rst b/Documentation/drivers/media/dvb-drivers/bt8xx.rst similarity index 100% rename from Documentation/media/dvb-drivers/bt8xx.rst rename to Documentation/drivers/media/dvb-drivers/bt8xx.rst diff --git a/Documentation/media/dvb-drivers/cards.rst b/Documentation/drivers/media/dvb-drivers/cards.rst similarity index 100% rename from Documentation/media/dvb-drivers/cards.rst rename to Documentation/drivers/media/dvb-drivers/cards.rst diff --git a/Documentation/media/dvb-drivers/ci.rst b/Documentation/drivers/media/dvb-drivers/ci.rst similarity index 100% rename from Documentation/media/dvb-drivers/ci.rst rename to Documentation/drivers/media/dvb-drivers/ci.rst diff --git a/Documentation/media/dvb-drivers/contributors.rst b/Documentation/drivers/media/dvb-drivers/contributors.rst similarity index 100% rename from Documentation/media/dvb-drivers/contributors.rst rename to Documentation/drivers/media/dvb-drivers/contributors.rst diff --git a/Documentation/media/dvb-drivers/dvb-usb.rst b/Documentation/drivers/media/dvb-drivers/dvb-usb.rst similarity index 100% rename from Documentation/media/dvb-drivers/dvb-usb.rst rename to Documentation/drivers/media/dvb-drivers/dvb-usb.rst diff --git a/Documentation/media/dvb-drivers/faq.rst b/Documentation/drivers/media/dvb-drivers/faq.rst similarity index 100% rename from Documentation/media/dvb-drivers/faq.rst rename to Documentation/drivers/media/dvb-drivers/faq.rst diff --git a/Documentation/media/dvb-drivers/frontends.rst b/Documentation/drivers/media/dvb-drivers/frontends.rst similarity index 100% rename from Documentation/media/dvb-drivers/frontends.rst rename to Documentation/drivers/media/dvb-drivers/frontends.rst diff --git a/Documentation/media/dvb-drivers/index.rst b/Documentation/drivers/media/dvb-drivers/index.rst similarity index 100% rename from Documentation/media/dvb-drivers/index.rst rename to Documentation/drivers/media/dvb-drivers/index.rst diff --git a/Documentation/media/dvb-drivers/intro.rst b/Documentation/drivers/media/dvb-drivers/intro.rst similarity index 100% rename from Documentation/media/dvb-drivers/intro.rst rename to Documentation/drivers/media/dvb-drivers/intro.rst diff --git a/Documentation/media/dvb-drivers/lmedm04.rst b/Documentation/drivers/media/dvb-drivers/lmedm04.rst similarity index 100% rename from Documentation/media/dvb-drivers/lmedm04.rst rename to Documentation/drivers/media/dvb-drivers/lmedm04.rst diff --git a/Documentation/media/dvb-drivers/opera-firmware.rst b/Documentation/drivers/media/dvb-drivers/opera-firmware.rst similarity index 100% rename from Documentation/media/dvb-drivers/opera-firmware.rst rename to Documentation/drivers/media/dvb-drivers/opera-firmware.rst diff --git a/Documentation/media/dvb-drivers/technisat.rst b/Documentation/drivers/media/dvb-drivers/technisat.rst similarity index 100% rename from Documentation/media/dvb-drivers/technisat.rst rename to Documentation/drivers/media/dvb-drivers/technisat.rst diff --git a/Documentation/media/dvb-drivers/ttusb-dec.rst b/Documentation/drivers/media/dvb-drivers/ttusb-dec.rst similarity index 100% rename from Documentation/media/dvb-drivers/ttusb-dec.rst rename to Documentation/drivers/media/dvb-drivers/ttusb-dec.rst diff --git a/Documentation/media/dvb-drivers/udev.rst b/Documentation/drivers/media/dvb-drivers/udev.rst similarity index 100% rename from Documentation/media/dvb-drivers/udev.rst rename to Documentation/drivers/media/dvb-drivers/udev.rst diff --git a/Documentation/media/frontend.h.rst.exceptions b/Documentation/drivers/media/frontend.h.rst.exceptions similarity index 100% rename from Documentation/media/frontend.h.rst.exceptions rename to Documentation/drivers/media/frontend.h.rst.exceptions diff --git a/Documentation/media/index.rst b/Documentation/drivers/media/index.rst similarity index 100% rename from Documentation/media/index.rst rename to Documentation/drivers/media/index.rst diff --git a/Documentation/media/intro.rst b/Documentation/drivers/media/intro.rst similarity index 100% rename from Documentation/media/intro.rst rename to Documentation/drivers/media/intro.rst diff --git a/Documentation/media/kapi/cec-core.rst b/Documentation/drivers/media/kapi/cec-core.rst similarity index 100% rename from Documentation/media/kapi/cec-core.rst rename to Documentation/drivers/media/kapi/cec-core.rst diff --git a/Documentation/media/kapi/csi2.rst b/Documentation/drivers/media/kapi/csi2.rst similarity index 100% rename from Documentation/media/kapi/csi2.rst rename to Documentation/drivers/media/kapi/csi2.rst diff --git a/Documentation/media/kapi/dtv-ca.rst b/Documentation/drivers/media/kapi/dtv-ca.rst similarity index 100% rename from Documentation/media/kapi/dtv-ca.rst rename to Documentation/drivers/media/kapi/dtv-ca.rst diff --git a/Documentation/media/kapi/dtv-common.rst b/Documentation/drivers/media/kapi/dtv-common.rst similarity index 100% rename from Documentation/media/kapi/dtv-common.rst rename to Documentation/drivers/media/kapi/dtv-common.rst diff --git a/Documentation/media/kapi/dtv-core.rst b/Documentation/drivers/media/kapi/dtv-core.rst similarity index 100% rename from Documentation/media/kapi/dtv-core.rst rename to Documentation/drivers/media/kapi/dtv-core.rst diff --git a/Documentation/media/kapi/dtv-demux.rst b/Documentation/drivers/media/kapi/dtv-demux.rst similarity index 100% rename from Documentation/media/kapi/dtv-demux.rst rename to Documentation/drivers/media/kapi/dtv-demux.rst diff --git a/Documentation/media/kapi/dtv-frontend.rst b/Documentation/drivers/media/kapi/dtv-frontend.rst similarity index 100% rename from Documentation/media/kapi/dtv-frontend.rst rename to Documentation/drivers/media/kapi/dtv-frontend.rst diff --git a/Documentation/media/kapi/dtv-net.rst b/Documentation/drivers/media/kapi/dtv-net.rst similarity index 100% rename from Documentation/media/kapi/dtv-net.rst rename to Documentation/drivers/media/kapi/dtv-net.rst diff --git a/Documentation/media/kapi/mc-core.rst b/Documentation/drivers/media/kapi/mc-core.rst similarity index 100% rename from Documentation/media/kapi/mc-core.rst rename to Documentation/drivers/media/kapi/mc-core.rst diff --git a/Documentation/media/kapi/rc-core.rst b/Documentation/drivers/media/kapi/rc-core.rst similarity index 100% rename from Documentation/media/kapi/rc-core.rst rename to Documentation/drivers/media/kapi/rc-core.rst diff --git a/Documentation/media/kapi/v4l2-async.rst b/Documentation/drivers/media/kapi/v4l2-async.rst similarity index 100% rename from Documentation/media/kapi/v4l2-async.rst rename to Documentation/drivers/media/kapi/v4l2-async.rst diff --git a/Documentation/media/kapi/v4l2-clocks.rst b/Documentation/drivers/media/kapi/v4l2-clocks.rst similarity index 100% rename from Documentation/media/kapi/v4l2-clocks.rst rename to Documentation/drivers/media/kapi/v4l2-clocks.rst diff --git a/Documentation/media/kapi/v4l2-common.rst b/Documentation/drivers/media/kapi/v4l2-common.rst similarity index 100% rename from Documentation/media/kapi/v4l2-common.rst rename to Documentation/drivers/media/kapi/v4l2-common.rst diff --git a/Documentation/media/kapi/v4l2-controls.rst b/Documentation/drivers/media/kapi/v4l2-controls.rst similarity index 100% rename from Documentation/media/kapi/v4l2-controls.rst rename to Documentation/drivers/media/kapi/v4l2-controls.rst diff --git a/Documentation/media/kapi/v4l2-core.rst b/Documentation/drivers/media/kapi/v4l2-core.rst similarity index 100% rename from Documentation/media/kapi/v4l2-core.rst rename to Documentation/drivers/media/kapi/v4l2-core.rst diff --git a/Documentation/media/kapi/v4l2-dev.rst b/Documentation/drivers/media/kapi/v4l2-dev.rst similarity index 100% rename from Documentation/media/kapi/v4l2-dev.rst rename to Documentation/drivers/media/kapi/v4l2-dev.rst diff --git a/Documentation/media/kapi/v4l2-device.rst b/Documentation/drivers/media/kapi/v4l2-device.rst similarity index 100% rename from Documentation/media/kapi/v4l2-device.rst rename to Documentation/drivers/media/kapi/v4l2-device.rst diff --git a/Documentation/media/kapi/v4l2-dv-timings.rst b/Documentation/drivers/media/kapi/v4l2-dv-timings.rst similarity index 100% rename from Documentation/media/kapi/v4l2-dv-timings.rst rename to Documentation/drivers/media/kapi/v4l2-dv-timings.rst diff --git a/Documentation/media/kapi/v4l2-event.rst b/Documentation/drivers/media/kapi/v4l2-event.rst similarity index 100% rename from Documentation/media/kapi/v4l2-event.rst rename to Documentation/drivers/media/kapi/v4l2-event.rst diff --git a/Documentation/media/kapi/v4l2-fh.rst b/Documentation/drivers/media/kapi/v4l2-fh.rst similarity index 100% rename from Documentation/media/kapi/v4l2-fh.rst rename to Documentation/drivers/media/kapi/v4l2-fh.rst diff --git a/Documentation/media/kapi/v4l2-flash-led-class.rst b/Documentation/drivers/media/kapi/v4l2-flash-led-class.rst similarity index 100% rename from Documentation/media/kapi/v4l2-flash-led-class.rst rename to Documentation/drivers/media/kapi/v4l2-flash-led-class.rst diff --git a/Documentation/media/kapi/v4l2-fwnode.rst b/Documentation/drivers/media/kapi/v4l2-fwnode.rst similarity index 100% rename from Documentation/media/kapi/v4l2-fwnode.rst rename to Documentation/drivers/media/kapi/v4l2-fwnode.rst diff --git a/Documentation/media/kapi/v4l2-intro.rst b/Documentation/drivers/media/kapi/v4l2-intro.rst similarity index 100% rename from Documentation/media/kapi/v4l2-intro.rst rename to Documentation/drivers/media/kapi/v4l2-intro.rst diff --git a/Documentation/media/kapi/v4l2-mc.rst b/Documentation/drivers/media/kapi/v4l2-mc.rst similarity index 100% rename from Documentation/media/kapi/v4l2-mc.rst rename to Documentation/drivers/media/kapi/v4l2-mc.rst diff --git a/Documentation/media/kapi/v4l2-mediabus.rst b/Documentation/drivers/media/kapi/v4l2-mediabus.rst similarity index 100% rename from Documentation/media/kapi/v4l2-mediabus.rst rename to Documentation/drivers/media/kapi/v4l2-mediabus.rst diff --git a/Documentation/media/kapi/v4l2-mem2mem.rst b/Documentation/drivers/media/kapi/v4l2-mem2mem.rst similarity index 100% rename from Documentation/media/kapi/v4l2-mem2mem.rst rename to Documentation/drivers/media/kapi/v4l2-mem2mem.rst diff --git a/Documentation/media/kapi/v4l2-rect.rst b/Documentation/drivers/media/kapi/v4l2-rect.rst similarity index 100% rename from Documentation/media/kapi/v4l2-rect.rst rename to Documentation/drivers/media/kapi/v4l2-rect.rst diff --git a/Documentation/media/kapi/v4l2-subdev.rst b/Documentation/drivers/media/kapi/v4l2-subdev.rst similarity index 100% rename from Documentation/media/kapi/v4l2-subdev.rst rename to Documentation/drivers/media/kapi/v4l2-subdev.rst diff --git a/Documentation/media/kapi/v4l2-tuner.rst b/Documentation/drivers/media/kapi/v4l2-tuner.rst similarity index 100% rename from Documentation/media/kapi/v4l2-tuner.rst rename to Documentation/drivers/media/kapi/v4l2-tuner.rst diff --git a/Documentation/media/kapi/v4l2-tveeprom.rst b/Documentation/drivers/media/kapi/v4l2-tveeprom.rst similarity index 100% rename from Documentation/media/kapi/v4l2-tveeprom.rst rename to Documentation/drivers/media/kapi/v4l2-tveeprom.rst diff --git a/Documentation/media/kapi/v4l2-videobuf.rst b/Documentation/drivers/media/kapi/v4l2-videobuf.rst similarity index 100% rename from Documentation/media/kapi/v4l2-videobuf.rst rename to Documentation/drivers/media/kapi/v4l2-videobuf.rst diff --git a/Documentation/media/kapi/v4l2-videobuf2.rst b/Documentation/drivers/media/kapi/v4l2-videobuf2.rst similarity index 100% rename from Documentation/media/kapi/v4l2-videobuf2.rst rename to Documentation/drivers/media/kapi/v4l2-videobuf2.rst diff --git a/Documentation/media/lirc.h.rst.exceptions b/Documentation/drivers/media/lirc.h.rst.exceptions similarity index 100% rename from Documentation/media/lirc.h.rst.exceptions rename to Documentation/drivers/media/lirc.h.rst.exceptions diff --git a/Documentation/media/media.h.rst.exceptions b/Documentation/drivers/media/media.h.rst.exceptions similarity index 100% rename from Documentation/media/media.h.rst.exceptions rename to Documentation/drivers/media/media.h.rst.exceptions diff --git a/Documentation/media/media_kapi.rst b/Documentation/drivers/media/media_kapi.rst similarity index 100% rename from Documentation/media/media_kapi.rst rename to Documentation/drivers/media/media_kapi.rst diff --git a/Documentation/media/media_uapi.rst b/Documentation/drivers/media/media_uapi.rst similarity index 100% rename from Documentation/media/media_uapi.rst rename to Documentation/drivers/media/media_uapi.rst diff --git a/Documentation/media/net.h.rst.exceptions b/Documentation/drivers/media/net.h.rst.exceptions similarity index 100% rename from Documentation/media/net.h.rst.exceptions rename to Documentation/drivers/media/net.h.rst.exceptions diff --git a/Documentation/media/typical_media_device.svg b/Documentation/drivers/media/typical_media_device.svg similarity index 100% rename from Documentation/media/typical_media_device.svg rename to Documentation/drivers/media/typical_media_device.svg diff --git a/Documentation/media/uapi/cec/cec-api.rst b/Documentation/drivers/media/uapi/cec/cec-api.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-api.rst rename to Documentation/drivers/media/uapi/cec/cec-api.rst diff --git a/Documentation/media/uapi/cec/cec-func-close.rst b/Documentation/drivers/media/uapi/cec/cec-func-close.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-func-close.rst rename to Documentation/drivers/media/uapi/cec/cec-func-close.rst diff --git a/Documentation/media/uapi/cec/cec-func-ioctl.rst b/Documentation/drivers/media/uapi/cec/cec-func-ioctl.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-func-ioctl.rst rename to Documentation/drivers/media/uapi/cec/cec-func-ioctl.rst diff --git a/Documentation/media/uapi/cec/cec-func-open.rst b/Documentation/drivers/media/uapi/cec/cec-func-open.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-func-open.rst rename to Documentation/drivers/media/uapi/cec/cec-func-open.rst diff --git a/Documentation/media/uapi/cec/cec-func-poll.rst b/Documentation/drivers/media/uapi/cec/cec-func-poll.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-func-poll.rst rename to Documentation/drivers/media/uapi/cec/cec-func-poll.rst diff --git a/Documentation/media/uapi/cec/cec-funcs.rst b/Documentation/drivers/media/uapi/cec/cec-funcs.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-funcs.rst rename to Documentation/drivers/media/uapi/cec/cec-funcs.rst diff --git a/Documentation/media/uapi/cec/cec-header.rst b/Documentation/drivers/media/uapi/cec/cec-header.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-header.rst rename to Documentation/drivers/media/uapi/cec/cec-header.rst diff --git a/Documentation/media/uapi/cec/cec-intro.rst b/Documentation/drivers/media/uapi/cec/cec-intro.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-intro.rst rename to Documentation/drivers/media/uapi/cec/cec-intro.rst diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst b/Documentation/drivers/media/uapi/cec/cec-ioc-adap-g-caps.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst rename to Documentation/drivers/media/uapi/cec/cec-ioc-adap-g-caps.rst diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst b/Documentation/drivers/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst rename to Documentation/drivers/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst b/Documentation/drivers/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst rename to Documentation/drivers/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst b/Documentation/drivers/media/uapi/cec/cec-ioc-dqevent.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-ioc-dqevent.rst rename to Documentation/drivers/media/uapi/cec/cec-ioc-dqevent.rst diff --git a/Documentation/media/uapi/cec/cec-ioc-g-mode.rst b/Documentation/drivers/media/uapi/cec/cec-ioc-g-mode.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-ioc-g-mode.rst rename to Documentation/drivers/media/uapi/cec/cec-ioc-g-mode.rst diff --git a/Documentation/media/uapi/cec/cec-ioc-receive.rst b/Documentation/drivers/media/uapi/cec/cec-ioc-receive.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-ioc-receive.rst rename to Documentation/drivers/media/uapi/cec/cec-ioc-receive.rst diff --git a/Documentation/media/uapi/cec/cec-pin-error-inj.rst b/Documentation/drivers/media/uapi/cec/cec-pin-error-inj.rst similarity index 100% rename from Documentation/media/uapi/cec/cec-pin-error-inj.rst rename to Documentation/drivers/media/uapi/cec/cec-pin-error-inj.rst diff --git a/Documentation/media/uapi/dvb/audio-bilingual-channel-select.rst b/Documentation/drivers/media/uapi/dvb/audio-bilingual-channel-select.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-bilingual-channel-select.rst rename to Documentation/drivers/media/uapi/dvb/audio-bilingual-channel-select.rst diff --git a/Documentation/media/uapi/dvb/audio-channel-select.rst b/Documentation/drivers/media/uapi/dvb/audio-channel-select.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-channel-select.rst rename to Documentation/drivers/media/uapi/dvb/audio-channel-select.rst diff --git a/Documentation/media/uapi/dvb/audio-clear-buffer.rst b/Documentation/drivers/media/uapi/dvb/audio-clear-buffer.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-clear-buffer.rst rename to Documentation/drivers/media/uapi/dvb/audio-clear-buffer.rst diff --git a/Documentation/media/uapi/dvb/audio-continue.rst b/Documentation/drivers/media/uapi/dvb/audio-continue.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-continue.rst rename to Documentation/drivers/media/uapi/dvb/audio-continue.rst diff --git a/Documentation/media/uapi/dvb/audio-fclose.rst b/Documentation/drivers/media/uapi/dvb/audio-fclose.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-fclose.rst rename to Documentation/drivers/media/uapi/dvb/audio-fclose.rst diff --git a/Documentation/media/uapi/dvb/audio-fopen.rst b/Documentation/drivers/media/uapi/dvb/audio-fopen.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-fopen.rst rename to Documentation/drivers/media/uapi/dvb/audio-fopen.rst diff --git a/Documentation/media/uapi/dvb/audio-fwrite.rst b/Documentation/drivers/media/uapi/dvb/audio-fwrite.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-fwrite.rst rename to Documentation/drivers/media/uapi/dvb/audio-fwrite.rst diff --git a/Documentation/media/uapi/dvb/audio-get-capabilities.rst b/Documentation/drivers/media/uapi/dvb/audio-get-capabilities.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-get-capabilities.rst rename to Documentation/drivers/media/uapi/dvb/audio-get-capabilities.rst diff --git a/Documentation/media/uapi/dvb/audio-get-status.rst b/Documentation/drivers/media/uapi/dvb/audio-get-status.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-get-status.rst rename to Documentation/drivers/media/uapi/dvb/audio-get-status.rst diff --git a/Documentation/media/uapi/dvb/audio-pause.rst b/Documentation/drivers/media/uapi/dvb/audio-pause.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-pause.rst rename to Documentation/drivers/media/uapi/dvb/audio-pause.rst diff --git a/Documentation/media/uapi/dvb/audio-play.rst b/Documentation/drivers/media/uapi/dvb/audio-play.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-play.rst rename to Documentation/drivers/media/uapi/dvb/audio-play.rst diff --git a/Documentation/media/uapi/dvb/audio-select-source.rst b/Documentation/drivers/media/uapi/dvb/audio-select-source.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-select-source.rst rename to Documentation/drivers/media/uapi/dvb/audio-select-source.rst diff --git a/Documentation/media/uapi/dvb/audio-set-av-sync.rst b/Documentation/drivers/media/uapi/dvb/audio-set-av-sync.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-set-av-sync.rst rename to Documentation/drivers/media/uapi/dvb/audio-set-av-sync.rst diff --git a/Documentation/media/uapi/dvb/audio-set-bypass-mode.rst b/Documentation/drivers/media/uapi/dvb/audio-set-bypass-mode.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-set-bypass-mode.rst rename to Documentation/drivers/media/uapi/dvb/audio-set-bypass-mode.rst diff --git a/Documentation/media/uapi/dvb/audio-set-id.rst b/Documentation/drivers/media/uapi/dvb/audio-set-id.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-set-id.rst rename to Documentation/drivers/media/uapi/dvb/audio-set-id.rst diff --git a/Documentation/media/uapi/dvb/audio-set-mixer.rst b/Documentation/drivers/media/uapi/dvb/audio-set-mixer.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-set-mixer.rst rename to Documentation/drivers/media/uapi/dvb/audio-set-mixer.rst diff --git a/Documentation/media/uapi/dvb/audio-set-mute.rst b/Documentation/drivers/media/uapi/dvb/audio-set-mute.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-set-mute.rst rename to Documentation/drivers/media/uapi/dvb/audio-set-mute.rst diff --git a/Documentation/media/uapi/dvb/audio-set-streamtype.rst b/Documentation/drivers/media/uapi/dvb/audio-set-streamtype.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-set-streamtype.rst rename to Documentation/drivers/media/uapi/dvb/audio-set-streamtype.rst diff --git a/Documentation/media/uapi/dvb/audio-stop.rst b/Documentation/drivers/media/uapi/dvb/audio-stop.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio-stop.rst rename to Documentation/drivers/media/uapi/dvb/audio-stop.rst diff --git a/Documentation/media/uapi/dvb/audio.rst b/Documentation/drivers/media/uapi/dvb/audio.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio.rst rename to Documentation/drivers/media/uapi/dvb/audio.rst diff --git a/Documentation/media/uapi/dvb/audio_data_types.rst b/Documentation/drivers/media/uapi/dvb/audio_data_types.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio_data_types.rst rename to Documentation/drivers/media/uapi/dvb/audio_data_types.rst diff --git a/Documentation/media/uapi/dvb/audio_function_calls.rst b/Documentation/drivers/media/uapi/dvb/audio_function_calls.rst similarity index 100% rename from Documentation/media/uapi/dvb/audio_function_calls.rst rename to Documentation/drivers/media/uapi/dvb/audio_function_calls.rst diff --git a/Documentation/media/uapi/dvb/ca-fclose.rst b/Documentation/drivers/media/uapi/dvb/ca-fclose.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-fclose.rst rename to Documentation/drivers/media/uapi/dvb/ca-fclose.rst diff --git a/Documentation/media/uapi/dvb/ca-fopen.rst b/Documentation/drivers/media/uapi/dvb/ca-fopen.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-fopen.rst rename to Documentation/drivers/media/uapi/dvb/ca-fopen.rst diff --git a/Documentation/media/uapi/dvb/ca-get-cap.rst b/Documentation/drivers/media/uapi/dvb/ca-get-cap.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-get-cap.rst rename to Documentation/drivers/media/uapi/dvb/ca-get-cap.rst diff --git a/Documentation/media/uapi/dvb/ca-get-descr-info.rst b/Documentation/drivers/media/uapi/dvb/ca-get-descr-info.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-get-descr-info.rst rename to Documentation/drivers/media/uapi/dvb/ca-get-descr-info.rst diff --git a/Documentation/media/uapi/dvb/ca-get-msg.rst b/Documentation/drivers/media/uapi/dvb/ca-get-msg.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-get-msg.rst rename to Documentation/drivers/media/uapi/dvb/ca-get-msg.rst diff --git a/Documentation/media/uapi/dvb/ca-get-slot-info.rst b/Documentation/drivers/media/uapi/dvb/ca-get-slot-info.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-get-slot-info.rst rename to Documentation/drivers/media/uapi/dvb/ca-get-slot-info.rst diff --git a/Documentation/media/uapi/dvb/ca-reset.rst b/Documentation/drivers/media/uapi/dvb/ca-reset.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-reset.rst rename to Documentation/drivers/media/uapi/dvb/ca-reset.rst diff --git a/Documentation/media/uapi/dvb/ca-send-msg.rst b/Documentation/drivers/media/uapi/dvb/ca-send-msg.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-send-msg.rst rename to Documentation/drivers/media/uapi/dvb/ca-send-msg.rst diff --git a/Documentation/media/uapi/dvb/ca-set-descr.rst b/Documentation/drivers/media/uapi/dvb/ca-set-descr.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca-set-descr.rst rename to Documentation/drivers/media/uapi/dvb/ca-set-descr.rst diff --git a/Documentation/media/uapi/dvb/ca.rst b/Documentation/drivers/media/uapi/dvb/ca.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca.rst rename to Documentation/drivers/media/uapi/dvb/ca.rst diff --git a/Documentation/media/uapi/dvb/ca_data_types.rst b/Documentation/drivers/media/uapi/dvb/ca_data_types.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca_data_types.rst rename to Documentation/drivers/media/uapi/dvb/ca_data_types.rst diff --git a/Documentation/media/uapi/dvb/ca_function_calls.rst b/Documentation/drivers/media/uapi/dvb/ca_function_calls.rst similarity index 100% rename from Documentation/media/uapi/dvb/ca_function_calls.rst rename to Documentation/drivers/media/uapi/dvb/ca_function_calls.rst diff --git a/Documentation/media/uapi/dvb/demux.rst b/Documentation/drivers/media/uapi/dvb/demux.rst similarity index 100% rename from Documentation/media/uapi/dvb/demux.rst rename to Documentation/drivers/media/uapi/dvb/demux.rst diff --git a/Documentation/media/uapi/dvb/dmx-add-pid.rst b/Documentation/drivers/media/uapi/dvb/dmx-add-pid.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-add-pid.rst rename to Documentation/drivers/media/uapi/dvb/dmx-add-pid.rst diff --git a/Documentation/media/uapi/dvb/dmx-expbuf.rst b/Documentation/drivers/media/uapi/dvb/dmx-expbuf.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-expbuf.rst rename to Documentation/drivers/media/uapi/dvb/dmx-expbuf.rst diff --git a/Documentation/media/uapi/dvb/dmx-fclose.rst b/Documentation/drivers/media/uapi/dvb/dmx-fclose.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-fclose.rst rename to Documentation/drivers/media/uapi/dvb/dmx-fclose.rst diff --git a/Documentation/media/uapi/dvb/dmx-fopen.rst b/Documentation/drivers/media/uapi/dvb/dmx-fopen.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-fopen.rst rename to Documentation/drivers/media/uapi/dvb/dmx-fopen.rst diff --git a/Documentation/media/uapi/dvb/dmx-fread.rst b/Documentation/drivers/media/uapi/dvb/dmx-fread.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-fread.rst rename to Documentation/drivers/media/uapi/dvb/dmx-fread.rst diff --git a/Documentation/media/uapi/dvb/dmx-fwrite.rst b/Documentation/drivers/media/uapi/dvb/dmx-fwrite.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-fwrite.rst rename to Documentation/drivers/media/uapi/dvb/dmx-fwrite.rst diff --git a/Documentation/media/uapi/dvb/dmx-get-pes-pids.rst b/Documentation/drivers/media/uapi/dvb/dmx-get-pes-pids.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-get-pes-pids.rst rename to Documentation/drivers/media/uapi/dvb/dmx-get-pes-pids.rst diff --git a/Documentation/media/uapi/dvb/dmx-get-stc.rst b/Documentation/drivers/media/uapi/dvb/dmx-get-stc.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-get-stc.rst rename to Documentation/drivers/media/uapi/dvb/dmx-get-stc.rst diff --git a/Documentation/media/uapi/dvb/dmx-mmap.rst b/Documentation/drivers/media/uapi/dvb/dmx-mmap.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-mmap.rst rename to Documentation/drivers/media/uapi/dvb/dmx-mmap.rst diff --git a/Documentation/media/uapi/dvb/dmx-munmap.rst b/Documentation/drivers/media/uapi/dvb/dmx-munmap.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-munmap.rst rename to Documentation/drivers/media/uapi/dvb/dmx-munmap.rst diff --git a/Documentation/media/uapi/dvb/dmx-qbuf.rst b/Documentation/drivers/media/uapi/dvb/dmx-qbuf.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-qbuf.rst rename to Documentation/drivers/media/uapi/dvb/dmx-qbuf.rst diff --git a/Documentation/media/uapi/dvb/dmx-querybuf.rst b/Documentation/drivers/media/uapi/dvb/dmx-querybuf.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-querybuf.rst rename to Documentation/drivers/media/uapi/dvb/dmx-querybuf.rst diff --git a/Documentation/media/uapi/dvb/dmx-remove-pid.rst b/Documentation/drivers/media/uapi/dvb/dmx-remove-pid.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-remove-pid.rst rename to Documentation/drivers/media/uapi/dvb/dmx-remove-pid.rst diff --git a/Documentation/media/uapi/dvb/dmx-reqbufs.rst b/Documentation/drivers/media/uapi/dvb/dmx-reqbufs.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-reqbufs.rst rename to Documentation/drivers/media/uapi/dvb/dmx-reqbufs.rst diff --git a/Documentation/media/uapi/dvb/dmx-set-buffer-size.rst b/Documentation/drivers/media/uapi/dvb/dmx-set-buffer-size.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-set-buffer-size.rst rename to Documentation/drivers/media/uapi/dvb/dmx-set-buffer-size.rst diff --git a/Documentation/media/uapi/dvb/dmx-set-filter.rst b/Documentation/drivers/media/uapi/dvb/dmx-set-filter.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-set-filter.rst rename to Documentation/drivers/media/uapi/dvb/dmx-set-filter.rst diff --git a/Documentation/media/uapi/dvb/dmx-set-pes-filter.rst b/Documentation/drivers/media/uapi/dvb/dmx-set-pes-filter.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-set-pes-filter.rst rename to Documentation/drivers/media/uapi/dvb/dmx-set-pes-filter.rst diff --git a/Documentation/media/uapi/dvb/dmx-start.rst b/Documentation/drivers/media/uapi/dvb/dmx-start.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-start.rst rename to Documentation/drivers/media/uapi/dvb/dmx-start.rst diff --git a/Documentation/media/uapi/dvb/dmx-stop.rst b/Documentation/drivers/media/uapi/dvb/dmx-stop.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx-stop.rst rename to Documentation/drivers/media/uapi/dvb/dmx-stop.rst diff --git a/Documentation/media/uapi/dvb/dmx_fcalls.rst b/Documentation/drivers/media/uapi/dvb/dmx_fcalls.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx_fcalls.rst rename to Documentation/drivers/media/uapi/dvb/dmx_fcalls.rst diff --git a/Documentation/media/uapi/dvb/dmx_types.rst b/Documentation/drivers/media/uapi/dvb/dmx_types.rst similarity index 100% rename from Documentation/media/uapi/dvb/dmx_types.rst rename to Documentation/drivers/media/uapi/dvb/dmx_types.rst diff --git a/Documentation/media/uapi/dvb/dvb-fe-read-status.rst b/Documentation/drivers/media/uapi/dvb/dvb-fe-read-status.rst similarity index 100% rename from Documentation/media/uapi/dvb/dvb-fe-read-status.rst rename to Documentation/drivers/media/uapi/dvb/dvb-fe-read-status.rst diff --git a/Documentation/media/uapi/dvb/dvb-frontend-event.rst b/Documentation/drivers/media/uapi/dvb/dvb-frontend-event.rst similarity index 100% rename from Documentation/media/uapi/dvb/dvb-frontend-event.rst rename to Documentation/drivers/media/uapi/dvb/dvb-frontend-event.rst diff --git a/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst b/Documentation/drivers/media/uapi/dvb/dvb-frontend-parameters.rst similarity index 100% rename from Documentation/media/uapi/dvb/dvb-frontend-parameters.rst rename to Documentation/drivers/media/uapi/dvb/dvb-frontend-parameters.rst diff --git a/Documentation/media/uapi/dvb/dvbapi.rst b/Documentation/drivers/media/uapi/dvb/dvbapi.rst similarity index 100% rename from Documentation/media/uapi/dvb/dvbapi.rst rename to Documentation/drivers/media/uapi/dvb/dvbapi.rst diff --git a/Documentation/media/uapi/dvb/dvbproperty.rst b/Documentation/drivers/media/uapi/dvb/dvbproperty.rst similarity index 100% rename from Documentation/media/uapi/dvb/dvbproperty.rst rename to Documentation/drivers/media/uapi/dvb/dvbproperty.rst diff --git a/Documentation/media/uapi/dvb/dvbstb.svg b/Documentation/drivers/media/uapi/dvb/dvbstb.svg similarity index 100% rename from Documentation/media/uapi/dvb/dvbstb.svg rename to Documentation/drivers/media/uapi/dvb/dvbstb.svg diff --git a/Documentation/media/uapi/dvb/examples.rst b/Documentation/drivers/media/uapi/dvb/examples.rst similarity index 100% rename from Documentation/media/uapi/dvb/examples.rst rename to Documentation/drivers/media/uapi/dvb/examples.rst diff --git a/Documentation/media/uapi/dvb/fe-bandwidth-t.rst b/Documentation/drivers/media/uapi/dvb/fe-bandwidth-t.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-bandwidth-t.rst rename to Documentation/drivers/media/uapi/dvb/fe-bandwidth-t.rst diff --git a/Documentation/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst b/Documentation/drivers/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst rename to Documentation/drivers/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst diff --git a/Documentation/media/uapi/dvb/fe-diseqc-reset-overload.rst b/Documentation/drivers/media/uapi/dvb/fe-diseqc-reset-overload.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-diseqc-reset-overload.rst rename to Documentation/drivers/media/uapi/dvb/fe-diseqc-reset-overload.rst diff --git a/Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst b/Documentation/drivers/media/uapi/dvb/fe-diseqc-send-burst.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst rename to Documentation/drivers/media/uapi/dvb/fe-diseqc-send-burst.rst diff --git a/Documentation/media/uapi/dvb/fe-diseqc-send-master-cmd.rst b/Documentation/drivers/media/uapi/dvb/fe-diseqc-send-master-cmd.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-diseqc-send-master-cmd.rst rename to Documentation/drivers/media/uapi/dvb/fe-diseqc-send-master-cmd.rst diff --git a/Documentation/media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst b/Documentation/drivers/media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst rename to Documentation/drivers/media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst diff --git a/Documentation/media/uapi/dvb/fe-enable-high-lnb-voltage.rst b/Documentation/drivers/media/uapi/dvb/fe-enable-high-lnb-voltage.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-enable-high-lnb-voltage.rst rename to Documentation/drivers/media/uapi/dvb/fe-enable-high-lnb-voltage.rst diff --git a/Documentation/media/uapi/dvb/fe-get-event.rst b/Documentation/drivers/media/uapi/dvb/fe-get-event.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-get-event.rst rename to Documentation/drivers/media/uapi/dvb/fe-get-event.rst diff --git a/Documentation/media/uapi/dvb/fe-get-frontend.rst b/Documentation/drivers/media/uapi/dvb/fe-get-frontend.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-get-frontend.rst rename to Documentation/drivers/media/uapi/dvb/fe-get-frontend.rst diff --git a/Documentation/media/uapi/dvb/fe-get-info.rst b/Documentation/drivers/media/uapi/dvb/fe-get-info.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-get-info.rst rename to Documentation/drivers/media/uapi/dvb/fe-get-info.rst diff --git a/Documentation/media/uapi/dvb/fe-get-property.rst b/Documentation/drivers/media/uapi/dvb/fe-get-property.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-get-property.rst rename to Documentation/drivers/media/uapi/dvb/fe-get-property.rst diff --git a/Documentation/media/uapi/dvb/fe-read-ber.rst b/Documentation/drivers/media/uapi/dvb/fe-read-ber.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-read-ber.rst rename to Documentation/drivers/media/uapi/dvb/fe-read-ber.rst diff --git a/Documentation/media/uapi/dvb/fe-read-signal-strength.rst b/Documentation/drivers/media/uapi/dvb/fe-read-signal-strength.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-read-signal-strength.rst rename to Documentation/drivers/media/uapi/dvb/fe-read-signal-strength.rst diff --git a/Documentation/media/uapi/dvb/fe-read-snr.rst b/Documentation/drivers/media/uapi/dvb/fe-read-snr.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-read-snr.rst rename to Documentation/drivers/media/uapi/dvb/fe-read-snr.rst diff --git a/Documentation/media/uapi/dvb/fe-read-status.rst b/Documentation/drivers/media/uapi/dvb/fe-read-status.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-read-status.rst rename to Documentation/drivers/media/uapi/dvb/fe-read-status.rst diff --git a/Documentation/media/uapi/dvb/fe-read-uncorrected-blocks.rst b/Documentation/drivers/media/uapi/dvb/fe-read-uncorrected-blocks.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-read-uncorrected-blocks.rst rename to Documentation/drivers/media/uapi/dvb/fe-read-uncorrected-blocks.rst diff --git a/Documentation/media/uapi/dvb/fe-set-frontend-tune-mode.rst b/Documentation/drivers/media/uapi/dvb/fe-set-frontend-tune-mode.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-set-frontend-tune-mode.rst rename to Documentation/drivers/media/uapi/dvb/fe-set-frontend-tune-mode.rst diff --git a/Documentation/media/uapi/dvb/fe-set-frontend.rst b/Documentation/drivers/media/uapi/dvb/fe-set-frontend.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-set-frontend.rst rename to Documentation/drivers/media/uapi/dvb/fe-set-frontend.rst diff --git a/Documentation/media/uapi/dvb/fe-set-tone.rst b/Documentation/drivers/media/uapi/dvb/fe-set-tone.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-set-tone.rst rename to Documentation/drivers/media/uapi/dvb/fe-set-tone.rst diff --git a/Documentation/media/uapi/dvb/fe-set-voltage.rst b/Documentation/drivers/media/uapi/dvb/fe-set-voltage.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-set-voltage.rst rename to Documentation/drivers/media/uapi/dvb/fe-set-voltage.rst diff --git a/Documentation/media/uapi/dvb/fe-type-t.rst b/Documentation/drivers/media/uapi/dvb/fe-type-t.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe-type-t.rst rename to Documentation/drivers/media/uapi/dvb/fe-type-t.rst diff --git a/Documentation/media/uapi/dvb/fe_property_parameters.rst b/Documentation/drivers/media/uapi/dvb/fe_property_parameters.rst similarity index 100% rename from Documentation/media/uapi/dvb/fe_property_parameters.rst rename to Documentation/drivers/media/uapi/dvb/fe_property_parameters.rst diff --git a/Documentation/media/uapi/dvb/frontend-header.rst b/Documentation/drivers/media/uapi/dvb/frontend-header.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend-header.rst rename to Documentation/drivers/media/uapi/dvb/frontend-header.rst diff --git a/Documentation/media/uapi/dvb/frontend-property-cable-systems.rst b/Documentation/drivers/media/uapi/dvb/frontend-property-cable-systems.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend-property-cable-systems.rst rename to Documentation/drivers/media/uapi/dvb/frontend-property-cable-systems.rst diff --git a/Documentation/media/uapi/dvb/frontend-property-satellite-systems.rst b/Documentation/drivers/media/uapi/dvb/frontend-property-satellite-systems.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend-property-satellite-systems.rst rename to Documentation/drivers/media/uapi/dvb/frontend-property-satellite-systems.rst diff --git a/Documentation/media/uapi/dvb/frontend-property-terrestrial-systems.rst b/Documentation/drivers/media/uapi/dvb/frontend-property-terrestrial-systems.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend-property-terrestrial-systems.rst rename to Documentation/drivers/media/uapi/dvb/frontend-property-terrestrial-systems.rst diff --git a/Documentation/media/uapi/dvb/frontend-stat-properties.rst b/Documentation/drivers/media/uapi/dvb/frontend-stat-properties.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend-stat-properties.rst rename to Documentation/drivers/media/uapi/dvb/frontend-stat-properties.rst diff --git a/Documentation/media/uapi/dvb/frontend.rst b/Documentation/drivers/media/uapi/dvb/frontend.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend.rst rename to Documentation/drivers/media/uapi/dvb/frontend.rst diff --git a/Documentation/media/uapi/dvb/frontend_f_close.rst b/Documentation/drivers/media/uapi/dvb/frontend_f_close.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend_f_close.rst rename to Documentation/drivers/media/uapi/dvb/frontend_f_close.rst diff --git a/Documentation/media/uapi/dvb/frontend_f_open.rst b/Documentation/drivers/media/uapi/dvb/frontend_f_open.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend_f_open.rst rename to Documentation/drivers/media/uapi/dvb/frontend_f_open.rst diff --git a/Documentation/media/uapi/dvb/frontend_fcalls.rst b/Documentation/drivers/media/uapi/dvb/frontend_fcalls.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend_fcalls.rst rename to Documentation/drivers/media/uapi/dvb/frontend_fcalls.rst diff --git a/Documentation/media/uapi/dvb/frontend_legacy_api.rst b/Documentation/drivers/media/uapi/dvb/frontend_legacy_api.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend_legacy_api.rst rename to Documentation/drivers/media/uapi/dvb/frontend_legacy_api.rst diff --git a/Documentation/media/uapi/dvb/frontend_legacy_dvbv3_api.rst b/Documentation/drivers/media/uapi/dvb/frontend_legacy_dvbv3_api.rst similarity index 100% rename from Documentation/media/uapi/dvb/frontend_legacy_dvbv3_api.rst rename to Documentation/drivers/media/uapi/dvb/frontend_legacy_dvbv3_api.rst diff --git a/Documentation/media/uapi/dvb/headers.rst b/Documentation/drivers/media/uapi/dvb/headers.rst similarity index 100% rename from Documentation/media/uapi/dvb/headers.rst rename to Documentation/drivers/media/uapi/dvb/headers.rst diff --git a/Documentation/media/uapi/dvb/intro.rst b/Documentation/drivers/media/uapi/dvb/intro.rst similarity index 100% rename from Documentation/media/uapi/dvb/intro.rst rename to Documentation/drivers/media/uapi/dvb/intro.rst diff --git a/Documentation/media/uapi/dvb/legacy_dvb_apis.rst b/Documentation/drivers/media/uapi/dvb/legacy_dvb_apis.rst similarity index 100% rename from Documentation/media/uapi/dvb/legacy_dvb_apis.rst rename to Documentation/drivers/media/uapi/dvb/legacy_dvb_apis.rst diff --git a/Documentation/media/uapi/dvb/net-add-if.rst b/Documentation/drivers/media/uapi/dvb/net-add-if.rst similarity index 100% rename from Documentation/media/uapi/dvb/net-add-if.rst rename to Documentation/drivers/media/uapi/dvb/net-add-if.rst diff --git a/Documentation/media/uapi/dvb/net-get-if.rst b/Documentation/drivers/media/uapi/dvb/net-get-if.rst similarity index 100% rename from Documentation/media/uapi/dvb/net-get-if.rst rename to Documentation/drivers/media/uapi/dvb/net-get-if.rst diff --git a/Documentation/media/uapi/dvb/net-remove-if.rst b/Documentation/drivers/media/uapi/dvb/net-remove-if.rst similarity index 100% rename from Documentation/media/uapi/dvb/net-remove-if.rst rename to Documentation/drivers/media/uapi/dvb/net-remove-if.rst diff --git a/Documentation/media/uapi/dvb/net-types.rst b/Documentation/drivers/media/uapi/dvb/net-types.rst similarity index 100% rename from Documentation/media/uapi/dvb/net-types.rst rename to Documentation/drivers/media/uapi/dvb/net-types.rst diff --git a/Documentation/media/uapi/dvb/net.rst b/Documentation/drivers/media/uapi/dvb/net.rst similarity index 100% rename from Documentation/media/uapi/dvb/net.rst rename to Documentation/drivers/media/uapi/dvb/net.rst diff --git a/Documentation/media/uapi/dvb/query-dvb-frontend-info.rst b/Documentation/drivers/media/uapi/dvb/query-dvb-frontend-info.rst similarity index 100% rename from Documentation/media/uapi/dvb/query-dvb-frontend-info.rst rename to Documentation/drivers/media/uapi/dvb/query-dvb-frontend-info.rst diff --git a/Documentation/media/uapi/dvb/video-clear-buffer.rst b/Documentation/drivers/media/uapi/dvb/video-clear-buffer.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-clear-buffer.rst rename to Documentation/drivers/media/uapi/dvb/video-clear-buffer.rst diff --git a/Documentation/media/uapi/dvb/video-command.rst b/Documentation/drivers/media/uapi/dvb/video-command.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-command.rst rename to Documentation/drivers/media/uapi/dvb/video-command.rst diff --git a/Documentation/media/uapi/dvb/video-continue.rst b/Documentation/drivers/media/uapi/dvb/video-continue.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-continue.rst rename to Documentation/drivers/media/uapi/dvb/video-continue.rst diff --git a/Documentation/media/uapi/dvb/video-fast-forward.rst b/Documentation/drivers/media/uapi/dvb/video-fast-forward.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-fast-forward.rst rename to Documentation/drivers/media/uapi/dvb/video-fast-forward.rst diff --git a/Documentation/media/uapi/dvb/video-fclose.rst b/Documentation/drivers/media/uapi/dvb/video-fclose.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-fclose.rst rename to Documentation/drivers/media/uapi/dvb/video-fclose.rst diff --git a/Documentation/media/uapi/dvb/video-fopen.rst b/Documentation/drivers/media/uapi/dvb/video-fopen.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-fopen.rst rename to Documentation/drivers/media/uapi/dvb/video-fopen.rst diff --git a/Documentation/media/uapi/dvb/video-freeze.rst b/Documentation/drivers/media/uapi/dvb/video-freeze.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-freeze.rst rename to Documentation/drivers/media/uapi/dvb/video-freeze.rst diff --git a/Documentation/media/uapi/dvb/video-fwrite.rst b/Documentation/drivers/media/uapi/dvb/video-fwrite.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-fwrite.rst rename to Documentation/drivers/media/uapi/dvb/video-fwrite.rst diff --git a/Documentation/media/uapi/dvb/video-get-capabilities.rst b/Documentation/drivers/media/uapi/dvb/video-get-capabilities.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-get-capabilities.rst rename to Documentation/drivers/media/uapi/dvb/video-get-capabilities.rst diff --git a/Documentation/media/uapi/dvb/video-get-event.rst b/Documentation/drivers/media/uapi/dvb/video-get-event.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-get-event.rst rename to Documentation/drivers/media/uapi/dvb/video-get-event.rst diff --git a/Documentation/media/uapi/dvb/video-get-frame-count.rst b/Documentation/drivers/media/uapi/dvb/video-get-frame-count.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-get-frame-count.rst rename to Documentation/drivers/media/uapi/dvb/video-get-frame-count.rst diff --git a/Documentation/media/uapi/dvb/video-get-pts.rst b/Documentation/drivers/media/uapi/dvb/video-get-pts.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-get-pts.rst rename to Documentation/drivers/media/uapi/dvb/video-get-pts.rst diff --git a/Documentation/media/uapi/dvb/video-get-size.rst b/Documentation/drivers/media/uapi/dvb/video-get-size.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-get-size.rst rename to Documentation/drivers/media/uapi/dvb/video-get-size.rst diff --git a/Documentation/media/uapi/dvb/video-get-status.rst b/Documentation/drivers/media/uapi/dvb/video-get-status.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-get-status.rst rename to Documentation/drivers/media/uapi/dvb/video-get-status.rst diff --git a/Documentation/media/uapi/dvb/video-play.rst b/Documentation/drivers/media/uapi/dvb/video-play.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-play.rst rename to Documentation/drivers/media/uapi/dvb/video-play.rst diff --git a/Documentation/media/uapi/dvb/video-select-source.rst b/Documentation/drivers/media/uapi/dvb/video-select-source.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-select-source.rst rename to Documentation/drivers/media/uapi/dvb/video-select-source.rst diff --git a/Documentation/media/uapi/dvb/video-set-blank.rst b/Documentation/drivers/media/uapi/dvb/video-set-blank.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-set-blank.rst rename to Documentation/drivers/media/uapi/dvb/video-set-blank.rst diff --git a/Documentation/media/uapi/dvb/video-set-display-format.rst b/Documentation/drivers/media/uapi/dvb/video-set-display-format.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-set-display-format.rst rename to Documentation/drivers/media/uapi/dvb/video-set-display-format.rst diff --git a/Documentation/media/uapi/dvb/video-set-format.rst b/Documentation/drivers/media/uapi/dvb/video-set-format.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-set-format.rst rename to Documentation/drivers/media/uapi/dvb/video-set-format.rst diff --git a/Documentation/media/uapi/dvb/video-set-streamtype.rst b/Documentation/drivers/media/uapi/dvb/video-set-streamtype.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-set-streamtype.rst rename to Documentation/drivers/media/uapi/dvb/video-set-streamtype.rst diff --git a/Documentation/media/uapi/dvb/video-slowmotion.rst b/Documentation/drivers/media/uapi/dvb/video-slowmotion.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-slowmotion.rst rename to Documentation/drivers/media/uapi/dvb/video-slowmotion.rst diff --git a/Documentation/media/uapi/dvb/video-stillpicture.rst b/Documentation/drivers/media/uapi/dvb/video-stillpicture.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-stillpicture.rst rename to Documentation/drivers/media/uapi/dvb/video-stillpicture.rst diff --git a/Documentation/media/uapi/dvb/video-stop.rst b/Documentation/drivers/media/uapi/dvb/video-stop.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-stop.rst rename to Documentation/drivers/media/uapi/dvb/video-stop.rst diff --git a/Documentation/media/uapi/dvb/video-try-command.rst b/Documentation/drivers/media/uapi/dvb/video-try-command.rst similarity index 100% rename from Documentation/media/uapi/dvb/video-try-command.rst rename to Documentation/drivers/media/uapi/dvb/video-try-command.rst diff --git a/Documentation/media/uapi/dvb/video.rst b/Documentation/drivers/media/uapi/dvb/video.rst similarity index 100% rename from Documentation/media/uapi/dvb/video.rst rename to Documentation/drivers/media/uapi/dvb/video.rst diff --git a/Documentation/media/uapi/dvb/video_function_calls.rst b/Documentation/drivers/media/uapi/dvb/video_function_calls.rst similarity index 100% rename from Documentation/media/uapi/dvb/video_function_calls.rst rename to Documentation/drivers/media/uapi/dvb/video_function_calls.rst diff --git a/Documentation/media/uapi/dvb/video_types.rst b/Documentation/drivers/media/uapi/dvb/video_types.rst similarity index 100% rename from Documentation/media/uapi/dvb/video_types.rst rename to Documentation/drivers/media/uapi/dvb/video_types.rst diff --git a/Documentation/media/uapi/fdl-appendix.rst b/Documentation/drivers/media/uapi/fdl-appendix.rst similarity index 100% rename from Documentation/media/uapi/fdl-appendix.rst rename to Documentation/drivers/media/uapi/fdl-appendix.rst diff --git a/Documentation/media/uapi/gen-errors.rst b/Documentation/drivers/media/uapi/gen-errors.rst similarity index 100% rename from Documentation/media/uapi/gen-errors.rst rename to Documentation/drivers/media/uapi/gen-errors.rst diff --git a/Documentation/media/uapi/mediactl/media-controller-intro.rst b/Documentation/drivers/media/uapi/mediactl/media-controller-intro.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-controller-intro.rst rename to Documentation/drivers/media/uapi/mediactl/media-controller-intro.rst diff --git a/Documentation/media/uapi/mediactl/media-controller-model.rst b/Documentation/drivers/media/uapi/mediactl/media-controller-model.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-controller-model.rst rename to Documentation/drivers/media/uapi/mediactl/media-controller-model.rst diff --git a/Documentation/media/uapi/mediactl/media-controller.rst b/Documentation/drivers/media/uapi/mediactl/media-controller.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-controller.rst rename to Documentation/drivers/media/uapi/mediactl/media-controller.rst diff --git a/Documentation/media/uapi/mediactl/media-func-close.rst b/Documentation/drivers/media/uapi/mediactl/media-func-close.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-func-close.rst rename to Documentation/drivers/media/uapi/mediactl/media-func-close.rst diff --git a/Documentation/media/uapi/mediactl/media-func-ioctl.rst b/Documentation/drivers/media/uapi/mediactl/media-func-ioctl.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-func-ioctl.rst rename to Documentation/drivers/media/uapi/mediactl/media-func-ioctl.rst diff --git a/Documentation/media/uapi/mediactl/media-func-open.rst b/Documentation/drivers/media/uapi/mediactl/media-func-open.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-func-open.rst rename to Documentation/drivers/media/uapi/mediactl/media-func-open.rst diff --git a/Documentation/media/uapi/mediactl/media-funcs.rst b/Documentation/drivers/media/uapi/mediactl/media-funcs.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-funcs.rst rename to Documentation/drivers/media/uapi/mediactl/media-funcs.rst diff --git a/Documentation/media/uapi/mediactl/media-header.rst b/Documentation/drivers/media/uapi/mediactl/media-header.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-header.rst rename to Documentation/drivers/media/uapi/mediactl/media-header.rst diff --git a/Documentation/media/uapi/mediactl/media-ioc-device-info.rst b/Documentation/drivers/media/uapi/mediactl/media-ioc-device-info.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-ioc-device-info.rst rename to Documentation/drivers/media/uapi/mediactl/media-ioc-device-info.rst diff --git a/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst b/Documentation/drivers/media/uapi/mediactl/media-ioc-enum-entities.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst rename to Documentation/drivers/media/uapi/mediactl/media-ioc-enum-entities.rst diff --git a/Documentation/media/uapi/mediactl/media-ioc-enum-links.rst b/Documentation/drivers/media/uapi/mediactl/media-ioc-enum-links.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-ioc-enum-links.rst rename to Documentation/drivers/media/uapi/mediactl/media-ioc-enum-links.rst diff --git a/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst b/Documentation/drivers/media/uapi/mediactl/media-ioc-g-topology.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-ioc-g-topology.rst rename to Documentation/drivers/media/uapi/mediactl/media-ioc-g-topology.rst diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/drivers/media/uapi/mediactl/media-ioc-request-alloc.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst rename to Documentation/drivers/media/uapi/mediactl/media-ioc-request-alloc.rst diff --git a/Documentation/media/uapi/mediactl/media-ioc-setup-link.rst b/Documentation/drivers/media/uapi/mediactl/media-ioc-setup-link.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-ioc-setup-link.rst rename to Documentation/drivers/media/uapi/mediactl/media-ioc-setup-link.rst diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst b/Documentation/drivers/media/uapi/mediactl/media-request-ioc-queue.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-request-ioc-queue.rst rename to Documentation/drivers/media/uapi/mediactl/media-request-ioc-queue.rst diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst b/Documentation/drivers/media/uapi/mediactl/media-request-ioc-reinit.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst rename to Documentation/drivers/media/uapi/mediactl/media-request-ioc-reinit.rst diff --git a/Documentation/media/uapi/mediactl/media-types.rst b/Documentation/drivers/media/uapi/mediactl/media-types.rst similarity index 100% rename from Documentation/media/uapi/mediactl/media-types.rst rename to Documentation/drivers/media/uapi/mediactl/media-types.rst diff --git a/Documentation/media/uapi/mediactl/request-api.rst b/Documentation/drivers/media/uapi/mediactl/request-api.rst similarity index 100% rename from Documentation/media/uapi/mediactl/request-api.rst rename to Documentation/drivers/media/uapi/mediactl/request-api.rst diff --git a/Documentation/media/uapi/mediactl/request-func-close.rst b/Documentation/drivers/media/uapi/mediactl/request-func-close.rst similarity index 100% rename from Documentation/media/uapi/mediactl/request-func-close.rst rename to Documentation/drivers/media/uapi/mediactl/request-func-close.rst diff --git a/Documentation/media/uapi/mediactl/request-func-ioctl.rst b/Documentation/drivers/media/uapi/mediactl/request-func-ioctl.rst similarity index 100% rename from Documentation/media/uapi/mediactl/request-func-ioctl.rst rename to Documentation/drivers/media/uapi/mediactl/request-func-ioctl.rst diff --git a/Documentation/media/uapi/mediactl/request-func-poll.rst b/Documentation/drivers/media/uapi/mediactl/request-func-poll.rst similarity index 100% rename from Documentation/media/uapi/mediactl/request-func-poll.rst rename to Documentation/drivers/media/uapi/mediactl/request-func-poll.rst diff --git a/Documentation/media/uapi/rc/keytable.c.rst b/Documentation/drivers/media/uapi/rc/keytable.c.rst similarity index 100% rename from Documentation/media/uapi/rc/keytable.c.rst rename to Documentation/drivers/media/uapi/rc/keytable.c.rst diff --git a/Documentation/media/uapi/rc/lirc-dev-intro.rst b/Documentation/drivers/media/uapi/rc/lirc-dev-intro.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-dev-intro.rst rename to Documentation/drivers/media/uapi/rc/lirc-dev-intro.rst diff --git a/Documentation/media/uapi/rc/lirc-dev.rst b/Documentation/drivers/media/uapi/rc/lirc-dev.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-dev.rst rename to Documentation/drivers/media/uapi/rc/lirc-dev.rst diff --git a/Documentation/media/uapi/rc/lirc-func.rst b/Documentation/drivers/media/uapi/rc/lirc-func.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-func.rst rename to Documentation/drivers/media/uapi/rc/lirc-func.rst diff --git a/Documentation/media/uapi/rc/lirc-get-features.rst b/Documentation/drivers/media/uapi/rc/lirc-get-features.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-get-features.rst rename to Documentation/drivers/media/uapi/rc/lirc-get-features.rst diff --git a/Documentation/media/uapi/rc/lirc-get-rec-mode.rst b/Documentation/drivers/media/uapi/rc/lirc-get-rec-mode.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-get-rec-mode.rst rename to Documentation/drivers/media/uapi/rc/lirc-get-rec-mode.rst diff --git a/Documentation/media/uapi/rc/lirc-get-rec-resolution.rst b/Documentation/drivers/media/uapi/rc/lirc-get-rec-resolution.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-get-rec-resolution.rst rename to Documentation/drivers/media/uapi/rc/lirc-get-rec-resolution.rst diff --git a/Documentation/media/uapi/rc/lirc-get-send-mode.rst b/Documentation/drivers/media/uapi/rc/lirc-get-send-mode.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-get-send-mode.rst rename to Documentation/drivers/media/uapi/rc/lirc-get-send-mode.rst diff --git a/Documentation/media/uapi/rc/lirc-get-timeout.rst b/Documentation/drivers/media/uapi/rc/lirc-get-timeout.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-get-timeout.rst rename to Documentation/drivers/media/uapi/rc/lirc-get-timeout.rst diff --git a/Documentation/media/uapi/rc/lirc-header.rst b/Documentation/drivers/media/uapi/rc/lirc-header.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-header.rst rename to Documentation/drivers/media/uapi/rc/lirc-header.rst diff --git a/Documentation/media/uapi/rc/lirc-read.rst b/Documentation/drivers/media/uapi/rc/lirc-read.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-read.rst rename to Documentation/drivers/media/uapi/rc/lirc-read.rst diff --git a/Documentation/media/uapi/rc/lirc-set-measure-carrier-mode.rst b/Documentation/drivers/media/uapi/rc/lirc-set-measure-carrier-mode.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-measure-carrier-mode.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-measure-carrier-mode.rst diff --git a/Documentation/media/uapi/rc/lirc-set-rec-carrier-range.rst b/Documentation/drivers/media/uapi/rc/lirc-set-rec-carrier-range.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-rec-carrier-range.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-rec-carrier-range.rst diff --git a/Documentation/media/uapi/rc/lirc-set-rec-carrier.rst b/Documentation/drivers/media/uapi/rc/lirc-set-rec-carrier.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-rec-carrier.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-rec-carrier.rst diff --git a/Documentation/media/uapi/rc/lirc-set-rec-timeout-reports.rst b/Documentation/drivers/media/uapi/rc/lirc-set-rec-timeout-reports.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-rec-timeout-reports.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-rec-timeout-reports.rst diff --git a/Documentation/media/uapi/rc/lirc-set-rec-timeout.rst b/Documentation/drivers/media/uapi/rc/lirc-set-rec-timeout.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-rec-timeout.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-rec-timeout.rst diff --git a/Documentation/media/uapi/rc/lirc-set-send-carrier.rst b/Documentation/drivers/media/uapi/rc/lirc-set-send-carrier.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-send-carrier.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-send-carrier.rst diff --git a/Documentation/media/uapi/rc/lirc-set-send-duty-cycle.rst b/Documentation/drivers/media/uapi/rc/lirc-set-send-duty-cycle.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-send-duty-cycle.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-send-duty-cycle.rst diff --git a/Documentation/media/uapi/rc/lirc-set-transmitter-mask.rst b/Documentation/drivers/media/uapi/rc/lirc-set-transmitter-mask.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-transmitter-mask.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-transmitter-mask.rst diff --git a/Documentation/media/uapi/rc/lirc-set-wideband-receiver.rst b/Documentation/drivers/media/uapi/rc/lirc-set-wideband-receiver.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-set-wideband-receiver.rst rename to Documentation/drivers/media/uapi/rc/lirc-set-wideband-receiver.rst diff --git a/Documentation/media/uapi/rc/lirc-write.rst b/Documentation/drivers/media/uapi/rc/lirc-write.rst similarity index 100% rename from Documentation/media/uapi/rc/lirc-write.rst rename to Documentation/drivers/media/uapi/rc/lirc-write.rst diff --git a/Documentation/media/uapi/rc/rc-intro.rst b/Documentation/drivers/media/uapi/rc/rc-intro.rst similarity index 100% rename from Documentation/media/uapi/rc/rc-intro.rst rename to Documentation/drivers/media/uapi/rc/rc-intro.rst diff --git a/Documentation/media/uapi/rc/rc-sysfs-nodes.rst b/Documentation/drivers/media/uapi/rc/rc-sysfs-nodes.rst similarity index 100% rename from Documentation/media/uapi/rc/rc-sysfs-nodes.rst rename to Documentation/drivers/media/uapi/rc/rc-sysfs-nodes.rst diff --git a/Documentation/media/uapi/rc/rc-table-change.rst b/Documentation/drivers/media/uapi/rc/rc-table-change.rst similarity index 100% rename from Documentation/media/uapi/rc/rc-table-change.rst rename to Documentation/drivers/media/uapi/rc/rc-table-change.rst diff --git a/Documentation/media/uapi/rc/rc-tables.rst b/Documentation/drivers/media/uapi/rc/rc-tables.rst similarity index 100% rename from Documentation/media/uapi/rc/rc-tables.rst rename to Documentation/drivers/media/uapi/rc/rc-tables.rst diff --git a/Documentation/media/uapi/rc/remote_controllers.rst b/Documentation/drivers/media/uapi/rc/remote_controllers.rst similarity index 100% rename from Documentation/media/uapi/rc/remote_controllers.rst rename to Documentation/drivers/media/uapi/rc/remote_controllers.rst diff --git a/Documentation/media/uapi/v4l/app-pri.rst b/Documentation/drivers/media/uapi/v4l/app-pri.rst similarity index 100% rename from Documentation/media/uapi/v4l/app-pri.rst rename to Documentation/drivers/media/uapi/v4l/app-pri.rst diff --git a/Documentation/media/uapi/v4l/async.rst b/Documentation/drivers/media/uapi/v4l/async.rst similarity index 100% rename from Documentation/media/uapi/v4l/async.rst rename to Documentation/drivers/media/uapi/v4l/async.rst diff --git a/Documentation/media/uapi/v4l/audio.rst b/Documentation/drivers/media/uapi/v4l/audio.rst similarity index 100% rename from Documentation/media/uapi/v4l/audio.rst rename to Documentation/drivers/media/uapi/v4l/audio.rst diff --git a/Documentation/media/uapi/v4l/bayer.svg b/Documentation/drivers/media/uapi/v4l/bayer.svg similarity index 100% rename from Documentation/media/uapi/v4l/bayer.svg rename to Documentation/drivers/media/uapi/v4l/bayer.svg diff --git a/Documentation/media/uapi/v4l/biblio.rst b/Documentation/drivers/media/uapi/v4l/biblio.rst similarity index 100% rename from Documentation/media/uapi/v4l/biblio.rst rename to Documentation/drivers/media/uapi/v4l/biblio.rst diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/drivers/media/uapi/v4l/buffer.rst similarity index 100% rename from Documentation/media/uapi/v4l/buffer.rst rename to Documentation/drivers/media/uapi/v4l/buffer.rst diff --git a/Documentation/media/uapi/v4l/capture-example.rst b/Documentation/drivers/media/uapi/v4l/capture-example.rst similarity index 100% rename from Documentation/media/uapi/v4l/capture-example.rst rename to Documentation/drivers/media/uapi/v4l/capture-example.rst diff --git a/Documentation/media/uapi/v4l/capture.c.rst b/Documentation/drivers/media/uapi/v4l/capture.c.rst similarity index 100% rename from Documentation/media/uapi/v4l/capture.c.rst rename to Documentation/drivers/media/uapi/v4l/capture.c.rst diff --git a/Documentation/media/uapi/v4l/colorspaces-defs.rst b/Documentation/drivers/media/uapi/v4l/colorspaces-defs.rst similarity index 100% rename from Documentation/media/uapi/v4l/colorspaces-defs.rst rename to Documentation/drivers/media/uapi/v4l/colorspaces-defs.rst diff --git a/Documentation/media/uapi/v4l/colorspaces-details.rst b/Documentation/drivers/media/uapi/v4l/colorspaces-details.rst similarity index 100% rename from Documentation/media/uapi/v4l/colorspaces-details.rst rename to Documentation/drivers/media/uapi/v4l/colorspaces-details.rst diff --git a/Documentation/media/uapi/v4l/colorspaces.rst b/Documentation/drivers/media/uapi/v4l/colorspaces.rst similarity index 100% rename from Documentation/media/uapi/v4l/colorspaces.rst rename to Documentation/drivers/media/uapi/v4l/colorspaces.rst diff --git a/Documentation/media/uapi/v4l/common-defs.rst b/Documentation/drivers/media/uapi/v4l/common-defs.rst similarity index 100% rename from Documentation/media/uapi/v4l/common-defs.rst rename to Documentation/drivers/media/uapi/v4l/common-defs.rst diff --git a/Documentation/media/uapi/v4l/common.rst b/Documentation/drivers/media/uapi/v4l/common.rst similarity index 100% rename from Documentation/media/uapi/v4l/common.rst rename to Documentation/drivers/media/uapi/v4l/common.rst diff --git a/Documentation/media/uapi/v4l/compat.rst b/Documentation/drivers/media/uapi/v4l/compat.rst similarity index 100% rename from Documentation/media/uapi/v4l/compat.rst rename to Documentation/drivers/media/uapi/v4l/compat.rst diff --git a/Documentation/media/uapi/v4l/constraints.svg b/Documentation/drivers/media/uapi/v4l/constraints.svg similarity index 100% rename from Documentation/media/uapi/v4l/constraints.svg rename to Documentation/drivers/media/uapi/v4l/constraints.svg diff --git a/Documentation/media/uapi/v4l/control.rst b/Documentation/drivers/media/uapi/v4l/control.rst similarity index 100% rename from Documentation/media/uapi/v4l/control.rst rename to Documentation/drivers/media/uapi/v4l/control.rst diff --git a/Documentation/media/uapi/v4l/crop.rst b/Documentation/drivers/media/uapi/v4l/crop.rst similarity index 100% rename from Documentation/media/uapi/v4l/crop.rst rename to Documentation/drivers/media/uapi/v4l/crop.rst diff --git a/Documentation/media/uapi/v4l/crop.svg b/Documentation/drivers/media/uapi/v4l/crop.svg similarity index 100% rename from Documentation/media/uapi/v4l/crop.svg rename to Documentation/drivers/media/uapi/v4l/crop.svg diff --git a/Documentation/media/uapi/v4l/depth-formats.rst b/Documentation/drivers/media/uapi/v4l/depth-formats.rst similarity index 100% rename from Documentation/media/uapi/v4l/depth-formats.rst rename to Documentation/drivers/media/uapi/v4l/depth-formats.rst diff --git a/Documentation/media/uapi/v4l/dev-capture.rst b/Documentation/drivers/media/uapi/v4l/dev-capture.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-capture.rst rename to Documentation/drivers/media/uapi/v4l/dev-capture.rst diff --git a/Documentation/media/uapi/v4l/dev-event.rst b/Documentation/drivers/media/uapi/v4l/dev-event.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-event.rst rename to Documentation/drivers/media/uapi/v4l/dev-event.rst diff --git a/Documentation/media/uapi/v4l/dev-mem2mem.rst b/Documentation/drivers/media/uapi/v4l/dev-mem2mem.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-mem2mem.rst rename to Documentation/drivers/media/uapi/v4l/dev-mem2mem.rst diff --git a/Documentation/media/uapi/v4l/dev-meta.rst b/Documentation/drivers/media/uapi/v4l/dev-meta.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-meta.rst rename to Documentation/drivers/media/uapi/v4l/dev-meta.rst diff --git a/Documentation/media/uapi/v4l/dev-osd.rst b/Documentation/drivers/media/uapi/v4l/dev-osd.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-osd.rst rename to Documentation/drivers/media/uapi/v4l/dev-osd.rst diff --git a/Documentation/media/uapi/v4l/dev-output.rst b/Documentation/drivers/media/uapi/v4l/dev-output.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-output.rst rename to Documentation/drivers/media/uapi/v4l/dev-output.rst diff --git a/Documentation/media/uapi/v4l/dev-overlay.rst b/Documentation/drivers/media/uapi/v4l/dev-overlay.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-overlay.rst rename to Documentation/drivers/media/uapi/v4l/dev-overlay.rst diff --git a/Documentation/media/uapi/v4l/dev-radio.rst b/Documentation/drivers/media/uapi/v4l/dev-radio.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-radio.rst rename to Documentation/drivers/media/uapi/v4l/dev-radio.rst diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst b/Documentation/drivers/media/uapi/v4l/dev-raw-vbi.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-raw-vbi.rst rename to Documentation/drivers/media/uapi/v4l/dev-raw-vbi.rst diff --git a/Documentation/media/uapi/v4l/dev-rds.rst b/Documentation/drivers/media/uapi/v4l/dev-rds.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-rds.rst rename to Documentation/drivers/media/uapi/v4l/dev-rds.rst diff --git a/Documentation/media/uapi/v4l/dev-sdr.rst b/Documentation/drivers/media/uapi/v4l/dev-sdr.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-sdr.rst rename to Documentation/drivers/media/uapi/v4l/dev-sdr.rst diff --git a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst b/Documentation/drivers/media/uapi/v4l/dev-sliced-vbi.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-sliced-vbi.rst rename to Documentation/drivers/media/uapi/v4l/dev-sliced-vbi.rst diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/drivers/media/uapi/v4l/dev-subdev.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-subdev.rst rename to Documentation/drivers/media/uapi/v4l/dev-subdev.rst diff --git a/Documentation/media/uapi/v4l/dev-touch.rst b/Documentation/drivers/media/uapi/v4l/dev-touch.rst similarity index 100% rename from Documentation/media/uapi/v4l/dev-touch.rst rename to Documentation/drivers/media/uapi/v4l/dev-touch.rst diff --git a/Documentation/media/uapi/v4l/devices.rst b/Documentation/drivers/media/uapi/v4l/devices.rst similarity index 100% rename from Documentation/media/uapi/v4l/devices.rst rename to Documentation/drivers/media/uapi/v4l/devices.rst diff --git a/Documentation/media/uapi/v4l/diff-v4l.rst b/Documentation/drivers/media/uapi/v4l/diff-v4l.rst similarity index 100% rename from Documentation/media/uapi/v4l/diff-v4l.rst rename to Documentation/drivers/media/uapi/v4l/diff-v4l.rst diff --git a/Documentation/media/uapi/v4l/dmabuf.rst b/Documentation/drivers/media/uapi/v4l/dmabuf.rst similarity index 100% rename from Documentation/media/uapi/v4l/dmabuf.rst rename to Documentation/drivers/media/uapi/v4l/dmabuf.rst diff --git a/Documentation/media/uapi/v4l/dv-timings.rst b/Documentation/drivers/media/uapi/v4l/dv-timings.rst similarity index 100% rename from Documentation/media/uapi/v4l/dv-timings.rst rename to Documentation/drivers/media/uapi/v4l/dv-timings.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-camera.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-camera.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-camera.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-codec.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-codec.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-codec.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-detect.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-detect.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-detect.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-detect.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-dv.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-dv.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-dv.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-dv.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-flash.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-flash.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-flash.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-flash.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-fm-rx.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-fm-rx.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-fm-rx.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-fm-rx.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-fm-tx.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-fm-tx.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-fm-tx.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-fm-tx.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-image-process.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-image-process.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-image-process.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-image-process.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-image-source.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-image-source.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-image-source.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-image-source.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-jpeg.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-jpeg.rst diff --git a/Documentation/media/uapi/v4l/ext-ctrls-rf-tuner.rst b/Documentation/drivers/media/uapi/v4l/ext-ctrls-rf-tuner.rst similarity index 100% rename from Documentation/media/uapi/v4l/ext-ctrls-rf-tuner.rst rename to Documentation/drivers/media/uapi/v4l/ext-ctrls-rf-tuner.rst diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/drivers/media/uapi/v4l/extended-controls.rst similarity index 100% rename from Documentation/media/uapi/v4l/extended-controls.rst rename to Documentation/drivers/media/uapi/v4l/extended-controls.rst diff --git a/Documentation/media/uapi/v4l/field-order.rst b/Documentation/drivers/media/uapi/v4l/field-order.rst similarity index 100% rename from Documentation/media/uapi/v4l/field-order.rst rename to Documentation/drivers/media/uapi/v4l/field-order.rst diff --git a/Documentation/media/uapi/v4l/fieldseq_bt.svg b/Documentation/drivers/media/uapi/v4l/fieldseq_bt.svg similarity index 100% rename from Documentation/media/uapi/v4l/fieldseq_bt.svg rename to Documentation/drivers/media/uapi/v4l/fieldseq_bt.svg diff --git a/Documentation/media/uapi/v4l/fieldseq_tb.svg b/Documentation/drivers/media/uapi/v4l/fieldseq_tb.svg similarity index 100% rename from Documentation/media/uapi/v4l/fieldseq_tb.svg rename to Documentation/drivers/media/uapi/v4l/fieldseq_tb.svg diff --git a/Documentation/media/uapi/v4l/format.rst b/Documentation/drivers/media/uapi/v4l/format.rst similarity index 100% rename from Documentation/media/uapi/v4l/format.rst rename to Documentation/drivers/media/uapi/v4l/format.rst diff --git a/Documentation/media/uapi/v4l/func-close.rst b/Documentation/drivers/media/uapi/v4l/func-close.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-close.rst rename to Documentation/drivers/media/uapi/v4l/func-close.rst diff --git a/Documentation/media/uapi/v4l/func-ioctl.rst b/Documentation/drivers/media/uapi/v4l/func-ioctl.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-ioctl.rst rename to Documentation/drivers/media/uapi/v4l/func-ioctl.rst diff --git a/Documentation/media/uapi/v4l/func-mmap.rst b/Documentation/drivers/media/uapi/v4l/func-mmap.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-mmap.rst rename to Documentation/drivers/media/uapi/v4l/func-mmap.rst diff --git a/Documentation/media/uapi/v4l/func-munmap.rst b/Documentation/drivers/media/uapi/v4l/func-munmap.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-munmap.rst rename to Documentation/drivers/media/uapi/v4l/func-munmap.rst diff --git a/Documentation/media/uapi/v4l/func-open.rst b/Documentation/drivers/media/uapi/v4l/func-open.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-open.rst rename to Documentation/drivers/media/uapi/v4l/func-open.rst diff --git a/Documentation/media/uapi/v4l/func-poll.rst b/Documentation/drivers/media/uapi/v4l/func-poll.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-poll.rst rename to Documentation/drivers/media/uapi/v4l/func-poll.rst diff --git a/Documentation/media/uapi/v4l/func-read.rst b/Documentation/drivers/media/uapi/v4l/func-read.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-read.rst rename to Documentation/drivers/media/uapi/v4l/func-read.rst diff --git a/Documentation/media/uapi/v4l/func-select.rst b/Documentation/drivers/media/uapi/v4l/func-select.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-select.rst rename to Documentation/drivers/media/uapi/v4l/func-select.rst diff --git a/Documentation/media/uapi/v4l/func-write.rst b/Documentation/drivers/media/uapi/v4l/func-write.rst similarity index 100% rename from Documentation/media/uapi/v4l/func-write.rst rename to Documentation/drivers/media/uapi/v4l/func-write.rst diff --git a/Documentation/media/uapi/v4l/hist-v4l2.rst b/Documentation/drivers/media/uapi/v4l/hist-v4l2.rst similarity index 100% rename from Documentation/media/uapi/v4l/hist-v4l2.rst rename to Documentation/drivers/media/uapi/v4l/hist-v4l2.rst diff --git a/Documentation/media/uapi/v4l/hsv-formats.rst b/Documentation/drivers/media/uapi/v4l/hsv-formats.rst similarity index 100% rename from Documentation/media/uapi/v4l/hsv-formats.rst rename to Documentation/drivers/media/uapi/v4l/hsv-formats.rst diff --git a/Documentation/media/uapi/v4l/io.rst b/Documentation/drivers/media/uapi/v4l/io.rst similarity index 100% rename from Documentation/media/uapi/v4l/io.rst rename to Documentation/drivers/media/uapi/v4l/io.rst diff --git a/Documentation/media/uapi/v4l/libv4l-introduction.rst b/Documentation/drivers/media/uapi/v4l/libv4l-introduction.rst similarity index 100% rename from Documentation/media/uapi/v4l/libv4l-introduction.rst rename to Documentation/drivers/media/uapi/v4l/libv4l-introduction.rst diff --git a/Documentation/media/uapi/v4l/libv4l.rst b/Documentation/drivers/media/uapi/v4l/libv4l.rst similarity index 100% rename from Documentation/media/uapi/v4l/libv4l.rst rename to Documentation/drivers/media/uapi/v4l/libv4l.rst diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/drivers/media/uapi/v4l/meta-formats.rst similarity index 100% rename from Documentation/media/uapi/v4l/meta-formats.rst rename to Documentation/drivers/media/uapi/v4l/meta-formats.rst diff --git a/Documentation/media/uapi/v4l/mmap.rst b/Documentation/drivers/media/uapi/v4l/mmap.rst similarity index 100% rename from Documentation/media/uapi/v4l/mmap.rst rename to Documentation/drivers/media/uapi/v4l/mmap.rst diff --git a/Documentation/media/uapi/v4l/nv12mt.svg b/Documentation/drivers/media/uapi/v4l/nv12mt.svg similarity index 100% rename from Documentation/media/uapi/v4l/nv12mt.svg rename to Documentation/drivers/media/uapi/v4l/nv12mt.svg diff --git a/Documentation/media/uapi/v4l/nv12mt_example.svg b/Documentation/drivers/media/uapi/v4l/nv12mt_example.svg similarity index 100% rename from Documentation/media/uapi/v4l/nv12mt_example.svg rename to Documentation/drivers/media/uapi/v4l/nv12mt_example.svg diff --git a/Documentation/media/uapi/v4l/open.rst b/Documentation/drivers/media/uapi/v4l/open.rst similarity index 100% rename from Documentation/media/uapi/v4l/open.rst rename to Documentation/drivers/media/uapi/v4l/open.rst diff --git a/Documentation/media/uapi/v4l/pipeline.dot b/Documentation/drivers/media/uapi/v4l/pipeline.dot similarity index 100% rename from Documentation/media/uapi/v4l/pipeline.dot rename to Documentation/drivers/media/uapi/v4l/pipeline.dot diff --git a/Documentation/media/uapi/v4l/pixfmt-cnf4.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-cnf4.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-cnf4.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-cnf4.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-compressed.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-compressed.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-compressed.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-grey.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-grey.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-grey.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-grey.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-indexed.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-indexed.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-indexed.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-indexed.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-intro.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-intro.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-intro.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-intro.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-inzi.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-inzi.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-inzi.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-inzi.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-m420.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-m420.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-m420.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-m420.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-meta-d4xx.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-meta-d4xx.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-uvc.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-meta-uvc.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-meta-uvc.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-meta-uvc.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-nv12.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-nv12.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-nv12.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12m.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-nv12m.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-nv12m.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-nv12m.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-nv12mt.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-nv12mt.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-nv12mt.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-nv16.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-nv16.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-nv16.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-nv16.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-nv16m.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-nv16m.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-nv16m.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-nv16m.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-nv24.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-nv24.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-nv24.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-nv24.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-packed-hsv.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-packed-hsv.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-packed-rgb.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-packed-rgb.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-packed-yuv.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-packed-yuv.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-reserved.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-reserved.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-reserved.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-reserved.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-rgb.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-rgb.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-rgb.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cs08.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cs08.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cs14le.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cs14le.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cu08.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cu08.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cu16le.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-cu16le.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-pcu16be.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-pcu16be.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-pcu16be.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-pcu16be.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-pcu18be.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-pcu18be.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-pcu18be.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-pcu18be.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-pcu20be.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-pcu20be.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-pcu20be.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-pcu20be.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-sdr-ru12le.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-sdr-ru12le.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb10-ipu3.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb10-ipu3.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb10.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb10.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb10.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10alaw8.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb10alaw8.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb10alaw8.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb10alaw8.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10dpcm8.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb10dpcm8.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb10dpcm8.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb10dpcm8.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb10p.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb10p.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb10p.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb12.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb12.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb12.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb12p.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb12p.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb12p.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb14p.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb14p.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb14p.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb16.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb16.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb16.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb16.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb8.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-srggb8.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-srggb8.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-srggb8.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-tch-td08.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-tch-td08.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-tch-td08.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-tch-td08.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-tch-td16.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-tch-td16.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-tch-td16.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-tch-td16.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-tch-tu08.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-tch-tu08.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-tch-tu08.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-tch-tu08.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-tch-tu16.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-tch-tu16.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-uv8.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-uv8.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-uv8.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-uv8.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-uyvy.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-uyvy.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-uyvy.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-uyvy.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-v4l2-mplane.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-v4l2-mplane.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-v4l2-mplane.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-v4l2.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-v4l2.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-v4l2.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-v4l2.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-vyuy.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-vyuy.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-vyuy.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-vyuy.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y10.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y10.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y10.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y10.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y10b.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y10b.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y10b.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y10b.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y10p.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y10p.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y10p.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y10p.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y12.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y12.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y12.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y12.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y12i.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y12i.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y12i.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y12i.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y16-be.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y16-be.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y16-be.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y16-be.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y16.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y16.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y16.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y16.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y41p.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y41p.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y41p.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y41p.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-y8i.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-y8i.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-y8i.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-y8i.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuv410.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuv410.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuv410.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuv410.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuv411p.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuv411p.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuv411p.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuv411p.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuv420.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuv420.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuv420.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuv420.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuv420m.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuv420m.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuv420m.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuv420m.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuv422m.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuv422m.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuv422m.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuv422m.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuv422p.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuv422p.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuv422p.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuv422p.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuv444m.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuv444m.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuv444m.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuv444m.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yuyv.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yuyv.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yuyv.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yuyv.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-yvyu.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-yvyu.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-yvyu.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-yvyu.rst diff --git a/Documentation/media/uapi/v4l/pixfmt-z16.rst b/Documentation/drivers/media/uapi/v4l/pixfmt-z16.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt-z16.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt-z16.rst diff --git a/Documentation/media/uapi/v4l/pixfmt.rst b/Documentation/drivers/media/uapi/v4l/pixfmt.rst similarity index 100% rename from Documentation/media/uapi/v4l/pixfmt.rst rename to Documentation/drivers/media/uapi/v4l/pixfmt.rst diff --git a/Documentation/media/uapi/v4l/planar-apis.rst b/Documentation/drivers/media/uapi/v4l/planar-apis.rst similarity index 100% rename from Documentation/media/uapi/v4l/planar-apis.rst rename to Documentation/drivers/media/uapi/v4l/planar-apis.rst diff --git a/Documentation/media/uapi/v4l/querycap.rst b/Documentation/drivers/media/uapi/v4l/querycap.rst similarity index 100% rename from Documentation/media/uapi/v4l/querycap.rst rename to Documentation/drivers/media/uapi/v4l/querycap.rst diff --git a/Documentation/media/uapi/v4l/rw.rst b/Documentation/drivers/media/uapi/v4l/rw.rst similarity index 100% rename from Documentation/media/uapi/v4l/rw.rst rename to Documentation/drivers/media/uapi/v4l/rw.rst diff --git a/Documentation/media/uapi/v4l/sdr-formats.rst b/Documentation/drivers/media/uapi/v4l/sdr-formats.rst similarity index 100% rename from Documentation/media/uapi/v4l/sdr-formats.rst rename to Documentation/drivers/media/uapi/v4l/sdr-formats.rst diff --git a/Documentation/media/uapi/v4l/selection-api-configuration.rst b/Documentation/drivers/media/uapi/v4l/selection-api-configuration.rst similarity index 100% rename from Documentation/media/uapi/v4l/selection-api-configuration.rst rename to Documentation/drivers/media/uapi/v4l/selection-api-configuration.rst diff --git a/Documentation/media/uapi/v4l/selection-api-examples.rst b/Documentation/drivers/media/uapi/v4l/selection-api-examples.rst similarity index 100% rename from Documentation/media/uapi/v4l/selection-api-examples.rst rename to Documentation/drivers/media/uapi/v4l/selection-api-examples.rst diff --git a/Documentation/media/uapi/v4l/selection-api-intro.rst b/Documentation/drivers/media/uapi/v4l/selection-api-intro.rst similarity index 100% rename from Documentation/media/uapi/v4l/selection-api-intro.rst rename to Documentation/drivers/media/uapi/v4l/selection-api-intro.rst diff --git a/Documentation/media/uapi/v4l/selection-api-targets.rst b/Documentation/drivers/media/uapi/v4l/selection-api-targets.rst similarity index 100% rename from Documentation/media/uapi/v4l/selection-api-targets.rst rename to Documentation/drivers/media/uapi/v4l/selection-api-targets.rst diff --git a/Documentation/media/uapi/v4l/selection-api-vs-crop-api.rst b/Documentation/drivers/media/uapi/v4l/selection-api-vs-crop-api.rst similarity index 100% rename from Documentation/media/uapi/v4l/selection-api-vs-crop-api.rst rename to Documentation/drivers/media/uapi/v4l/selection-api-vs-crop-api.rst diff --git a/Documentation/media/uapi/v4l/selection-api.rst b/Documentation/drivers/media/uapi/v4l/selection-api.rst similarity index 100% rename from Documentation/media/uapi/v4l/selection-api.rst rename to Documentation/drivers/media/uapi/v4l/selection-api.rst diff --git a/Documentation/media/uapi/v4l/selection.svg b/Documentation/drivers/media/uapi/v4l/selection.svg similarity index 100% rename from Documentation/media/uapi/v4l/selection.svg rename to Documentation/drivers/media/uapi/v4l/selection.svg diff --git a/Documentation/media/uapi/v4l/selections-common.rst b/Documentation/drivers/media/uapi/v4l/selections-common.rst similarity index 100% rename from Documentation/media/uapi/v4l/selections-common.rst rename to Documentation/drivers/media/uapi/v4l/selections-common.rst diff --git a/Documentation/media/uapi/v4l/standard.rst b/Documentation/drivers/media/uapi/v4l/standard.rst similarity index 100% rename from Documentation/media/uapi/v4l/standard.rst rename to Documentation/drivers/media/uapi/v4l/standard.rst diff --git a/Documentation/media/uapi/v4l/streaming-par.rst b/Documentation/drivers/media/uapi/v4l/streaming-par.rst similarity index 100% rename from Documentation/media/uapi/v4l/streaming-par.rst rename to Documentation/drivers/media/uapi/v4l/streaming-par.rst diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/drivers/media/uapi/v4l/subdev-formats.rst similarity index 100% rename from Documentation/media/uapi/v4l/subdev-formats.rst rename to Documentation/drivers/media/uapi/v4l/subdev-formats.rst diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg b/Documentation/drivers/media/uapi/v4l/subdev-image-processing-crop.svg similarity index 100% rename from Documentation/media/uapi/v4l/subdev-image-processing-crop.svg rename to Documentation/drivers/media/uapi/v4l/subdev-image-processing-crop.svg diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-full.svg b/Documentation/drivers/media/uapi/v4l/subdev-image-processing-full.svg similarity index 100% rename from Documentation/media/uapi/v4l/subdev-image-processing-full.svg rename to Documentation/drivers/media/uapi/v4l/subdev-image-processing-full.svg diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg b/Documentation/drivers/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg similarity index 100% rename from Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg rename to Documentation/drivers/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg diff --git a/Documentation/media/uapi/v4l/tch-formats.rst b/Documentation/drivers/media/uapi/v4l/tch-formats.rst similarity index 100% rename from Documentation/media/uapi/v4l/tch-formats.rst rename to Documentation/drivers/media/uapi/v4l/tch-formats.rst diff --git a/Documentation/media/uapi/v4l/tuner.rst b/Documentation/drivers/media/uapi/v4l/tuner.rst similarity index 100% rename from Documentation/media/uapi/v4l/tuner.rst rename to Documentation/drivers/media/uapi/v4l/tuner.rst diff --git a/Documentation/media/uapi/v4l/user-func.rst b/Documentation/drivers/media/uapi/v4l/user-func.rst similarity index 100% rename from Documentation/media/uapi/v4l/user-func.rst rename to Documentation/drivers/media/uapi/v4l/user-func.rst diff --git a/Documentation/media/uapi/v4l/userp.rst b/Documentation/drivers/media/uapi/v4l/userp.rst similarity index 100% rename from Documentation/media/uapi/v4l/userp.rst rename to Documentation/drivers/media/uapi/v4l/userp.rst diff --git a/Documentation/media/uapi/v4l/v4l2-selection-flags.rst b/Documentation/drivers/media/uapi/v4l/v4l2-selection-flags.rst similarity index 100% rename from Documentation/media/uapi/v4l/v4l2-selection-flags.rst rename to Documentation/drivers/media/uapi/v4l/v4l2-selection-flags.rst diff --git a/Documentation/media/uapi/v4l/v4l2-selection-targets.rst b/Documentation/drivers/media/uapi/v4l/v4l2-selection-targets.rst similarity index 100% rename from Documentation/media/uapi/v4l/v4l2-selection-targets.rst rename to Documentation/drivers/media/uapi/v4l/v4l2-selection-targets.rst diff --git a/Documentation/media/uapi/v4l/v4l2.rst b/Documentation/drivers/media/uapi/v4l/v4l2.rst similarity index 100% rename from Documentation/media/uapi/v4l/v4l2.rst rename to Documentation/drivers/media/uapi/v4l/v4l2.rst diff --git a/Documentation/media/uapi/v4l/v4l2grab-example.rst b/Documentation/drivers/media/uapi/v4l/v4l2grab-example.rst similarity index 100% rename from Documentation/media/uapi/v4l/v4l2grab-example.rst rename to Documentation/drivers/media/uapi/v4l/v4l2grab-example.rst diff --git a/Documentation/media/uapi/v4l/v4l2grab.c.rst b/Documentation/drivers/media/uapi/v4l/v4l2grab.c.rst similarity index 100% rename from Documentation/media/uapi/v4l/v4l2grab.c.rst rename to Documentation/drivers/media/uapi/v4l/v4l2grab.c.rst diff --git a/Documentation/media/uapi/v4l/vbi_525.svg b/Documentation/drivers/media/uapi/v4l/vbi_525.svg similarity index 100% rename from Documentation/media/uapi/v4l/vbi_525.svg rename to Documentation/drivers/media/uapi/v4l/vbi_525.svg diff --git a/Documentation/media/uapi/v4l/vbi_625.svg b/Documentation/drivers/media/uapi/v4l/vbi_625.svg similarity index 100% rename from Documentation/media/uapi/v4l/vbi_625.svg rename to Documentation/drivers/media/uapi/v4l/vbi_625.svg diff --git a/Documentation/media/uapi/v4l/vbi_hsync.svg b/Documentation/drivers/media/uapi/v4l/vbi_hsync.svg similarity index 100% rename from Documentation/media/uapi/v4l/vbi_hsync.svg rename to Documentation/drivers/media/uapi/v4l/vbi_hsync.svg diff --git a/Documentation/media/uapi/v4l/video.rst b/Documentation/drivers/media/uapi/v4l/video.rst similarity index 100% rename from Documentation/media/uapi/v4l/video.rst rename to Documentation/drivers/media/uapi/v4l/video.rst diff --git a/Documentation/media/uapi/v4l/videodev.rst b/Documentation/drivers/media/uapi/v4l/videodev.rst similarity index 100% rename from Documentation/media/uapi/v4l/videodev.rst rename to Documentation/drivers/media/uapi/v4l/videodev.rst diff --git a/Documentation/media/uapi/v4l/vidioc-create-bufs.rst b/Documentation/drivers/media/uapi/v4l/vidioc-create-bufs.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-create-bufs.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-create-bufs.rst diff --git a/Documentation/media/uapi/v4l/vidioc-cropcap.rst b/Documentation/drivers/media/uapi/v4l/vidioc-cropcap.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-cropcap.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-cropcap.rst diff --git a/Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst b/Documentation/drivers/media/uapi/v4l/vidioc-dbg-g-chip-info.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-dbg-g-chip-info.rst diff --git a/Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst b/Documentation/drivers/media/uapi/v4l/vidioc-dbg-g-register.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-dbg-g-register.rst diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst b/Documentation/drivers/media/uapi/v4l/vidioc-decoder-cmd.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-decoder-cmd.rst diff --git a/Documentation/media/uapi/v4l/vidioc-dqevent.rst b/Documentation/drivers/media/uapi/v4l/vidioc-dqevent.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-dqevent.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-dqevent.rst diff --git a/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst b/Documentation/drivers/media/uapi/v4l/vidioc-dv-timings-cap.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-dv-timings-cap.rst diff --git a/Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst b/Documentation/drivers/media/uapi/v4l/vidioc-encoder-cmd.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-encoder-cmd.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enum-dv-timings.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enum-dv-timings.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enum-fmt.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enum-fmt.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enum-fmt.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enum-frameintervals.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enum-frameintervals.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enum-framesizes.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enum-framesizes.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enum-freq-bands.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enum-freq-bands.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enumaudio.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enumaudio.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enumaudio.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enumaudio.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enumaudioout.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enumaudioout.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enumaudioout.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enumaudioout.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enuminput.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enuminput.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enuminput.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enuminput.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enumoutput.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enumoutput.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enumoutput.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enumoutput.rst diff --git a/Documentation/media/uapi/v4l/vidioc-enumstd.rst b/Documentation/drivers/media/uapi/v4l/vidioc-enumstd.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-enumstd.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-enumstd.rst diff --git a/Documentation/media/uapi/v4l/vidioc-expbuf.rst b/Documentation/drivers/media/uapi/v4l/vidioc-expbuf.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-expbuf.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-expbuf.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-audio.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-audio.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-audio.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-audio.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-audioout.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-audioout.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-audioout.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-audioout.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-crop.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-crop.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-crop.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-crop.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-ctrl.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-ctrl.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-ctrl.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-ctrl.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-dv-timings.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-dv-timings.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-edid.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-edid.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-edid.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-edid.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-enc-index.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-enc-index.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-enc-index.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-enc-index.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-ext-ctrls.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-ext-ctrls.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-fbuf.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-fbuf.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-fbuf.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-fbuf.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-fmt.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-fmt.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-fmt.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-fmt.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-frequency.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-frequency.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-frequency.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-frequency.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-input.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-input.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-input.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-input.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-jpegcomp.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-jpegcomp.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-modulator.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-modulator.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-modulator.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-modulator.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-output.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-output.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-output.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-output.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-parm.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-parm.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-parm.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-parm.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-priority.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-priority.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-priority.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-priority.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-selection.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-selection.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-selection.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-std.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-std.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-std.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-std.rst diff --git a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst b/Documentation/drivers/media/uapi/v4l/vidioc-g-tuner.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-g-tuner.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-g-tuner.rst diff --git a/Documentation/media/uapi/v4l/vidioc-log-status.rst b/Documentation/drivers/media/uapi/v4l/vidioc-log-status.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-log-status.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-log-status.rst diff --git a/Documentation/media/uapi/v4l/vidioc-overlay.rst b/Documentation/drivers/media/uapi/v4l/vidioc-overlay.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-overlay.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-overlay.rst diff --git a/Documentation/media/uapi/v4l/vidioc-prepare-buf.rst b/Documentation/drivers/media/uapi/v4l/vidioc-prepare-buf.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-prepare-buf.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-prepare-buf.rst diff --git a/Documentation/media/uapi/v4l/vidioc-qbuf.rst b/Documentation/drivers/media/uapi/v4l/vidioc-qbuf.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-qbuf.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-qbuf.rst diff --git a/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst b/Documentation/drivers/media/uapi/v4l/vidioc-query-dv-timings.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-query-dv-timings.rst diff --git a/Documentation/media/uapi/v4l/vidioc-querybuf.rst b/Documentation/drivers/media/uapi/v4l/vidioc-querybuf.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-querybuf.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-querybuf.rst diff --git a/Documentation/media/uapi/v4l/vidioc-querycap.rst b/Documentation/drivers/media/uapi/v4l/vidioc-querycap.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-querycap.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-querycap.rst diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/drivers/media/uapi/v4l/vidioc-queryctrl.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-queryctrl.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-queryctrl.rst diff --git a/Documentation/media/uapi/v4l/vidioc-querystd.rst b/Documentation/drivers/media/uapi/v4l/vidioc-querystd.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-querystd.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-querystd.rst diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/drivers/media/uapi/v4l/vidioc-reqbufs.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-reqbufs.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-reqbufs.rst diff --git a/Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst b/Documentation/drivers/media/uapi/v4l/vidioc-s-hw-freq-seek.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-s-hw-freq-seek.rst diff --git a/Documentation/media/uapi/v4l/vidioc-streamon.rst b/Documentation/drivers/media/uapi/v4l/vidioc-streamon.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-streamon.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-streamon.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-crop.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-crop.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-fmt.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-fmt.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-selection.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subdev-g-selection.rst diff --git a/Documentation/media/uapi/v4l/vidioc-subscribe-event.rst b/Documentation/drivers/media/uapi/v4l/vidioc-subscribe-event.rst similarity index 100% rename from Documentation/media/uapi/v4l/vidioc-subscribe-event.rst rename to Documentation/drivers/media/uapi/v4l/vidioc-subscribe-event.rst diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/drivers/media/uapi/v4l/yuv-formats.rst similarity index 100% rename from Documentation/media/uapi/v4l/yuv-formats.rst rename to Documentation/drivers/media/uapi/v4l/yuv-formats.rst diff --git a/Documentation/media/v4l-drivers/au0828-cardlist.rst b/Documentation/drivers/media/v4l-drivers/au0828-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/au0828-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/au0828-cardlist.rst diff --git a/Documentation/media/v4l-drivers/bttv-cardlist.rst b/Documentation/drivers/media/v4l-drivers/bttv-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/bttv-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/bttv-cardlist.rst diff --git a/Documentation/media/v4l-drivers/bttv.rst b/Documentation/drivers/media/v4l-drivers/bttv.rst similarity index 100% rename from Documentation/media/v4l-drivers/bttv.rst rename to Documentation/drivers/media/v4l-drivers/bttv.rst diff --git a/Documentation/media/v4l-drivers/cafe_ccic.rst b/Documentation/drivers/media/v4l-drivers/cafe_ccic.rst similarity index 100% rename from Documentation/media/v4l-drivers/cafe_ccic.rst rename to Documentation/drivers/media/v4l-drivers/cafe_ccic.rst diff --git a/Documentation/media/v4l-drivers/cardlist.rst b/Documentation/drivers/media/v4l-drivers/cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/cardlist.rst rename to Documentation/drivers/media/v4l-drivers/cardlist.rst diff --git a/Documentation/media/v4l-drivers/cpia2.rst b/Documentation/drivers/media/v4l-drivers/cpia2.rst similarity index 100% rename from Documentation/media/v4l-drivers/cpia2.rst rename to Documentation/drivers/media/v4l-drivers/cpia2.rst diff --git a/Documentation/media/v4l-drivers/cx18.rst b/Documentation/drivers/media/v4l-drivers/cx18.rst similarity index 100% rename from Documentation/media/v4l-drivers/cx18.rst rename to Documentation/drivers/media/v4l-drivers/cx18.rst diff --git a/Documentation/media/v4l-drivers/cx2341x.rst b/Documentation/drivers/media/v4l-drivers/cx2341x.rst similarity index 100% rename from Documentation/media/v4l-drivers/cx2341x.rst rename to Documentation/drivers/media/v4l-drivers/cx2341x.rst diff --git a/Documentation/media/v4l-drivers/cx23885-cardlist.rst b/Documentation/drivers/media/v4l-drivers/cx23885-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/cx23885-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/cx23885-cardlist.rst diff --git a/Documentation/media/v4l-drivers/cx88-cardlist.rst b/Documentation/drivers/media/v4l-drivers/cx88-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/cx88-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/cx88-cardlist.rst diff --git a/Documentation/media/v4l-drivers/cx88.rst b/Documentation/drivers/media/v4l-drivers/cx88.rst similarity index 100% rename from Documentation/media/v4l-drivers/cx88.rst rename to Documentation/drivers/media/v4l-drivers/cx88.rst diff --git a/Documentation/media/v4l-drivers/davinci-vpbe.rst b/Documentation/drivers/media/v4l-drivers/davinci-vpbe.rst similarity index 100% rename from Documentation/media/v4l-drivers/davinci-vpbe.rst rename to Documentation/drivers/media/v4l-drivers/davinci-vpbe.rst diff --git a/Documentation/media/v4l-drivers/em28xx-cardlist.rst b/Documentation/drivers/media/v4l-drivers/em28xx-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/em28xx-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/em28xx-cardlist.rst diff --git a/Documentation/media/v4l-drivers/fimc.rst b/Documentation/drivers/media/v4l-drivers/fimc.rst similarity index 100% rename from Documentation/media/v4l-drivers/fimc.rst rename to Documentation/drivers/media/v4l-drivers/fimc.rst diff --git a/Documentation/media/v4l-drivers/fourcc.rst b/Documentation/drivers/media/v4l-drivers/fourcc.rst similarity index 100% rename from Documentation/media/v4l-drivers/fourcc.rst rename to Documentation/drivers/media/v4l-drivers/fourcc.rst diff --git a/Documentation/media/v4l-drivers/gspca-cardlist.rst b/Documentation/drivers/media/v4l-drivers/gspca-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/gspca-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/gspca-cardlist.rst diff --git a/Documentation/media/v4l-drivers/imx.rst b/Documentation/drivers/media/v4l-drivers/imx.rst similarity index 100% rename from Documentation/media/v4l-drivers/imx.rst rename to Documentation/drivers/media/v4l-drivers/imx.rst diff --git a/Documentation/media/v4l-drivers/imx7.rst b/Documentation/drivers/media/v4l-drivers/imx7.rst similarity index 100% rename from Documentation/media/v4l-drivers/imx7.rst rename to Documentation/drivers/media/v4l-drivers/imx7.rst diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/drivers/media/v4l-drivers/index.rst similarity index 100% rename from Documentation/media/v4l-drivers/index.rst rename to Documentation/drivers/media/v4l-drivers/index.rst diff --git a/Documentation/media/v4l-drivers/ipu3.rst b/Documentation/drivers/media/v4l-drivers/ipu3.rst similarity index 100% rename from Documentation/media/v4l-drivers/ipu3.rst rename to Documentation/drivers/media/v4l-drivers/ipu3.rst diff --git a/Documentation/media/v4l-drivers/ivtv-cardlist.rst b/Documentation/drivers/media/v4l-drivers/ivtv-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/ivtv-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/ivtv-cardlist.rst diff --git a/Documentation/media/v4l-drivers/ivtv.rst b/Documentation/drivers/media/v4l-drivers/ivtv.rst similarity index 100% rename from Documentation/media/v4l-drivers/ivtv.rst rename to Documentation/drivers/media/v4l-drivers/ivtv.rst diff --git a/Documentation/media/v4l-drivers/max2175.rst b/Documentation/drivers/media/v4l-drivers/max2175.rst similarity index 100% rename from Documentation/media/v4l-drivers/max2175.rst rename to Documentation/drivers/media/v4l-drivers/max2175.rst diff --git a/Documentation/media/v4l-drivers/meye.rst b/Documentation/drivers/media/v4l-drivers/meye.rst similarity index 100% rename from Documentation/media/v4l-drivers/meye.rst rename to Documentation/drivers/media/v4l-drivers/meye.rst diff --git a/Documentation/media/v4l-drivers/omap3isp.rst b/Documentation/drivers/media/v4l-drivers/omap3isp.rst similarity index 100% rename from Documentation/media/v4l-drivers/omap3isp.rst rename to Documentation/drivers/media/v4l-drivers/omap3isp.rst diff --git a/Documentation/media/v4l-drivers/omap4_camera.rst b/Documentation/drivers/media/v4l-drivers/omap4_camera.rst similarity index 100% rename from Documentation/media/v4l-drivers/omap4_camera.rst rename to Documentation/drivers/media/v4l-drivers/omap4_camera.rst diff --git a/Documentation/media/v4l-drivers/philips.rst b/Documentation/drivers/media/v4l-drivers/philips.rst similarity index 100% rename from Documentation/media/v4l-drivers/philips.rst rename to Documentation/drivers/media/v4l-drivers/philips.rst diff --git a/Documentation/media/v4l-drivers/pvrusb2.rst b/Documentation/drivers/media/v4l-drivers/pvrusb2.rst similarity index 100% rename from Documentation/media/v4l-drivers/pvrusb2.rst rename to Documentation/drivers/media/v4l-drivers/pvrusb2.rst diff --git a/Documentation/media/v4l-drivers/pxa_camera.rst b/Documentation/drivers/media/v4l-drivers/pxa_camera.rst similarity index 100% rename from Documentation/media/v4l-drivers/pxa_camera.rst rename to Documentation/drivers/media/v4l-drivers/pxa_camera.rst diff --git a/Documentation/media/v4l-drivers/qcom_camss.rst b/Documentation/drivers/media/v4l-drivers/qcom_camss.rst similarity index 100% rename from Documentation/media/v4l-drivers/qcom_camss.rst rename to Documentation/drivers/media/v4l-drivers/qcom_camss.rst diff --git a/Documentation/media/v4l-drivers/qcom_camss_8x96_graph.dot b/Documentation/drivers/media/v4l-drivers/qcom_camss_8x96_graph.dot similarity index 100% rename from Documentation/media/v4l-drivers/qcom_camss_8x96_graph.dot rename to Documentation/drivers/media/v4l-drivers/qcom_camss_8x96_graph.dot diff --git a/Documentation/media/v4l-drivers/qcom_camss_graph.dot b/Documentation/drivers/media/v4l-drivers/qcom_camss_graph.dot similarity index 100% rename from Documentation/media/v4l-drivers/qcom_camss_graph.dot rename to Documentation/drivers/media/v4l-drivers/qcom_camss_graph.dot diff --git a/Documentation/media/v4l-drivers/radiotrack.rst b/Documentation/drivers/media/v4l-drivers/radiotrack.rst similarity index 100% rename from Documentation/media/v4l-drivers/radiotrack.rst rename to Documentation/drivers/media/v4l-drivers/radiotrack.rst diff --git a/Documentation/media/v4l-drivers/rcar-fdp1.rst b/Documentation/drivers/media/v4l-drivers/rcar-fdp1.rst similarity index 100% rename from Documentation/media/v4l-drivers/rcar-fdp1.rst rename to Documentation/drivers/media/v4l-drivers/rcar-fdp1.rst diff --git a/Documentation/media/v4l-drivers/saa7134-cardlist.rst b/Documentation/drivers/media/v4l-drivers/saa7134-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/saa7134-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/saa7134-cardlist.rst diff --git a/Documentation/media/v4l-drivers/saa7134.rst b/Documentation/drivers/media/v4l-drivers/saa7134.rst similarity index 100% rename from Documentation/media/v4l-drivers/saa7134.rst rename to Documentation/drivers/media/v4l-drivers/saa7134.rst diff --git a/Documentation/media/v4l-drivers/saa7164-cardlist.rst b/Documentation/drivers/media/v4l-drivers/saa7164-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/saa7164-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/saa7164-cardlist.rst diff --git a/Documentation/media/v4l-drivers/sh_mobile_ceu_camera.rst b/Documentation/drivers/media/v4l-drivers/sh_mobile_ceu_camera.rst similarity index 100% rename from Documentation/media/v4l-drivers/sh_mobile_ceu_camera.rst rename to Documentation/drivers/media/v4l-drivers/sh_mobile_ceu_camera.rst diff --git a/Documentation/media/v4l-drivers/si470x.rst b/Documentation/drivers/media/v4l-drivers/si470x.rst similarity index 100% rename from Documentation/media/v4l-drivers/si470x.rst rename to Documentation/drivers/media/v4l-drivers/si470x.rst diff --git a/Documentation/media/v4l-drivers/si4713.rst b/Documentation/drivers/media/v4l-drivers/si4713.rst similarity index 100% rename from Documentation/media/v4l-drivers/si4713.rst rename to Documentation/drivers/media/v4l-drivers/si4713.rst diff --git a/Documentation/media/v4l-drivers/si476x.rst b/Documentation/drivers/media/v4l-drivers/si476x.rst similarity index 100% rename from Documentation/media/v4l-drivers/si476x.rst rename to Documentation/drivers/media/v4l-drivers/si476x.rst diff --git a/Documentation/media/v4l-drivers/soc-camera.rst b/Documentation/drivers/media/v4l-drivers/soc-camera.rst similarity index 100% rename from Documentation/media/v4l-drivers/soc-camera.rst rename to Documentation/drivers/media/v4l-drivers/soc-camera.rst diff --git a/Documentation/media/v4l-drivers/tm6000-cardlist.rst b/Documentation/drivers/media/v4l-drivers/tm6000-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/tm6000-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/tm6000-cardlist.rst diff --git a/Documentation/media/v4l-drivers/tuner-cardlist.rst b/Documentation/drivers/media/v4l-drivers/tuner-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/tuner-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/tuner-cardlist.rst diff --git a/Documentation/media/v4l-drivers/tuners.rst b/Documentation/drivers/media/v4l-drivers/tuners.rst similarity index 100% rename from Documentation/media/v4l-drivers/tuners.rst rename to Documentation/drivers/media/v4l-drivers/tuners.rst diff --git a/Documentation/media/v4l-drivers/usbvision-cardlist.rst b/Documentation/drivers/media/v4l-drivers/usbvision-cardlist.rst similarity index 100% rename from Documentation/media/v4l-drivers/usbvision-cardlist.rst rename to Documentation/drivers/media/v4l-drivers/usbvision-cardlist.rst diff --git a/Documentation/media/v4l-drivers/uvcvideo.rst b/Documentation/drivers/media/v4l-drivers/uvcvideo.rst similarity index 100% rename from Documentation/media/v4l-drivers/uvcvideo.rst rename to Documentation/drivers/media/v4l-drivers/uvcvideo.rst diff --git a/Documentation/media/v4l-drivers/v4l-with-ir.rst b/Documentation/drivers/media/v4l-drivers/v4l-with-ir.rst similarity index 100% rename from Documentation/media/v4l-drivers/v4l-with-ir.rst rename to Documentation/drivers/media/v4l-drivers/v4l-with-ir.rst diff --git a/Documentation/media/v4l-drivers/vimc.dot b/Documentation/drivers/media/v4l-drivers/vimc.dot similarity index 100% rename from Documentation/media/v4l-drivers/vimc.dot rename to Documentation/drivers/media/v4l-drivers/vimc.dot diff --git a/Documentation/media/v4l-drivers/vimc.rst b/Documentation/drivers/media/v4l-drivers/vimc.rst similarity index 100% rename from Documentation/media/v4l-drivers/vimc.rst rename to Documentation/drivers/media/v4l-drivers/vimc.rst diff --git a/Documentation/media/v4l-drivers/vivid.rst b/Documentation/drivers/media/v4l-drivers/vivid.rst similarity index 100% rename from Documentation/media/v4l-drivers/vivid.rst rename to Documentation/drivers/media/v4l-drivers/vivid.rst diff --git a/Documentation/media/v4l-drivers/zr364xx.rst b/Documentation/drivers/media/v4l-drivers/zr364xx.rst similarity index 100% rename from Documentation/media/v4l-drivers/zr364xx.rst rename to Documentation/drivers/media/v4l-drivers/zr364xx.rst diff --git a/Documentation/media/video.h.rst.exceptions b/Documentation/drivers/media/video.h.rst.exceptions similarity index 100% rename from Documentation/media/video.h.rst.exceptions rename to Documentation/drivers/media/video.h.rst.exceptions diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/drivers/media/videodev2.h.rst.exceptions similarity index 100% rename from Documentation/media/videodev2.h.rst.exceptions rename to Documentation/drivers/media/videodev2.h.rst.exceptions diff --git a/Documentation/memory-devices/ti-emif.txt b/Documentation/drivers/memory/ti-emif.txt similarity index 100% rename from Documentation/memory-devices/ti-emif.txt rename to Documentation/drivers/memory/ti-emif.txt diff --git a/Documentation/misc-devices/ad525x_dpot.txt b/Documentation/drivers/misc/ad525x_dpot.txt similarity index 100% rename from Documentation/misc-devices/ad525x_dpot.txt rename to Documentation/drivers/misc/ad525x_dpot.txt diff --git a/Documentation/misc-devices/apds990x.txt b/Documentation/drivers/misc/apds990x.txt similarity index 100% rename from Documentation/misc-devices/apds990x.txt rename to Documentation/drivers/misc/apds990x.txt diff --git a/Documentation/misc-devices/bh1770glc.txt b/Documentation/drivers/misc/bh1770glc.txt similarity index 100% rename from Documentation/misc-devices/bh1770glc.txt rename to Documentation/drivers/misc/bh1770glc.txt diff --git a/Documentation/misc-devices/c2port.txt b/Documentation/drivers/misc/c2port.txt similarity index 100% rename from Documentation/misc-devices/c2port.txt rename to Documentation/drivers/misc/c2port.txt diff --git a/Documentation/misc-devices/eeprom b/Documentation/drivers/misc/eeprom similarity index 100% rename from Documentation/misc-devices/eeprom rename to Documentation/drivers/misc/eeprom diff --git a/Documentation/misc-devices/ibmvmc.rst b/Documentation/drivers/misc/ibmvmc.rst similarity index 100% rename from Documentation/misc-devices/ibmvmc.rst rename to Documentation/drivers/misc/ibmvmc.rst diff --git a/Documentation/misc-devices/ics932s401 b/Documentation/drivers/misc/ics932s401 similarity index 100% rename from Documentation/misc-devices/ics932s401 rename to Documentation/drivers/misc/ics932s401 diff --git a/Documentation/misc-devices/index.rst b/Documentation/drivers/misc/index.rst similarity index 100% rename from Documentation/misc-devices/index.rst rename to Documentation/drivers/misc/index.rst diff --git a/Documentation/misc-devices/isl29003 b/Documentation/drivers/misc/isl29003 similarity index 100% rename from Documentation/misc-devices/isl29003 rename to Documentation/drivers/misc/isl29003 diff --git a/Documentation/misc-devices/lis3lv02d b/Documentation/drivers/misc/lis3lv02d similarity index 100% rename from Documentation/misc-devices/lis3lv02d rename to Documentation/drivers/misc/lis3lv02d diff --git a/Documentation/misc-devices/max6875 b/Documentation/drivers/misc/max6875 similarity index 100% rename from Documentation/misc-devices/max6875 rename to Documentation/drivers/misc/max6875 diff --git a/Documentation/misc-devices/mei/mei-client-bus.txt b/Documentation/drivers/misc/mei/mei-client-bus.txt similarity index 100% rename from Documentation/misc-devices/mei/mei-client-bus.txt rename to Documentation/drivers/misc/mei/mei-client-bus.txt diff --git a/Documentation/misc-devices/mei/mei.txt b/Documentation/drivers/misc/mei/mei.txt similarity index 100% rename from Documentation/misc-devices/mei/mei.txt rename to Documentation/drivers/misc/mei/mei.txt diff --git a/Documentation/misc-devices/pci-endpoint-test.txt b/Documentation/drivers/misc/pci-endpoint-test.txt similarity index 100% rename from Documentation/misc-devices/pci-endpoint-test.txt rename to Documentation/drivers/misc/pci-endpoint-test.txt diff --git a/Documentation/misc-devices/spear-pcie-gadget.txt b/Documentation/drivers/misc/spear-pcie-gadget.txt similarity index 100% rename from Documentation/misc-devices/spear-pcie-gadget.txt rename to Documentation/drivers/misc/spear-pcie-gadget.txt diff --git a/Documentation/mmc/mmc-async-req.txt b/Documentation/drivers/mmc/mmc-async-req.txt similarity index 100% rename from Documentation/mmc/mmc-async-req.txt rename to Documentation/drivers/mmc/mmc-async-req.txt diff --git a/Documentation/mmc/mmc-dev-attrs.txt b/Documentation/drivers/mmc/mmc-dev-attrs.txt similarity index 100% rename from Documentation/mmc/mmc-dev-attrs.txt rename to Documentation/drivers/mmc/mmc-dev-attrs.txt diff --git a/Documentation/mmc/mmc-dev-parts.txt b/Documentation/drivers/mmc/mmc-dev-parts.txt similarity index 100% rename from Documentation/mmc/mmc-dev-parts.txt rename to Documentation/drivers/mmc/mmc-dev-parts.txt diff --git a/Documentation/mmc/mmc-tools.txt b/Documentation/drivers/mmc/mmc-tools.txt similarity index 100% rename from Documentation/mmc/mmc-tools.txt rename to Documentation/drivers/mmc/mmc-tools.txt diff --git a/Documentation/mtd/intel-spi.txt b/Documentation/drivers/mtd/intel-spi.txt similarity index 100% rename from Documentation/mtd/intel-spi.txt rename to Documentation/drivers/mtd/intel-spi.txt diff --git a/Documentation/mtd/nand_ecc.txt b/Documentation/drivers/mtd/nand_ecc.txt similarity index 100% rename from Documentation/mtd/nand_ecc.txt rename to Documentation/drivers/mtd/nand_ecc.txt diff --git a/Documentation/mtd/spi-nor.txt b/Documentation/drivers/mtd/spi-nor.txt similarity index 100% rename from Documentation/mtd/spi-nor.txt rename to Documentation/drivers/mtd/spi-nor.txt diff --git a/Documentation/nfc/nfc-hci.txt b/Documentation/drivers/nfc/nfc-hci.txt similarity index 100% rename from Documentation/nfc/nfc-hci.txt rename to Documentation/drivers/nfc/nfc-hci.txt diff --git a/Documentation/nfc/nfc-pn544.txt b/Documentation/drivers/nfc/nfc-pn544.txt similarity index 100% rename from Documentation/nfc/nfc-pn544.txt rename to Documentation/drivers/nfc/nfc-pn544.txt diff --git a/Documentation/nvdimm/btt.txt b/Documentation/drivers/nvdimm/btt.txt similarity index 100% rename from Documentation/nvdimm/btt.txt rename to Documentation/drivers/nvdimm/btt.txt diff --git a/Documentation/nvdimm/nvdimm.txt b/Documentation/drivers/nvdimm/nvdimm.txt similarity index 100% rename from Documentation/nvdimm/nvdimm.txt rename to Documentation/drivers/nvdimm/nvdimm.txt diff --git a/Documentation/nvdimm/security.txt b/Documentation/drivers/nvdimm/security.txt similarity index 100% rename from Documentation/nvdimm/security.txt rename to Documentation/drivers/nvdimm/security.txt diff --git a/Documentation/nvmem/nvmem.txt b/Documentation/drivers/nvmem/nvmem.txt similarity index 100% rename from Documentation/nvmem/nvmem.txt rename to Documentation/drivers/nvmem/nvmem.txt diff --git a/Documentation/pcmcia/devicetable.rst b/Documentation/drivers/pcmcia/devicetable.rst similarity index 100% rename from Documentation/pcmcia/devicetable.rst rename to Documentation/drivers/pcmcia/devicetable.rst diff --git a/Documentation/pcmcia/driver-changes.rst b/Documentation/drivers/pcmcia/driver-changes.rst similarity index 100% rename from Documentation/pcmcia/driver-changes.rst rename to Documentation/drivers/pcmcia/driver-changes.rst diff --git a/Documentation/pcmcia/driver.rst b/Documentation/drivers/pcmcia/driver.rst similarity index 100% rename from Documentation/pcmcia/driver.rst rename to Documentation/drivers/pcmcia/driver.rst diff --git a/Documentation/pcmcia/index.rst b/Documentation/drivers/pcmcia/index.rst similarity index 100% rename from Documentation/pcmcia/index.rst rename to Documentation/drivers/pcmcia/index.rst diff --git a/Documentation/pcmcia/locking.rst b/Documentation/drivers/pcmcia/locking.rst similarity index 100% rename from Documentation/pcmcia/locking.rst rename to Documentation/drivers/pcmcia/locking.rst diff --git a/Documentation/rapidio/mport_cdev.txt b/Documentation/drivers/rapidio/mport_cdev.txt similarity index 100% rename from Documentation/rapidio/mport_cdev.txt rename to Documentation/drivers/rapidio/mport_cdev.txt diff --git a/Documentation/rapidio/rapidio.txt b/Documentation/drivers/rapidio/rapidio.txt similarity index 100% rename from Documentation/rapidio/rapidio.txt rename to Documentation/drivers/rapidio/rapidio.txt diff --git a/Documentation/rapidio/rio_cm.txt b/Documentation/drivers/rapidio/rio_cm.txt similarity index 100% rename from Documentation/rapidio/rio_cm.txt rename to Documentation/drivers/rapidio/rio_cm.txt diff --git a/Documentation/rapidio/sysfs.txt b/Documentation/drivers/rapidio/sysfs.txt similarity index 100% rename from Documentation/rapidio/sysfs.txt rename to Documentation/drivers/rapidio/sysfs.txt diff --git a/Documentation/rapidio/tsi721.txt b/Documentation/drivers/rapidio/tsi721.txt similarity index 100% rename from Documentation/rapidio/tsi721.txt rename to Documentation/drivers/rapidio/tsi721.txt diff --git a/Documentation/scsi/53c700.txt b/Documentation/drivers/scsi/53c700.txt similarity index 100% rename from Documentation/scsi/53c700.txt rename to Documentation/drivers/scsi/53c700.txt diff --git a/Documentation/scsi/BusLogic.txt b/Documentation/drivers/scsi/BusLogic.txt similarity index 100% rename from Documentation/scsi/BusLogic.txt rename to Documentation/drivers/scsi/BusLogic.txt diff --git a/Documentation/scsi/ChangeLog.arcmsr b/Documentation/drivers/scsi/ChangeLog.arcmsr similarity index 100% rename from Documentation/scsi/ChangeLog.arcmsr rename to Documentation/drivers/scsi/ChangeLog.arcmsr diff --git a/Documentation/scsi/ChangeLog.ips b/Documentation/drivers/scsi/ChangeLog.ips similarity index 100% rename from Documentation/scsi/ChangeLog.ips rename to Documentation/drivers/scsi/ChangeLog.ips diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/drivers/scsi/ChangeLog.lpfc similarity index 100% rename from Documentation/scsi/ChangeLog.lpfc rename to Documentation/drivers/scsi/ChangeLog.lpfc diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/drivers/scsi/ChangeLog.megaraid similarity index 100% rename from Documentation/scsi/ChangeLog.megaraid rename to Documentation/drivers/scsi/ChangeLog.megaraid diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/drivers/scsi/ChangeLog.megaraid_sas similarity index 100% rename from Documentation/scsi/ChangeLog.megaraid_sas rename to Documentation/drivers/scsi/ChangeLog.megaraid_sas diff --git a/Documentation/scsi/ChangeLog.ncr53c8xx b/Documentation/drivers/scsi/ChangeLog.ncr53c8xx similarity index 100% rename from Documentation/scsi/ChangeLog.ncr53c8xx rename to Documentation/drivers/scsi/ChangeLog.ncr53c8xx diff --git a/Documentation/scsi/ChangeLog.sym53c8xx b/Documentation/drivers/scsi/ChangeLog.sym53c8xx similarity index 100% rename from Documentation/scsi/ChangeLog.sym53c8xx rename to Documentation/drivers/scsi/ChangeLog.sym53c8xx diff --git a/Documentation/scsi/ChangeLog.sym53c8xx_2 b/Documentation/drivers/scsi/ChangeLog.sym53c8xx_2 similarity index 100% rename from Documentation/scsi/ChangeLog.sym53c8xx_2 rename to Documentation/drivers/scsi/ChangeLog.sym53c8xx_2 diff --git a/Documentation/scsi/FlashPoint.txt b/Documentation/drivers/scsi/FlashPoint.txt similarity index 100% rename from Documentation/scsi/FlashPoint.txt rename to Documentation/drivers/scsi/FlashPoint.txt diff --git a/Documentation/scsi/LICENSE.FlashPoint b/Documentation/drivers/scsi/LICENSE.FlashPoint similarity index 100% rename from Documentation/scsi/LICENSE.FlashPoint rename to Documentation/drivers/scsi/LICENSE.FlashPoint diff --git a/Documentation/scsi/LICENSE.qla2xxx b/Documentation/drivers/scsi/LICENSE.qla2xxx similarity index 100% rename from Documentation/scsi/LICENSE.qla2xxx rename to Documentation/drivers/scsi/LICENSE.qla2xxx diff --git a/Documentation/scsi/LICENSE.qla4xxx b/Documentation/drivers/scsi/LICENSE.qla4xxx similarity index 100% rename from Documentation/scsi/LICENSE.qla4xxx rename to Documentation/drivers/scsi/LICENSE.qla4xxx diff --git a/Documentation/scsi/NinjaSCSI.txt b/Documentation/drivers/scsi/NinjaSCSI.txt similarity index 100% rename from Documentation/scsi/NinjaSCSI.txt rename to Documentation/drivers/scsi/NinjaSCSI.txt diff --git a/Documentation/scsi/aacraid.txt b/Documentation/drivers/scsi/aacraid.txt similarity index 100% rename from Documentation/scsi/aacraid.txt rename to Documentation/drivers/scsi/aacraid.txt diff --git a/Documentation/scsi/advansys.txt b/Documentation/drivers/scsi/advansys.txt similarity index 100% rename from Documentation/scsi/advansys.txt rename to Documentation/drivers/scsi/advansys.txt diff --git a/Documentation/scsi/aha152x.txt b/Documentation/drivers/scsi/aha152x.txt similarity index 100% rename from Documentation/scsi/aha152x.txt rename to Documentation/drivers/scsi/aha152x.txt diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/drivers/scsi/aic79xx.txt similarity index 100% rename from Documentation/scsi/aic79xx.txt rename to Documentation/drivers/scsi/aic79xx.txt diff --git a/Documentation/scsi/aic7xxx.txt b/Documentation/drivers/scsi/aic7xxx.txt similarity index 100% rename from Documentation/scsi/aic7xxx.txt rename to Documentation/drivers/scsi/aic7xxx.txt diff --git a/Documentation/scsi/arcmsr_spec.txt b/Documentation/drivers/scsi/arcmsr_spec.txt similarity index 100% rename from Documentation/scsi/arcmsr_spec.txt rename to Documentation/drivers/scsi/arcmsr_spec.txt diff --git a/Documentation/scsi/bfa.txt b/Documentation/drivers/scsi/bfa.txt similarity index 100% rename from Documentation/scsi/bfa.txt rename to Documentation/drivers/scsi/bfa.txt diff --git a/Documentation/scsi/bnx2fc.txt b/Documentation/drivers/scsi/bnx2fc.txt similarity index 100% rename from Documentation/scsi/bnx2fc.txt rename to Documentation/drivers/scsi/bnx2fc.txt diff --git a/Documentation/scsi/cxgb3i.txt b/Documentation/drivers/scsi/cxgb3i.txt similarity index 100% rename from Documentation/scsi/cxgb3i.txt rename to Documentation/drivers/scsi/cxgb3i.txt diff --git a/Documentation/scsi/dc395x.txt b/Documentation/drivers/scsi/dc395x.txt similarity index 100% rename from Documentation/scsi/dc395x.txt rename to Documentation/drivers/scsi/dc395x.txt diff --git a/Documentation/scsi/dpti.txt b/Documentation/drivers/scsi/dpti.txt similarity index 100% rename from Documentation/scsi/dpti.txt rename to Documentation/drivers/scsi/dpti.txt diff --git a/Documentation/scsi/g_NCR5380.txt b/Documentation/drivers/scsi/g_NCR5380.txt similarity index 100% rename from Documentation/scsi/g_NCR5380.txt rename to Documentation/drivers/scsi/g_NCR5380.txt diff --git a/Documentation/scsi/hpsa.txt b/Documentation/drivers/scsi/hpsa.txt similarity index 100% rename from Documentation/scsi/hpsa.txt rename to Documentation/drivers/scsi/hpsa.txt diff --git a/Documentation/scsi/hptiop.txt b/Documentation/drivers/scsi/hptiop.txt similarity index 100% rename from Documentation/scsi/hptiop.txt rename to Documentation/drivers/scsi/hptiop.txt diff --git a/Documentation/scsi/libsas.txt b/Documentation/drivers/scsi/libsas.txt similarity index 100% rename from Documentation/scsi/libsas.txt rename to Documentation/drivers/scsi/libsas.txt diff --git a/Documentation/scsi/link_power_management_policy.txt b/Documentation/drivers/scsi/link_power_management_policy.txt similarity index 100% rename from Documentation/scsi/link_power_management_policy.txt rename to Documentation/drivers/scsi/link_power_management_policy.txt diff --git a/Documentation/scsi/lpfc.txt b/Documentation/drivers/scsi/lpfc.txt similarity index 100% rename from Documentation/scsi/lpfc.txt rename to Documentation/drivers/scsi/lpfc.txt diff --git a/Documentation/scsi/megaraid.txt b/Documentation/drivers/scsi/megaraid.txt similarity index 100% rename from Documentation/scsi/megaraid.txt rename to Documentation/drivers/scsi/megaraid.txt diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/drivers/scsi/ncr53c8xx.txt similarity index 100% rename from Documentation/scsi/ncr53c8xx.txt rename to Documentation/drivers/scsi/ncr53c8xx.txt diff --git a/Documentation/scsi/osst.txt b/Documentation/drivers/scsi/osst.txt similarity index 100% rename from Documentation/scsi/osst.txt rename to Documentation/drivers/scsi/osst.txt diff --git a/Documentation/scsi/ppa.txt b/Documentation/drivers/scsi/ppa.txt similarity index 100% rename from Documentation/scsi/ppa.txt rename to Documentation/drivers/scsi/ppa.txt diff --git a/Documentation/scsi/qlogicfas.txt b/Documentation/drivers/scsi/qlogicfas.txt similarity index 100% rename from Documentation/scsi/qlogicfas.txt rename to Documentation/drivers/scsi/qlogicfas.txt diff --git a/Documentation/scsi/scsi-changer.txt b/Documentation/drivers/scsi/scsi-changer.txt similarity index 100% rename from Documentation/scsi/scsi-changer.txt rename to Documentation/drivers/scsi/scsi-changer.txt diff --git a/Documentation/scsi/scsi-generic.txt b/Documentation/drivers/scsi/scsi-generic.txt similarity index 100% rename from Documentation/scsi/scsi-generic.txt rename to Documentation/drivers/scsi/scsi-generic.txt diff --git a/Documentation/scsi/scsi-parameters.txt b/Documentation/drivers/scsi/scsi-parameters.txt similarity index 100% rename from Documentation/scsi/scsi-parameters.txt rename to Documentation/drivers/scsi/scsi-parameters.txt diff --git a/Documentation/scsi/scsi.txt b/Documentation/drivers/scsi/scsi.txt similarity index 100% rename from Documentation/scsi/scsi.txt rename to Documentation/drivers/scsi/scsi.txt diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/drivers/scsi/scsi_eh.txt similarity index 100% rename from Documentation/scsi/scsi_eh.txt rename to Documentation/drivers/scsi/scsi_eh.txt diff --git a/Documentation/scsi/scsi_fc_transport.txt b/Documentation/drivers/scsi/scsi_fc_transport.txt similarity index 100% rename from Documentation/scsi/scsi_fc_transport.txt rename to Documentation/drivers/scsi/scsi_fc_transport.txt diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/drivers/scsi/scsi_mid_low_api.txt similarity index 100% rename from Documentation/scsi/scsi_mid_low_api.txt rename to Documentation/drivers/scsi/scsi_mid_low_api.txt diff --git a/Documentation/scsi/scsi_transport_srp/Makefile b/Documentation/drivers/scsi/scsi_transport_srp/Makefile similarity index 100% rename from Documentation/scsi/scsi_transport_srp/Makefile rename to Documentation/drivers/scsi/scsi_transport_srp/Makefile diff --git a/Documentation/scsi/scsi_transport_srp/rport_state_diagram.dot b/Documentation/drivers/scsi/scsi_transport_srp/rport_state_diagram.dot similarity index 100% rename from Documentation/scsi/scsi_transport_srp/rport_state_diagram.dot rename to Documentation/drivers/scsi/scsi_transport_srp/rport_state_diagram.dot diff --git a/Documentation/scsi/sd-parameters.txt b/Documentation/drivers/scsi/sd-parameters.txt similarity index 100% rename from Documentation/scsi/sd-parameters.txt rename to Documentation/drivers/scsi/sd-parameters.txt diff --git a/Documentation/scsi/smartpqi.txt b/Documentation/drivers/scsi/smartpqi.txt similarity index 100% rename from Documentation/scsi/smartpqi.txt rename to Documentation/drivers/scsi/smartpqi.txt diff --git a/Documentation/scsi/st.txt b/Documentation/drivers/scsi/st.txt similarity index 100% rename from Documentation/scsi/st.txt rename to Documentation/drivers/scsi/st.txt diff --git a/Documentation/scsi/sym53c500_cs.txt b/Documentation/drivers/scsi/sym53c500_cs.txt similarity index 100% rename from Documentation/scsi/sym53c500_cs.txt rename to Documentation/drivers/scsi/sym53c500_cs.txt diff --git a/Documentation/scsi/sym53c8xx_2.txt b/Documentation/drivers/scsi/sym53c8xx_2.txt similarity index 100% rename from Documentation/scsi/sym53c8xx_2.txt rename to Documentation/drivers/scsi/sym53c8xx_2.txt diff --git a/Documentation/scsi/tcm_qla2xxx.txt b/Documentation/drivers/scsi/tcm_qla2xxx.txt similarity index 100% rename from Documentation/scsi/tcm_qla2xxx.txt rename to Documentation/drivers/scsi/tcm_qla2xxx.txt diff --git a/Documentation/scsi/ufs.txt b/Documentation/drivers/scsi/ufs.txt similarity index 100% rename from Documentation/scsi/ufs.txt rename to Documentation/drivers/scsi/ufs.txt diff --git a/Documentation/scsi/wd719x.txt b/Documentation/drivers/scsi/wd719x.txt similarity index 100% rename from Documentation/scsi/wd719x.txt rename to Documentation/drivers/scsi/wd719x.txt diff --git a/Documentation/serial/cyclades_z.rst b/Documentation/drivers/serial/cyclades_z.rst similarity index 100% rename from Documentation/serial/cyclades_z.rst rename to Documentation/drivers/serial/cyclades_z.rst diff --git a/Documentation/serial/driver.rst b/Documentation/drivers/serial/driver.rst similarity index 100% rename from Documentation/serial/driver.rst rename to Documentation/drivers/serial/driver.rst diff --git a/Documentation/serial/index.rst b/Documentation/drivers/serial/index.rst similarity index 100% rename from Documentation/serial/index.rst rename to Documentation/drivers/serial/index.rst diff --git a/Documentation/serial/moxa-smartio.rst b/Documentation/drivers/serial/moxa-smartio.rst similarity index 100% rename from Documentation/serial/moxa-smartio.rst rename to Documentation/drivers/serial/moxa-smartio.rst diff --git a/Documentation/serial/n_gsm.rst b/Documentation/drivers/serial/n_gsm.rst similarity index 100% rename from Documentation/serial/n_gsm.rst rename to Documentation/drivers/serial/n_gsm.rst diff --git a/Documentation/serial/rocket.rst b/Documentation/drivers/serial/rocket.rst similarity index 100% rename from Documentation/serial/rocket.rst rename to Documentation/drivers/serial/rocket.rst diff --git a/Documentation/serial/serial-iso7816.rst b/Documentation/drivers/serial/serial-iso7816.rst similarity index 100% rename from Documentation/serial/serial-iso7816.rst rename to Documentation/drivers/serial/serial-iso7816.rst diff --git a/Documentation/serial/serial-rs485.rst b/Documentation/drivers/serial/serial-rs485.rst similarity index 100% rename from Documentation/serial/serial-rs485.rst rename to Documentation/drivers/serial/serial-rs485.rst diff --git a/Documentation/serial/tty.rst b/Documentation/drivers/serial/tty.rst similarity index 100% rename from Documentation/serial/tty.rst rename to Documentation/drivers/serial/tty.rst diff --git a/Documentation/sound/alsa-configuration.rst b/Documentation/drivers/sound/alsa-configuration.rst similarity index 100% rename from Documentation/sound/alsa-configuration.rst rename to Documentation/drivers/sound/alsa-configuration.rst diff --git a/Documentation/sound/cards/audigy-mixer.rst b/Documentation/drivers/sound/cards/audigy-mixer.rst similarity index 100% rename from Documentation/sound/cards/audigy-mixer.rst rename to Documentation/drivers/sound/cards/audigy-mixer.rst diff --git a/Documentation/sound/cards/audiophile-usb.rst b/Documentation/drivers/sound/cards/audiophile-usb.rst similarity index 100% rename from Documentation/sound/cards/audiophile-usb.rst rename to Documentation/drivers/sound/cards/audiophile-usb.rst diff --git a/Documentation/sound/cards/bt87x.rst b/Documentation/drivers/sound/cards/bt87x.rst similarity index 100% rename from Documentation/sound/cards/bt87x.rst rename to Documentation/drivers/sound/cards/bt87x.rst diff --git a/Documentation/sound/cards/cmipci.rst b/Documentation/drivers/sound/cards/cmipci.rst similarity index 100% rename from Documentation/sound/cards/cmipci.rst rename to Documentation/drivers/sound/cards/cmipci.rst diff --git a/Documentation/sound/cards/emu10k1-jack.rst b/Documentation/drivers/sound/cards/emu10k1-jack.rst similarity index 100% rename from Documentation/sound/cards/emu10k1-jack.rst rename to Documentation/drivers/sound/cards/emu10k1-jack.rst diff --git a/Documentation/sound/cards/hdspm.rst b/Documentation/drivers/sound/cards/hdspm.rst similarity index 100% rename from Documentation/sound/cards/hdspm.rst rename to Documentation/drivers/sound/cards/hdspm.rst diff --git a/Documentation/sound/cards/img-spdif-in.rst b/Documentation/drivers/sound/cards/img-spdif-in.rst similarity index 100% rename from Documentation/sound/cards/img-spdif-in.rst rename to Documentation/drivers/sound/cards/img-spdif-in.rst diff --git a/Documentation/sound/cards/index.rst b/Documentation/drivers/sound/cards/index.rst similarity index 100% rename from Documentation/sound/cards/index.rst rename to Documentation/drivers/sound/cards/index.rst diff --git a/Documentation/sound/cards/joystick.rst b/Documentation/drivers/sound/cards/joystick.rst similarity index 100% rename from Documentation/sound/cards/joystick.rst rename to Documentation/drivers/sound/cards/joystick.rst diff --git a/Documentation/sound/cards/maya44.rst b/Documentation/drivers/sound/cards/maya44.rst similarity index 100% rename from Documentation/sound/cards/maya44.rst rename to Documentation/drivers/sound/cards/maya44.rst diff --git a/Documentation/sound/cards/mixart.rst b/Documentation/drivers/sound/cards/mixart.rst similarity index 100% rename from Documentation/sound/cards/mixart.rst rename to Documentation/drivers/sound/cards/mixart.rst diff --git a/Documentation/sound/cards/multisound.sh b/Documentation/drivers/sound/cards/multisound.sh similarity index 100% rename from Documentation/sound/cards/multisound.sh rename to Documentation/drivers/sound/cards/multisound.sh diff --git a/Documentation/sound/cards/sb-live-mixer.rst b/Documentation/drivers/sound/cards/sb-live-mixer.rst similarity index 100% rename from Documentation/sound/cards/sb-live-mixer.rst rename to Documentation/drivers/sound/cards/sb-live-mixer.rst diff --git a/Documentation/sound/cards/serial-u16550.rst b/Documentation/drivers/sound/cards/serial-u16550.rst similarity index 100% rename from Documentation/sound/cards/serial-u16550.rst rename to Documentation/drivers/sound/cards/serial-u16550.rst diff --git a/Documentation/sound/cards/via82xx-mixer.rst b/Documentation/drivers/sound/cards/via82xx-mixer.rst similarity index 100% rename from Documentation/sound/cards/via82xx-mixer.rst rename to Documentation/drivers/sound/cards/via82xx-mixer.rst diff --git a/Documentation/sound/conf.py b/Documentation/drivers/sound/conf.py similarity index 100% rename from Documentation/sound/conf.py rename to Documentation/drivers/sound/conf.py diff --git a/Documentation/sound/designs/channel-mapping-api.rst b/Documentation/drivers/sound/designs/channel-mapping-api.rst similarity index 100% rename from Documentation/sound/designs/channel-mapping-api.rst rename to Documentation/drivers/sound/designs/channel-mapping-api.rst diff --git a/Documentation/sound/designs/compress-offload.rst b/Documentation/drivers/sound/designs/compress-offload.rst similarity index 100% rename from Documentation/sound/designs/compress-offload.rst rename to Documentation/drivers/sound/designs/compress-offload.rst diff --git a/Documentation/sound/designs/control-names.rst b/Documentation/drivers/sound/designs/control-names.rst similarity index 100% rename from Documentation/sound/designs/control-names.rst rename to Documentation/drivers/sound/designs/control-names.rst diff --git a/Documentation/sound/designs/index.rst b/Documentation/drivers/sound/designs/index.rst similarity index 100% rename from Documentation/sound/designs/index.rst rename to Documentation/drivers/sound/designs/index.rst diff --git a/Documentation/sound/designs/jack-controls.rst b/Documentation/drivers/sound/designs/jack-controls.rst similarity index 100% rename from Documentation/sound/designs/jack-controls.rst rename to Documentation/drivers/sound/designs/jack-controls.rst diff --git a/Documentation/sound/designs/oss-emulation.rst b/Documentation/drivers/sound/designs/oss-emulation.rst similarity index 100% rename from Documentation/sound/designs/oss-emulation.rst rename to Documentation/drivers/sound/designs/oss-emulation.rst diff --git a/Documentation/sound/designs/powersave.rst b/Documentation/drivers/sound/designs/powersave.rst similarity index 100% rename from Documentation/sound/designs/powersave.rst rename to Documentation/drivers/sound/designs/powersave.rst diff --git a/Documentation/sound/designs/procfile.rst b/Documentation/drivers/sound/designs/procfile.rst similarity index 100% rename from Documentation/sound/designs/procfile.rst rename to Documentation/drivers/sound/designs/procfile.rst diff --git a/Documentation/sound/designs/seq-oss.rst b/Documentation/drivers/sound/designs/seq-oss.rst similarity index 100% rename from Documentation/sound/designs/seq-oss.rst rename to Documentation/drivers/sound/designs/seq-oss.rst diff --git a/Documentation/sound/designs/timestamping.rst b/Documentation/drivers/sound/designs/timestamping.rst similarity index 100% rename from Documentation/sound/designs/timestamping.rst rename to Documentation/drivers/sound/designs/timestamping.rst diff --git a/Documentation/sound/designs/tracepoints.rst b/Documentation/drivers/sound/designs/tracepoints.rst similarity index 100% rename from Documentation/sound/designs/tracepoints.rst rename to Documentation/drivers/sound/designs/tracepoints.rst diff --git a/Documentation/sound/hd-audio/controls.rst b/Documentation/drivers/sound/hd-audio/controls.rst similarity index 100% rename from Documentation/sound/hd-audio/controls.rst rename to Documentation/drivers/sound/hd-audio/controls.rst diff --git a/Documentation/sound/hd-audio/dp-mst.rst b/Documentation/drivers/sound/hd-audio/dp-mst.rst similarity index 100% rename from Documentation/sound/hd-audio/dp-mst.rst rename to Documentation/drivers/sound/hd-audio/dp-mst.rst diff --git a/Documentation/sound/hd-audio/index.rst b/Documentation/drivers/sound/hd-audio/index.rst similarity index 100% rename from Documentation/sound/hd-audio/index.rst rename to Documentation/drivers/sound/hd-audio/index.rst diff --git a/Documentation/sound/hd-audio/models.rst b/Documentation/drivers/sound/hd-audio/models.rst similarity index 100% rename from Documentation/sound/hd-audio/models.rst rename to Documentation/drivers/sound/hd-audio/models.rst diff --git a/Documentation/sound/hd-audio/notes.rst b/Documentation/drivers/sound/hd-audio/notes.rst similarity index 100% rename from Documentation/sound/hd-audio/notes.rst rename to Documentation/drivers/sound/hd-audio/notes.rst diff --git a/Documentation/sound/index.rst b/Documentation/drivers/sound/index.rst similarity index 100% rename from Documentation/sound/index.rst rename to Documentation/drivers/sound/index.rst diff --git a/Documentation/sound/kernel-api/alsa-driver-api.rst b/Documentation/drivers/sound/kernel-api/alsa-driver-api.rst similarity index 100% rename from Documentation/sound/kernel-api/alsa-driver-api.rst rename to Documentation/drivers/sound/kernel-api/alsa-driver-api.rst diff --git a/Documentation/sound/kernel-api/index.rst b/Documentation/drivers/sound/kernel-api/index.rst similarity index 100% rename from Documentation/sound/kernel-api/index.rst rename to Documentation/drivers/sound/kernel-api/index.rst diff --git a/Documentation/sound/kernel-api/writing-an-alsa-driver.rst b/Documentation/drivers/sound/kernel-api/writing-an-alsa-driver.rst similarity index 100% rename from Documentation/sound/kernel-api/writing-an-alsa-driver.rst rename to Documentation/drivers/sound/kernel-api/writing-an-alsa-driver.rst diff --git a/Documentation/sound/soc/clocking.rst b/Documentation/drivers/sound/soc/clocking.rst similarity index 100% rename from Documentation/sound/soc/clocking.rst rename to Documentation/drivers/sound/soc/clocking.rst diff --git a/Documentation/sound/soc/codec-to-codec.rst b/Documentation/drivers/sound/soc/codec-to-codec.rst similarity index 100% rename from Documentation/sound/soc/codec-to-codec.rst rename to Documentation/drivers/sound/soc/codec-to-codec.rst diff --git a/Documentation/sound/soc/codec.rst b/Documentation/drivers/sound/soc/codec.rst similarity index 100% rename from Documentation/sound/soc/codec.rst rename to Documentation/drivers/sound/soc/codec.rst diff --git a/Documentation/sound/soc/dai.rst b/Documentation/drivers/sound/soc/dai.rst similarity index 100% rename from Documentation/sound/soc/dai.rst rename to Documentation/drivers/sound/soc/dai.rst diff --git a/Documentation/sound/soc/dapm.rst b/Documentation/drivers/sound/soc/dapm.rst similarity index 100% rename from Documentation/sound/soc/dapm.rst rename to Documentation/drivers/sound/soc/dapm.rst diff --git a/Documentation/sound/soc/dpcm.rst b/Documentation/drivers/sound/soc/dpcm.rst similarity index 100% rename from Documentation/sound/soc/dpcm.rst rename to Documentation/drivers/sound/soc/dpcm.rst diff --git a/Documentation/sound/soc/index.rst b/Documentation/drivers/sound/soc/index.rst similarity index 100% rename from Documentation/sound/soc/index.rst rename to Documentation/drivers/sound/soc/index.rst diff --git a/Documentation/sound/soc/jack.rst b/Documentation/drivers/sound/soc/jack.rst similarity index 100% rename from Documentation/sound/soc/jack.rst rename to Documentation/drivers/sound/soc/jack.rst diff --git a/Documentation/sound/soc/machine.rst b/Documentation/drivers/sound/soc/machine.rst similarity index 100% rename from Documentation/sound/soc/machine.rst rename to Documentation/drivers/sound/soc/machine.rst diff --git a/Documentation/sound/soc/overview.rst b/Documentation/drivers/sound/soc/overview.rst similarity index 100% rename from Documentation/sound/soc/overview.rst rename to Documentation/drivers/sound/soc/overview.rst diff --git a/Documentation/sound/soc/platform.rst b/Documentation/drivers/sound/soc/platform.rst similarity index 100% rename from Documentation/sound/soc/platform.rst rename to Documentation/drivers/sound/soc/platform.rst diff --git a/Documentation/sound/soc/pops-clicks.rst b/Documentation/drivers/sound/soc/pops-clicks.rst similarity index 100% rename from Documentation/sound/soc/pops-clicks.rst rename to Documentation/drivers/sound/soc/pops-clicks.rst diff --git a/Documentation/usb/CREDITS b/Documentation/drivers/usb/CREDITS similarity index 100% rename from Documentation/usb/CREDITS rename to Documentation/drivers/usb/CREDITS diff --git a/Documentation/usb/WUSB-Design-overview.txt b/Documentation/drivers/usb/WUSB-Design-overview.txt similarity index 100% rename from Documentation/usb/WUSB-Design-overview.txt rename to Documentation/drivers/usb/WUSB-Design-overview.txt diff --git a/Documentation/usb/acm.txt b/Documentation/drivers/usb/acm.txt similarity index 100% rename from Documentation/usb/acm.txt rename to Documentation/drivers/usb/acm.txt diff --git a/Documentation/usb/authorization.txt b/Documentation/drivers/usb/authorization.txt similarity index 100% rename from Documentation/usb/authorization.txt rename to Documentation/drivers/usb/authorization.txt diff --git a/Documentation/usb/chipidea.txt b/Documentation/drivers/usb/chipidea.txt similarity index 100% rename from Documentation/usb/chipidea.txt rename to Documentation/drivers/usb/chipidea.txt diff --git a/Documentation/usb/dwc3.txt b/Documentation/drivers/usb/dwc3.txt similarity index 100% rename from Documentation/usb/dwc3.txt rename to Documentation/drivers/usb/dwc3.txt diff --git a/Documentation/usb/ehci.txt b/Documentation/drivers/usb/ehci.txt similarity index 100% rename from Documentation/usb/ehci.txt rename to Documentation/drivers/usb/ehci.txt diff --git a/Documentation/usb/functionfs.txt b/Documentation/drivers/usb/functionfs.txt similarity index 100% rename from Documentation/usb/functionfs.txt rename to Documentation/drivers/usb/functionfs.txt diff --git a/Documentation/usb/gadget-testing.txt b/Documentation/drivers/usb/gadget-testing.txt similarity index 100% rename from Documentation/usb/gadget-testing.txt rename to Documentation/drivers/usb/gadget-testing.txt diff --git a/Documentation/usb/gadget_configfs.txt b/Documentation/drivers/usb/gadget_configfs.txt similarity index 100% rename from Documentation/usb/gadget_configfs.txt rename to Documentation/drivers/usb/gadget_configfs.txt diff --git a/Documentation/usb/gadget_hid.txt b/Documentation/drivers/usb/gadget_hid.txt similarity index 100% rename from Documentation/usb/gadget_hid.txt rename to Documentation/drivers/usb/gadget_hid.txt diff --git a/Documentation/usb/gadget_multi.txt b/Documentation/drivers/usb/gadget_multi.txt similarity index 100% rename from Documentation/usb/gadget_multi.txt rename to Documentation/drivers/usb/gadget_multi.txt diff --git a/Documentation/usb/gadget_printer.txt b/Documentation/drivers/usb/gadget_printer.txt similarity index 100% rename from Documentation/usb/gadget_printer.txt rename to Documentation/drivers/usb/gadget_printer.txt diff --git a/Documentation/usb/gadget_serial.txt b/Documentation/drivers/usb/gadget_serial.txt similarity index 100% rename from Documentation/usb/gadget_serial.txt rename to Documentation/drivers/usb/gadget_serial.txt diff --git a/Documentation/usb/iuu_phoenix.txt b/Documentation/drivers/usb/iuu_phoenix.txt similarity index 100% rename from Documentation/usb/iuu_phoenix.txt rename to Documentation/drivers/usb/iuu_phoenix.txt diff --git a/Documentation/usb/linux-cdc-acm.inf b/Documentation/drivers/usb/linux-cdc-acm.inf similarity index 100% rename from Documentation/usb/linux-cdc-acm.inf rename to Documentation/drivers/usb/linux-cdc-acm.inf diff --git a/Documentation/usb/linux.inf b/Documentation/drivers/usb/linux.inf similarity index 100% rename from Documentation/usb/linux.inf rename to Documentation/drivers/usb/linux.inf diff --git a/Documentation/usb/mass-storage.txt b/Documentation/drivers/usb/mass-storage.txt similarity index 100% rename from Documentation/usb/mass-storage.txt rename to Documentation/drivers/usb/mass-storage.txt diff --git a/Documentation/usb/misc_usbsevseg.txt b/Documentation/drivers/usb/misc_usbsevseg.txt similarity index 100% rename from Documentation/usb/misc_usbsevseg.txt rename to Documentation/drivers/usb/misc_usbsevseg.txt diff --git a/Documentation/usb/mtouchusb.txt b/Documentation/drivers/usb/mtouchusb.txt similarity index 100% rename from Documentation/usb/mtouchusb.txt rename to Documentation/drivers/usb/mtouchusb.txt diff --git a/Documentation/usb/ohci.txt b/Documentation/drivers/usb/ohci.txt similarity index 100% rename from Documentation/usb/ohci.txt rename to Documentation/drivers/usb/ohci.txt diff --git a/Documentation/usb/rio.txt b/Documentation/drivers/usb/rio.txt similarity index 100% rename from Documentation/usb/rio.txt rename to Documentation/drivers/usb/rio.txt diff --git a/Documentation/usb/usb-help.txt b/Documentation/drivers/usb/usb-help.txt similarity index 100% rename from Documentation/usb/usb-help.txt rename to Documentation/drivers/usb/usb-help.txt diff --git a/Documentation/usb/usb-serial.txt b/Documentation/drivers/usb/usb-serial.txt similarity index 100% rename from Documentation/usb/usb-serial.txt rename to Documentation/drivers/usb/usb-serial.txt diff --git a/Documentation/usb/usbdevfs-drop-permissions.c b/Documentation/drivers/usb/usbdevfs-drop-permissions.c similarity index 100% rename from Documentation/usb/usbdevfs-drop-permissions.c rename to Documentation/drivers/usb/usbdevfs-drop-permissions.c diff --git a/Documentation/usb/usbip_protocol.txt b/Documentation/drivers/usb/usbip_protocol.txt similarity index 100% rename from Documentation/usb/usbip_protocol.txt rename to Documentation/drivers/usb/usbip_protocol.txt diff --git a/Documentation/usb/usbmon.txt b/Documentation/drivers/usb/usbmon.txt similarity index 100% rename from Documentation/usb/usbmon.txt rename to Documentation/drivers/usb/usbmon.txt diff --git a/Documentation/usb/wusb-cbaf b/Documentation/drivers/usb/wusb-cbaf similarity index 100% rename from Documentation/usb/wusb-cbaf rename to Documentation/drivers/usb/wusb-cbaf diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.rst b/Documentation/drivers/watchdog/convert_drivers_to_kernel_api.rst similarity index 100% rename from Documentation/watchdog/convert_drivers_to_kernel_api.rst rename to Documentation/drivers/watchdog/convert_drivers_to_kernel_api.rst diff --git a/Documentation/watchdog/hpwdt.rst b/Documentation/drivers/watchdog/hpwdt.rst similarity index 100% rename from Documentation/watchdog/hpwdt.rst rename to Documentation/drivers/watchdog/hpwdt.rst diff --git a/Documentation/watchdog/index.rst b/Documentation/drivers/watchdog/index.rst similarity index 100% rename from Documentation/watchdog/index.rst rename to Documentation/drivers/watchdog/index.rst diff --git a/Documentation/watchdog/mlx-wdt.rst b/Documentation/drivers/watchdog/mlx-wdt.rst similarity index 100% rename from Documentation/watchdog/mlx-wdt.rst rename to Documentation/drivers/watchdog/mlx-wdt.rst diff --git a/Documentation/watchdog/pcwd-watchdog.rst b/Documentation/drivers/watchdog/pcwd-watchdog.rst similarity index 100% rename from Documentation/watchdog/pcwd-watchdog.rst rename to Documentation/drivers/watchdog/pcwd-watchdog.rst diff --git a/Documentation/watchdog/watchdog-api.rst b/Documentation/drivers/watchdog/watchdog-api.rst similarity index 100% rename from Documentation/watchdog/watchdog-api.rst rename to Documentation/drivers/watchdog/watchdog-api.rst diff --git a/Documentation/watchdog/watchdog-kernel-api.rst b/Documentation/drivers/watchdog/watchdog-kernel-api.rst similarity index 100% rename from Documentation/watchdog/watchdog-kernel-api.rst rename to Documentation/drivers/watchdog/watchdog-kernel-api.rst diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/drivers/watchdog/watchdog-parameters.rst similarity index 100% rename from Documentation/watchdog/watchdog-parameters.rst rename to Documentation/drivers/watchdog/watchdog-parameters.rst diff --git a/Documentation/watchdog/watchdog-pm.rst b/Documentation/drivers/watchdog/watchdog-pm.rst similarity index 100% rename from Documentation/watchdog/watchdog-pm.rst rename to Documentation/drivers/watchdog/watchdog-pm.rst diff --git a/Documentation/watchdog/wdt.rst b/Documentation/drivers/watchdog/wdt.rst similarity index 100% rename from Documentation/watchdog/wdt.rst rename to Documentation/drivers/watchdog/wdt.rst -- 2.19.1.856.g8858448bb

1 1

[alsa-devel] [PATCH 0/2] ALSA: AMD and Nvidia HD-audio component notifier support
by Takashi Iwai 18 Jul '19

18 Jul '19

Hi, this is a revival of my old patchset for adding the support of drm audio component for AMD and Nvidia HDMI codecs. This is only HD-audio side, and we need the support in DRM side as well, but it's a step forward to the better HDMI hotplug handling. I'm going to submit the radeon and nouveau patches later once after merging this for 5.4 kernel. The first patch is somewhat new, a sort of optimization. The second patch has been slightly rewritten frm the previous version and the support for Nvidia was added as well. Lightly tested on a Dell desktop with Nvidia graphics. Takashi === Takashi Iwai (2): ALSA: hda/hdmi - Don't report spurious jack state changes ALSA: hda/hdmi - Allow audio component for AMD/ATI and Nvidia HDMI sound/pci/hda/patch_hdmi.c | 265 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 229 insertions(+), 36 deletions(-) -- 2.16.4

2 4

[alsa-devel] [PATCH] ALSA: hda - Optimize resume for codecs without jack detection
by Takashi Iwai 18 Jul '19

18 Jul '19

The codecs without jack detection also don't have to be resumed forcibly because, obviously, they have no jack. Skip the forced resume in such a case as optimization as well. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index e30e86ca6b72..51f10ed9bc43 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2942,7 +2942,7 @@ static int hda_codec_runtime_resume(struct device *dev) static int hda_codec_force_resume(struct device *dev) { struct hda_codec *codec = dev_to_hda_codec(dev); - bool forced_resume = !codec->relaxed_resume; + bool forced_resume = !codec->relaxed_resume && codec->jacktbl.used; int ret; /* The get/put pair below enforces the runtime resume even if the -- 2.16.4

2 1

[alsa-devel] [PATCH] ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1
by Kai-Heng Feng 18 Jul '19

18 Jul '19

Commit 7b9584fa1c0b ("staging: line6: Move altsetting to properties") set a wrong altsetting for LINE6_PODHD500_1 during refactoring. Set the correct altsetting number to fix the issue. BugLink: https://bugs.launchpad.net/bugs/1790595 Fixes: 7b9584fa1c0b ("staging: line6: Move altsetting to properties") Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/usb/line6/podhd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index f0662bd4e50f..27bf61c177c0 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -368,7 +368,7 @@ static const struct line6_properties podhd_properties_table[] = { .name = "POD HD500", .capabilities = LINE6_CAP_PCM | LINE6_CAP_HWMON, - .altsetting = 1, + .altsetting = 0, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, .ep_audio_r = 0x86, -- 2.17.1

2 1

[alsa-devel] [PATCH] ASoC: samsung: odroid: Use common code in odroid_audio_probe()
by Markus Elfring 18 Jul '19

18 Jul '19

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Thu, 18 Jul 2019 11:42:29 +0200 Replace a function call and a return statement by a goto statement so that a bit of common code will be reused at the end of this function. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/samsung/odroid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index f0f5fa9c27d3..d152ef8dfea3 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -316,8 +316,7 @@ static int odroid_audio_probe(struct platform_device *pdev) } of_node_put(cpu_dai); - of_node_put(codec); - return 0; + goto err_put_node; err_put_clk_i2s: clk_put(priv->clk_i2s_bus); -- 2.22.0

2 1

[alsa-devel] [PATCH v2 1/2] ASoC: SOF: add flag for position update ipc
by Keyon Jie 18 Jul '19

18 Jul '19

From: Marcin Rajwa <marcin.rajwa(a)linux.intel.com> In some cases, FW might need use the host_period_bytes even no position update ipc reqiured from driver, here add another flag for position update, and preserve host_period_bytes for FW to use. This might require corresponding FW change and ABI alignment. Signed-off-by: Marcin Rajwa <marcin.rajwa(a)linux.intel.com> Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- include/sound/sof/stream.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/sof/stream.h b/include/sound/sof/stream.h index 643f175cb479..44acfa62fa69 100644 --- a/include/sound/sof/stream.h +++ b/include/sound/sof/stream.h @@ -83,10 +83,10 @@ struct sof_ipc_stream_params { uint16_t sample_valid_bytes; uint16_t sample_container_bytes; - /* for notifying host period has completed - 0 means no period IRQ */ uint32_t host_period_bytes; + uint16_t no_period_irq; /* 1 means period IRQ mode OFF */ - uint32_t reserved[2]; + uint16_t reserved[3]; uint16_t chmap[SOF_IPC_MAX_CHANNELS]; /**< channel map - SOF_CHMAP_ */ } __packed; -- 2.20.1

4 8

[alsa-devel] [PATCH v4 0/6] VAG power control improvement for sgtl5000 codec
by Oleksandr Suvorov 18 Jul '19

18 Jul '19

VAG power control is improved to fit the manual [1]. This patchset fixes as minimum one bug: if customer muxes Headphone to Line-In right after boot, the VAG power remains off that leads to poor sound quality from line-in. I.e. after boot: - Connect sound source to Line-In jack; - Connect headphone to HP jack; - Run following commands: $ amixer set 'Headphone' 80% $ amixer set 'Headphone Mux' LINE_IN Also this series includes fixes of non-important bugs in sgtl5000 codec driver. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Changes in v4: - CC the patch to kernel-stable - Code optimization, simplify function signature (thanks to Cezary Rojewski <cezary.rojewski(a)intel.com> for an idea) - CC the patch to kernel-stable - Add a Fixes tag Changes in v3: - Add the reference to NXP SGTL5000 data sheet to commit message - Add the reference to NXP SGTL5000 data sheet to commit message - Fix multi-line comment format Changes in v2: - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting Oleksandr Suvorov (6): ASoC: Define a set of DAPM pre/post-up events ASoC: sgtl5000: Improve VAG power and mute control ASoC: sgtl5000: Fix definition of VAG Ramp Control ASoC: sgtl5000: add ADC mute control ASoC: sgtl5000: Fix of unmute outputs on probe ASoC: sgtl5000: Fix charge pump source assignment include/sound/soc-dapm.h | 2 + sound/soc/codecs/sgtl5000.c | 240 ++++++++++++++++++++++++++++++------ sound/soc/codecs/sgtl5000.h | 2 +- 3 files changed, 203 insertions(+), 41 deletions(-) -- 2.20.1

3 13

[alsa-devel] Is there a way to support TX master mode and RX slave mode?
by S.j. Wang 17 Jul '19

17 Jul '19

Hi Experts Is there a way to support TX master mode but RX slave mode? It seems current .set_fmt only set same mode for TX and RX. Best regards Wang shengjiu

3 2

[alsa-devel] [PATCH v3 0/6] VAG power control improvement for sgtl5000 codec
by Oleksandr Suvorov 17 Jul '19

17 Jul '19

VAG power control is improved to fit the manual [1]. This patchset fixes as minimum one bug: if customer muxes Headphone to Line-In right after boot, the VAG power remains off that leads to poor sound quality from line-in. I.e. after boot: - Connect sound source to Line-In jack; - Connect headphone to HP jack; - Run following commands: $ amixer set 'Headphone' 80% $ amixer set 'Headphone Mux' LINE_IN Also this series includes fixes of non-important bugs in sgtl5000 codec driver. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Changes in v3: - Add the reference to NXP SGTL5000 data sheet to commit message - Fix multi-line comment format - Add the reference to NXP SGTL5000 data sheet to commit message Changes in v2: - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting - Fix patch formatting Oleksandr Suvorov (6): ASoC: sgtl5000: Fix definition of VAG Ramp Control ASoC: sgtl5000: add ADC mute control ASoC: sgtl5000: Fix of unmute outputs on probe ASoC: sgtl5000: Fix charge pump source assignment ASoC: Define a set of DAPM pre/post-up events ASoC: sgtl5000: Improve VAG power and mute control include/sound/soc-dapm.h | 2 + sound/soc/codecs/sgtl5000.c | 251 ++++++++++++++++++++++++++++++------ sound/soc/codecs/sgtl5000.h | 2 +- 3 files changed, 213 insertions(+), 42 deletions(-) -- 2.20.1

3 10

[alsa-devel] [PATCH] ASoC: Intel: Atom: read timestamp moved to period_elapsed
by Alex Levin 17 Jul '19

17 Jul '19

sst_platform_pcm_pointer is called from both snd_pcm_period_elapsed and from snd_pcm_ioctl. Calling read timestamp results in recalculating pcm_delay and buffer_ptr (sst_calc_tstamp) which consumes buffers in a faster rate than intended. In a tested BSW system with chtrt5650, for a rate of 48000, the measured rate was sometimes 10 times more than that. After moving the timestamp read to period elapsed, buffer consumption is as expected. Signed-off-by: Alex Levin <levinale(a)chromium.org> --- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 0e8b1c5eec88..196af0b30b41 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -265,16 +265,28 @@ static void sst_period_elapsed(void *arg) { struct snd_pcm_substream *substream = arg; struct sst_runtime_stream *stream; - int status; + struct snd_soc_pcm_runtime *rtd; + int status, ret_val; if (!substream || !substream->runtime) return; stream = substream->runtime->private_data; if (!stream) return; + + rtd = substream->private_data; + if (!rtd) + return; + status = sst_get_stream_status(stream); if (status != SST_PLATFORM_RUNNING) return; + + ret_val = stream->ops->stream_read_tstamp(sst->dev, &stream->stream_info); + if (ret_val) { + dev_err(rtd->dev, "stream_read_tstamp err code = %d\n", ret_val); + return; + } snd_pcm_period_elapsed(substream); } @@ -658,20 +670,15 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer (struct snd_pcm_substream *substream) { struct sst_runtime_stream *stream; - int ret_val, status; + int status; struct pcm_stream_info *str_info; - struct snd_soc_pcm_runtime *rtd = substream->private_data; stream = substream->runtime->private_data; status = sst_get_stream_status(stream); if (status == SST_PLATFORM_INIT) return 0; + str_info = &stream->stream_info; - ret_val = stream->ops->stream_read_tstamp(sst->dev, str_info); - if (ret_val) { - dev_err(rtd->dev, "sst: error code = %d\n", ret_val); - return ret_val; - } substream->runtime->delay = str_info->pcm_delay; return str_info->buffer_ptr; } -- 2.22.0.410.gd8fdbe21b5-goog

4 3

[alsa-devel] [PATCH v4 0/5] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 17 Jul '19

17 Jul '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. Changes from v3 to v4: - hdmi-codec.h: Modify the hook_plugged_cb ops to take an additional argument, that is, the pointer to struct device for codec device. - dw-hdmi-i2s-audio.c: Simplify the registration of callback so it uses dw_hdmi_set_plugged_cb exported by dw-hdmi.c. - dw-hdmi.c: Simplify the flow to invoke callback since now dw_hdmi has a pointer to codec device as callback argument. There is no need to rely on driver data of other driver. - dw-hdmi.c: Minor change for readability. - synopsys/Kconfig: Fix the dependency of hdmi-codec in Kconfig. - Fixed the incorrect FROMLIST title of patch 5/5. Cheng-Yi Chiang (5): ASoC: hdmi-codec: Add an op to set callback function for plug event drm: bridge: dw-hdmi: Report connector status using callback drm: dw-hdmi-i2s: Use fixed id for codec device ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip_max98090: Add HDMI jack support drivers/gpu/drm/bridge/synopsys/Kconfig | 2 +- .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 13 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 ++++++- include/drm/bridge/dw_hdmi.h | 4 + include/sound/hdmi-codec.h | 17 +++ sound/soc/codecs/hdmi-codec.c | 46 +++++++ sound/soc/rockchip/Kconfig | 3 +- sound/soc/rockchip/rk3288_hdmi_analog.c | 3 +- sound/soc/rockchip/rockchip_max98090.c | 116 ++++++++++++++---- 9 files changed, 217 insertions(+), 28 deletions(-) -- 2.22.0.510.g264f2c817a-goog

2 11

[alsa-devel] [PATCH] ALSA: hda/realtek: apply ALC891 headset fixup to one Dell machine
by Hui Wang 17 Jul '19

17 Jul '19

Without this patch, the headset-mic and headphone-mic don't work. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1c84c12b39b3..de224cbea7a0 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8803,6 +8803,11 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { {0x18, 0x01a19030}, {0x1a, 0x01813040}, {0x21, 0x01014020}), + SND_HDA_PIN_QUIRK(0x10ec0867, 0x1028, "Dell", ALC891_FIXUP_DELL_MIC_NO_PRESENCE, + {0x16, 0x01813030}, + {0x17, 0x02211010}, + {0x18, 0x01a19040}, + {0x21, 0x01014020}), SND_HDA_PIN_QUIRK(0x10ec0662, 0x1028, "Dell", ALC662_FIXUP_DELL_MIC_NO_PRESENCE, {0x14, 0x01014010}, {0x18, 0x01a19020}, -- 2.17.1

3 2

[alsa-devel] [PATCH 0/2] ASoC: samsung: odroid: fix err handling of odroid_audio_probe
by Wen Yang 16 Jul '19

16 Jul '19

We developed a coccinelle SmPL to detect sound/soc/samsung/odroid.c and found some use-after-free problems. This patch series fixes those problems. Wen Yang (2): ASoC: samsung: odroid: fix an use-after-free issue for codec ASoC: samsung: odroid: fix a double-free issue for cpu_dai sound/soc/samsung/odroid.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Cc: Krzysztof Kozlowski <krzk(a)kernel.org> Cc: Sangbeom Kim <sbkim73(a)samsung.com> Cc: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org -- 2.9.5

5 12

[alsa-devel] [PATCH] ASoC: Intel: bytcht_es8316: Add quirk for Irbis NB41 netbook
by Hans de Goede 16 Jul '19

16 Jul '19

The Irbis NB41 netbook has its internal mic on IN2, inverted jack-detect and stereo speakers, add a quirk for this. Cc: russianneuromancer(a)ya.ru Reported-and-tested-by: russianneuromancer(a)ya.ru Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/boards/bytcht_es8316.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 2fe1ce879123..c360ebc3ccc7 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -436,6 +436,14 @@ static const struct acpi_gpio_mapping byt_cht_es8316_gpios[] = { /* Please keep this list alphabetically sorted */ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { + { /* Irbis NB41 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IRBIS"), + DMI_MATCH(DMI_PRODUCT_NAME, "NB41"), + }, + .driver_data = (void *)(BYT_CHT_ES8316_INTMIC_IN2_MAP + | BYT_CHT_ES8316_JD_INVERTED), + }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), -- 2.21.0

2 1

[alsa-devel] [PATCH 1/2] ALSA: hda/hdmi - Remove duplicated define
by Takashi Iwai 16 Jul '19

16 Jul '19

INTEL_GET_VENDOR_VERB is defined twice identically. Let's remove a superfluous line. Fixes: b0d8bc50b9f2 ("ALSA: hda: hdmi - add Icelake support") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 40323d91f9e4..1e6c489bca15 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2416,7 +2416,6 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec, snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); } -#define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_SET_VENDOR_VERB 0x781 #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */ -- 2.16.4

2 4

[alsa-devel] [PATCH v2] ALSA: hda/hdmi - Fix i915 reverse port/pin mapping
by Takashi Iwai 16 Jul '19

16 Jul '19

The recent fix for Icelake HDMI codec introduced the mapping from pin NID to the i915 gfx port number. However, it forgot the reverse mapping from the port number to the pin NID that is used in the ELD notifier callback. As a result, it's processed to a wrong widget and gives a warning like snd_hda_codec_hdmi hdaudioC0D2: HDMI: pin nid 5 not registered This patch corrects it with a proper reverse mapping function. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204133 Fixes: b0d8bc50b9f2 ("ALSA: hda: hdmi - add Icelake support") Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- v1->v2: Add missing error check from intel_port2pin() sound/pci/hda/patch_hdmi.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 1e6c489bca15..0b2a26e2c5f1 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2524,18 +2524,32 @@ static int intel_pin2port(void *audio_ptr, int pin_nid) return -1; } +static int intel_port2pin(struct hda_codec *codec, int port) +{ + struct hdmi_spec *spec = codec->spec; + + if (!spec->port_num) { + /* we assume only from port-B to port-D */ + if (port < 1 || port > 3) + return 0; + /* intel port is 1-based */ + return port + intel_base_nid(codec) - 1; + } + + if (port < 1 || port > spec->port_num) + return 0; + return spec->port_map[port - 1]; +} + static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe) { struct hda_codec *codec = audio_ptr; int pin_nid; int dev_id = pipe; - /* we assume only from port-B to port-D */ - if (port < 1 || port > 3) + pin_nid = intel_port2pin(codec, port); + if (!pin_nid) return; - - pin_nid = port + intel_base_nid(codec) - 1; /* intel port is 1-based */ - /* skip notification during system suspend (but not in runtime PM); * the state will be updated at resume */ -- 2.16.4

1 0

[alsa-devel] [PATCH 00/14] pending doc patches for 5.3-rc
by Mauro Carvalho Chehab 16 Jul '19

16 Jul '19

Those are the pending documentation patches after my pull request for this branch: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git tags/docs/v5.3-1 Patches 1 to 13 were already submitted, but got rebased. Patch 14 is a new fixup one. Patches 1 and 2 weren't submitted before due to merge conflicts that are now solved upstream; Patch 3 fixes a series of random Documentation/* references that are pointing to the wrong places. Patch 4 fix a longstanding issue: every time a new book is added, conf.py need changes, in order to allow generating a PDF file. After the patch, conf.py will automatically recognize new books, saving the trouble of keeping adding documents to it. Patches 5 to 11 are due to fonts support when building translations.pdf. The main focus is to add xeCJK support. While doing it, I discovered some bugs at sphinx-pre-install script after running it with 7 different distributions. Patch 12 improves support for partial doc building. Currently, each subdir needs to have its own conf.py, in order to support partial doc build. After it, any Documentation subdir can be used to roduce html/pdf docs with: make SPHINXDIRS="foo bar" htmldocs (or pdfdocs, latexdocs, epubdocs, ...) Patch 13 is a cleanup patch: it simply get rid of all those extra conf.py files that aren't needed anymore. The only extra config file after it is this one: Documentation/media/conf_nitpick.py With enables some extra optional Sphinx features. Patch 14 adds Documentation/virtual to the main index.rst file and add a new *.rst file that was orphaned there. - After this series, there's just one more patch meant to be applied for 5.3, with is still waiting for some patches to be merged from linux-next: https://git.linuxtv.org/mchehab/experimental.git/commit/?id=b1b5dc7d7bbfbbf… Mauro Carvalho Chehab (14): docs: powerpc: convert docs to ReST and rename to *.rst docs: power: add it to to the main documentation index docs: fix broken doc references due to renames docs: pdf: add all Documentation/*/index.rst to PDF output docs: conf.py: add CJK package needed by translations docs: conf.py: only use CJK if the font is available scripts/sphinx-pre-install: fix script for RHEL/CentOS scripts/sphinx-pre-install: don't use LaTeX with CentOS 7 scripts/sphinx-pre-install: fix latexmk dependencies scripts/sphinx-pre-install: cleanup Gentoo checks scripts/sphinx-pre-install: seek for Noto CJK fonts for pdf output docs: load_config.py: avoid needing a conf.py just due to LaTeX docs docs: remove extra conf.py files docs: virtual: add it to the documentation body Documentation/PCI/pci-error-recovery.rst | 5 +- Documentation/RCU/rculist_nulls.txt | 2 +- Documentation/admin-guide/conf.py | 10 -- Documentation/conf.py | 30 +++- Documentation/core-api/conf.py | 10 -- Documentation/crypto/conf.py | 10 -- Documentation/dev-tools/conf.py | 10 -- .../devicetree/bindings/arm/idle-states.txt | 2 +- Documentation/doc-guide/conf.py | 10 -- Documentation/driver-api/80211/conf.py | 10 -- Documentation/driver-api/conf.py | 10 -- Documentation/driver-api/pm/conf.py | 10 -- Documentation/filesystems/conf.py | 10 -- Documentation/gpu/conf.py | 10 -- Documentation/index.rst | 3 + Documentation/input/conf.py | 10 -- Documentation/kernel-hacking/conf.py | 10 -- Documentation/locking/spinlocks.rst | 4 +- Documentation/maintainer/conf.py | 10 -- Documentation/media/conf.py | 12 -- Documentation/memory-barriers.txt | 2 +- Documentation/networking/conf.py | 10 -- Documentation/power/index.rst | 2 +- .../{bootwrapper.txt => bootwrapper.rst} | 28 +++- .../{cpu_families.txt => cpu_families.rst} | 23 +-- .../{cpu_features.txt => cpu_features.rst} | 6 +- Documentation/powerpc/{cxl.txt => cxl.rst} | 46 ++++-- .../powerpc/{cxlflash.txt => cxlflash.rst} | 10 +- .../{DAWR-POWER9.txt => dawr-power9.rst} | 15 +- Documentation/powerpc/{dscr.txt => dscr.rst} | 18 +- ...ecovery.txt => eeh-pci-error-recovery.rst} | 108 ++++++------ ...ed-dump.txt => firmware-assisted-dump.rst} | 117 +++++++------ Documentation/powerpc/{hvcs.txt => hvcs.rst} | 108 ++++++------ Documentation/powerpc/index.rst | 34 ++++ Documentation/powerpc/isa-versions.rst | 15 +- .../powerpc/{mpc52xx.txt => mpc52xx.rst} | 12 +- ...nv.txt => pci_iov_resource_on_powernv.rst} | 15 +- .../powerpc/{pmu-ebb.txt => pmu-ebb.rst} | 1 + Documentation/powerpc/ptrace.rst | 156 ++++++++++++++++++ Documentation/powerpc/ptrace.txt | 151 ----------------- .../{qe_firmware.txt => qe_firmware.rst} | 37 +++-- .../{syscall64-abi.txt => syscall64-abi.rst} | 29 ++-- ...al_memory.txt => transactional_memory.rst} | 45 ++--- Documentation/process/conf.py | 10 -- Documentation/sh/conf.py | 10 -- Documentation/sound/conf.py | 10 -- Documentation/sphinx/load_config.py | 27 ++- .../translations/ko_KR/memory-barriers.txt | 2 +- Documentation/userspace-api/conf.py | 10 -- Documentation/virtual/kvm/index.rst | 1 + Documentation/vm/conf.py | 10 -- Documentation/watchdog/hpwdt.rst | 2 +- Documentation/x86/conf.py | 10 -- MAINTAINERS | 14 +- arch/powerpc/kernel/exceptions-64s.S | 2 +- drivers/gpu/drm/drm_modes.c | 2 +- drivers/i2c/busses/i2c-nvidia-gpu.c | 2 +- drivers/scsi/hpsa.c | 4 +- drivers/soc/fsl/qe/qe.c | 2 +- drivers/tty/hvc/hvcs.c | 2 +- include/soc/fsl/qe/qe.h | 2 +- scripts/sphinx-pre-install | 118 ++++++++++--- 62 files changed, 738 insertions(+), 678 deletions(-) delete mode 100644 Documentation/admin-guide/conf.py delete mode 100644 Documentation/core-api/conf.py delete mode 100644 Documentation/crypto/conf.py delete mode 100644 Documentation/dev-tools/conf.py delete mode 100644 Documentation/doc-guide/conf.py delete mode 100644 Documentation/driver-api/80211/conf.py delete mode 100644 Documentation/driver-api/conf.py delete mode 100644 Documentation/driver-api/pm/conf.py delete mode 100644 Documentation/filesystems/conf.py delete mode 100644 Documentation/gpu/conf.py delete mode 100644 Documentation/input/conf.py delete mode 100644 Documentation/kernel-hacking/conf.py delete mode 100644 Documentation/maintainer/conf.py delete mode 100644 Documentation/media/conf.py delete mode 100644 Documentation/networking/conf.py rename Documentation/powerpc/{bootwrapper.txt => bootwrapper.rst} (93%) rename Documentation/powerpc/{cpu_families.txt => cpu_families.rst} (95%) rename Documentation/powerpc/{cpu_features.txt => cpu_features.rst} (97%) rename Documentation/powerpc/{cxl.txt => cxl.rst} (95%) rename Documentation/powerpc/{cxlflash.txt => cxlflash.rst} (98%) rename Documentation/powerpc/{DAWR-POWER9.txt => dawr-power9.rst} (95%) rename Documentation/powerpc/{dscr.txt => dscr.rst} (91%) rename Documentation/powerpc/{eeh-pci-error-recovery.txt => eeh-pci-error-recovery.rst} (82%) rename Documentation/powerpc/{firmware-assisted-dump.txt => firmware-assisted-dump.rst} (80%) rename Documentation/powerpc/{hvcs.txt => hvcs.rst} (91%) create mode 100644 Documentation/powerpc/index.rst rename Documentation/powerpc/{mpc52xx.txt => mpc52xx.rst} (91%) rename Documentation/powerpc/{pci_iov_resource_on_powernv.txt => pci_iov_resource_on_powernv.rst} (97%) rename Documentation/powerpc/{pmu-ebb.txt => pmu-ebb.rst} (99%) create mode 100644 Documentation/powerpc/ptrace.rst delete mode 100644 Documentation/powerpc/ptrace.txt rename Documentation/powerpc/{qe_firmware.txt => qe_firmware.rst} (95%) rename Documentation/powerpc/{syscall64-abi.txt => syscall64-abi.rst} (82%) rename Documentation/powerpc/{transactional_memory.txt => transactional_memory.rst} (93%) delete mode 100644 Documentation/process/conf.py delete mode 100644 Documentation/sh/conf.py delete mode 100644 Documentation/sound/conf.py delete mode 100644 Documentation/userspace-api/conf.py delete mode 100644 Documentation/vm/conf.py delete mode 100644 Documentation/x86/conf.py -- 2.21.0

1 1

[alsa-devel] [PATCH v3 0/5] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 16 Jul '19

16 Jul '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. Changes from v2 to v3: - dw-hdmi-i2s-audio.c: Use fixed ID instead of auto ID. - rk3288_hdmi_analog.c: Use the fixed name hdmi-audio-codec for codec device. - rockchip_max98090: Use the fixed name hdmi-audio-codec for codec device. - rockchip_max98090: Fix the dependency of hdmi-codec in Kconfig. Cheng-Yi Chiang (5): ASoC: hdmi-codec: Add an op to set callback function for plug event drm: bridge: dw-hdmi: Report connector status using callback drm: dw-hdmi-i2s: Use fixed id for codec device ASoC: rockchip_max98090: Add dai_link for HDMI FROMLIST: ASoC: rockchip_max98090: Add HDMI jack support .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 3 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 12 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 55 ++++++++- include/sound/hdmi-codec.h | 16 +++ sound/soc/codecs/hdmi-codec.c | 45 +++++++ sound/soc/rockchip/Kconfig | 3 +- sound/soc/rockchip/rk3288_hdmi_analog.c | 3 +- sound/soc/rockchip/rockchip_max98090.c | 116 ++++++++++++++---- 8 files changed, 226 insertions(+), 27 deletions(-) -- 2.22.0.510.g264f2c817a-goog

3 11

[alsa-devel] [PATCH] ALSA: hda - Don't resume forcibly i915 HDMI/DP codec
by Takashi Iwai 16 Jul '19

16 Jul '19

We apply the codec resume forcibly at system resume callback for updating and syncing the jack detection state that may have changed during sleeping. This is, however, superfluous for the codec like Intel HDMI/DP, where the jack detection is managed via the audio component notification; i.e. the jack state change shall be reported sooner or later from the graphics side at mode change. This patch changes the codec resume callback to avoid the forcible resume conditionally with a new flag, codec->relaxed_resume, for reducing the resume time. The flag is set in the codec probe. Although this doesn't fix the entire bug mentioned in the bugzilla entry below, it's still a good optimization and some improvements are seen. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201901 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hda_codec.h | 2 ++ sound/pci/hda/hda_codec.c | 8 ++++++-- sound/pci/hda/patch_hdmi.c | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index 8f46ff3449d5..871993696c5f 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -252,6 +252,8 @@ struct hda_codec { unsigned int auto_runtime_pm:1; /* enable automatic codec runtime pm */ unsigned int force_pin_prefix:1; /* Add location prefix */ unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ + unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ + #ifdef CONFIG_PM unsigned long power_on_acct; unsigned long power_off_acct; diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 5346631df1ec..e30e86ca6b72 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2941,15 +2941,19 @@ static int hda_codec_runtime_resume(struct device *dev) #ifdef CONFIG_PM_SLEEP static int hda_codec_force_resume(struct device *dev) { + struct hda_codec *codec = dev_to_hda_codec(dev); + bool forced_resume = !codec->relaxed_resume; int ret; /* The get/put pair below enforces the runtime resume even if the * device hasn't been used at suspend time. This trick is needed to * update the jack state change during the sleep. */ - pm_runtime_get_noresume(dev); + if (forced_resume) + pm_runtime_get_noresume(dev); ret = pm_runtime_force_resume(dev); - pm_runtime_put(dev); + if (forced_resume) + pm_runtime_put(dev); return ret; } diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 40323d91f9e4..72000f6fedca 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2292,8 +2292,10 @@ static void generic_hdmi_free(struct hda_codec *codec) struct hdmi_spec *spec = codec->spec; int pin_idx, pcm_idx; - if (codec_has_acomp(codec)) + if (codec_has_acomp(codec)) { snd_hdac_acomp_register_notifier(&codec->bus->core, NULL); + codec->relaxed_resume = 0; + } for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); @@ -2566,6 +2568,8 @@ static void register_i915_notifier(struct hda_codec *codec) spec->drm_audio_ops.pin_eld_notify = intel_pin_eld_notify; snd_hdac_acomp_register_notifier(&codec->bus->core, &spec->drm_audio_ops); + /* no need for forcible resume for jack check thanks to notifier */ + codec->relaxed_resume = 1; } /* setup_stream ops override for HSW+ */ -- 2.16.4

1 0

[alsa-devel] [PATCH 0/2] expand dshare to allow audio clock when not streaming data
by Adam Miartus 16 Jul '19

16 Jul '19

The general idea of these changes is to be able to open the device without defined bindings. This would start the audio clock without blocking a channel. This might be useful for hardware that requires running clock early at system start and to be available even without application streaming audio data. Andreas Pape (2): alsa: pcm: add unsupported OPS alsa: dshare: allow missing bindings src/pcm/Makefile.am | 4 +- src/pcm/pcm_dshare.c | 72 +++++++++++-- src/pcm/pcm_unsupported.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++ src/pcm/pcm_unsupported.h | 167 +++++++++++++++++++++++++++++ 4 files changed, 495 insertions(+), 13 deletions(-) create mode 100644 src/pcm/pcm_unsupported.c create mode 100644 src/pcm/pcm_unsupported.h -- 2.7.4

3 7

[alsa-devel] [PATCH v2 0/6]
by vanitha.channaiah＠in.bosch.com 16 Jul '19

16 Jul '19

- Updated the patches by incorporating review comments from Takashi Iwai-san [PATCH 1/5] pcm: direct: Add generic hw_ptr_alignment function for dmix, dshare and dsnoop [Takashi Iwai:] > The patch description needs rephrasing. What actually this does is to move the code from pcm_dmix.c to pcm_direct.c > and its header so that the helper code can be re-used by other direct-PCM plugins. - Commit message is rephrased as suggested. - New commit: [PATCH v2 1/6] pcm: direct: Add generic hw_ptr_alignment function for [PATCH 2/5] pcm: dshare: Added "hw_ptr_alignment" option in configuration for alignment of slave pointers [Takashi Iwai:] > Again, this patch description is too ambiguous. > And, if it enables the hw_ptr_alignment option, update the documentation as well. - Commit message is explained in detail for the changes done. - Documentation updated. - New commit: [PATCH v2 2/6] pcm: dshare: Added "hw_ptr_alignment" option in [PATCH 3/5] pcm: dsnoop: Added "hw_ptr_alignment" option in configuration for slave pointer alignment [Takashi Iwai:] > Ditto as patch 2, the description is too ambiguous, and the update of documentation is missing. > It's not good to change the helper function semantics out of sudden, even without any description. - Commit message is explained in detail for the changes done. - Documentation updated. - Divided the patch with commit ("pcm: dsnoop: Add hw_ptr_alignment option in configuration") into additional patch commit ("pcm: direct: Round up of slave_app_ptr pointer if buffer") - Usecase scenario is described for the changes done in helper function. - New commit: [PATCH v2 3/6] pcm: dsnoop: Added "hw_ptr_alignment" option in [PATCH v2 4/6] pcm: direct: Round up of slave_app_ptr pointer if buffer [PATCH 4/5] pcm: restructuring sw params function [Takashi Iwai:] > I see no reason to do that. Please describe. - Commit message is explained in detail why reformating was done. - New commit: [PATCH v2 5/6] pcm: restructuring sw params function [PATCH 5/5] pcm: Update pcm->avail_min with needed_slave_avail_min, after reading unaligned frames [Takashi Iwai:] > This kind of changes in the core code should be avoided as much as possible, especially if it's only relevant with the specific plugins. > Sorry, this isn't convincing enough. If this is a MUST, please clarify better. - Commit message is explained in detail with the generic usecase and specific use case we came across. - New commit: [PATCH v2 6/6] pcm: Update pcm->avail_min with needed_slave_avail_min,

4 20

[alsa-devel] [PATCH] ALSA: seq: Break too long mutex context in the write loop
by Takashi Iwai 15 Jul '19

15 Jul '19

The fix for the racy writes and ioctls to sequencer widened the application of client->ioctl_mutex to the whole write loop. Although it does unlock/relock for the lengthy operation like the event dup, the loop keeps the ioctl_mutex for the whole time in other situations. This may take quite long time if the user-space would give a huge buffer, and this is a likely cause of some weird behavior spotted by syzcaller fuzzer. This patch puts a simple workaround, just adding a mutex break in the loop when a large number of events have been processed. This shouldn't hit any performance drop because the threshold is set high enough for usual operations. Fixes: 7bd800915677 ("ALSA: seq: More protection for concurrent write and ioctl races") Reported-by: syzbot+97aae04ce27e39cbfca9(a)syzkaller.appspotmail.com Reported-by: syzbot+4c595632b98bb8ffcc66(a)syzkaller.appspotmail.com Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_clientmgr.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index a60e7a17f0b8..7737b2670064 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -1021,7 +1021,7 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf, { struct snd_seq_client *client = file->private_data; int written = 0, len; - int err; + int err, handled; struct snd_seq_event event; if (!(snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_OUTPUT)) @@ -1034,6 +1034,8 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf, if (!client->accept_output || client->pool == NULL) return -ENXIO; + repeat: + handled = 0; /* allocate the pool now if the pool is not allocated yet */ mutex_lock(&client->ioctl_mutex); if (client->pool->size > 0 && !snd_seq_write_pool_allocated(client)) { @@ -1093,12 +1095,19 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf, 0, 0, &client->ioctl_mutex); if (err < 0) break; + handled++; __skip_event: /* Update pointers and counts */ count -= len; buf += len; written += len; + + /* let's have a coffee break if too many events are queued */ + if (++handled >= 200) { + mutex_unlock(&client->ioctl_mutex); + goto repeat; + } } out: -- 2.16.4

1 0

[alsa-devel] [PATCH] ASoC: SOF: Intel: hda: Initialize HDA controller after i915 init
by Ranjani Sridharan 15 Jul '19

15 Jul '19

On some platforms, sound card registration fails when a HDMI monitor is not connected. This is caused by a recent commit that switched the order in which the HDA controller and the i915 are initialized. Initializing the i915 before initializing the HDA controller fixes the problem. Fixes: be1b577d01787c ("ASoC: SOF: Intel: hda: fix the hda init chip") Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/soc/sof/intel/hda.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 136f98bf5d7e..82f61c4e74bd 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -321,10 +321,23 @@ static int hda_init_caps(struct snd_sof_dev *sdev) if (bus->ppcap) dev_dbg(sdev->dev, "PP capability, will probe DSP later.\n"); +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) + /* init i915 and HDMI codecs */ + ret = hda_codec_i915_init(sdev); + if (ret < 0) { + dev_err(sdev->dev, "error: init i915 and HDMI codec failed\n"); + return ret; + } +#endif + + /* Init HDA controller after i915 init */ ret = hda_dsp_ctrl_init_chip(sdev, true); if (ret < 0) { dev_err(bus->dev, "error: init chip failed with ret: %d\n", ret); +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) + hda_codec_i915_exit(sdev); +#endif return ret; } @@ -332,13 +345,6 @@ static int hda_init_caps(struct snd_sof_dev *sdev) if (bus->mlcap) snd_hdac_ext_bus_get_ml_capabilities(bus); - /* init i915 and HDMI codecs */ - ret = hda_codec_i915_init(sdev); - if (ret < 0) { - dev_err(sdev->dev, "error: no HDMI audio devices found\n"); - return ret; - } - /* codec detection */ if (!bus->codec_mask) { dev_info(bus->dev, "no hda codecs found!\n"); -- 2.17.1

1 0

[alsa-devel] [RESEND PATCH v2] ASoC: SOF: Intel: hda: Make hdac_device device-managed
by Ranjani Sridharan 15 Jul '19

15 Jul '19

snd_hdac_ext_bus_device_exit() has been recently modified to no longer free the hdac device. SOF allocates memory for hdac_device and hda_hda_priv with kzalloc. Make them device-managed instead so that they will be freed when the SOF driver is unloaded. Because of the above change, hda_codec is device-managed and it will be freed when the ASoC device is removed. Freeing the codec in snd_hda_codec_dev_release() leads to kernel panic while unloading and reloading the ASoC driver. So, avoid freeing the hda_codec for ASoC driver. This is done in the same patch to avoid bisect failure. Signed-off-by: Libin Yang <libin.yang(a)intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/pci/hda/hda_codec.c | 8 +++++++- sound/soc/sof/intel/hda-codec.c | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 6c51b8363f8b..a2e23d7e768f 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -846,7 +846,13 @@ static void snd_hda_codec_dev_release(struct device *dev) snd_hda_sysfs_clear(codec); kfree(codec->modelname); kfree(codec->wcaps); - kfree(codec); + + /* + * In the case of ASoC HD-audio, hda_codec is device managed. + * It will be freed when the ASoC device is removed. + */ + if (codec->core.type == HDA_DEV_LEGACY) + kfree(codec); } #define DEV_NAME_LEN 31 diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index b8b37f082309..0d8437b080bf 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -62,8 +62,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address) address, resp); #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) - /* snd_hdac_ext_bus_device_exit will use kfree to free hdev */ - hda_priv = kzalloc(sizeof(*hda_priv), GFP_KERNEL); + hda_priv = devm_kzalloc(sdev->dev, sizeof(*hda_priv), GFP_KERNEL); if (!hda_priv) return -ENOMEM; @@ -82,8 +81,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address) return 0; #else - /* snd_hdac_ext_bus_device_exit will use kfree to free hdev */ - hdev = kzalloc(sizeof(*hdev), GFP_KERNEL); + hdev = devm_kzalloc(sdev->dev, sizeof(*hdev), GFP_KERNEL); if (!hdev) return -ENOMEM; -- 2.17.1

2 3

[alsa-devel] [PATCH AUTOSEL 5.1 201/219] ASoC: audio-graph-card: fix use-after-free in graph_for_each_link
by Sasha Levin 15 Jul '19

15 Jul '19

From: Wen Yang <wen.yang99(a)zte.com.cn> [ Upstream commit 1bcc1fd64e4dd903f4d868a9e053986e3b102713 ] After calling of_node_put() on the codec_ep and codec_port variables, they are still being used, which may result in use-after-free. We fix this issue by calling of_node_put() after the last usage. Fixes: fce9b90c1ab7 ("ASoC: audio-graph-card: cleanup DAI link loop method - step2") Signed-off-by: Wen Yang <wen.yang99(a)zte.com.cn> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Link: https://lore.kernel.org/r/1562229530-8121-1-git-send-email-wen.yang99@zte.c… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/generic/audio-graph-card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 69bc4848d787..f730830fb36c 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -460,9 +460,6 @@ static int graph_for_each_link(struct graph_priv *priv, codec_ep = of_graph_get_remote_endpoint(cpu_ep); codec_port = of_get_parent(codec_ep); - of_node_put(codec_ep); - of_node_put(codec_port); - /* get convert-xxx property */ memset(&adata, 0, sizeof(adata)); graph_get_conversion(dev, codec_ep, &adata); @@ -482,6 +479,9 @@ static int graph_for_each_link(struct graph_priv *priv, else ret = func_noml(priv, cpu_ep, codec_ep, li); + of_node_put(codec_ep); + of_node_put(codec_port); + if (ret < 0) return ret; -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.2 230/249] ASoC: audio-graph-card: fix use-after-free in graph_for_each_link
by Sasha Levin 15 Jul '19

15 Jul '19

From: Wen Yang <wen.yang99(a)zte.com.cn> [ Upstream commit 1bcc1fd64e4dd903f4d868a9e053986e3b102713 ] After calling of_node_put() on the codec_ep and codec_port variables, they are still being used, which may result in use-after-free. We fix this issue by calling of_node_put() after the last usage. Fixes: fce9b90c1ab7 ("ASoC: audio-graph-card: cleanup DAI link loop method - step2") Signed-off-by: Wen Yang <wen.yang99(a)zte.com.cn> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Link: https://lore.kernel.org/r/1562229530-8121-1-git-send-email-wen.yang99@zte.c… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/generic/audio-graph-card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index ec7e673ba475..70ed28d97d49 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -435,9 +435,6 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, codec_ep = of_graph_get_remote_endpoint(cpu_ep); codec_port = of_get_parent(codec_ep); - of_node_put(codec_ep); - of_node_put(codec_port); - /* get convert-xxx property */ memset(&adata, 0, sizeof(adata)); graph_parse_convert(dev, codec_ep, &adata); @@ -457,6 +454,9 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, else ret = func_noml(priv, cpu_ep, codec_ep, li); + of_node_put(codec_ep); + of_node_put(codec_port); + if (ret < 0) return ret; -- 2.20.1

1 0

[alsa-devel] [PATCH 0/8] docs: some improvements when producing PDF files
by Mauro Carvalho Chehab 15 Jul '19

15 Jul '19

Hi Jon, This series addresses your concerns related to CJK fonts that are needed for translations.pdf. It touches only the documentation build system, not the docs themselves. It ended to be bigger than I originally foreseen, as I found several issues when running "make pdfdocs" for the distros that are recognized by the scripts/sphinx-pre-install script. It also took a lot of time, as I tested it with several VMs (each one updated to latest packages): - Fedora 30, CentOS 7, Mageia 7, ArchLinux, Ubuntu 18.04, Gentoo, OpenSuse Tumbleweed. Patch 1 addresses an issue that could be related to the fact that I don't use openSUSE. Basically, I was unable to find the right package for texlive to use CJK fonts on openSUSE. [1]. So, the first patch on this series adds a workaround: if the needed CJK font is not found on a system, conf.py won't use xeCjk extension. That sounds a good thing to have, as other distros may not package it, or maybe the one building the doc is not that interested on translations.pdf file; [1] I actually found some, but they are not recognized with the font name conf.py is expecting ("Noto Sans CJK SC"). Perhaps SUSE uses a different name for those fonts? Patch 2 fixes the logic with recognizes CentOS/RHEL; Patch 3 is another workaround: CentOS 7 (and similar distros) don't package all texlive packages we need. So, it just ignores PDF when recommending packages on such distros, and point to a URL with explains how to install TexLive outside distro-specific package management (for the brave enough people); Patch 4 fixes latexmk dependency on a few distros; Patch 5 suppreses a Gentoo specific instruction if the user already followed in the past; Patch 6 is the one that actually does what you requested. Patch 7 solves an issue when SPHINXDIRS is used with make pdfdocs: right now, using it will produce a lot of warnings and won't do anything, if a dir-specific conf.py file is not found. With the patch, latex_documents are now properly updated when SPHINXDIRS is used. Patch 8 is a cleanup: with patch 7 applied, we don't need to have anymore any conf.py file due to pdfdocs. With regard to the load_config.py extension, It keeps accepting custom configuration. That's helpful if someone wants, for example, to have something like: Documentation/media/conf_nitpick.py with would enable extra nitpick options if one wants that. - Jon, Please let me know if you prefer if I submit those together with the big pile of doc files I have, or if you prefer adding (some of?) them on your tree after the merge window. Regards, Mauro Mauro Carvalho Chehab (8): docs: conf.py: only use CJK if the font is available scripts/sphinx-pre-install: fix script for RHEL/CentOS scripts/sphinx-pre-install: don't use LaTeX with CentOS 7 scripts/sphinx-pre-install: fix latexmk dependencies scripts/sphinx-pre-install: cleanup Gentoo checks scripts/sphinx-pre-install: seek for Noto CJK fonts for pdf output docs: load_config.py: avoid needing a conf.py just due to LaTeX docs docs: remove extra conf.py files Documentation/admin-guide/conf.py | 10 --- Documentation/conf.py | 13 ++- Documentation/core-api/conf.py | 10 --- Documentation/crypto/conf.py | 10 --- Documentation/dev-tools/conf.py | 10 --- Documentation/doc-guide/conf.py | 10 --- Documentation/driver-api/80211/conf.py | 10 --- Documentation/driver-api/conf.py | 10 --- Documentation/driver-api/pm/conf.py | 10 --- Documentation/filesystems/conf.py | 10 --- Documentation/gpu/conf.py | 10 --- Documentation/input/conf.py | 10 --- Documentation/kernel-hacking/conf.py | 10 --- Documentation/maintainer/conf.py | 10 --- Documentation/media/conf.py | 12 --- Documentation/networking/conf.py | 10 --- Documentation/process/conf.py | 10 --- Documentation/sh/conf.py | 10 --- Documentation/sound/conf.py | 10 --- Documentation/sphinx/load_config.py | 25 +++++- Documentation/userspace-api/conf.py | 10 --- Documentation/vm/conf.py | 10 --- Documentation/x86/conf.py | 10 --- scripts/sphinx-pre-install | 118 ++++++++++++++++++++----- 24 files changed, 131 insertions(+), 237 deletions(-) delete mode 100644 Documentation/admin-guide/conf.py delete mode 100644 Documentation/core-api/conf.py delete mode 100644 Documentation/crypto/conf.py delete mode 100644 Documentation/dev-tools/conf.py delete mode 100644 Documentation/doc-guide/conf.py delete mode 100644 Documentation/driver-api/80211/conf.py delete mode 100644 Documentation/driver-api/conf.py delete mode 100644 Documentation/driver-api/pm/conf.py delete mode 100644 Documentation/filesystems/conf.py delete mode 100644 Documentation/gpu/conf.py delete mode 100644 Documentation/input/conf.py delete mode 100644 Documentation/kernel-hacking/conf.py delete mode 100644 Documentation/maintainer/conf.py delete mode 100644 Documentation/media/conf.py delete mode 100644 Documentation/networking/conf.py delete mode 100644 Documentation/process/conf.py delete mode 100644 Documentation/sh/conf.py delete mode 100644 Documentation/sound/conf.py delete mode 100644 Documentation/userspace-api/conf.py delete mode 100644 Documentation/vm/conf.py delete mode 100644 Documentation/x86/conf.py -- 2.21.0

2 3

[alsa-devel] [PATCH] sound: pci: rme9652: Unneeded variable: "result".
by Hariprasad Kelam 15 Jul '19

15 Jul '19

This patch fixes below issue reported by coccicheck sound/pci/rme9652/rme9652.c:2161:5-11: Unneeded variable: "result". Return "0" on line 2167 Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/pci/rme9652/rme9652.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index cb9818a..4c851f8 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c @@ -2158,13 +2158,12 @@ static int snd_rme9652_prepare(struct snd_pcm_substream *substream) { struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream); unsigned long flags; - int result = 0; spin_lock_irqsave(&rme9652->lock, flags); if (!rme9652->running) rme9652_reset_hw_pointer(rme9652); spin_unlock_irqrestore(&rme9652->lock, flags); - return result; + return 0; } static const struct snd_pcm_hardware snd_rme9652_playback_subinfo = -- 2.7.4

2 1

[alsa-devel] [PATCH] sound: pci: emu10k1: Remove unneeded variable "change"
by Hariprasad Kelam 15 Jul '19

15 Jul '19

fix below issue reported by coccicheck sound/pci/emu10k1/emu10k1x.c:1077:5-11: Unneeded variable: "change". Return "0" on line 1092 Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/pci/emu10k1/emu10k1x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 67d6473..9cf8183 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c @@ -1074,7 +1074,6 @@ static int snd_emu10k1x_shared_spdif_put(struct snd_kcontrol *kcontrol, { struct emu10k1x *emu = snd_kcontrol_chip(kcontrol); unsigned int val; - int change = 0; val = ucontrol->value.integer.value[0] ; @@ -1089,7 +1088,7 @@ static int snd_emu10k1x_shared_spdif_put(struct snd_kcontrol *kcontrol, snd_emu10k1x_ptr_write(emu, ROUTING, 0, 0x1003F); snd_emu10k1x_gpio_write(emu, 0x1080); } - return change; + return 0; } static const struct snd_kcontrol_new snd_emu10k1x_shared_spdif = -- 2.7.4

3 3

[alsa-devel] [PATCH] sound: pci: au88x0: Remove unneeded variable: "changed"
by Hariprasad Kelam 15 Jul '19

15 Jul '19

Fix below issues reported by coccicheck sound/pci/au88x0/au88x0_a3d.c:821:8-15: Unneeded variable: "changed". Return "1" on line 834 sound/pci/au88x0/au88x0_a3d.c:768:5-12: Unneeded variable: "changed". Return "1" on line 777 sound/pci/au88x0/au88x0_a3d.c:804:5-12: Unneeded variable: "changed". Return "1" on line 813 sound/pci/au88x0/au88x0_a3d.c:786:8-15: Unneeded variable: "changed". Return "1" on line 796 Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/pci/au88x0/au88x0_a3d.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c index 7347103..2db183f 100644 --- a/sound/pci/au88x0/au88x0_a3d.c +++ b/sound/pci/au88x0/au88x0_a3d.c @@ -765,7 +765,7 @@ snd_vortex_a3d_hrtf_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { a3dsrc_t *a = kcontrol->private_data; - int changed = 1, i; + int i; int coord[6]; for (i = 0; i < 6; i++) coord[i] = ucontrol->value.integer.value[i]; @@ -774,7 +774,7 @@ snd_vortex_a3d_hrtf_put(struct snd_kcontrol *kcontrol, vortex_a3d_coord2hrtf(a->hrtf[1], coord); a3dsrc_SetHrtfTarget(a, a->hrtf[0], a->hrtf[1]); a3dsrc_SetHrtfCurrent(a, a->hrtf[0], a->hrtf[1]); - return changed; + return 1; } static int @@ -783,7 +783,7 @@ snd_vortex_a3d_itd_put(struct snd_kcontrol *kcontrol, { a3dsrc_t *a = kcontrol->private_data; int coord[6]; - int i, changed = 1; + int i; for (i = 0; i < 6; i++) coord[i] = ucontrol->value.integer.value[i]; /* Translate orientation coordinates to a3d params. */ @@ -793,7 +793,7 @@ snd_vortex_a3d_itd_put(struct snd_kcontrol *kcontrol, a3dsrc_SetItdTarget(a, a->itd[0], a->itd[1]); a3dsrc_SetItdCurrent(a, a->itd[0], a->itd[1]); a3dsrc_SetItdDline(a, a->dline); - return changed; + return 1; } static int @@ -801,7 +801,6 @@ snd_vortex_a3d_ild_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { a3dsrc_t *a = kcontrol->private_data; - int changed = 1; int l, r; /* There may be some scale tranlation needed here. */ l = ucontrol->value.integer.value[0]; @@ -810,7 +809,7 @@ snd_vortex_a3d_ild_put(struct snd_kcontrol *kcontrol, /* Left Right panning. */ a3dsrc_SetGainTarget(a, l, r); a3dsrc_SetGainCurrent(a, l, r); - return changed; + return 1; } static int @@ -818,7 +817,7 @@ snd_vortex_a3d_filter_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { a3dsrc_t *a = kcontrol->private_data; - int i, changed = 1; + int i; int params[6]; for (i = 0; i < 6; i++) params[i] = ucontrol->value.integer.value[i]; @@ -831,7 +830,7 @@ snd_vortex_a3d_filter_put(struct snd_kcontrol *kcontrol, a3dsrc_SetAtmosCurrent(a, a->filter[0], a->filter[1], a->filter[2], a->filter[3], a->filter[4]); - return changed; + return 1; } static const struct snd_kcontrol_new vortex_a3d_kcontrol = { -- 2.7.4

2 1

[alsa-devel] Dell ALC295 Headphone Mic can't record
by Kailang 15 Jul '19

15 Jul '19

Hi Takashi, Attach patch was for Dell ALC295 Headphone Mic can't record. Thanks. BR, Kailang

2 1

[alsa-devel] [PATCH] sound: soc: codecs: wcd9335: fix "conversion to bool not needed here"
by Hariprasad Kelam 13 Jul '19

13 Jul '19

Fix below issue reported by coccicheck sound/soc/codecs/wcd9335.c:3991:25-30: WARNING: conversion to bool not needed here Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/soc/codecs/wcd9335.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 1bbbe42..85a8d10 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -3988,12 +3988,7 @@ static irqreturn_t wcd9335_slimbus_irq(int irq, void *data) regmap_read(wcd->if_regmap, WCD9335_SLIM_PGD_PORT_INT_RX_SOURCE0 + j, &val); if (val) { - if (!tx) - reg = WCD9335_SLIM_PGD_PORT_INT_EN0 + - (port_id / 8); - else - reg = WCD9335_SLIM_PGD_PORT_INT_TX_EN0 + - (port_id / 8); + reg = WCD9335_SLIM_PGD_PORT_INT_TX_EN0 + (port_id / 8); regmap_read( wcd->if_regmap, reg, &int_val); /* -- 2.7.4

2 3

[alsa-devel] [PATCH] ASoC: audio-graph-card: fix type mismatch warning
by Arnd Bergmann 13 Jul '19

13 Jul '19

The new temporary variable is lacks a 'const' annotation: sound/soc/generic/audio-graph-card.c:87:7: error: assigning to 'u32 *' (aka 'unsigned int *') from 'const void *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] Fixes: c152f8491a8d ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/generic/audio-graph-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index c8abb86afefa..288df245b2f0 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -63,7 +63,7 @@ static int graph_get_dai_id(struct device_node *ep) struct device_node *endpoint; struct of_endpoint info; int i, id; - u32 *reg; + const u32 *reg; int ret; /* use driver specified DAI ID if exist */ -- 2.20.0

2 1

[alsa-devel] [PATCH] ASoC: audio-graph-card: add missing const at graph_get_dai_id()
by Kuninori Morimoto 12 Jul '19

12 Jul '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit c152f8491a8d9 ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") fixups use-after-free issue, but, it need to use "const" for reg. This patch adds it. We will have below without this patch LINUX/sound/soc/generic/audio-graph-card.c: In function 'graph_get_dai_id': LINUX/sound/soc/generic/audio-graph-card.c:87:7: warning: assignment discards\ 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] reg = of_get_property(node, "reg", NULL); Fixes: c152f8491a8d9 ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/audio-graph-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 343ede8..ebf2ca3 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -63,7 +63,7 @@ static int graph_get_dai_id(struct device_node *ep) struct device_node *endpoint; struct of_endpoint info; int i, id; - u32 *reg; + const u32 *reg; int ret; /* use driver specified DAI ID if exist */ -- 2.7.4

3 4

[alsa-devel] How to treat old style platform components
by Daniel Baluta 12 Jul '19

12 Jul '19

HI Morimoto-san, I'm using simple-card with an out of tree PCM DMA driver which basically just does this: static struct snd_soc_component_driver imx_soc_platform = { .ops» » = &imx_pcm_ops, .pcm_new» = imx_pcm_new, }; Then somewhere in the DAI driver we call: devm_snd_soc_register_component(dev, &imx_soc_platform, NULL, 0); I'm using simple-card with the following configuration: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/ar… After latest changes it seems that imx_pcm_ops->open() function is no longer called. Any idea? Please feel free to not waste any time on this, as we are using an out of tree driver. thanks, Daniel.

2 3

[alsa-devel] [PATCH] ASoC: audio-graph-card: Constify reg in graph_get_dai_id
by Nathan Chancellor 12 Jul '19

12 Jul '19

clang errors: sound/soc/generic/audio-graph-card.c:87:7: error: assigning to 'u32 *' (aka 'unsigned int *') from 'const void *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] reg = of_get_property(node, "reg", NULL); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Move the declaration up a bit to keep the reverse christmas tree look. Fixes: c152f8491a8d ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") Link: https://github.com/ClangBuiltLinux/linux/issues/599 Signed-off-by: Nathan Chancellor <natechancellor(a)gmail.com> --- sound/soc/generic/audio-graph-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index c8abb86afefa..c0d262a2ce2c 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -62,8 +62,8 @@ static int graph_get_dai_id(struct device_node *ep) struct device_node *node; struct device_node *endpoint; struct of_endpoint info; + const u32 *reg; int i, id; - u32 *reg; int ret; /* use driver specified DAI ID if exist */ -- 2.22.0

2 3

Re: [alsa-devel] DW-DMA: Probe failures on broadwell
by Andy Shevchenko 11 Jul '19

11 Jul '19

(I think this is okay to go on public here) +Cc: Pierre, Liam, DMA Engine ML, ASoC ML On Mon, Jul 08, 2019 at 01:50:07PM -0700, Curtis Malainey wrote: > Hello Andy, > > I am reaching out to you as you are the main author for > drivers/dma/dw/core.c and we are seeing a failure in there on some of > our samus devices. On certain device we are seeing the following > failure (debugging enabled in this log.) > > [ 3.587515] sst-acpi INT3438:00: DW_PARAMS: 0x00000000 AFAIK, when Synopsys DesignWare DMA IP is in use in Intel, we almost always (yes, I know couple of exceptions), enable auto configuration block. Thus, the *private* DMA controllers used in Broadwell are actually Intel iDMA 32-bit. Nowadays the differences can be seen in drivers/dma/dw/idma32.c. Note, DMA in the driver is used solely for firmware load, simplest workaround is to disable DMA. Though, personally, for sake of test coverage, I would like to see how it works in DMA case. > [ 3.587519] haswell-pcm-audio haswell-pcm-audio: error: DMA device > register failed > [ 3.587524] haswell-pcm-audio haswell-pcm-audio: sst_dma_new failed -22 > [ 3.598010] bdw-rt5677 bdw-rt5677: ASoC: failed to init link System PCM > > I don't have the datasheets for this component but I am wondering if > you could help us troubleshoot this bug it would be greatly > appreciated if possible. I am not sure if we are seeing a hardware > boot failure or a boot race. I was hoping you could shed some light on > this and if it is a boot race help us recover from it. I know Intel > relies on no defers typically but it would be nice to see if we can > fix this. Below is where I have traced the error source to in core.c. So, the correct fix is to provide a platform data, like it's done in drivers/dma/dw/pci.c::idma32_pdata, in the sst-firmware.c::dw_probe(), and call idma32_dma_probe() with idma32_dma_remove() respectively on removal stage. (It will require latest patches to be applied, which are material for v5.x) > dw_params = dma_readl(dw, DW_PARAMS); > dev_dbg(chip->dev, "DW_PARAMS: 0x%08x\n", dw_params); > > autocfg = dw_params >> DW_PARAMS_EN & 1; > if (!autocfg) { > err = -EINVAL; > goto err_pdata; > } > Let me know if you have any ideas on how to mitigate this, thanks. -- With Best Regards, Andy Shevchenko

2 8

[alsa-devel] [PATCH 1/2] ASoC: rt1011: fix DC calibration offset not applying
by shumingf＠realtek.com 11 Jul '19

11 Jul '19

From: Shuming Fan <shumingf(a)realtek.com> There are two issues to fix: - DC offset calibration data will be reset after stopping playback. - DC offset calibration data should be applied in the initial setting. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 5605b660f4bf..0a6ff13d76e1 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -39,7 +39,7 @@ static const struct reg_sequence init_list[] = { { RT1011_POWER_9, 0xa840 }, { RT1011_ADC_SET_5, 0x0a20 }, - { RT1011_DAC_SET_2, 0xa232 }, + { RT1011_DAC_SET_2, 0xa032 }, { RT1011_ADC_SET_1, 0x2925 }, { RT1011_SPK_PRO_DC_DET_1, 0xb00c }, @@ -1917,7 +1917,7 @@ static int rt1011_set_bias_level(struct snd_soc_component *component, snd_soc_component_write(component, RT1011_SYSTEM_RESET_2, 0x0000); snd_soc_component_write(component, - RT1011_SYSTEM_RESET_3, 0x0000); + RT1011_SYSTEM_RESET_3, 0x0001); snd_soc_component_write(component, RT1011_SYSTEM_RESET_1, 0x003f); snd_soc_component_write(component, -- 2.22.0

2 1

[alsa-devel] [PATCH v2 0/6] VAG power control improvement for sgtl5000 codec
by Oleksandr Suvorov 11 Jul '19

11 Jul '19

VAG power control is improved to fit the manual. This fixes as minimum one bug: if customer muxes Headphone to Line-In right after boot w/o playing any sound, the VAG power remains off that leads to poor sound quality from line-in. I.e. after boot: - Connect sound source to Line-In jack; - Connect headphone to HP jack; - Run following commands: $ amixer set 'Headphone' 80% $ amixer set 'Headphone Mux' LINE_IN Also this series includes fixes of non-important bugs in sgtl5000 codec driver. Fix patch formatting in patchset v2. Oleksandr Suvorov (6): ASoC: sgtl5000: Fix definition of VAG Ramp Control ASoC: sgtl5000: add ADC mute control ASoC: sgtl5000: Fix of unmute outputs on probe ASoC: sgtl5000: Fix charge pump source assignment ASoC: Define a set of DAPM pre/post-up events ASoC: sgtl5000: Improve VAG power and mute control include/sound/soc-dapm.h | 2 + sound/soc/codecs/sgtl5000.c | 250 ++++++++++++++++++++++++++++++------ sound/soc/codecs/sgtl5000.h | 2 +- 3 files changed, 212 insertions(+), 42 deletions(-) -- 2.20.1

2 11

[alsa-devel] [PATCH 2/2] ASoC: rt1011: Add R0 temperature and TDM1 ADC2DAT Swap control
by shumingf＠realtek.com 11 Jul '19

11 Jul '19

From: Shuming Fan <shumingf(a)realtek.com> - The user level application could set the R0 temperature after booting system. The degree Celsius of R0 temperature store in the non-volatile space when doing R0 calibration. - TDM1 ADC2DAT Swap controls use to control TDM slot2/3 data Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 9 ++++++++- sound/soc/codecs/rt1011.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 0a6ff13d76e1..b25b4c1127ca 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -1029,6 +1029,8 @@ static const char * const rt1011_tdm_adc_swap_select[] = { static SOC_ENUM_SINGLE_DECL(rt1011_tdm_adc1_1_enum, RT1011_TDM1_SET_3, 6, rt1011_tdm_adc_swap_select); +static SOC_ENUM_SINGLE_DECL(rt1011_tdm_adc2_1_enum, RT1011_TDM1_SET_3, 4, + rt1011_tdm_adc_swap_select); static void rt1011_reset(struct regmap *regmap) { @@ -1333,7 +1335,8 @@ static const struct snd_kcontrol_new rt1011_snd_controls[] = { /* TDM1 Data Out Selection */ SOC_ENUM("TDM1 DOUT Source", rt1011_tdm1_adc1_dat_enum), SOC_ENUM("TDM1 DOUT Location", rt1011_tdm1_adc1_loc_enum), - SOC_ENUM("TDM1 ADCDAT Swap Select", rt1011_tdm_adc1_1_enum), + SOC_ENUM("TDM1 ADC1DAT Swap Select", rt1011_tdm_adc1_1_enum), + SOC_ENUM("TDM1 ADC2DAT Swap Select", rt1011_tdm_adc2_1_enum), /* Data Out Mode */ SOC_ENUM("I2S ADC DOUT Mode", rt1011_adc_dout_mode_enum), @@ -1355,6 +1358,10 @@ static const struct snd_kcontrol_new rt1011_snd_controls[] = { SOC_SINGLE_EXT("R0 Calibration", SND_SOC_NOPM, 0, 1, 0, rt1011_r0_cali_get, rt1011_r0_cali_put), RT1011_R0_LOAD("R0 Load Mode"), + + /* R0 temperature */ + SOC_SINGLE("R0 Temperature", RT1011_STP_INITIAL_RESISTANCE_TEMP, + 2, 255, 0), }; static int rt1011_is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, diff --git a/sound/soc/codecs/rt1011.h b/sound/soc/codecs/rt1011.h index 98a38800c4df..5d431d7f1d16 100644 --- a/sound/soc/codecs/rt1011.h +++ b/sound/soc/codecs/rt1011.h @@ -227,6 +227,7 @@ #define RT1011_STP_CALIB_RS_TEMP 0x152a #define RT1011_INIT_RECIPROCAL_REG_24_16 0x1538 #define RT1011_INIT_RECIPROCAL_REG_15_0 0x1539 +#define RT1011_STP_INITIAL_RESISTANCE_TEMP 0x153c #define RT1011_STP_ALPHA_RECIPROCAL_MSB 0x153e #define RT1011_SPK_RESISTANCE_1 0x1544 #define RT1011_SPK_RESISTANCE_2 0x1546 -- 2.22.0

1 0

Re: [alsa-devel] [PATCH V3 2/2] ASoC: fsl_esai: recover the channel swap after xrun
by S.j. Wang 11 Jul '19

11 Jul '19

> > Hi Shengjiu, > > Mostly looks good to me, just some small comments. > > On Mon, Jul 08, 2019 at 02:38:52PM +0800, shengjiu.wang(a)nxp.com wrote: > > > +static void fsl_esai_hw_reset(unsigned long arg) { > > + struct fsl_esai *esai_priv = (struct fsl_esai *)arg; > > + u32 saisr, tfcr, rfcr; > > + bool tx = true, rx = false, enabled[2]; > > Could we swap the lines of u32 and bool? It'd look better. > > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, > > + ESAI_xCR_xPR_MASK, ESAI_xCR_xPR); > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, > > + ESAI_xCR_xPR_MASK, ESAI_xCR_xPR); > > Let's add a line of comments for these two: > /* Enforce ESAI personal resets for both TX and RX */ > > > + /* > > + * Restore registers by regcache_sync, and ignore > > + * return value > > + */ > > Could fit into single-line? > > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, > > + ESAI_xCR_xPR_MASK, 0); > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, > > + ESAI_xCR_xPR_MASK, 0); > > + > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_PRRC, > > + ESAI_PRRC_PDC_MASK, ESAI_PRRC_PDC(ESAI_GPIO)); > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_PCRC, > > + ESAI_PCRC_PC_MASK, ESAI_PCRC_PC(ESAI_GPIO)); > > Could remove the blank line and add a line of comments: > /* Remove ESAI personal resets by configuring PCRC and PRRC also */ > > Btw, I still feel this personal reset can be stuffed into one of the wrapper > functions. But let's keep this simple for now. > > > + regmap_read(esai_priv->regmap, REG_ESAI_SAISR, &saisr); > > Why do we read saisr here? All its bits would get cleared by the hardware > reset. If it's a must to clear again, we should add a line of comments to > emphasize it. This line can be removed. Best regards Wang Shengjiu

1 0

[alsa-devel] [PATCH V3 0/2] recover the channel swap after xrun
by shengjiu.wang＠nxp.com 11 Jul '19

11 Jul '19

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> recover the channel swap after xrun Shengjiu Wang (2): ASoC: fsl_esai: Wrap some operations to be functions ASoC: fsl_esai: recover the channel swap after xrun sound/soc/fsl/fsl_esai.c | 270 ++++++++++++++++++++++++++++----------- 1 file changed, 197 insertions(+), 73 deletions(-) Changes in V3 - update code sytle. Changes in v2 - add one patch for wrap operations to functions. - fix some coding style issue -- 2.21.0

2 3

[alsa-devel] [RFC PATCH] ASoC: max98357a: use mdelay for sdmode-delay
by Tzung-Bi Shih 10 Jul '19

10 Jul '19

max98357a_daiops_trigger() is possible to be called in atomic context if the .nonatomic flag is equal to 0 in the DAI links. When cancel_delayed_work_sync() in max98357a_daiops_trigger() is called in atomic context, kernel emits the following message: "BUG: sleeping function called from invalid context". According to the DT binding document, value less than or equal to 5ms of sdmod-delay should be sufficient to avoid the pop noise. Use mdelay (i.e. busy loop) for such low delay should be acceptable. Fixes: cec5b01f8f1c ("ASoC: max98357a: avoid speaker pop when playback startup") Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- Hi, Not sure whether this fix is acceptable or not. Because in the document "timers-howto.txt", it states "In general, use of mdelay is discouraged and code should be refactored to allow for the use of msleep." sound/soc/codecs/max98357a.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index 6f0e28f903bf..16313b973eaa 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -20,20 +20,10 @@ #include <sound/soc-dapm.h> struct max98357a_priv { - struct delayed_work enable_sdmode_work; struct gpio_desc *sdmode; unsigned int sdmode_delay; }; -static void max98357a_enable_sdmode_work(struct work_struct *work) -{ - struct max98357a_priv *max98357a = - container_of(work, struct max98357a_priv, - enable_sdmode_work.work); - - gpiod_set_value(max98357a->sdmode, 1); -} - static int max98357a_daiops_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { @@ -46,14 +36,12 @@ static int max98357a_daiops_trigger(struct snd_pcm_substream *substream, case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - queue_delayed_work(system_power_efficient_wq, - &max98357a->enable_sdmode_work, - msecs_to_jiffies(max98357a->sdmode_delay)); + mdelay(max98357a->sdmode_delay); + gpiod_set_value(max98357a->sdmode, 1); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - cancel_delayed_work_sync(&max98357a->enable_sdmode_work); gpiod_set_value(max98357a->sdmode, 0); break; } @@ -112,30 +100,25 @@ static int max98357a_platform_probe(struct platform_device *pdev) int ret; max98357a = devm_kzalloc(&pdev->dev, sizeof(*max98357a), GFP_KERNEL); - if (!max98357a) return -ENOMEM; max98357a->sdmode = devm_gpiod_get_optional(&pdev->dev, "sdmode", GPIOD_OUT_LOW); - if (IS_ERR(max98357a->sdmode)) return PTR_ERR(max98357a->sdmode); ret = device_property_read_u32(&pdev->dev, "sdmode-delay", &max98357a->sdmode_delay); - if (ret) { max98357a->sdmode_delay = 0; dev_dbg(&pdev->dev, - "no optional property 'sdmode-delay' found, default: no delay\n"); + "no optional property 'sdmode-delay' found, " + "default: no delay\n"); } dev_set_drvdata(&pdev->dev, max98357a); - INIT_DELAYED_WORK(&max98357a->enable_sdmode_work, - max98357a_enable_sdmode_work); - return devm_snd_soc_register_component(&pdev->dev, &max98357a_component_driver, &max98357a_dai_driver, 1); -- 2.22.0.410.gd8fdbe21b5-goog

2 1

[alsa-devel] [PATCH] ASoC: rt1308: Remove executable attribute from source files
by Joe Perches 10 Jul '19

10 Jul '19

These are source files not executable. Signed-off-by: Joe Perches <joe(a)perches.com> --- sound/soc/codecs/rt1308.c | 0 sound/soc/codecs/rt1308.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c old mode 100755 new mode 100644 diff --git a/sound/soc/codecs/rt1308.h b/sound/soc/codecs/rt1308.h old mode 100755 new mode 100644

2 1

[alsa-devel] [PATCH] ASoC: Relocate my e-mail to .com domain zone
by Kirill Marinushkin 10 Jul '19

10 Jul '19

Signed-off-by: Kirill Marinushkin <kmarinushkin(a)birdec.com> --- MAINTAINERS | 2 +- sound/soc/codecs/pcm3060-i2c.c | 4 ++-- sound/soc/codecs/pcm3060-spi.c | 4 ++-- sound/soc/codecs/pcm3060.c | 4 ++-- sound/soc/codecs/pcm3060.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 558acf24ea1e..9cdc10e80d78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15829,7 +15829,7 @@ S: Maintained F: drivers/net/ethernet/ti/netcp* TI PCM3060 ASoC CODEC DRIVER -M: Kirill Marinushkin <kmarinushkin(a)birdec.tech> +M: Kirill Marinushkin <kmarinushkin(a)birdec.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/pcm3060.txt diff --git a/sound/soc/codecs/pcm3060-i2c.c b/sound/soc/codecs/pcm3060-i2c.c index cdc8314882bc..abcdeb922201 100644 --- a/sound/soc/codecs/pcm3060-i2c.c +++ b/sound/soc/codecs/pcm3060-i2c.c @@ -2,7 +2,7 @@ // // PCM3060 I2C driver // -// Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.tech> +// Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.com> #include <linux/i2c.h> #include <linux/module.h> @@ -56,5 +56,5 @@ static struct i2c_driver pcm3060_i2c_driver = { module_i2c_driver(pcm3060_i2c_driver); MODULE_DESCRIPTION("PCM3060 I2C driver"); -MODULE_AUTHOR("Kirill Marinushkin <kmarinushkin(a)birdec.tech>"); +MODULE_AUTHOR("Kirill Marinushkin <kmarinushkin(a)birdec.com>"); MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/pcm3060-spi.c b/sound/soc/codecs/pcm3060-spi.c index f6f19fa80932..3b79734b832b 100644 --- a/sound/soc/codecs/pcm3060-spi.c +++ b/sound/soc/codecs/pcm3060-spi.c @@ -2,7 +2,7 @@ // // PCM3060 SPI driver // -// Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.tech> +// Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.com> #include <linux/module.h> #include <linux/spi/spi.h> @@ -55,5 +55,5 @@ static struct spi_driver pcm3060_spi_driver = { module_spi_driver(pcm3060_spi_driver); MODULE_DESCRIPTION("PCM3060 SPI driver"); -MODULE_AUTHOR("Kirill Marinushkin <kmarinushkin(a)birdec.tech>"); +MODULE_AUTHOR("Kirill Marinushkin <kmarinushkin(a)birdec.com>"); MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/pcm3060.c b/sound/soc/codecs/pcm3060.c index 32b26f1c2282..b2358069cf9b 100644 --- a/sound/soc/codecs/pcm3060.c +++ b/sound/soc/codecs/pcm3060.c @@ -2,7 +2,7 @@ // // PCM3060 codec driver // -// Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.tech> +// Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.com> #include <linux/module.h> #include <sound/pcm_params.h> @@ -342,5 +342,5 @@ int pcm3060_probe(struct device *dev) EXPORT_SYMBOL(pcm3060_probe); MODULE_DESCRIPTION("PCM3060 codec driver"); -MODULE_AUTHOR("Kirill Marinushkin <kmarinushkin(a)birdec.tech>"); +MODULE_AUTHOR("Kirill Marinushkin <kmarinushkin(a)birdec.com>"); MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/pcm3060.h b/sound/soc/codecs/pcm3060.h index 75931c9a9d85..18d51e5dac2c 100644 --- a/sound/soc/codecs/pcm3060.h +++ b/sound/soc/codecs/pcm3060.h @@ -2,7 +2,7 @@ /* * PCM3060 codec driver * - * Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.tech> + * Copyright (C) 2018 Kirill Marinushkin <kmarinushkin(a)birdec.com> */ #ifndef _SND_SOC_PCM3060_H -- 2.13.6

2 1

[alsa-devel] [PATCH 0/4] Fix some use-after-free problems in sound/soc/generic
by Wen Yang 10 Jul '19

10 Jul '19

We developed a coccinelle SmPL to detect sound/sooc/generic code and found some use-after-free problems. This patch series fixes those problems. Wen Yang (4): ASoC: simple-card: fix an use-after-free in simple_dai_link_of_dpcm() ASoC: simple-card: fix an use-after-free in simple_for_each_link() ASoC: audio-graph-card: fix use-after-free in graph_dai_link_of_dpcm() ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id() sound/soc/generic/audio-graph-card.c | 30 ++++++++++++++++-------------- sound/soc/generic/simple-card.c | 26 +++++++++++++------------- 2 files changed, 29 insertions(+), 27 deletions(-) Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org -- 2.9.5

3 9

[alsa-devel] [PATCH for v5.3] ASoC: simple_card_utils.h: care NULL dai at asoc_simple_debug_dai()
by Kuninori Morimoto 10 Jul '19

10 Jul '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> props->xxx_dai might be NULL when DPCM. This patch cares it for debug. Fixes: commit 0580dde59438 ("ASoC: simple-card-utils: add asoc_simple_debug_info()") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- include/sound/simple_card_utils.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 954563e..985a5f5 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -141,6 +141,10 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, { struct device *dev = simple_priv_to_dev(priv); + /* dai might be NULL */ + if (!dai) + return; + if (dai->name) dev_dbg(dev, "%s dai name = %s\n", name, dai->name); -- 2.7.4

2 1

[alsa-devel] [PATCH for v5.3] ASoC: simple-card-utils: care no Platform for DPCM
by Kuninori Morimoto 10 Jul '19

10 Jul '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit 34614739988ad ("ASoC: soc-core: support dai_link with platforms_num != 1") supports multi Platform, and commit 9f3eb91753451 ("ASoC: simple-card-utils: consider CPU-Platform possibility") removed no Platform from simple-card. Multi Platform is now checking both Platform name/of_node are NULL case. But in normal case, DPCM be doesn't have Platform. asoc_simple_canonicalize_platform() try to use CPU of_node to Platform (This is needed for DMAEngine platform case), but it still might be NULL at DPCM be. This patch try to use no Platform after that if Platform of_node is still NULL. It can't probe without this patch. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/simple-card-utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index ac8678f..556b1a7 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -349,6 +349,13 @@ void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link) /* Assumes platform == cpu */ if (!dai_link->platforms->of_node) dai_link->platforms->of_node = dai_link->cpus->of_node; + + /* + * DPCM BE can be no platform. + * Alloced memory will be waste, but not leak. + */ + if (!dai_link->platforms->of_node) + dai_link->num_platforms = 0; } EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform); -- 2.7.4

2 1

[alsa-devel] [PATCH V6] ALSA: usb-audio: Scarlett Gen 2 mixer interface
by Geoffrey D. Bennett 10 Jul '19

10 Jul '19

Add mixer quirk for the Focusrite Scarlett 6i6, 18i8, and 18i20 Gen 2 audio interfaces. Although the interfaces are USB compliant, additional input/output level controls and hardware routing/mixing functionality are available using proprietary USB requests. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- Hi all, This patch adds the following controls for the Scarlett 6i6, 18i8, and 18i20 Gen 2: - Master volume knob indicator (18i20 only) - Mute and dim switches (18i20 only) - Volume controls for the analogue HW outputs - HW/SW volume switches for the 10 analogue HW outputs (18i20 only) - Line Level/Instrument Level and Pad controls (6i6 and 18i8 only) - Output mux (where the sound for the HW outputs comes from; defaults to PCM outputs) - Capture mux (where the sound for PCM recording comes from; defaults to HW inputs) - Matrix mux (where the sound going into the mixer comes from; 18 inputs default off) - Mixer matrix (18 inputs * 10 outputs = 180 controls) - Level meters Changes since v1: - Add support for the Scarlett 18i8 Gen 2 - Save configuration parameters to NVRAM - Implemented feedback from Takashi's email 24/Apr/2019 - Moved private field from struct snd_usb_audio to struct usb_mixer_interface - Added timer and buffer fields to struct usb_mixer_interface - Other small code fixes/cleanups/improvements Changes since v2: - Add support for the Scarlett 6i6 Gen 2 - Add support for controlling the mute/dim switches (18i20 only) - Implemented feedback from Takashi's email 29/Apr/2019: One pointer field private_data and one function pointer private_free. Replaced timer with delayed work (thanks for that suggestion; it makes the code a *lot* simpler!). - The new functionality is disabled by default as there were reports of some Gen 2 devices not responding to the initialisation sequence and hanging. Added module parameter "scarlett_gen2_mixer_enable". If this parameter is not set, logs a message "Focusrite Scarlett Gen 2 Mixer Driver disabled; use options snd_usb_audio scarlett_gen2_mixer_enable=1 to enable and report any issues to g(a)b4.vu". Changes since v3: - No functional changes; fix checkpatch.pl error and typo in declaration. Changes since v4: - Implemented feedback from Takashi's email 9/Jul/2019: cancel delayed work on suspend, drop copyright texts, remove unnecessary blank lines, and run kmalloc outside the mutex. Changes since v5: - Implemented feedback from Takashi's emails 9-10/Jul/2019: use chip->setup value (device_setup option) instead of the scarlett_gen2_mixer_enable option and sync config to NVRAM immediately on suspend. - Fixed issue where the config save delayed work would be cancelled and not restarted if a scarlett2_*_ctl_put() function was called and the parameter value was not changed. - Renaming definitions and functions for consistency and move private free/suspend functions above their use so pre-declaration isn't necessary. diff --git a/sound/usb/Makefile b/sound/usb/Makefile index e1ce257ab705..f4b7384caa9d 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -11,6 +11,7 @@ snd-usb-audio-objs := card.o \ mixer.o \ mixer_quirks.o \ mixer_scarlett.o \ + mixer_scarlett_gen2.o \ mixer_us16x08.o \ pcm.o \ power.o \ diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c703f8534b07..734846faee7a 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3505,6 +3505,8 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) usb_kill_urb(mixer->urb); if (mixer->rc_urb) usb_kill_urb(mixer->rc_urb); + if (mixer->private_free) + mixer->private_free(mixer); mixer->disconnected = true; } @@ -3532,6 +3534,8 @@ static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer) int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer) { snd_usb_mixer_inactivate(mixer); + if (mixer->private_suspend) + mixer->private_suspend(mixer); return 0; } diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 394cd9107507..37e1b234c802 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -28,6 +28,10 @@ struct usb_mixer_interface { struct media_mixer_ctl *media_mixer_ctl; bool disconnected; + + void *private_data; + void (*private_free)(struct usb_mixer_interface *mixer); + void (*private_suspend)(struct usb_mixer_interface *mixer); }; #define MAX_CHANNELS 16 /* max logical channels */ diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 199fa157a411..70805c15b0b5 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -32,6 +32,7 @@ #include "mixer.h" #include "mixer_quirks.h" #include "mixer_scarlett.h" +#include "mixer_scarlett_gen2.h" #include "mixer_us16x08.h" #include "helper.h" @@ -2258,6 +2259,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_scarlett_controls_create(mixer); break; + case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */ + case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */ + case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */ + err = snd_scarlett_gen2_controls_create(mixer); + break; + case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ err = snd_soundblaster_e1_switch_create(mixer); break; diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c new file mode 100644 index 000000000000..a772e21bddaa --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.c @@ -0,0 +1,2076 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Focusrite Scarlett 6i6/18i8/18i20 Gen 2 Driver for ALSA + * + * Copyright (c) 2018-2019 by Geoffrey D. Bennett <g at b4.vu> + * + * Based on the Scarlett (Gen 1) Driver for ALSA: + * + * Copyright (c) 2013 by Tobias Hoffmann + * Copyright (c) 2013 by Robin Gareus <robin at gareus.org> + * Copyright (c) 2002 by Takashi Iwai <tiwai at suse.de> + * Copyright (c) 2014 by Chris J Arges <chris.j.arges at canonical.com> + * + * Many codes borrowed from audio.c by + * Alan Cox (alan at lxorguk.ukuu.org.uk) + * Thomas Sailer (sailer at ife.ee.ethz.ch) + * + * Code cleanup: + * David Henningsson <david.henningsson at canonical.com> + */ + +/* Mixer Interface for the Focusrite Scarlett 6i6/18i8/18i20 Gen 2 audio + * interface. Based on the Gen 1 driver and rewritten. + */ + +/* The protocol was reverse engineered by looking at the communication + * between Focusrite Control 2.3.4 and the Focusrite(R) Scarlett 18i20 + * (firmware 1083) using usbmon in July-August 2018. + * + * Scarlett 18i8 support added in April 2019. + * + * Scarlett 6i6 support added in June 2019 (thanks to Martin Wittmann + * for providing usbmon output and testing). + * + * This ALSA mixer gives access to: + * - input, output, mixer-matrix muxes + * - 18x10 mixer-matrix gain stages + * - gain/volume controls + * - level meters + * - line/inst level and pad controls + * + * <ditaa> + * /--------------\ 18chn 20chn /--------------\ + * | Hardware in +--+------\ /-------------+--+ ALSA PCM out | + * \--------------/ | | | | \--------------/ + * | | | /-----\ | + * | | | | | | + * | v v v | | + * | +---------------+ | | + * | \ Matrix Mux / | | + * | +-----+-----+ | | + * | | | | + * | |18chn | | + * | | | | + * | | 10chn| | + * | v | | + * | +------------+ | | + * | | Mixer | | | + * | | Matrix | | | + * | | | | | + * | | 18x10 Gain | | | + * | | stages | | | + * | +-----+------+ | | + * | | | | + * |18chn |10chn | |20chn + * | | | | + * | +----------/ | + * | | | + * v v v + * =========================== + * +---------------+ +--—------------+ + * \ Output Mux / \ Capture Mux / + * +---+---+---+ +-----+-----+ + * | | | + * 10chn| | |18chn + * | | | + * /--------------\ | | | /--------------\ + * | S/PDIF, ADAT |<--/ |10chn \-->| ALSA PCM in | + * | Hardware out | | \--------------/ + * \--------------/ | + * v + * +-------------+ Software gain per channel. + * | Master Gain |<-- 18i20 only: Switch per channel + * +------+------+ to select HW or SW gain control. + * | + * |10chn + * /--------------\ | + * | Analogue |<------/ + * | Hardware out | + * \--------------/ + * </ditaa> + * + */ + +#include <linux/slab.h> +#include <linux/usb.h> +#include <linux/moduleparam.h> + +#include <sound/control.h> +#include <sound/tlv.h> + +#include "usbaudio.h" +#include "mixer.h" +#include "helper.h" + +#include "mixer_scarlett_gen2.h" + +/* device_setup value to enable */ +#define SCARLETT2_ENABLE 0x01 + +/* some gui mixers can't handle negative ctl values */ +#define SCARLETT2_VOLUME_BIAS 127 + +/* mixer range from -80dB to +6dB in 0.5dB steps */ +#define SCARLETT2_MIXER_MIN_DB -80 +#define SCARLETT2_MIXER_BIAS (-SCARLETT2_MIXER_MIN_DB * 2) +#define SCARLETT2_MIXER_MAX_DB 6 +#define SCARLETT2_MIXER_MAX_VALUE \ + ((SCARLETT2_MIXER_MAX_DB - SCARLETT2_MIXER_MIN_DB) * 2) + +/* map from (dB + 80) * 2 to mixer value + * for dB in 0 .. 172: int(8192 * pow(10, ((dB - 160) / 2 / 20))) + */ +static const u16 scarlett2_mixer_values[173] = { + 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 23, 24, 25, 27, 29, 30, 32, 34, 36, 38, 41, 43, 46, 48, 51, + 54, 57, 61, 65, 68, 73, 77, 81, 86, 91, 97, 103, 109, 115, + 122, 129, 137, 145, 154, 163, 173, 183, 194, 205, 217, 230, + 244, 259, 274, 290, 307, 326, 345, 365, 387, 410, 434, 460, + 487, 516, 547, 579, 614, 650, 689, 730, 773, 819, 867, 919, + 973, 1031, 1092, 1157, 1225, 1298, 1375, 1456, 1543, 1634, + 1731, 1833, 1942, 2057, 2179, 2308, 2445, 2590, 2744, 2906, + 3078, 3261, 3454, 3659, 3876, 4105, 4349, 4606, 4879, 5168, + 5475, 5799, 6143, 6507, 6892, 7301, 7733, 8192, 8677, 9191, + 9736, 10313, 10924, 11571, 12257, 12983, 13752, 14567, 15430, + 16345 +}; + +/* Maximum number of analogue outputs */ +#define SCARLETT2_ANALOGUE_MAX 10 + +/* Maximum number of level and pad switches */ +#define SCARLETT2_LEVEL_SWITCH_MAX 2 +#define SCARLETT2_PAD_SWITCH_MAX 4 + +/* Maximum number of inputs to the mixer */ +#define SCARLETT2_INPUT_MIX_MAX 18 + +/* Maximum number of outputs from the mixer */ +#define SCARLETT2_OUTPUT_MIX_MAX 10 + +/* Maximum size of the data in the USB mux assignment message: + * 18 inputs, 20 outputs, 18 matrix inputs, 8 spare + */ +#define SCARLETT2_MUX_MAX 64 + +/* Number of meters: + * 18 inputs, 20 outputs, 18 matrix inputs + */ +#define SCARLETT2_NUM_METERS 56 + +/* Hardware port types: + * - None (no input to mux) + * - Analogue I/O + * - S/PDIF I/O + * - ADAT I/O + * - Mixer I/O + * - PCM I/O + */ +enum { + SCARLETT2_PORT_TYPE_NONE = 0, + SCARLETT2_PORT_TYPE_ANALOGUE = 1, + SCARLETT2_PORT_TYPE_SPDIF = 2, + SCARLETT2_PORT_TYPE_ADAT = 3, + SCARLETT2_PORT_TYPE_MIX = 4, + SCARLETT2_PORT_TYPE_PCM = 5, + SCARLETT2_PORT_TYPE_COUNT = 6, +}; + +/* Count of total I/O and number available at each sample rate */ +enum { + SCARLETT2_PORT_IN = 0, + SCARLETT2_PORT_OUT = 1, + SCARLETT2_PORT_OUT_44 = 2, + SCARLETT2_PORT_OUT_88 = 3, + SCARLETT2_PORT_OUT_176 = 4, + SCARLETT2_PORT_DIRECTIONS = 5, +}; + +/* Hardware buttons on the 18i20 */ +#define SCARLETT2_BUTTON_MAX 2 + +static const char *const scarlett2_button_names[SCARLETT2_BUTTON_MAX] = { + "Mute", "Dim" +}; + +/* Description of each hardware port type: + * - id: hardware ID for this port type + * - num: number of sources/destinations of this port type + * - src_descr: printf format string for mux input selections + * - src_num_offset: added to channel number for the fprintf + * - dst_descr: printf format string for mixer controls + */ +struct scarlett2_ports { + u16 id; + int num[SCARLETT2_PORT_DIRECTIONS]; + const char * const src_descr; + int src_num_offset; + const char * const dst_descr; +}; + +struct scarlett2_device_info { + u8 line_out_hw_vol; /* line out hw volume is sw controlled */ + u8 button_count; /* number of buttons */ + u8 level_input_count; /* inputs with level selectable */ + u8 pad_input_count; /* inputs with pad selectable */ + const char * const line_out_descrs[SCARLETT2_ANALOGUE_MAX]; + struct scarlett2_ports ports[SCARLETT2_PORT_TYPE_COUNT]; +}; + +struct scarlett2_mixer_data { + struct usb_mixer_interface *mixer; + struct mutex usb_mutex; /* prevent sending concurrent USB requests */ + struct mutex data_mutex; /* lock access to this data */ + struct delayed_work work; + const struct scarlett2_device_info *info; + int num_mux_srcs; + u16 scarlett2_seq; + u8 vol_updated; + u8 master_vol; + u8 vol[SCARLETT2_ANALOGUE_MAX]; + u8 vol_sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + u8 level_switch[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switch[SCARLETT2_PAD_SWITCH_MAX]; + u8 buttons[SCARLETT2_BUTTON_MAX]; + struct snd_kcontrol *master_vol_ctl; + struct snd_kcontrol *vol_ctls[SCARLETT2_ANALOGUE_MAX]; + struct snd_kcontrol *button_ctls[SCARLETT2_BUTTON_MAX]; + u8 mux[SCARLETT2_MUX_MAX]; + u8 mix[SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX]; +}; + +/*** Model-specific data ***/ + +static const struct scarlett2_device_info s6i6_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first two analogue inputs have an optional pad. */ + .pad_input_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones L", + "Headphones R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 8 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 4, 4, 4, 4, 4 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 6, 6, 6, 6, 6 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i8_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first four analogue inputs have an optional pad. */ + .pad_input_count = 4, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 4 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 6, 6, 6, 6 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 0, 0, 0, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i20_gen2_info = { + /* The analogue line outputs on the 18i20 can be switched + * between software and hardware volume control + */ + .line_out_hw_vol = 1, + + /* Mute and dim buttons */ + .button_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + NULL, + NULL, + NULL, + NULL, + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 6 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 10, 10, 10, 10 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 8, 8, 4, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + .dst_descr = "ADAT Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +/* get the starting port index number for a given port type/direction */ +static int scarlett2_get_port_start_num(const struct scarlett2_ports *ports, + int direction, int port_type) +{ + int i, num = 0; + + for (i = 0; i < port_type; i++) + num += ports[i].num[direction]; + + return num; +} + +/*** USB Interactions ***/ + +/* Vendor-Specific Interface, Endpoint, MaxPacketSize, Interval */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE 5 +#define SCARLETT2_USB_INTERRUPT_ENDPOINT 4 +#define SCARLETT2_USB_INTERRUPT_MAX_DATA 64 +#define SCARLETT2_USB_INTERRUPT_INTERVAL 3 + +/* Interrupt flags for volume and mute/dim button changes */ +#define SCARLETT2_USB_INTERRUPT_VOL_CHANGE 0x400000 +#define SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE 0x200000 + +/* Commands for sending/receiving requests/responses */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ 2 +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP 3 + +#define SCARLETT2_USB_INIT_SEQ 0x00000000 +#define SCARLETT2_USB_GET_METER_LEVELS 0x00001001 +#define SCARLETT2_USB_SET_MIX 0x00002002 +#define SCARLETT2_USB_SET_MUX 0x00003002 +#define SCARLETT2_USB_GET_DATA 0x00800000 +#define SCARLETT2_USB_SET_DATA 0x00800001 +#define SCARLETT2_USB_DATA_CMD 0x00800002 +#define SCARLETT2_USB_CONFIG_SAVE 6 + +#define SCARLETT2_USB_VOLUME_STATUS_OFFSET 0x31 +#define SCARLETT2_USB_METER_LEVELS_GET_MAGIC 1 + +/* volume status is read together (matches scarlett2_config_items[]) */ +struct scarlett2_usb_volume_status { + /* mute & dim buttons */ + u8 buttons[SCARLETT2_BUTTON_MAX]; + + u8 pad1; + + /* software volume setting */ + s16 sw_vol[SCARLETT2_ANALOGUE_MAX]; + + /* actual volume of output inc. dim (-18dB) */ + s16 hw_vol[SCARLETT2_ANALOGUE_MAX]; + + u8 pad2[SCARLETT2_ANALOGUE_MAX]; + + /* sw (0) or hw (1) controlled */ + u8 sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + + u8 pad3[6]; + + /* front panel volume knob */ + s16 master_vol; +} __packed; + +/* Configuration parameters that can be read and written */ +enum { + SCARLETT2_CONFIG_BUTTONS = 0, + SCARLETT2_CONFIG_LINE_OUT_VOLUME = 1, + SCARLETT2_CONFIG_SW_HW_SWITCH = 2, + SCARLETT2_CONFIG_LEVEL_SWITCH = 3, + SCARLETT2_CONFIG_PAD_SWITCH = 4, + SCARLETT2_CONFIG_COUNT = 5 +}; + +/* Location, size, and activation command number for the configuration + * parameters + */ +struct scarlett2_config { + u8 offset; + u8 size; + u8 activate; +}; + +static const struct scarlett2_config + scarlett2_config_items[SCARLETT2_CONFIG_COUNT] = { + /* Mute/Dim Buttons */ + { + .offset = 0x31, + .size = 1, + .activate = 2 + }, + + /* Line Out Volume */ + { + .offset = 0x34, + .size = 2, + .activate = 1 + }, + + /* SW/HW Volume Switch */ + { + .offset = 0x66, + .size = 1, + .activate = 3 + }, + + /* Level Switch */ + { + .offset = 0x7c, + .size = 1, + .activate = 7 + }, + + /* Pad Switch */ + { + .offset = 0x84, + .size = 1, + .activate = 8 + } +}; + +/* proprietary request/response format */ +struct scarlett2_usb_packet { + u32 cmd; + u16 size; + u16 seq; + u32 error; + u32 pad; + u8 data[]; +}; + +#define SCARLETT2_USB_PACKET_LEN (sizeof(struct scarlett2_usb_packet)) + +static void scarlett2_fill_request_header(struct scarlett2_mixer_data *private, + struct scarlett2_usb_packet *req, + u32 cmd, u16 req_size) +{ + /* sequence must go up by 1 for each request */ + u16 seq = private->scarlett2_seq++; + + req->cmd = cpu_to_le32(cmd); + req->size = cpu_to_le16(req_size); + req->seq = cpu_to_le16(seq); + req->error = 0; + req->pad = 0; +} + +/* Send a proprietary format request to the Scarlett interface */ +static int scarlett2_usb( + struct usb_mixer_interface *mixer, u32 cmd, + void *req_data, u16 req_size, void *resp_data, u16 resp_size) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + u16 req_buf_size = sizeof(struct scarlett2_usb_packet) + req_size; + u16 resp_buf_size = sizeof(struct scarlett2_usb_packet) + resp_size; + struct scarlett2_usb_packet *req = 0, *resp = 0; + int err = 0; + + req = kmalloc(req_buf_size, GFP_KERNEL); + if (!req) { + err = -ENOMEM; + goto error; + } + + resp = kmalloc(resp_buf_size, GFP_KERNEL); + if (!resp) { + err = -ENOMEM; + goto error; + } + + mutex_lock(&private->usb_mutex); + + /* build request message and send it */ + + scarlett2_fill_request_header(private, req, cmd, req_size); + + if (req_size) + memcpy(req->data, req_data, req_size); + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + req, + req_buf_size); + + if (err != req_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB request result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + /* send a second message to get the response */ + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + resp, + resp_buf_size); + + /* validate the response */ + + if (err != resp_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB response result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + if (resp->cmd != req->cmd || + resp->seq != req->seq || + resp_size != le16_to_cpu(resp->size) || + resp->error || + resp->pad) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB invalid response; " + "cmd tx/rx %d/%d seq %d/%d size %d/%d " + "error %d pad %d\n", + le16_to_cpu(req->cmd), le16_to_cpu(resp->cmd), + le16_to_cpu(req->seq), le16_to_cpu(resp->seq), + resp_size, le16_to_cpu(resp->size), + le16_to_cpu(resp->error), + le16_to_cpu(resp->pad)); + err = -EINVAL; + goto unlock; + } + + if (resp_size > 0) + memcpy(resp_data, resp->data, resp_size); + +unlock: + mutex_unlock(&private->usb_mutex); +error: + kfree(req); + kfree(resp); + return err; +} + +/* Send SCARLETT2_USB_DATA_CMD SCARLETT2_USB_CONFIG_SAVE */ +static void scarlett2_config_save(struct usb_mixer_interface *mixer) +{ + u32 req = cpu_to_le32(SCARLETT2_USB_CONFIG_SAVE); + + scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req, sizeof(u32), + NULL, 0); +} + +/* Delayed work to save config */ +static void scarlett2_config_save_work(struct work_struct *work) +{ + struct scarlett2_mixer_data *private = + container_of(work, struct scarlett2_mixer_data, work.work); + + scarlett2_config_save(private->mixer); +} + +/* Send a USB message to set a configuration parameter (volume level, + * sw/hw volume switch, line/inst level switch, or pad switch) + */ +static int scarlett2_usb_set_config( + struct usb_mixer_interface *mixer, + int config_item_num, int index, int value) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + struct { + u32 offset; + u32 bytes; + s32 value; + } __packed req; + u32 req2; + int err; + struct scarlett2_mixer_data *private = mixer->private_data; + + /* Cancel any pending NVRAM save */ + cancel_delayed_work_sync(&private->work); + + /* Send the configuration parameter data */ + req.offset = cpu_to_le32(config_item.offset + index * config_item.size); + req.bytes = cpu_to_le32(config_item.size); + req.value = cpu_to_le32(value); + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_DATA, + &req, sizeof(u32) * 2 + config_item.size, + NULL, 0); + if (err < 0) + return err; + + /* Activate the change */ + req2 = cpu_to_le32(config_item.activate); + err = scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req2, sizeof(req2), NULL, 0); + if (err < 0) + return err; + + /* Schedule the change to be written to NVRAM */ + schedule_delayed_work(&private->work, msecs_to_jiffies(2000)); + + return 0; +} + +/* Send a USB message to get data; result placed in *buf */ +static int scarlett2_usb_get( + struct usb_mixer_interface *mixer, + int offset, void *buf, int size) +{ + struct { + u32 offset; + u32 size; + } __packed req; + + req.offset = cpu_to_le32(offset); + req.size = cpu_to_le32(size); + return scarlett2_usb(mixer, SCARLETT2_USB_GET_DATA, + &req, sizeof(req), buf, size); +} + +/* Send a USB message to get configuration parameters; result placed in *buf */ +static int scarlett2_usb_get_config( + struct usb_mixer_interface *mixer, + int config_item_num, int count, void *buf) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + int size = config_item.size * count; + + return scarlett2_usb_get(mixer, config_item.offset, buf, size); +} + +/* Send a USB message to get volume status; result placed in *buf */ +static int scarlett2_usb_get_volume_status( + struct usb_mixer_interface *mixer, + struct scarlett2_usb_volume_status *buf) +{ + return scarlett2_usb_get(mixer, SCARLETT2_USB_VOLUME_STATUS_OFFSET, + buf, sizeof(*buf)); +} + +/* Send a USB message to set the volumes for all inputs of one mix + * (values obtained from private->mix[]) + */ +static int scarlett2_usb_set_mix(struct usb_mixer_interface *mixer, + int mix_num) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + + struct { + u16 mix_num; + u16 data[SCARLETT2_INPUT_MIX_MAX]; + } __packed req; + + int i, j; + int num_mixer_in = + info->ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + + req.mix_num = cpu_to_le16(mix_num); + + for (i = 0, j = mix_num * num_mixer_in; i < num_mixer_in; i++, j++) + req.data[i] = cpu_to_le16( + scarlett2_mixer_values[private->mix[j]] + ); + + return scarlett2_usb(mixer, SCARLETT2_USB_SET_MIX, + &req, (num_mixer_in + 1) * sizeof(u16), + NULL, 0); +} + +/* Convert a port number index (per info->ports) to a hardware ID */ +static u32 scarlett2_mux_src_num_to_id(const struct scarlett2_ports *ports, + int num) +{ + int port_type; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (num < ports[port_type].num[SCARLETT2_PORT_IN]) + return ports[port_type].id | num; + num -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + /* Oops */ + return 0; +} + +/* Send USB messages to set mux inputs */ +static int scarlett2_usb_set_mux(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int rate, port_dir_rate; + + static const int assignment_order[SCARLETT2_PORT_TYPE_COUNT] = { + SCARLETT2_PORT_TYPE_PCM, + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + SCARLETT2_PORT_TYPE_MIX, + SCARLETT2_PORT_TYPE_NONE, + }; + + struct { + u16 pad; + u16 num; + u32 data[SCARLETT2_MUX_MAX]; + } __packed req; + + req.pad = 0; + + /* mux settings for each rate */ + for (rate = 0, port_dir_rate = SCARLETT2_PORT_OUT_44; + port_dir_rate <= SCARLETT2_PORT_OUT_176; + rate++, port_dir_rate++) { + int order_num, i, err; + + req.num = cpu_to_le16(rate); + + for (order_num = 0, i = 0; + order_num < SCARLETT2_PORT_TYPE_COUNT; + order_num++) { + int port_type = assignment_order[order_num]; + int j = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + port_type); + int port_id = ports[port_type].id; + int channel; + + for (channel = 0; + channel < ports[port_type].num[port_dir_rate]; + channel++, i++, j++) + /* lower 12 bits for the destination and + * next 12 bits for the source + */ + req.data[i] = !port_id + ? 0 + : cpu_to_le32( + port_id | + channel | + scarlett2_mux_src_num_to_id( + ports, private->mux[j] + ) << 12 + ); + + /* skip private->mux[j] entries not output */ + j += ports[port_type].num[SCARLETT2_PORT_OUT] - + ports[port_type].num[port_dir_rate]; + } + + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_MUX, + &req, (i + 1) * sizeof(u32), + NULL, 0); + if (err < 0) + return err; + } + + return 0; +} + +/* Send USB message to get meter levels */ +static int scarlett2_usb_get_meter_levels(struct usb_mixer_interface *mixer, + u16 *levels) +{ + struct { + u16 pad; + u16 num_meters; + u32 magic; + } __packed req; + u32 resp[SCARLETT2_NUM_METERS]; + int i, err; + + req.pad = 0; + req.num_meters = cpu_to_le16(SCARLETT2_NUM_METERS); + req.magic = cpu_to_le32(SCARLETT2_USB_METER_LEVELS_GET_MAGIC); + err = scarlett2_usb(mixer, SCARLETT2_USB_GET_METER_LEVELS, + &req, sizeof(req), resp, sizeof(resp)); + if (err < 0) + return err; + + /* copy, convert to u16 */ + for (i = 0; i < SCARLETT2_NUM_METERS; i++) + levels[i] = resp[i]; + + return 0; +} + +/*** Control Functions ***/ + +/* helper function to create a new control */ +static int scarlett2_add_new_ctl(struct usb_mixer_interface *mixer, + const struct snd_kcontrol_new *ncontrol, + int index, int channels, const char *name, + struct snd_kcontrol **kctl_return) +{ + struct snd_kcontrol *kctl; + struct usb_mixer_elem_info *elem; + int err; + + elem = kzalloc(sizeof(*elem), GFP_KERNEL); + if (!elem) + return -ENOMEM; + + elem->head.mixer = mixer; + elem->control = index; + elem->head.id = index; + elem->channels = channels; + + kctl = snd_ctl_new1(ncontrol, elem); + if (!kctl) { + kfree(elem); + return -ENOMEM; + } + kctl->private_free = snd_usb_mixer_elem_free; + + strlcpy(kctl->id.name, name, sizeof(kctl->id.name)); + + err = snd_usb_mixer_add_control(&elem->head, kctl); + if (err < 0) + return err; + + if (kctl_return) + *kctl_return = kctl; + + return 0; +} + +/*** Analogue Line Out Volume Controls ***/ + +/* Update hardware volume controls after receiving notification that + * they have changed + */ +static int scarlett2_update_volumes(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + struct scarlett2_usb_volume_status volume_status; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + + private->vol_updated = 0; + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + if (private->vol_sw_hw_switch[i]) + private->vol[i] = private->master_vol; + } + + for (i = 0; i < private->info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +static int scarlett2_volume_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT2_VOLUME_BIAS; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->master_vol; + return 0; +} + +static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->vol[index]; + return 0; +} + +static int scarlett2_volume_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->vol[index]; + val = ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol[index] = val; + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, val - SCARLETT2_VOLUME_BIAS); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett2_gain, -SCARLETT2_VOLUME_BIAS * 100, 0 +); + +static const struct snd_kcontrol_new scarlett2_master_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READ | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_master_volume_ctl_get, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett2_gain } +}; + +static const struct snd_kcontrol_new scarlett2_line_out_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_volume_ctl_get, + .put = scarlett2_volume_ctl_put, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett2_gain } +}; + +/*** HW/SW Volume Switch Controls ***/ + +static int scarlett2_sw_hw_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "SW", "HW" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_sw_hw_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->vol_sw_hw_switch[elem->control]; + return 0; +} + +static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->vol_sw_hw_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol_sw_hw_switch[index] = val; + + /* Change access mode to RO (hardware controlled volume) + * or RW (software controlled volume) + */ + if (val) + private->vol_ctls[index]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + else + private->vol_ctls[index]->vd[0].access |= + SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* Reset volume to master volume */ + private->vol[index] = private->master_vol; + + /* Set SW volume to current HW volume */ + err = scarlett2_usb_set_config( + mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, private->master_vol - SCARLETT2_VOLUME_BIAS); + if (err < 0) + goto unlock; + + /* Notify of RO/RW change */ + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_INFO, + &private->vol_ctls[index]->id); + + /* Send SW/HW switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_SW_HW_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_sw_hw_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_sw_hw_enum_ctl_info, + .get = scarlett2_sw_hw_enum_ctl_get, + .put = scarlett2_sw_hw_enum_ctl_put, +}; + +/*** Line Level/Instrument Level Switch Controls ***/ + +static int scarlett2_level_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "Line", "Inst" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_level_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->level_switch[elem->control]; + return 0; +} + +static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->level_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->level_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LEVEL_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_level_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_level_enum_ctl_info, + .get = scarlett2_level_enum_ctl_get, + .put = scarlett2_level_enum_ctl_put, +}; + +/*** Pad Switch Controls ***/ + +static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->pad_switch[elem->control]; + return 0; +} + +static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->pad_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->pad_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_PAD_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_pad_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_pad_ctl_get, + .put = scarlett2_pad_ctl_put, +}; + +/*** Mute/Dim Controls ***/ + +static int scarlett2_button_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.enumerated.item[0] = private->buttons[elem->control]; + return 0; +} + +static int scarlett2_button_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->buttons[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->buttons[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_BUTTONS, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_button_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_button_ctl_get, + .put = scarlett2_button_ctl_put +}; + +/*** Create the analogue output controls ***/ + +static int scarlett2_add_line_out_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add R/O HW volume control */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), "Master HW Playback Volume"); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_master_volume_ctl, + 0, 1, s, &private->master_vol_ctl); + if (err < 0) + return err; + } + + /* Add volume controls */ + for (i = 0; i < num_line_out; i++) { + + /* Fader */ + if (info->line_out_descrs[i]) + snprintf(s, sizeof(s), + "Line %02d (%s) Playback Volume", + i + 1, info->line_out_descrs[i]); + else + snprintf(s, sizeof(s), + "Line %02d Playback Volume", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_line_out_volume_ctl, + i, 1, s, &private->vol_ctls[i]); + if (err < 0) + return err; + + /* Make the fader read-only if the SW/HW switch is set to HW */ + if (private->vol_sw_hw_switch[i]) + private->vol_ctls[i]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* SW/HW Switch */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), + "Line Out %02d Volume Control Playback Enum", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_sw_hw_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + /* Add HW button controls */ + for (i = 0; i < private->info->button_count; i++) { + err = scarlett2_add_new_ctl(mixer, &scarlett2_button_ctl, + i, 1, scarlett2_button_names[i], + &private->button_ctls[i]); + if (err < 0) + return err; + } + + return 0; +} + +/*** Create the analogue input controls ***/ + +static int scarlett2_add_line_in_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add input level (line/inst) controls */ + for (i = 0; i < info->level_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Level Capture Enum", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_level_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + /* Add input pad controls */ + for (i = 0; i < info->pad_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Pad Capture Switch", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_pad_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + return 0; +} + +/*** Mixer Volume Controls ***/ + +static int scarlett2_mixer_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT2_MIXER_MAX_VALUE; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_mixer_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.integer.value[0] = private->mix[elem->control]; + return 0; +} + +static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int oval, val, num_mixer_in, mix_num, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mix[elem->control]; + val = ucontrol->value.integer.value[0]; + num_mixer_in = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + mix_num = elem->control / num_mixer_in; + + if (oval == val) + goto unlock; + + private->mix[elem->control] = val; + err = scarlett2_usb_set_mix(mixer, mix_num); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett2_mixer, + SCARLETT2_MIXER_MIN_DB * 100, + SCARLETT2_MIXER_MAX_DB * 100 +); + +static const struct snd_kcontrol_new scarlett2_mixer_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_mixer_ctl_info, + .get = scarlett2_mixer_ctl_get, + .put = scarlett2_mixer_ctl_put, + .private_value = SCARLETT2_MIXER_MAX_DB, /* max value */ + .tlv = { .p = db_scale_scarlett2_mixer } +}; + +static int scarlett2_add_mixer_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int err, i, j; + int index; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + int num_inputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + int num_outputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_IN]; + + for (i = 0, index = 0; i < num_outputs; i++) { + for (j = 0; j < num_inputs; j++, index++) { + snprintf(s, sizeof(s), + "Mix %c Input %02d Playback Volume", + 'A' + i, j + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_mixer_ctl, + index, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Mux Source Selection Controls ***/ + +static int scarlett2_mux_src_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + unsigned int item = uinfo->value.enumerated.item; + int items = private->num_mux_srcs; + int port_type; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->count = elem->channels; + uinfo->value.enumerated.items = items; + + if (item >= items) + item = uinfo->value.enumerated.item = items - 1; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (item < ports[port_type].num[SCARLETT2_PORT_IN]) { + sprintf(uinfo->value.enumerated.name, + ports[port_type].src_descr, + item + ports[port_type].src_num_offset); + return 0; + } + item -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + return -EINVAL; +} + +static int scarlett2_mux_src_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = private->mux[elem->control]; + return 0; +} + +static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mux[index]; + val = clamp(ucontrol->value.integer.value[0], + 0L, private->num_mux_srcs - 1L); + + if (oval == val) + goto unlock; + + private->mux[index] = val; + err = scarlett2_usb_set_mux(mixer); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_mux_src_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_mux_src_enum_ctl_info, + .get = scarlett2_mux_src_enum_ctl_get, + .put = scarlett2_mux_src_enum_ctl_put, +}; + +static int scarlett2_add_mux_enums(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int port_type, channel, i; + + for (i = 0, port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + for (channel = 0; + channel < ports[port_type].num[SCARLETT2_PORT_OUT]; + channel++, i++) { + int err; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + const char *const descr = ports[port_type].dst_descr; + + snprintf(s, sizeof(s) - 5, descr, channel + 1); + strcat(s, " Enum"); + + err = scarlett2_add_new_ctl(mixer, + &scarlett2_mux_src_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Meter Controls ***/ + +static int scarlett2_meter_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 4095; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + u16 meter_levels[SCARLETT2_NUM_METERS]; + int i, err; + + err = scarlett2_usb_get_meter_levels(elem->head.mixer, meter_levels); + if (err < 0) + return err; + + for (i = 0; i < elem->channels; i++) + ucontrol->value.integer.value[i] = meter_levels[i]; + + return 0; +} + +static const struct snd_kcontrol_new scarlett2_meter_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, + .name = "", + .info = scarlett2_meter_ctl_info, + .get = scarlett2_meter_ctl_get +}; + +static int scarlett2_add_meter_ctl(struct usb_mixer_interface *mixer) +{ + return scarlett2_add_new_ctl(mixer, &scarlett2_meter_ctl, + 0, SCARLETT2_NUM_METERS, + "Level Meter", NULL); +} + +/*** Cleanup/Suspend Callbacks ***/ + +static void scarlett2_private_free(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + cancel_delayed_work_sync(&private->work); + kfree(private); + mixer->private_data = NULL; +} + +static void scarlett2_private_suspend(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + if (cancel_delayed_work_sync(&private->work)) + scarlett2_config_save(private->mixer); +} + +/*** Initialisation ***/ + +static int scarlett2_count_mux_srcs(const struct scarlett2_ports *ports) +{ + int port_type, count = 0; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) + count += ports[port_type].num[SCARLETT2_PORT_IN]; + + return count; +} + +/* Default routing connects PCM outputs and inputs to Analogue, + * S/PDIF, then ADAT + */ +static void scarlett2_init_routing(u8 *mux, + const struct scarlett2_ports *ports) +{ + int i, input_num, input_count, port_type; + int output_num, output_count, port_type_connect_num; + + static const int connect_order[] = { + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + -1 + }; + + /* Assign PCM inputs (routing outputs) */ + output_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + SCARLETT2_PORT_TYPE_PCM); + output_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_OUT]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + input_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_IN, port_type); + input_count = ports[port_type].num[SCARLETT2_PORT_IN]; + for (i = 0; + i < input_count && output_count; + i++, output_count--) + mux[output_num++] = input_num++; + } + + /* Assign PCM outputs (routing inputs) */ + input_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_IN, + SCARLETT2_PORT_TYPE_PCM); + input_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_IN]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + output_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_OUT, port_type); + output_count = ports[port_type].num[SCARLETT2_PORT_OUT]; + for (i = 0; + i < output_count && input_count; + i++, input_count--) + mux[output_num++] = input_num++; + } +} + +/* Initialise private data, routing, sequence number */ +static int scarlett2_init_private(struct usb_mixer_interface *mixer, + const struct scarlett2_device_info *info) +{ + struct scarlett2_mixer_data *private = + kzalloc(sizeof(struct scarlett2_mixer_data), GFP_KERNEL); + + if (!private) + return -ENOMEM; + + mutex_init(&private->usb_mutex); + mutex_init(&private->data_mutex); + INIT_DELAYED_WORK(&private->work, scarlett2_config_save_work); + private->info = info; + private->num_mux_srcs = scarlett2_count_mux_srcs(info->ports); + private->scarlett2_seq = 0; + private->mixer = mixer; + mixer->private_data = private; + mixer->private_free = scarlett2_private_free; + mixer->private_suspend = scarlett2_private_suspend; + + /* Setup default routing */ + scarlett2_init_routing(private->mux, info->ports); + + /* Initialise the sequence number used for the proprietary commands */ + return scarlett2_usb(mixer, SCARLETT2_USB_INIT_SEQ, + NULL, 0, NULL, 0); +} + +/* Read line-in config and line-out volume settings on start */ +static int scarlett2_read_configs(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + u8 level_switches[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switches[SCARLETT2_PAD_SWITCH_MAX]; + struct scarlett2_usb_volume_status volume_status; + int err, i; + + if (info->level_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_LEVEL_SWITCH, + info->level_input_count, + level_switches); + if (err < 0) + return err; + for (i = 0; i < info->level_input_count; i++) + private->level_switch[i] = level_switches[i]; + } + + if (info->pad_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_PAD_SWITCH, + info->pad_input_count, + pad_switches); + if (err < 0) + return err; + for (i = 0; i < info->pad_input_count; i++) + private->pad_switch[i] = pad_switches[i]; + } + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + int volume; + + private->vol_sw_hw_switch[i] = + info->line_out_hw_vol + && volume_status.sw_hw_switch[i]; + + volume = private->vol_sw_hw_switch[i] + ? volume_status.master_vol + : volume_status.sw_vol[i]; + volume = clamp(volume + SCARLETT2_VOLUME_BIAS, + 0, SCARLETT2_VOLUME_BIAS); + private->vol[i] = volume; + } + + for (i = 0; i < info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +/* Notify on volume change */ +static void scarlett2_mixer_interrupt_vol_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int i; + + private->vol_updated = 1; + + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->master_vol_ctl->id); + + for (i = 0; i < num_line_out; i++) { + if (!private->vol_sw_hw_switch[i]) + continue; + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->vol_ctls[i]->id); + } +} + +/* Notify on button change */ +static void scarlett2_mixer_interrupt_button_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + int i; + + private->vol_updated = 1; + + for (i = 0; i < private->info->button_count; i++) + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->button_ctls[i]->id); +} + +/* Interrupt callback */ +static void scarlett2_mixer_interrupt(struct urb *urb) +{ + struct usb_mixer_interface *mixer = urb->context; + int len = urb->actual_length; + int ustatus = urb->status; + u32 data; + + if (ustatus != 0) + goto requeue; + + if (len == 8) { + data = le32_to_cpu(*(u32 *)urb->transfer_buffer); + if (data & SCARLETT2_USB_INTERRUPT_VOL_CHANGE) + scarlett2_mixer_interrupt_vol_change(mixer); + if (data & SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE) + scarlett2_mixer_interrupt_button_change(mixer); + } else { + usb_audio_err(mixer->chip, + "scarlett mixer interrupt length %d\n", len); + } + +requeue: + if (ustatus != -ENOENT && + ustatus != -ECONNRESET && + ustatus != -ESHUTDOWN) { + urb->dev = mixer->chip->dev; + usb_submit_urb(urb, GFP_ATOMIC); + } +} + +static int scarlett2_mixer_status_create(struct usb_mixer_interface *mixer) +{ + void *transfer_buffer; + + if (mixer->urb) { + usb_audio_err(mixer->chip, + "%s: mixer urb already in use!\n", __func__); + return 0; + } + + mixer->urb = usb_alloc_urb(0, GFP_KERNEL); + if (!mixer->urb) + return -ENOMEM; + + transfer_buffer = kmalloc(SCARLETT2_USB_INTERRUPT_MAX_DATA, GFP_KERNEL); + if (!transfer_buffer) + return -ENOMEM; + + usb_fill_int_urb( + mixer->urb, + mixer->chip->dev, + usb_rcvintpipe(mixer->chip->dev, + SCARLETT2_USB_INTERRUPT_ENDPOINT), + transfer_buffer, + SCARLETT2_USB_INTERRUPT_MAX_DATA, + scarlett2_mixer_interrupt, + mixer, + SCARLETT2_USB_INTERRUPT_INTERVAL); + + return usb_submit_urb(mixer->urb, GFP_KERNEL); +} + +/* Entry point */ +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) +{ + const struct scarlett2_device_info *info; + int err; + + /* only use UAC_VERSION_2 */ + if (!mixer->protocol) + return 0; + + switch (mixer->chip->usb_id) { + case USB_ID(0x1235, 0x8203): + info = &s6i6_gen2_info; + break; + case USB_ID(0x1235, 0x8204): + info = &s18i8_gen2_info; + break; + case USB_ID(0x1235, 0x8201): + info = &s18i20_gen2_info; + break; + default: /* device not (yet) supported */ + return -EINVAL; + } + + if (!(mixer->chip->setup & SCARLETT2_ENABLE)) { + usb_audio_err(mixer->chip, + "Focusrite Scarlett Gen 2 Mixer Driver disabled; " + "use options snd_usb_audio device_setup=1 " + "to enable and report any issues to g(a)b4.vu"); + return 0; + } + + /* Initialise private data, routing, sequence number */ + err = scarlett2_init_private(mixer, info); + if (err < 0) + return err; + + /* Read volume levels and controls from the interface */ + err = scarlett2_read_configs(mixer); + if (err < 0) + return err; + + /* Create the analogue output controls */ + err = scarlett2_add_line_out_ctls(mixer); + if (err < 0) + return err; + + /* Create the analogue input controls */ + err = scarlett2_add_line_in_ctls(mixer); + if (err < 0) + return err; + + /* Create the input, output, and mixer mux input selections */ + err = scarlett2_add_mux_enums(mixer); + if (err < 0) + return err; + + /* Create the matrix mixer controls */ + err = scarlett2_add_mixer_ctls(mixer); + if (err < 0) + return err; + + /* Create the level meter controls */ + err = scarlett2_add_meter_ctl(mixer); + if (err < 0) + return err; + + /* Set up the interrupt polling if there are hardware buttons */ + if (info->button_count) { + err = scarlett2_mixer_status_create(mixer); + if (err < 0) + return err; + } + + return 0; +} diff --git a/sound/usb/mixer_scarlett_gen2.h b/sound/usb/mixer_scarlett_gen2.h new file mode 100644 index 000000000000..52e1dad77afd --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __USB_MIXER_SCARLETT_GEN2_H +#define __USB_MIXER_SCARLETT_GEN2_H + +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer); + +#endif /* __USB_MIXER_SCARLETT_GEN2_H */

1 0

[alsa-devel] [PATCH V4] ALSA: usb-audio: Scarlett Gen 2 mixer interface
by Geoffrey D. Bennett 10 Jul '19

10 Jul '19

Add mixer quirk for the Focusrite Scarlett 6i6, 18i8, and 18i20 Gen 2 audio interfaces. Although the interfaces are USB compliant, additional input/output level controls and hardware routing/mixing functionality are available using proprietary USB requests. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- Hi all, This patch adds the following controls for the Scarlett 6i6, 18i8, and 18i20 Gen 2: - Master volume knob indicator (18i20 only) - Mute and dim switches (18i20 only) - Volume controls for the analogue HW outputs - HW/SW volume switches for the 10 analogue HW outputs (18i20 only) - Line Level/Instrument Level and Pad controls (6i6 and 18i8 only) - Output mux (where the sound for the HW outputs comes from; defaults to PCM outputs) - Capture mux (where the sound for PCM recording comes from; defaults to HW inputs) - Matrix mux (where the sound going into the mixer comes from; 18 inputs default off) - Mixer matrix (18 inputs * 10 outputs = 180 controls) - Level meters Changes since v1: - Add support for the Scarlett 18i8 Gen 2 - Save configuration parameters to NVRAM - Implemented feedback from Takashi's email 24/Apr/2019 - Moved private field from struct snd_usb_audio to struct usb_mixer_interface - Added timer and buffer fields to struct usb_mixer_interface - Other small code fixes/cleanups/improvements Changes since v2: - Add support for the Scarlett 6i6 Gen 2 - Add support for controlling the mute/dim switches (18i20 only) - Implemented feedback from Takashi's email 29/Apr/2019: One pointer field private_data and one function pointer private_free. Replaced timer with delayed work (thanks for that suggestion; it makes the code a *lot* simpler!). - The new functionality is disabled by default as there were reports of some Gen 2 devices not responding to the initialisation sequence and hanging. Added module parameter "scarlett_gen2_mixer_enable". If this parameter is not set, logs a message "Focusrite Scarlett Gen 2 Mixer Driver disabled; use options snd_usb_audio scarlett_gen2_mixer_enable=1 to enable and report any issues to g(a)b4.vu". Changes since v3: - No functional changes; fix checkpatch.pl error and typo in declaration. Only outstanding question I believe: - Takashi, you wrote last time "Also, the delayed work needs to be canceled or flushed at PM suspend callback as well as disconnecting." I'm not sure why it should be cancelled; is it not okay to do on resume? But I tested suspending while the delayed work was waiting and it seemed like the delayed work was cancelled anyway. Probably better to do a flush on suspend though; should this be done through a hook like: diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 2444737a14b2..1572a89267c6 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3547,6 +3547,8 @@ static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer) int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer) { snd_usb_mixer_inactivate(mixer); + if (mixer->private_suspend) + mixer->private_suspend(mixer); return 0; } diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index fa6e216a06f0..d94c688c65f7 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -28,6 +28,7 @@ struct usb_mixer_interface { void *private_data; void (*private_free)(struct usb_mixer_interface *private_data); + void (*private_suspend)(struct usb_mixer_interface *); }; #define MAX_CHANNELS 16 /* max logical channels */ ...or just keep the existing behaviour where it seems to get cancelled? Thanks, Geoffrey. diff --git a/sound/usb/Makefile b/sound/usb/Makefile index e1ce257ab705..f4b7384caa9d 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -11,6 +11,7 @@ snd-usb-audio-objs := card.o \ mixer.o \ mixer_quirks.o \ mixer_scarlett.o \ + mixer_scarlett_gen2.o \ mixer_us16x08.o \ pcm.o \ power.o \ diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c703f8534b07..079ebb85805f 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3505,6 +3505,8 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) usb_kill_urb(mixer->urb); if (mixer->rc_urb) usb_kill_urb(mixer->rc_urb); + if (mixer->private_free) + mixer->private_free(mixer); mixer->disconnected = true; } diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 394cd9107507..41e8be671b73 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -28,6 +28,9 @@ struct usb_mixer_interface { struct media_mixer_ctl *media_mixer_ctl; bool disconnected; + + void *private_data; + void (*private_free)(struct usb_mixer_interface *mixer); }; #define MAX_CHANNELS 16 /* max logical channels */ diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 199fa157a411..70805c15b0b5 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -32,6 +32,7 @@ #include "mixer.h" #include "mixer_quirks.h" #include "mixer_scarlett.h" +#include "mixer_scarlett_gen2.h" #include "mixer_us16x08.h" #include "helper.h" @@ -2258,6 +2259,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_scarlett_controls_create(mixer); break; + case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */ + case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */ + case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */ + err = snd_scarlett_gen2_controls_create(mixer); + break; + case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ err = snd_soundblaster_e1_switch_create(mixer); break; diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c new file mode 100644 index 000000000000..02bab6ae59e8 --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.c @@ -0,0 +1,2078 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Focusrite Scarlett 6i6/18i8/18i20 Gen 2 Driver for ALSA + * + * Copyright (c) 2018-2019 by Geoffrey D. Bennett <g at b4.vu> + * + * Based on the Scarlett (Gen 1) Driver for ALSA: + * + * Copyright (c) 2013 by Tobias Hoffmann + * Copyright (c) 2013 by Robin Gareus <robin at gareus.org> + * Copyright (c) 2002 by Takashi Iwai <tiwai at suse.de> + * Copyright (c) 2014 by Chris J Arges <chris.j.arges at canonical.com> + * + * Many codes borrowed from audio.c by + * Alan Cox (alan at lxorguk.ukuu.org.uk) + * Thomas Sailer (sailer at ife.ee.ethz.ch) + * + * Code cleanup: + * David Henningsson <david.henningsson at canonical.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +/* Mixer Interface for the Focusrite Scarlett 6i6/18i8/18i20 Gen 2 audio + * interface. Based on the Gen 1 driver and rewritten. + */ + +/* The protocol was reverse engineered by looking at the communication + * between Focusrite Control 2.3.4 and the Focusrite(R) Scarlett 18i20 + * (firmware 1083) using usbmon in July-August 2018. + * + * Scarlett 18i8 support added in April 2019. + * + * Scarlett 6i6 support added in June 2019 (thanks to Martin Wittmann + * for providing usbmon output and testing). + * + * This ALSA mixer gives access to: + * - input, output, mixer-matrix muxes + * - 18x10 mixer-matrix gain stages + * - gain/volume controls + * - level meters + * - line/inst level and pad controls + * + * <ditaa> + * /--------------\ 18chn 20chn /--------------\ + * | Hardware in +--+------\ /-------------+--+ ALSA PCM out | + * \--------------/ | | | | \--------------/ + * | | | /-----\ | + * | | | | | | + * | v v v | | + * | +---------------+ | | + * | \ Matrix Mux / | | + * | +-----+-----+ | | + * | | | | + * | |18chn | | + * | | | | + * | | 10chn| | + * | v | | + * | +------------+ | | + * | | Mixer | | | + * | | Matrix | | | + * | | | | | + * | | 18x10 Gain | | | + * | | stages | | | + * | +-----+------+ | | + * | | | | + * |18chn |10chn | |20chn + * | | | | + * | +----------/ | + * | | | + * v v v + * =========================== + * +---------------+ +--—------------+ + * \ Output Mux / \ Capture Mux / + * +---+---+---+ +-----+-----+ + * | | | + * 10chn| | |18chn + * | | | + * /--------------\ | | | /--------------\ + * | S/PDIF, ADAT |<--/ |10chn \-->| ALSA PCM in | + * | Hardware out | | \--------------/ + * \--------------/ | + * v + * +-------------+ Software gain per channel. + * | Master Gain |<-- 18i20 only: Switch per channel + * +------+------+ to select HW or SW gain control. + * | + * |10chn + * /--------------\ | + * | Analogue |<------/ + * | Hardware out | + * \--------------/ + * </ditaa> + * + */ + +#include <linux/slab.h> +#include <linux/usb.h> +#include <linux/moduleparam.h> + +#include <sound/control.h> +#include <sound/tlv.h> + +#include "usbaudio.h" +#include "mixer.h" +#include "helper.h" + +#include "mixer_scarlett_gen2.h" + +static int scarlett_gen2_mixer_enable; +module_param(scarlett_gen2_mixer_enable, int, 0444); +MODULE_PARM_DESC(scarlett_gen2_mixer_enable, + "Focusrite Scarlett Gen 2 Mixer Driver Enable"); + +/* some gui mixers can't handle negative ctl values */ +#define SCARLETT_VOLUME_BIAS 127 + +/* mixer range from -80dB to +6dB in 0.5dB steps */ +#define SCARLETT_MIXER_MIN_DB -80 +#define SCARLETT_MIXER_BIAS (-SCARLETT_MIXER_MIN_DB * 2) +#define SCARLETT_MIXER_MAX_DB 6 +#define SCARLETT_MIXER_MAX_VALUE \ + ((SCARLETT_MIXER_MAX_DB - SCARLETT_MIXER_MIN_DB) * 2) + +/* map from (dB + 80) * 2 to mixer value + * for dB in 0 .. 172: int(8192 * pow(10, ((dB - 160) / 2 / 20))) + */ +static const u16 scarlett2_mixer_values[173] = { + 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 23, 24, 25, 27, 29, 30, 32, 34, 36, 38, 41, 43, 46, 48, 51, + 54, 57, 61, 65, 68, 73, 77, 81, 86, 91, 97, 103, 109, 115, + 122, 129, 137, 145, 154, 163, 173, 183, 194, 205, 217, 230, + 244, 259, 274, 290, 307, 326, 345, 365, 387, 410, 434, 460, + 487, 516, 547, 579, 614, 650, 689, 730, 773, 819, 867, 919, + 973, 1031, 1092, 1157, 1225, 1298, 1375, 1456, 1543, 1634, + 1731, 1833, 1942, 2057, 2179, 2308, 2445, 2590, 2744, 2906, + 3078, 3261, 3454, 3659, 3876, 4105, 4349, 4606, 4879, 5168, + 5475, 5799, 6143, 6507, 6892, 7301, 7733, 8192, 8677, 9191, + 9736, 10313, 10924, 11571, 12257, 12983, 13752, 14567, 15430, + 16345 +}; + +/* Maximum number of analogue outputs */ +#define SCARLETT2_ANALOGUE_MAX 10 + +/* Maximum number of level and pad switches */ +#define SCARLETT2_LEVEL_SWITCH_MAX 2 +#define SCARLETT2_PAD_SWITCH_MAX 4 + +/* Maximum number of inputs to the mixer */ +#define SCARLETT2_INPUT_MIX_MAX 18 + +/* Maximum number of outputs from the mixer */ +#define SCARLETT2_OUTPUT_MIX_MAX 10 + +/* Maximum size of the data in the USB mux assignment message: + * 18 inputs, 20 outputs, 18 matrix inputs, 8 spare + */ +#define SCARLETT2_MUX_MAX 64 + +/* Number of meters: + * 18 inputs, 20 outputs, 18 matrix inputs + */ +#define SCARLETT2_NUM_METERS 56 + +/* Hardware port types: + * - None (no input to mux) + * - Analogue I/O + * - S/PDIF I/O + * - ADAT I/O + * - Mixer I/O + * - PCM I/O + */ +enum { + SCARLETT2_PORT_TYPE_NONE = 0, + SCARLETT2_PORT_TYPE_ANALOGUE = 1, + SCARLETT2_PORT_TYPE_SPDIF = 2, + SCARLETT2_PORT_TYPE_ADAT = 3, + SCARLETT2_PORT_TYPE_MIX = 4, + SCARLETT2_PORT_TYPE_PCM = 5, + SCARLETT2_PORT_TYPE_COUNT = 6, +}; + +/* Count of total I/O and number available at each sample rate */ +enum { + SCARLETT2_PORT_IN = 0, + SCARLETT2_PORT_OUT = 1, + SCARLETT2_PORT_OUT_44 = 2, + SCARLETT2_PORT_OUT_88 = 3, + SCARLETT2_PORT_OUT_176 = 4, + SCARLETT2_PORT_DIRECTIONS = 5, +}; + +/* Hardware buttons on the 18i20 */ +#define SCARLETT2_BUTTON_MAX 2 + +static const char *const scarlett2_button_names[SCARLETT2_BUTTON_MAX] = { + "Mute", "Dim" +}; + +/* Description of each hardware port type: + * - id: hardware ID for this port type + * - num: number of sources/destinations of this port type + * - src_descr: printf format string for mux input selections + * - src_num_offset: added to channel number for the fprintf + * - dst_descr: printf format string for mixer controls + */ +struct scarlett2_ports { + u16 id; + int num[SCARLETT2_PORT_DIRECTIONS]; + const char * const src_descr; + int src_num_offset; + const char * const dst_descr; +}; + +struct scarlett2_device_info { + u8 line_out_hw_vol; /* line out hw volume is sw controlled */ + u8 button_count; /* number of buttons */ + u8 level_input_count; /* inputs with level selectable */ + u8 pad_input_count; /* inputs with pad selectable */ + const char * const line_out_descrs[SCARLETT2_ANALOGUE_MAX]; + struct scarlett2_ports ports[SCARLETT2_PORT_TYPE_COUNT]; +}; + +struct scarlett2_mixer_data { + struct usb_mixer_interface *mixer; + struct mutex usb_mutex; /* prevent sending concurrent USB requests */ + struct mutex data_mutex; /* lock access to this data */ + struct delayed_work work; + const struct scarlett2_device_info *info; + int num_mux_srcs; + u16 scarlett2_seq; + u8 vol_updated; + u8 master_vol; + u8 vol[SCARLETT2_ANALOGUE_MAX]; + u8 vol_sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + u8 level_switch[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switch[SCARLETT2_PAD_SWITCH_MAX]; + u8 buttons[SCARLETT2_BUTTON_MAX]; + struct snd_kcontrol *master_vol_ctl; + struct snd_kcontrol *vol_ctls[SCARLETT2_ANALOGUE_MAX]; + struct snd_kcontrol *button_ctls[SCARLETT2_BUTTON_MAX]; + u8 mux[SCARLETT2_MUX_MAX]; + u8 mix[SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX]; +}; + +static void snd_scarlett_gen2_private_free(struct usb_mixer_interface *mixer); + +/*** Model-specific data ***/ + +static const struct scarlett2_device_info s6i6_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first two analogue inputs have an optional pad. */ + .pad_input_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones L", + "Headphones R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 8 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 4, 4, 4, 4, 4 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 6, 6, 6, 6, 6 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i8_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first four analogue inputs have an optional pad. */ + .pad_input_count = 4, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 4 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 6, 6, 6, 6 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 0, 0, 0, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i20_gen2_info = { + /* The analogue line outputs on the 18i20 can be switched + * between software and hardware volume control + */ + .line_out_hw_vol = 1, + + /* Mute and dim buttons */ + .button_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + NULL, + NULL, + NULL, + NULL, + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 6 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 10, 10, 10, 10 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 8, 8, 4, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + .dst_descr = "ADAT Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +/* get the starting port index number for a given port type/direction */ +static int scarlett2_get_port_start_num(const struct scarlett2_ports *ports, + int direction, int port_type) +{ + int i, num = 0; + + for (i = 0; i < port_type; i++) + num += ports[i].num[direction]; + + return num; +} + +/*** USB Interactions ***/ + +/* Vendor-Specific Interface, Endpoint, MaxPacketSize, Interval */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE 5 +#define SCARLETT2_USB_INTERRUPT_ENDPOINT 4 +#define SCARLETT2_USB_INTERRUPT_MAX_DATA 64 +#define SCARLETT2_USB_INTERRUPT_INTERVAL 3 + +/* Interrupt flags for volume and mute/dim button changes */ +#define SCARLETT2_USB_INTERRUPT_VOL_CHANGE 0x400000 +#define SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE 0x200000 + +/* Commands for sending/receiving requests/responses */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ 2 +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP 3 + +#define SCARLETT2_USB_INIT_SEQ 0x00000000 +#define SCARLETT2_USB_GET_METER_LEVELS 0x00001001 +#define SCARLETT2_USB_SET_MIX 0x00002002 +#define SCARLETT2_USB_SET_MUX 0x00003002 +#define SCARLETT2_USB_GET_DATA 0x00800000 +#define SCARLETT2_USB_SET_DATA 0x00800001 +#define SCARLETT2_USB_DATA_CMD 0x00800002 +#define SCARLETT2_USB_CONFIG_SAVE 6 + +#define SCARLETT2_USB_VOLUME_STATUS_OFFSET 0x31 +#define SCARLETT2_USB_METER_LEVELS_GET_MAGIC 1 + +/* volume status is read together (matches scarlett2_config_items[]) */ +struct scarlett2_usb_volume_status { + /* mute & dim buttons */ + u8 buttons[SCARLETT2_BUTTON_MAX]; + + u8 pad1; + + /* software volume setting */ + s16 sw_vol[SCARLETT2_ANALOGUE_MAX]; + + /* actual volume of output inc. dim (-18dB) */ + s16 hw_vol[SCARLETT2_ANALOGUE_MAX]; + + u8 pad2[SCARLETT2_ANALOGUE_MAX]; + + /* sw (0) or hw (1) controlled */ + u8 sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + + u8 pad3[6]; + + /* front panel volume knob */ + s16 master_vol; +} __packed; + +/* Configuration parameters that can be read and written */ +enum { + SCARLETT2_CONFIG_BUTTONS = 0, + SCARLETT2_CONFIG_LINE_OUT_VOLUME = 1, + SCARLETT2_CONFIG_SW_HW_SWITCH = 2, + SCARLETT2_CONFIG_LEVEL_SWITCH = 3, + SCARLETT2_CONFIG_PAD_SWITCH = 4, + SCARLETT2_CONFIG_COUNT = 5 +}; + +/* Location, size, and activation command number for the configuration + * parameters + */ +struct scarlett2_config { + u8 offset; + u8 size; + u8 activate; +}; + +static const struct scarlett2_config + scarlett2_config_items[SCARLETT2_CONFIG_COUNT] = { + /* Mute/Dim Buttons */ + { + .offset = 0x31, + .size = 1, + .activate = 2 + }, + + /* Line Out Volume */ + { + .offset = 0x34, + .size = 2, + .activate = 1 + }, + + /* SW/HW Volume Switch */ + { + .offset = 0x66, + .size = 1, + .activate = 3 + }, + + /* Level Switch */ + { + .offset = 0x7c, + .size = 1, + .activate = 7 + }, + + /* Pad Switch */ + { + .offset = 0x84, + .size = 1, + .activate = 8 + } +}; + +/* proprietary request/response format */ +struct scarlett2_usb_packet { + u32 cmd; + u16 size; + u16 seq; + u32 error; + u32 pad; + u8 data[]; +}; + +#define SCARLETT2_USB_PACKET_LEN (sizeof(struct scarlett2_usb_packet)) + +static void scarlett2_fill_request_header(struct scarlett2_mixer_data *private, + struct scarlett2_usb_packet *req, + u32 cmd, u16 req_size) +{ + /* sequence must go up by 1 for each request */ + u16 seq = private->scarlett2_seq++; + + req->cmd = cpu_to_le32(cmd); + req->size = cpu_to_le16(req_size); + req->seq = cpu_to_le16(seq); + req->error = 0; + req->pad = 0; +} + +/* Send a proprietary format request to the Scarlett interface */ +static int scarlett2_usb( + struct usb_mixer_interface *mixer, u32 cmd, + void *req_data, u16 req_size, void *resp_data, u16 resp_size) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + u16 req_buf_size = sizeof(struct scarlett2_usb_packet) + req_size; + u16 resp_buf_size = sizeof(struct scarlett2_usb_packet) + resp_size; + + struct scarlett2_usb_packet *req = 0, *resp = 0; + + int err = 0; + + mutex_lock(&private->usb_mutex); + + /* build request message and send it */ + + req = kmalloc(req_buf_size, GFP_KERNEL); + if (!req) { + err = -ENOMEM; + goto unlock; + } + + scarlett2_fill_request_header(private, req, cmd, req_size); + + if (req_size) + memcpy(req->data, req_data, req_size); + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + req, + req_buf_size); + + if (err != req_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB request result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + /* send a second message to get the response */ + + resp = kmalloc(resp_buf_size, GFP_KERNEL); + if (!resp) { + err = -ENOMEM; + goto unlock; + } + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + resp, + resp_buf_size); + + /* validate the response */ + + if (err != resp_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB response result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + if (resp->cmd != req->cmd || + resp->seq != req->seq || + resp_size != le16_to_cpu(resp->size) || + resp->error || + resp->pad) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB invalid response; " + "cmd tx/rx %d/%d seq %d/%d size %d/%d " + "error %d pad %d\n", + le16_to_cpu(req->cmd), le16_to_cpu(resp->cmd), + le16_to_cpu(req->seq), le16_to_cpu(resp->seq), + resp_size, le16_to_cpu(resp->size), + le16_to_cpu(resp->error), + le16_to_cpu(resp->pad)); + err = -EINVAL; + goto unlock; + } + + if (resp_size > 0) + memcpy(resp_data, resp->data, resp_size); + +unlock: + kfree(req); + kfree(resp); + mutex_unlock(&private->usb_mutex); + return err; +} + +/* Send SCARLETT2_USB_DATA_CMD SCARLETT2_USB_CONFIG_SAVE */ +static void scarlett2_config_save(struct work_struct *work) +{ + struct scarlett2_mixer_data *private = + container_of(work, struct scarlett2_mixer_data, work.work); + struct usb_mixer_interface *mixer = private->mixer; + u32 req = cpu_to_le32(SCARLETT2_USB_CONFIG_SAVE); + + scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req, sizeof(u32), + NULL, 0); +} + +/* Send a USB message to set a configuration parameter (volume level, + * sw/hw volume switch, line/inst level switch, or pad switch) + */ +static int scarlett2_usb_set_config( + struct usb_mixer_interface *mixer, + int config_item_num, int index, int value) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + struct { + u32 offset; + u32 bytes; + s32 value; + } __packed req; + u32 req2; + int err; + struct scarlett2_mixer_data *private = mixer->private_data; + + /* Send the configuration parameter data */ + req.offset = cpu_to_le32(config_item.offset + index * config_item.size); + req.bytes = cpu_to_le32(config_item.size); + req.value = cpu_to_le32(value); + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_DATA, + &req, sizeof(u32) * 2 + config_item.size, + NULL, 0); + if (err < 0) + return err; + + /* Activate the change */ + req2 = cpu_to_le32(config_item.activate); + err = scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req2, sizeof(req2), NULL, 0); + if (err < 0) + return err; + + /* Schedule the change to be written to NVRAM */ + schedule_delayed_work(&private->work, msecs_to_jiffies(2000)); + + return 0; +} + +/* Send a USB message to get data; result placed in *buf */ +static int scarlett2_usb_get( + struct usb_mixer_interface *mixer, + int offset, void *buf, int size) +{ + struct { + u32 offset; + u32 size; + } __packed req; + + req.offset = cpu_to_le32(offset); + req.size = cpu_to_le32(size); + return scarlett2_usb(mixer, SCARLETT2_USB_GET_DATA, + &req, sizeof(req), buf, size); +} + +/* Send a USB message to get configuration parameters; result placed in *buf */ +static int scarlett2_usb_get_config( + struct usb_mixer_interface *mixer, + int config_item_num, int count, void *buf) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + int size = config_item.size * count; + + return scarlett2_usb_get(mixer, config_item.offset, buf, size); +} + +/* Send a USB message to get volume status; result placed in *buf */ +static int scarlett2_usb_get_volume_status( + struct usb_mixer_interface *mixer, + struct scarlett2_usb_volume_status *buf) +{ + return scarlett2_usb_get(mixer, SCARLETT2_USB_VOLUME_STATUS_OFFSET, + buf, sizeof(*buf)); +} + +/* Send a USB message to set the volumes for all inputs of one mix + * (values obtained from private->mix[]) + */ +static int scarlett2_usb_set_mix(struct usb_mixer_interface *mixer, + int mix_num) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + + struct { + u16 mix_num; + u16 data[SCARLETT2_INPUT_MIX_MAX]; + } __packed req; + + int i, j; + int num_mixer_in = + info->ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + + req.mix_num = cpu_to_le16(mix_num); + + for (i = 0, j = mix_num * num_mixer_in; i < num_mixer_in; i++, j++) + req.data[i] = cpu_to_le16( + scarlett2_mixer_values[private->mix[j]] + ); + + return scarlett2_usb(mixer, SCARLETT2_USB_SET_MIX, + &req, (num_mixer_in + 1) * sizeof(u16), + NULL, 0); +} + +/* Convert a port number index (per info->ports) to a hardware ID */ +static u32 scarlett2_mux_src_num_to_id(const struct scarlett2_ports *ports, + int num) +{ + int port_type; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (num < ports[port_type].num[SCARLETT2_PORT_IN]) + return ports[port_type].id | num; + num -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + /* Oops */ + return 0; +} + +/* Send USB messages to set mux inputs */ +static int scarlett2_usb_set_mux(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int rate, port_dir_rate; + + static const int assignment_order[SCARLETT2_PORT_TYPE_COUNT] = { + SCARLETT2_PORT_TYPE_PCM, + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + SCARLETT2_PORT_TYPE_MIX, + SCARLETT2_PORT_TYPE_NONE, + }; + + struct { + u16 pad; + u16 num; + u32 data[SCARLETT2_MUX_MAX]; + } __packed req; + + req.pad = 0; + + /* mux settings for each rate */ + for (rate = 0, port_dir_rate = SCARLETT2_PORT_OUT_44; + port_dir_rate <= SCARLETT2_PORT_OUT_176; + rate++, port_dir_rate++) { + int order_num, i, err; + + req.num = cpu_to_le16(rate); + + for (order_num = 0, i = 0; + order_num < SCARLETT2_PORT_TYPE_COUNT; + order_num++) { + int port_type = assignment_order[order_num]; + int j = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + port_type); + int port_id = ports[port_type].id; + int channel; + + for (channel = 0; + channel < ports[port_type].num[port_dir_rate]; + channel++, i++, j++) + /* lower 12 bits for the destination and + * next 12 bits for the source + */ + req.data[i] = !port_id + ? 0 + : cpu_to_le32( + port_id | + channel | + scarlett2_mux_src_num_to_id( + ports, private->mux[j] + ) << 12 + ); + + /* skip private->mux[j] entries not output */ + j += ports[port_type].num[SCARLETT2_PORT_OUT] - + ports[port_type].num[port_dir_rate]; + } + + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_MUX, + &req, (i + 1) * sizeof(u32), + NULL, 0); + if (err < 0) + return err; + } + + return 0; +} + +/* Send USB message to get meter levels */ +static int scarlett2_usb_get_meter_levels(struct usb_mixer_interface *mixer, + u16 *levels) +{ + struct { + u16 pad; + u16 num_meters; + u32 magic; + } __packed req; + u32 resp[SCARLETT2_NUM_METERS]; + int i, err; + + req.pad = 0; + req.num_meters = cpu_to_le16(SCARLETT2_NUM_METERS); + req.magic = cpu_to_le32(SCARLETT2_USB_METER_LEVELS_GET_MAGIC); + err = scarlett2_usb(mixer, SCARLETT2_USB_GET_METER_LEVELS, + &req, sizeof(req), resp, sizeof(resp)); + if (err < 0) + return err; + + /* copy, convert to u16 */ + for (i = 0; i < SCARLETT2_NUM_METERS; i++) + levels[i] = resp[i]; + + return 0; +} + +/*** Control Functions ***/ + +/* helper function to create a new control */ +static int scarlett2_add_new_ctl(struct usb_mixer_interface *mixer, + const struct snd_kcontrol_new *ncontrol, + int index, int channels, const char *name, + struct snd_kcontrol **kctl_return) +{ + struct snd_kcontrol *kctl; + struct usb_mixer_elem_info *elem; + int err; + + elem = kzalloc(sizeof(*elem), GFP_KERNEL); + if (!elem) + return -ENOMEM; + + elem->head.mixer = mixer; + elem->control = index; + elem->head.id = index; + elem->channels = channels; + + kctl = snd_ctl_new1(ncontrol, elem); + if (!kctl) { + kfree(elem); + return -ENOMEM; + } + kctl->private_free = snd_usb_mixer_elem_free; + + strlcpy(kctl->id.name, name, sizeof(kctl->id.name)); + + err = snd_usb_mixer_add_control(&elem->head, kctl); + if (err < 0) + return err; + + if (kctl_return) + *kctl_return = kctl; + + return 0; +} + +/*** Analogue Line Out Volume Controls ***/ + +/* Update hardware volume controls after receiving notification that + * they have changed + */ +static int scarlett2_update_volumes(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + struct scarlett2_usb_volume_status volume_status; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + + private->vol_updated = 0; + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT_VOLUME_BIAS, + 0, SCARLETT_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + if (private->vol_sw_hw_switch[i]) + private->vol[i] = private->master_vol; + } + + for (i = 0; i < private->info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +static int scarlett2_volume_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT_VOLUME_BIAS; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->master_vol; + return 0; +} + +static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->vol[index]; + return 0; +} + +static int scarlett2_volume_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->vol[index]; + val = ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol[index] = val; + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, val - SCARLETT_VOLUME_BIAS); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett_gain, -SCARLETT_VOLUME_BIAS * 100, 0 +); + +static const struct snd_kcontrol_new scarlett2_master_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READ | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_master_volume_ctl_get, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett_gain } +}; + +static const struct snd_kcontrol_new scarlett2_line_out_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_volume_ctl_get, + .put = scarlett2_volume_ctl_put, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett_gain } +}; + +/*** HW/SW Volume Switch Controls ***/ + +static int scarlett2_sw_hw_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "SW", "HW" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_sw_hw_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->vol_sw_hw_switch[elem->control]; + return 0; +} + +static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->vol_sw_hw_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol_sw_hw_switch[index] = val; + + /* Change access mode to RO (hardware controlled volume) + * or RW (software controlled volume) + */ + if (val) + private->vol_ctls[index]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + else + private->vol_ctls[index]->vd[0].access |= + SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* Reset volume to master volume */ + private->vol[index] = private->master_vol; + + /* Set SW volume to current HW volume */ + err = scarlett2_usb_set_config( + mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, private->master_vol - SCARLETT_VOLUME_BIAS); + if (err < 0) + goto unlock; + + /* Notify of RO/RW change */ + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_INFO, + &private->vol_ctls[index]->id); + + /* Send SW/HW switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_SW_HW_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_sw_hw_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_sw_hw_enum_ctl_info, + .get = scarlett2_sw_hw_enum_ctl_get, + .put = scarlett2_sw_hw_enum_ctl_put, +}; + +/*** Line Level/Instrument Level Switch Controls ***/ + +static int scarlett2_level_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "Line", "Inst" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_level_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->level_switch[elem->control]; + return 0; +} + +static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->level_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->level_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LEVEL_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_level_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_level_enum_ctl_info, + .get = scarlett2_level_enum_ctl_get, + .put = scarlett2_level_enum_ctl_put, +}; + +/*** Pad Switch Controls ***/ + +static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->pad_switch[elem->control]; + return 0; +} + +static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->pad_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->pad_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_PAD_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_pad_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_pad_ctl_get, + .put = scarlett2_pad_ctl_put, +}; + +/*** Mute/Dim Controls ***/ + +static int scarlett2_button_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.enumerated.item[0] = private->buttons[elem->control]; + return 0; +} + +static int scarlett2_button_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->buttons[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->buttons[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_BUTTONS, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_button_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_button_ctl_get, + .put = scarlett2_button_ctl_put +}; + +/*** Create the analogue output controls ***/ + +static int scarlett2_add_line_out_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add R/O HW volume control */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), "Master HW Playback Volume"); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_master_volume_ctl, + 0, 1, s, &private->master_vol_ctl); + if (err < 0) + return err; + } + + /* Add volume controls */ + for (i = 0; i < num_line_out; i++) { + + /* Fader */ + if (info->line_out_descrs[i]) + snprintf(s, sizeof(s), + "Line %02d (%s) Playback Volume", + i + 1, info->line_out_descrs[i]); + else + snprintf(s, sizeof(s), + "Line %02d Playback Volume", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_line_out_volume_ctl, + i, 1, s, &private->vol_ctls[i]); + if (err < 0) + return err; + + /* Make the fader read-only if the SW/HW switch is set to HW */ + if (private->vol_sw_hw_switch[i]) + private->vol_ctls[i]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* SW/HW Switch */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), + "Line Out %02d Volume Control Playback Enum", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_sw_hw_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + /* Add HW button controls */ + for (i = 0; i < private->info->button_count; i++) { + err = scarlett2_add_new_ctl(mixer, &scarlett2_button_ctl, + i, 1, scarlett2_button_names[i], + &private->button_ctls[i]); + if (err < 0) + return err; + } + + return 0; +} + +/*** Create the analogue input controls ***/ + +static int scarlett2_add_line_in_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add input level (line/inst) controls */ + for (i = 0; i < info->level_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Level Capture Enum", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_level_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + /* Add input pad controls */ + for (i = 0; i < info->pad_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Pad Capture Switch", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_pad_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + return 0; +} + +/*** Mixer Volume Controls ***/ + +static int scarlett2_mixer_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT_MIXER_MAX_VALUE; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_mixer_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.integer.value[0] = private->mix[elem->control]; + return 0; +} + +static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int oval, val, num_mixer_in, mix_num, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mix[elem->control]; + val = ucontrol->value.integer.value[0]; + num_mixer_in = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + mix_num = elem->control / num_mixer_in; + + if (oval == val) + goto unlock; + + private->mix[elem->control] = val; + err = scarlett2_usb_set_mix(mixer, mix_num); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett_mixer, + SCARLETT_MIXER_MIN_DB * 100, + SCARLETT_MIXER_MAX_DB * 100 +); + +static const struct snd_kcontrol_new scarlett2_mixer_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_mixer_ctl_info, + .get = scarlett2_mixer_ctl_get, + .put = scarlett2_mixer_ctl_put, + .private_value = SCARLETT_MIXER_MAX_DB, /* max value */ + .tlv = { .p = db_scale_scarlett_mixer } +}; + +static int scarlett2_add_mixer_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int err, i, j; + int index; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + int num_inputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + int num_outputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_IN]; + + for (i = 0, index = 0; i < num_outputs; i++) { + for (j = 0; j < num_inputs; j++, index++) { + snprintf(s, sizeof(s), + "Mix %c Input %02d Playback Volume", + 'A' + i, j + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_mixer_ctl, + index, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Mux Source Selection Controls ***/ + +static int scarlett2_mux_src_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + unsigned int item = uinfo->value.enumerated.item; + int items = private->num_mux_srcs; + int port_type; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->count = elem->channels; + uinfo->value.enumerated.items = items; + + if (item >= items) + item = uinfo->value.enumerated.item = items - 1; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (item < ports[port_type].num[SCARLETT2_PORT_IN]) { + sprintf(uinfo->value.enumerated.name, + ports[port_type].src_descr, + item + ports[port_type].src_num_offset); + return 0; + } + item -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + return -EINVAL; +} + +static int scarlett2_mux_src_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = private->mux[elem->control]; + return 0; +} + +static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mux[index]; + val = clamp(ucontrol->value.integer.value[0], + 0L, private->num_mux_srcs - 1L); + + if (oval == val) + goto unlock; + + private->mux[index] = val; + err = scarlett2_usb_set_mux(mixer); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_mux_src_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_mux_src_enum_ctl_info, + .get = scarlett2_mux_src_enum_ctl_get, + .put = scarlett2_mux_src_enum_ctl_put, +}; + +static int scarlett2_add_mux_enums(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int port_type, channel, i; + + for (i = 0, port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + for (channel = 0; + channel < ports[port_type].num[SCARLETT2_PORT_OUT]; + channel++, i++) { + int err; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + const char *const descr = ports[port_type].dst_descr; + + snprintf(s, sizeof(s) - 5, descr, channel + 1); + strcat(s, " Enum"); + + err = scarlett2_add_new_ctl(mixer, + &scarlett2_mux_src_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Meter Controls ***/ + +static int scarlett2_meter_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 4095; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + u16 meter_levels[SCARLETT2_NUM_METERS]; + int i, err; + + err = scarlett2_usb_get_meter_levels(elem->head.mixer, meter_levels); + if (err < 0) + return err; + + for (i = 0; i < elem->channels; i++) + ucontrol->value.integer.value[i] = meter_levels[i]; + + return 0; +} + +static const struct snd_kcontrol_new scarlett2_meter_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, + .name = "", + .info = scarlett2_meter_ctl_info, + .get = scarlett2_meter_ctl_get +}; + +static int scarlett2_add_meter_ctl(struct usb_mixer_interface *mixer) +{ + return scarlett2_add_new_ctl(mixer, &scarlett2_meter_ctl, + 0, SCARLETT2_NUM_METERS, + "Level Meter", NULL); +} + +/*** Initialisation ***/ + +static int scarlett2_count_mux_srcs(const struct scarlett2_ports *ports) +{ + int port_type, count = 0; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) + count += ports[port_type].num[SCARLETT2_PORT_IN]; + + return count; +} + +/* Default routing connects PCM outputs and inputs to Analogue, + * S/PDIF, then ADAT + */ +static void scarlett2_init_routing(u8 *mux, + const struct scarlett2_ports *ports) +{ + int i, input_num, input_count, port_type; + int output_num, output_count, port_type_connect_num; + + static const int connect_order[] = { + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + -1 + }; + + /* Assign PCM inputs (routing outputs) */ + output_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + SCARLETT2_PORT_TYPE_PCM); + output_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_OUT]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + input_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_IN, port_type); + input_count = ports[port_type].num[SCARLETT2_PORT_IN]; + for (i = 0; + i < input_count && output_count; + i++, output_count--) + mux[output_num++] = input_num++; + } + + /* Assign PCM outputs (routing inputs) */ + input_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_IN, + SCARLETT2_PORT_TYPE_PCM); + input_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_IN]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + output_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_OUT, port_type); + output_count = ports[port_type].num[SCARLETT2_PORT_OUT]; + for (i = 0; + i < output_count && input_count; + i++, input_count--) + mux[output_num++] = input_num++; + } +} + +/* Initialise private data, routing, sequence number */ +static int scarlett2_init_private(struct usb_mixer_interface *mixer, + const struct scarlett2_device_info *info) +{ + struct scarlett2_mixer_data *private = + kzalloc(sizeof(struct scarlett2_mixer_data), GFP_KERNEL); + + if (!private) + return -ENOMEM; + + mutex_init(&private->usb_mutex); + mutex_init(&private->data_mutex); + INIT_DELAYED_WORK(&private->work, scarlett2_config_save); + private->info = info; + private->num_mux_srcs = scarlett2_count_mux_srcs(info->ports); + private->scarlett2_seq = 0; + private->mixer = mixer; + mixer->private_data = private; + mixer->private_free = snd_scarlett_gen2_private_free; + + /* Setup default routing */ + scarlett2_init_routing(private->mux, info->ports); + + /* Initialise the sequence number used for the proprietary commands */ + return scarlett2_usb(mixer, SCARLETT2_USB_INIT_SEQ, + NULL, 0, NULL, 0); +} + +/* Read line-in config and line-out volume settings on start */ +static int scarlett2_read_configs(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + u8 level_switches[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switches[SCARLETT2_PAD_SWITCH_MAX]; + struct scarlett2_usb_volume_status volume_status; + int err, i; + + if (info->level_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_LEVEL_SWITCH, + info->level_input_count, + level_switches); + if (err < 0) + return err; + for (i = 0; i < info->level_input_count; i++) + private->level_switch[i] = level_switches[i]; + } + + if (info->pad_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_PAD_SWITCH, + info->pad_input_count, + pad_switches); + if (err < 0) + return err; + for (i = 0; i < info->pad_input_count; i++) + private->pad_switch[i] = pad_switches[i]; + } + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT_VOLUME_BIAS, + 0, SCARLETT_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + int volume; + + private->vol_sw_hw_switch[i] = + info->line_out_hw_vol + && volume_status.sw_hw_switch[i]; + + volume = private->vol_sw_hw_switch[i] + ? volume_status.master_vol + : volume_status.sw_vol[i]; + volume = clamp(volume + SCARLETT_VOLUME_BIAS, + 0, SCARLETT_VOLUME_BIAS); + private->vol[i] = volume; + } + + for (i = 0; i < info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +/* Notify on volume change */ +static void scarlett2_mixer_interrupt_vol_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int i; + + private->vol_updated = 1; + + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->master_vol_ctl->id); + + for (i = 0; i < num_line_out; i++) { + if (!private->vol_sw_hw_switch[i]) + continue; + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->vol_ctls[i]->id); + } +} + +/* Notify on button change */ +static void scarlett2_mixer_interrupt_button_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + int i; + + private->vol_updated = 1; + + for (i = 0; i < private->info->button_count; i++) + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->button_ctls[i]->id); +} + +/* Interrupt callback */ +static void scarlett2_mixer_interrupt(struct urb *urb) +{ + struct usb_mixer_interface *mixer = urb->context; + int len = urb->actual_length; + int ustatus = urb->status; + u32 data; + + if (ustatus != 0) + goto requeue; + + if (len == 8) { + data = le32_to_cpu(*(u32 *)urb->transfer_buffer); + if (data & SCARLETT2_USB_INTERRUPT_VOL_CHANGE) + scarlett2_mixer_interrupt_vol_change(mixer); + if (data & SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE) + scarlett2_mixer_interrupt_button_change(mixer); + } else { + usb_audio_err(mixer->chip, + "scarlett mixer interrupt length %d\n", len); + } + +requeue: + if (ustatus != -ENOENT && + ustatus != -ECONNRESET && + ustatus != -ESHUTDOWN) { + urb->dev = mixer->chip->dev; + usb_submit_urb(urb, GFP_ATOMIC); + } +} + +static int scarlett2_mixer_status_create(struct usb_mixer_interface *mixer) +{ + void *transfer_buffer; + + if (mixer->urb) { + usb_audio_err(mixer->chip, + "%s: mixer urb already in use!\n", __func__); + return 0; + } + + mixer->urb = usb_alloc_urb(0, GFP_KERNEL); + if (!mixer->urb) + return -ENOMEM; + + transfer_buffer = kmalloc(SCARLETT2_USB_INTERRUPT_MAX_DATA, GFP_KERNEL); + if (!transfer_buffer) + return -ENOMEM; + + usb_fill_int_urb( + mixer->urb, + mixer->chip->dev, + usb_rcvintpipe(mixer->chip->dev, + SCARLETT2_USB_INTERRUPT_ENDPOINT), + transfer_buffer, + SCARLETT2_USB_INTERRUPT_MAX_DATA, + scarlett2_mixer_interrupt, + mixer, + SCARLETT2_USB_INTERRUPT_INTERVAL); + + return usb_submit_urb(mixer->urb, GFP_KERNEL); +} + +/* Entry point */ +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) +{ + const struct scarlett2_device_info *info; + int err; + + /* only use UAC_VERSION_2 */ + if (!mixer->protocol) + return 0; + + switch (mixer->chip->usb_id) { + case USB_ID(0x1235, 0x8203): + info = &s6i6_gen2_info; + break; + case USB_ID(0x1235, 0x8204): + info = &s18i8_gen2_info; + break; + case USB_ID(0x1235, 0x8201): + info = &s18i20_gen2_info; + break; + default: /* device not (yet) supported */ + return -EINVAL; + } + + if (!scarlett_gen2_mixer_enable) { + usb_audio_err(mixer->chip, + "Focusrite Scarlett Gen 2 Mixer Driver disabled; use " + "options snd_usb_audio scarlett_gen2_mixer_enable=1 " + "to enable and report any issues to g(a)b4.vu"); + return 0; + } + + /* Initialise private data, routing, sequence number */ + err = scarlett2_init_private(mixer, info); + if (err < 0) + return err; + + /* Read volume levels and controls from the interface */ + err = scarlett2_read_configs(mixer); + if (err < 0) + return err; + + /* Create the analogue output controls */ + err = scarlett2_add_line_out_ctls(mixer); + if (err < 0) + return err; + + /* Create the analogue input controls */ + err = scarlett2_add_line_in_ctls(mixer); + if (err < 0) + return err; + + /* Create the input, output, and mixer mux input selections */ + err = scarlett2_add_mux_enums(mixer); + if (err < 0) + return err; + + /* Create the matrix mixer controls */ + err = scarlett2_add_mixer_ctls(mixer); + if (err < 0) + return err; + + /* Create the level meter controls */ + err = scarlett2_add_meter_ctl(mixer); + if (err < 0) + return err; + + /* Set up the interrupt polling if there are hardware buttons */ + if (info->button_count) { + err = scarlett2_mixer_status_create(mixer); + if (err < 0) + return err; + } + + return 0; +} + +static void snd_scarlett_gen2_private_free(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + cancel_delayed_work_sync(&private->work); + kfree(private); + mixer->private_data = NULL; +} diff --git a/sound/usb/mixer_scarlett_gen2.h b/sound/usb/mixer_scarlett_gen2.h new file mode 100644 index 000000000000..52e1dad77afd --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __USB_MIXER_SCARLETT_GEN2_H +#define __USB_MIXER_SCARLETT_GEN2_H + +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer); + +#endif /* __USB_MIXER_SCARLETT_GEN2_H */

2 4

[alsa-devel] [PATCH V5] ALSA: usb-audio: Scarlett Gen 2 mixer interface
by Geoffrey D. Bennett 10 Jul '19

10 Jul '19

Add mixer quirk for the Focusrite Scarlett 6i6, 18i8, and 18i20 Gen 2 audio interfaces. Although the interfaces are USB compliant, additional input/output level controls and hardware routing/mixing functionality are available using proprietary USB requests. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- Hi all, This patch adds the following controls for the Scarlett 6i6, 18i8, and 18i20 Gen 2: - Master volume knob indicator (18i20 only) - Mute and dim switches (18i20 only) - Volume controls for the analogue HW outputs - HW/SW volume switches for the 10 analogue HW outputs (18i20 only) - Line Level/Instrument Level and Pad controls (6i6 and 18i8 only) - Output mux (where the sound for the HW outputs comes from; defaults to PCM outputs) - Capture mux (where the sound for PCM recording comes from; defaults to HW inputs) - Matrix mux (where the sound going into the mixer comes from; 18 inputs default off) - Mixer matrix (18 inputs * 10 outputs = 180 controls) - Level meters Changes since v1: - Add support for the Scarlett 18i8 Gen 2 - Save configuration parameters to NVRAM - Implemented feedback from Takashi's email 24/Apr/2019 - Moved private field from struct snd_usb_audio to struct usb_mixer_interface - Added timer and buffer fields to struct usb_mixer_interface - Other small code fixes/cleanups/improvements Changes since v2: - Add support for the Scarlett 6i6 Gen 2 - Add support for controlling the mute/dim switches (18i20 only) - Implemented feedback from Takashi's email 29/Apr/2019: One pointer field private_data and one function pointer private_free. Replaced timer with delayed work (thanks for that suggestion; it makes the code a *lot* simpler!). - The new functionality is disabled by default as there were reports of some Gen 2 devices not responding to the initialisation sequence and hanging. Added module parameter "scarlett_gen2_mixer_enable". If this parameter is not set, logs a message "Focusrite Scarlett Gen 2 Mixer Driver disabled; use options snd_usb_audio scarlett_gen2_mixer_enable=1 to enable and report any issues to g(a)b4.vu". Changes since v3: - No functional changes; fix checkpatch.pl error and typo in declaration. Changes since v4: - Implemented feedback from Takashi's email 9/Jul/2019: cancel delayed work on suspend, drop copyright texts, remove unnecessary blank lines, and run kmalloc outside the mutex. diff --git a/sound/usb/Makefile b/sound/usb/Makefile index e1ce257ab705..f4b7384caa9d 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -11,6 +11,7 @@ snd-usb-audio-objs := card.o \ mixer.o \ mixer_quirks.o \ mixer_scarlett.o \ + mixer_scarlett_gen2.o \ mixer_us16x08.o \ pcm.o \ power.o \ diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c703f8534b07..734846faee7a 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3505,6 +3505,8 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) usb_kill_urb(mixer->urb); if (mixer->rc_urb) usb_kill_urb(mixer->rc_urb); + if (mixer->private_free) + mixer->private_free(mixer); mixer->disconnected = true; } @@ -3532,6 +3534,8 @@ static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer) int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer) { snd_usb_mixer_inactivate(mixer); + if (mixer->private_suspend) + mixer->private_suspend(mixer); return 0; } diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 394cd9107507..37e1b234c802 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -28,6 +28,10 @@ struct usb_mixer_interface { struct media_mixer_ctl *media_mixer_ctl; bool disconnected; + + void *private_data; + void (*private_free)(struct usb_mixer_interface *mixer); + void (*private_suspend)(struct usb_mixer_interface *mixer); }; #define MAX_CHANNELS 16 /* max logical channels */ diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 199fa157a411..70805c15b0b5 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -32,6 +32,7 @@ #include "mixer.h" #include "mixer_quirks.h" #include "mixer_scarlett.h" +#include "mixer_scarlett_gen2.h" #include "mixer_us16x08.h" #include "helper.h" @@ -2258,6 +2259,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_scarlett_controls_create(mixer); break; + case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */ + case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */ + case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */ + err = snd_scarlett_gen2_controls_create(mixer); + break; + case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ err = snd_soundblaster_e1_switch_create(mixer); break; diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c new file mode 100644 index 000000000000..1f055cb89e91 --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.c @@ -0,0 +1,2075 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Focusrite Scarlett 6i6/18i8/18i20 Gen 2 Driver for ALSA + * + * Copyright (c) 2018-2019 by Geoffrey D. Bennett <g at b4.vu> + * + * Based on the Scarlett (Gen 1) Driver for ALSA: + * + * Copyright (c) 2013 by Tobias Hoffmann + * Copyright (c) 2013 by Robin Gareus <robin at gareus.org> + * Copyright (c) 2002 by Takashi Iwai <tiwai at suse.de> + * Copyright (c) 2014 by Chris J Arges <chris.j.arges at canonical.com> + * + * Many codes borrowed from audio.c by + * Alan Cox (alan at lxorguk.ukuu.org.uk) + * Thomas Sailer (sailer at ife.ee.ethz.ch) + * + * Code cleanup: + * David Henningsson <david.henningsson at canonical.com> + */ + +/* Mixer Interface for the Focusrite Scarlett 6i6/18i8/18i20 Gen 2 audio + * interface. Based on the Gen 1 driver and rewritten. + */ + +/* The protocol was reverse engineered by looking at the communication + * between Focusrite Control 2.3.4 and the Focusrite(R) Scarlett 18i20 + * (firmware 1083) using usbmon in July-August 2018. + * + * Scarlett 18i8 support added in April 2019. + * + * Scarlett 6i6 support added in June 2019 (thanks to Martin Wittmann + * for providing usbmon output and testing). + * + * This ALSA mixer gives access to: + * - input, output, mixer-matrix muxes + * - 18x10 mixer-matrix gain stages + * - gain/volume controls + * - level meters + * - line/inst level and pad controls + * + * <ditaa> + * /--------------\ 18chn 20chn /--------------\ + * | Hardware in +--+------\ /-------------+--+ ALSA PCM out | + * \--------------/ | | | | \--------------/ + * | | | /-----\ | + * | | | | | | + * | v v v | | + * | +---------------+ | | + * | \ Matrix Mux / | | + * | +-----+-----+ | | + * | | | | + * | |18chn | | + * | | | | + * | | 10chn| | + * | v | | + * | +------------+ | | + * | | Mixer | | | + * | | Matrix | | | + * | | | | | + * | | 18x10 Gain | | | + * | | stages | | | + * | +-----+------+ | | + * | | | | + * |18chn |10chn | |20chn + * | | | | + * | +----------/ | + * | | | + * v v v + * =========================== + * +---------------+ +--—------------+ + * \ Output Mux / \ Capture Mux / + * +---+---+---+ +-----+-----+ + * | | | + * 10chn| | |18chn + * | | | + * /--------------\ | | | /--------------\ + * | S/PDIF, ADAT |<--/ |10chn \-->| ALSA PCM in | + * | Hardware out | | \--------------/ + * \--------------/ | + * v + * +-------------+ Software gain per channel. + * | Master Gain |<-- 18i20 only: Switch per channel + * +------+------+ to select HW or SW gain control. + * | + * |10chn + * /--------------\ | + * | Analogue |<------/ + * | Hardware out | + * \--------------/ + * </ditaa> + * + */ + +#include <linux/slab.h> +#include <linux/usb.h> +#include <linux/moduleparam.h> + +#include <sound/control.h> +#include <sound/tlv.h> + +#include "usbaudio.h" +#include "mixer.h" +#include "helper.h" + +#include "mixer_scarlett_gen2.h" + +static int scarlett_gen2_mixer_enable; +module_param(scarlett_gen2_mixer_enable, int, 0444); +MODULE_PARM_DESC(scarlett_gen2_mixer_enable, + "Focusrite Scarlett Gen 2 Mixer Driver Enable"); + +/* some gui mixers can't handle negative ctl values */ +#define SCARLETT_VOLUME_BIAS 127 + +/* mixer range from -80dB to +6dB in 0.5dB steps */ +#define SCARLETT_MIXER_MIN_DB -80 +#define SCARLETT_MIXER_BIAS (-SCARLETT_MIXER_MIN_DB * 2) +#define SCARLETT_MIXER_MAX_DB 6 +#define SCARLETT_MIXER_MAX_VALUE \ + ((SCARLETT_MIXER_MAX_DB - SCARLETT_MIXER_MIN_DB) * 2) + +/* map from (dB + 80) * 2 to mixer value + * for dB in 0 .. 172: int(8192 * pow(10, ((dB - 160) / 2 / 20))) + */ +static const u16 scarlett2_mixer_values[173] = { + 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 23, 24, 25, 27, 29, 30, 32, 34, 36, 38, 41, 43, 46, 48, 51, + 54, 57, 61, 65, 68, 73, 77, 81, 86, 91, 97, 103, 109, 115, + 122, 129, 137, 145, 154, 163, 173, 183, 194, 205, 217, 230, + 244, 259, 274, 290, 307, 326, 345, 365, 387, 410, 434, 460, + 487, 516, 547, 579, 614, 650, 689, 730, 773, 819, 867, 919, + 973, 1031, 1092, 1157, 1225, 1298, 1375, 1456, 1543, 1634, + 1731, 1833, 1942, 2057, 2179, 2308, 2445, 2590, 2744, 2906, + 3078, 3261, 3454, 3659, 3876, 4105, 4349, 4606, 4879, 5168, + 5475, 5799, 6143, 6507, 6892, 7301, 7733, 8192, 8677, 9191, + 9736, 10313, 10924, 11571, 12257, 12983, 13752, 14567, 15430, + 16345 +}; + +/* Maximum number of analogue outputs */ +#define SCARLETT2_ANALOGUE_MAX 10 + +/* Maximum number of level and pad switches */ +#define SCARLETT2_LEVEL_SWITCH_MAX 2 +#define SCARLETT2_PAD_SWITCH_MAX 4 + +/* Maximum number of inputs to the mixer */ +#define SCARLETT2_INPUT_MIX_MAX 18 + +/* Maximum number of outputs from the mixer */ +#define SCARLETT2_OUTPUT_MIX_MAX 10 + +/* Maximum size of the data in the USB mux assignment message: + * 18 inputs, 20 outputs, 18 matrix inputs, 8 spare + */ +#define SCARLETT2_MUX_MAX 64 + +/* Number of meters: + * 18 inputs, 20 outputs, 18 matrix inputs + */ +#define SCARLETT2_NUM_METERS 56 + +/* Hardware port types: + * - None (no input to mux) + * - Analogue I/O + * - S/PDIF I/O + * - ADAT I/O + * - Mixer I/O + * - PCM I/O + */ +enum { + SCARLETT2_PORT_TYPE_NONE = 0, + SCARLETT2_PORT_TYPE_ANALOGUE = 1, + SCARLETT2_PORT_TYPE_SPDIF = 2, + SCARLETT2_PORT_TYPE_ADAT = 3, + SCARLETT2_PORT_TYPE_MIX = 4, + SCARLETT2_PORT_TYPE_PCM = 5, + SCARLETT2_PORT_TYPE_COUNT = 6, +}; + +/* Count of total I/O and number available at each sample rate */ +enum { + SCARLETT2_PORT_IN = 0, + SCARLETT2_PORT_OUT = 1, + SCARLETT2_PORT_OUT_44 = 2, + SCARLETT2_PORT_OUT_88 = 3, + SCARLETT2_PORT_OUT_176 = 4, + SCARLETT2_PORT_DIRECTIONS = 5, +}; + +/* Hardware buttons on the 18i20 */ +#define SCARLETT2_BUTTON_MAX 2 + +static const char *const scarlett2_button_names[SCARLETT2_BUTTON_MAX] = { + "Mute", "Dim" +}; + +/* Description of each hardware port type: + * - id: hardware ID for this port type + * - num: number of sources/destinations of this port type + * - src_descr: printf format string for mux input selections + * - src_num_offset: added to channel number for the fprintf + * - dst_descr: printf format string for mixer controls + */ +struct scarlett2_ports { + u16 id; + int num[SCARLETT2_PORT_DIRECTIONS]; + const char * const src_descr; + int src_num_offset; + const char * const dst_descr; +}; + +struct scarlett2_device_info { + u8 line_out_hw_vol; /* line out hw volume is sw controlled */ + u8 button_count; /* number of buttons */ + u8 level_input_count; /* inputs with level selectable */ + u8 pad_input_count; /* inputs with pad selectable */ + const char * const line_out_descrs[SCARLETT2_ANALOGUE_MAX]; + struct scarlett2_ports ports[SCARLETT2_PORT_TYPE_COUNT]; +}; + +struct scarlett2_mixer_data { + struct usb_mixer_interface *mixer; + struct mutex usb_mutex; /* prevent sending concurrent USB requests */ + struct mutex data_mutex; /* lock access to this data */ + struct delayed_work work; + const struct scarlett2_device_info *info; + int num_mux_srcs; + u16 scarlett2_seq; + u8 vol_updated; + u8 master_vol; + u8 vol[SCARLETT2_ANALOGUE_MAX]; + u8 vol_sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + u8 level_switch[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switch[SCARLETT2_PAD_SWITCH_MAX]; + u8 buttons[SCARLETT2_BUTTON_MAX]; + struct snd_kcontrol *master_vol_ctl; + struct snd_kcontrol *vol_ctls[SCARLETT2_ANALOGUE_MAX]; + struct snd_kcontrol *button_ctls[SCARLETT2_BUTTON_MAX]; + u8 mux[SCARLETT2_MUX_MAX]; + u8 mix[SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX]; +}; + +static void snd_scarlett_gen2_private_free(struct usb_mixer_interface *mixer); +static void snd_scarlett_gen2_private_suspend( + struct usb_mixer_interface *mixer); + +/*** Model-specific data ***/ + +static const struct scarlett2_device_info s6i6_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first two analogue inputs have an optional pad. */ + .pad_input_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones L", + "Headphones R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 8 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 4, 4, 4, 4, 4 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 6, 6, 6, 6, 6 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i8_gen2_info = { + /* The first two analogue inputs can be switched between line + * and instrument levels. + */ + .level_input_count = 2, + + /* The first four analogue inputs have an optional pad. */ + .pad_input_count = 4, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 4 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 6, 6, 6, 6 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 0, 0, 0, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +static const struct scarlett2_device_info s18i20_gen2_info = { + /* The analogue line outputs on the 18i20 can be switched + * between software and hardware volume control + */ + .line_out_hw_vol = 1, + + /* Mute and dim buttons */ + .button_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + NULL, + NULL, + NULL, + NULL, + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .ports = { + { + .id = 0x000, + .num = { 1, 0, 8, 8, 6 }, + .src_descr = "Off", + .src_num_offset = 0, + }, + { + .id = 0x080, + .num = { 8, 10, 10, 10, 10 }, + .src_descr = "Analogue %d", + .src_num_offset = 1, + .dst_descr = "Analogue Output %02d Playback" + }, + { + /* S/PDIF outputs aren't available at 192KHz + * but are included in the USB mux I/O + * assignment message anyway + */ + .id = 0x180, + .num = { 2, 2, 2, 2, 2 }, + .src_descr = "S/PDIF %d", + .src_num_offset = 1, + .dst_descr = "S/PDIF Output %d Playback" + }, + { + .id = 0x200, + .num = { 8, 8, 8, 4, 0 }, + .src_descr = "ADAT %d", + .src_num_offset = 1, + .dst_descr = "ADAT Output %d Playback" + }, + { + .id = 0x300, + .num = { 10, 18, 18, 18, 18 }, + .src_descr = "Mix %c", + .src_num_offset = 65, + .dst_descr = "Mixer Input %02d Capture" + }, + { + .id = 0x600, + .num = { 20, 18, 18, 14, 10 }, + .src_descr = "PCM %d", + .src_num_offset = 1, + .dst_descr = "PCM %02d Capture" + }, + }, +}; + +/* get the starting port index number for a given port type/direction */ +static int scarlett2_get_port_start_num(const struct scarlett2_ports *ports, + int direction, int port_type) +{ + int i, num = 0; + + for (i = 0; i < port_type; i++) + num += ports[i].num[direction]; + + return num; +} + +/*** USB Interactions ***/ + +/* Vendor-Specific Interface, Endpoint, MaxPacketSize, Interval */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE 5 +#define SCARLETT2_USB_INTERRUPT_ENDPOINT 4 +#define SCARLETT2_USB_INTERRUPT_MAX_DATA 64 +#define SCARLETT2_USB_INTERRUPT_INTERVAL 3 + +/* Interrupt flags for volume and mute/dim button changes */ +#define SCARLETT2_USB_INTERRUPT_VOL_CHANGE 0x400000 +#define SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE 0x200000 + +/* Commands for sending/receiving requests/responses */ +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ 2 +#define SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP 3 + +#define SCARLETT2_USB_INIT_SEQ 0x00000000 +#define SCARLETT2_USB_GET_METER_LEVELS 0x00001001 +#define SCARLETT2_USB_SET_MIX 0x00002002 +#define SCARLETT2_USB_SET_MUX 0x00003002 +#define SCARLETT2_USB_GET_DATA 0x00800000 +#define SCARLETT2_USB_SET_DATA 0x00800001 +#define SCARLETT2_USB_DATA_CMD 0x00800002 +#define SCARLETT2_USB_CONFIG_SAVE 6 + +#define SCARLETT2_USB_VOLUME_STATUS_OFFSET 0x31 +#define SCARLETT2_USB_METER_LEVELS_GET_MAGIC 1 + +/* volume status is read together (matches scarlett2_config_items[]) */ +struct scarlett2_usb_volume_status { + /* mute & dim buttons */ + u8 buttons[SCARLETT2_BUTTON_MAX]; + + u8 pad1; + + /* software volume setting */ + s16 sw_vol[SCARLETT2_ANALOGUE_MAX]; + + /* actual volume of output inc. dim (-18dB) */ + s16 hw_vol[SCARLETT2_ANALOGUE_MAX]; + + u8 pad2[SCARLETT2_ANALOGUE_MAX]; + + /* sw (0) or hw (1) controlled */ + u8 sw_hw_switch[SCARLETT2_ANALOGUE_MAX]; + + u8 pad3[6]; + + /* front panel volume knob */ + s16 master_vol; +} __packed; + +/* Configuration parameters that can be read and written */ +enum { + SCARLETT2_CONFIG_BUTTONS = 0, + SCARLETT2_CONFIG_LINE_OUT_VOLUME = 1, + SCARLETT2_CONFIG_SW_HW_SWITCH = 2, + SCARLETT2_CONFIG_LEVEL_SWITCH = 3, + SCARLETT2_CONFIG_PAD_SWITCH = 4, + SCARLETT2_CONFIG_COUNT = 5 +}; + +/* Location, size, and activation command number for the configuration + * parameters + */ +struct scarlett2_config { + u8 offset; + u8 size; + u8 activate; +}; + +static const struct scarlett2_config + scarlett2_config_items[SCARLETT2_CONFIG_COUNT] = { + /* Mute/Dim Buttons */ + { + .offset = 0x31, + .size = 1, + .activate = 2 + }, + + /* Line Out Volume */ + { + .offset = 0x34, + .size = 2, + .activate = 1 + }, + + /* SW/HW Volume Switch */ + { + .offset = 0x66, + .size = 1, + .activate = 3 + }, + + /* Level Switch */ + { + .offset = 0x7c, + .size = 1, + .activate = 7 + }, + + /* Pad Switch */ + { + .offset = 0x84, + .size = 1, + .activate = 8 + } +}; + +/* proprietary request/response format */ +struct scarlett2_usb_packet { + u32 cmd; + u16 size; + u16 seq; + u32 error; + u32 pad; + u8 data[]; +}; + +#define SCARLETT2_USB_PACKET_LEN (sizeof(struct scarlett2_usb_packet)) + +static void scarlett2_fill_request_header(struct scarlett2_mixer_data *private, + struct scarlett2_usb_packet *req, + u32 cmd, u16 req_size) +{ + /* sequence must go up by 1 for each request */ + u16 seq = private->scarlett2_seq++; + + req->cmd = cpu_to_le32(cmd); + req->size = cpu_to_le16(req_size); + req->seq = cpu_to_le16(seq); + req->error = 0; + req->pad = 0; +} + +/* Send a proprietary format request to the Scarlett interface */ +static int scarlett2_usb( + struct usb_mixer_interface *mixer, u32 cmd, + void *req_data, u16 req_size, void *resp_data, u16 resp_size) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + u16 req_buf_size = sizeof(struct scarlett2_usb_packet) + req_size; + u16 resp_buf_size = sizeof(struct scarlett2_usb_packet) + resp_size; + struct scarlett2_usb_packet *req = 0, *resp = 0; + int err = 0; + + req = kmalloc(req_buf_size, GFP_KERNEL); + if (!req) { + err = -ENOMEM; + goto error; + } + + resp = kmalloc(resp_buf_size, GFP_KERNEL); + if (!resp) { + err = -ENOMEM; + goto error; + } + + mutex_lock(&private->usb_mutex); + + /* build request message and send it */ + + scarlett2_fill_request_header(private, req, cmd, req_size); + + if (req_size) + memcpy(req->data, req_data, req_size); + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_REQ, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + req, + req_buf_size); + + if (err != req_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB request result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + /* send a second message to get the response */ + + err = snd_usb_ctl_msg(mixer->chip->dev, + usb_sndctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, + 0, + SCARLETT2_USB_VENDOR_SPECIFIC_INTERFACE, + resp, + resp_buf_size); + + /* validate the response */ + + if (err != resp_buf_size) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB response result cmd %x was %d\n", + cmd, err); + err = -EINVAL; + goto unlock; + } + + if (resp->cmd != req->cmd || + resp->seq != req->seq || + resp_size != le16_to_cpu(resp->size) || + resp->error || + resp->pad) { + usb_audio_err( + mixer->chip, + "Scarlett Gen 2 USB invalid response; " + "cmd tx/rx %d/%d seq %d/%d size %d/%d " + "error %d pad %d\n", + le16_to_cpu(req->cmd), le16_to_cpu(resp->cmd), + le16_to_cpu(req->seq), le16_to_cpu(resp->seq), + resp_size, le16_to_cpu(resp->size), + le16_to_cpu(resp->error), + le16_to_cpu(resp->pad)); + err = -EINVAL; + goto unlock; + } + + if (resp_size > 0) + memcpy(resp_data, resp->data, resp_size); + +unlock: + mutex_unlock(&private->usb_mutex); +error: + kfree(req); + kfree(resp); + return err; +} + +/* Send SCARLETT2_USB_DATA_CMD SCARLETT2_USB_CONFIG_SAVE */ +static void scarlett2_config_save(struct work_struct *work) +{ + struct scarlett2_mixer_data *private = + container_of(work, struct scarlett2_mixer_data, work.work); + struct usb_mixer_interface *mixer = private->mixer; + u32 req = cpu_to_le32(SCARLETT2_USB_CONFIG_SAVE); + + scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req, sizeof(u32), + NULL, 0); +} + +/* Send a USB message to set a configuration parameter (volume level, + * sw/hw volume switch, line/inst level switch, or pad switch) + */ +static int scarlett2_usb_set_config( + struct usb_mixer_interface *mixer, + int config_item_num, int index, int value) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + struct { + u32 offset; + u32 bytes; + s32 value; + } __packed req; + u32 req2; + int err; + struct scarlett2_mixer_data *private = mixer->private_data; + + /* Send the configuration parameter data */ + req.offset = cpu_to_le32(config_item.offset + index * config_item.size); + req.bytes = cpu_to_le32(config_item.size); + req.value = cpu_to_le32(value); + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_DATA, + &req, sizeof(u32) * 2 + config_item.size, + NULL, 0); + if (err < 0) + return err; + + /* Activate the change */ + req2 = cpu_to_le32(config_item.activate); + err = scarlett2_usb(mixer, SCARLETT2_USB_DATA_CMD, + &req2, sizeof(req2), NULL, 0); + if (err < 0) + return err; + + /* Schedule the change to be written to NVRAM */ + schedule_delayed_work(&private->work, msecs_to_jiffies(2000)); + + return 0; +} + +/* Send a USB message to get data; result placed in *buf */ +static int scarlett2_usb_get( + struct usb_mixer_interface *mixer, + int offset, void *buf, int size) +{ + struct { + u32 offset; + u32 size; + } __packed req; + + req.offset = cpu_to_le32(offset); + req.size = cpu_to_le32(size); + return scarlett2_usb(mixer, SCARLETT2_USB_GET_DATA, + &req, sizeof(req), buf, size); +} + +/* Send a USB message to get configuration parameters; result placed in *buf */ +static int scarlett2_usb_get_config( + struct usb_mixer_interface *mixer, + int config_item_num, int count, void *buf) +{ + const struct scarlett2_config config_item = + scarlett2_config_items[config_item_num]; + int size = config_item.size * count; + + return scarlett2_usb_get(mixer, config_item.offset, buf, size); +} + +/* Send a USB message to get volume status; result placed in *buf */ +static int scarlett2_usb_get_volume_status( + struct usb_mixer_interface *mixer, + struct scarlett2_usb_volume_status *buf) +{ + return scarlett2_usb_get(mixer, SCARLETT2_USB_VOLUME_STATUS_OFFSET, + buf, sizeof(*buf)); +} + +/* Send a USB message to set the volumes for all inputs of one mix + * (values obtained from private->mix[]) + */ +static int scarlett2_usb_set_mix(struct usb_mixer_interface *mixer, + int mix_num) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + + struct { + u16 mix_num; + u16 data[SCARLETT2_INPUT_MIX_MAX]; + } __packed req; + + int i, j; + int num_mixer_in = + info->ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + + req.mix_num = cpu_to_le16(mix_num); + + for (i = 0, j = mix_num * num_mixer_in; i < num_mixer_in; i++, j++) + req.data[i] = cpu_to_le16( + scarlett2_mixer_values[private->mix[j]] + ); + + return scarlett2_usb(mixer, SCARLETT2_USB_SET_MIX, + &req, (num_mixer_in + 1) * sizeof(u16), + NULL, 0); +} + +/* Convert a port number index (per info->ports) to a hardware ID */ +static u32 scarlett2_mux_src_num_to_id(const struct scarlett2_ports *ports, + int num) +{ + int port_type; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (num < ports[port_type].num[SCARLETT2_PORT_IN]) + return ports[port_type].id | num; + num -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + /* Oops */ + return 0; +} + +/* Send USB messages to set mux inputs */ +static int scarlett2_usb_set_mux(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int rate, port_dir_rate; + + static const int assignment_order[SCARLETT2_PORT_TYPE_COUNT] = { + SCARLETT2_PORT_TYPE_PCM, + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + SCARLETT2_PORT_TYPE_MIX, + SCARLETT2_PORT_TYPE_NONE, + }; + + struct { + u16 pad; + u16 num; + u32 data[SCARLETT2_MUX_MAX]; + } __packed req; + + req.pad = 0; + + /* mux settings for each rate */ + for (rate = 0, port_dir_rate = SCARLETT2_PORT_OUT_44; + port_dir_rate <= SCARLETT2_PORT_OUT_176; + rate++, port_dir_rate++) { + int order_num, i, err; + + req.num = cpu_to_le16(rate); + + for (order_num = 0, i = 0; + order_num < SCARLETT2_PORT_TYPE_COUNT; + order_num++) { + int port_type = assignment_order[order_num]; + int j = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + port_type); + int port_id = ports[port_type].id; + int channel; + + for (channel = 0; + channel < ports[port_type].num[port_dir_rate]; + channel++, i++, j++) + /* lower 12 bits for the destination and + * next 12 bits for the source + */ + req.data[i] = !port_id + ? 0 + : cpu_to_le32( + port_id | + channel | + scarlett2_mux_src_num_to_id( + ports, private->mux[j] + ) << 12 + ); + + /* skip private->mux[j] entries not output */ + j += ports[port_type].num[SCARLETT2_PORT_OUT] - + ports[port_type].num[port_dir_rate]; + } + + err = scarlett2_usb(mixer, SCARLETT2_USB_SET_MUX, + &req, (i + 1) * sizeof(u32), + NULL, 0); + if (err < 0) + return err; + } + + return 0; +} + +/* Send USB message to get meter levels */ +static int scarlett2_usb_get_meter_levels(struct usb_mixer_interface *mixer, + u16 *levels) +{ + struct { + u16 pad; + u16 num_meters; + u32 magic; + } __packed req; + u32 resp[SCARLETT2_NUM_METERS]; + int i, err; + + req.pad = 0; + req.num_meters = cpu_to_le16(SCARLETT2_NUM_METERS); + req.magic = cpu_to_le32(SCARLETT2_USB_METER_LEVELS_GET_MAGIC); + err = scarlett2_usb(mixer, SCARLETT2_USB_GET_METER_LEVELS, + &req, sizeof(req), resp, sizeof(resp)); + if (err < 0) + return err; + + /* copy, convert to u16 */ + for (i = 0; i < SCARLETT2_NUM_METERS; i++) + levels[i] = resp[i]; + + return 0; +} + +/*** Control Functions ***/ + +/* helper function to create a new control */ +static int scarlett2_add_new_ctl(struct usb_mixer_interface *mixer, + const struct snd_kcontrol_new *ncontrol, + int index, int channels, const char *name, + struct snd_kcontrol **kctl_return) +{ + struct snd_kcontrol *kctl; + struct usb_mixer_elem_info *elem; + int err; + + elem = kzalloc(sizeof(*elem), GFP_KERNEL); + if (!elem) + return -ENOMEM; + + elem->head.mixer = mixer; + elem->control = index; + elem->head.id = index; + elem->channels = channels; + + kctl = snd_ctl_new1(ncontrol, elem); + if (!kctl) { + kfree(elem); + return -ENOMEM; + } + kctl->private_free = snd_usb_mixer_elem_free; + + strlcpy(kctl->id.name, name, sizeof(kctl->id.name)); + + err = snd_usb_mixer_add_control(&elem->head, kctl); + if (err < 0) + return err; + + if (kctl_return) + *kctl_return = kctl; + + return 0; +} + +/*** Analogue Line Out Volume Controls ***/ + +/* Update hardware volume controls after receiving notification that + * they have changed + */ +static int scarlett2_update_volumes(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + struct scarlett2_usb_volume_status volume_status; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + + private->vol_updated = 0; + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT_VOLUME_BIAS, + 0, SCARLETT_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + if (private->vol_sw_hw_switch[i]) + private->vol[i] = private->master_vol; + } + + for (i = 0; i < private->info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +static int scarlett2_volume_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT_VOLUME_BIAS; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->master_vol; + return 0; +} + +static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.integer.value[0] = private->vol[index]; + return 0; +} + +static int scarlett2_volume_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->vol[index]; + val = ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol[index] = val; + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, val - SCARLETT_VOLUME_BIAS); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett_gain, -SCARLETT_VOLUME_BIAS * 100, 0 +); + +static const struct snd_kcontrol_new scarlett2_master_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READ | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_master_volume_ctl_get, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett_gain } +}; + +static const struct snd_kcontrol_new scarlett2_line_out_volume_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_volume_ctl_info, + .get = scarlett2_volume_ctl_get, + .put = scarlett2_volume_ctl_put, + .private_value = 0, /* max value */ + .tlv = { .p = db_scale_scarlett_gain } +}; + +/*** HW/SW Volume Switch Controls ***/ + +static int scarlett2_sw_hw_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "SW", "HW" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_sw_hw_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->vol_sw_hw_switch[elem->control]; + return 0; +} + +static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->vol_sw_hw_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->vol_sw_hw_switch[index] = val; + + /* Change access mode to RO (hardware controlled volume) + * or RW (software controlled volume) + */ + if (val) + private->vol_ctls[index]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + else + private->vol_ctls[index]->vd[0].access |= + SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* Reset volume to master volume */ + private->vol[index] = private->master_vol; + + /* Set SW volume to current HW volume */ + err = scarlett2_usb_set_config( + mixer, SCARLETT2_CONFIG_LINE_OUT_VOLUME, + index, private->master_vol - SCARLETT_VOLUME_BIAS); + if (err < 0) + goto unlock; + + /* Notify of RO/RW change */ + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_INFO, + &private->vol_ctls[index]->id); + + /* Send SW/HW switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_SW_HW_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_sw_hw_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_sw_hw_enum_ctl_info, + .get = scarlett2_sw_hw_enum_ctl_get, + .put = scarlett2_sw_hw_enum_ctl_put, +}; + +/*** Line Level/Instrument Level Switch Controls ***/ + +static int scarlett2_level_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const values[2] = { + "Line", "Inst" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, values); +} + +static int scarlett2_level_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->level_switch[elem->control]; + return 0; +} + +static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->level_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->level_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LEVEL_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_level_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_level_enum_ctl_info, + .get = scarlett2_level_enum_ctl_get, + .put = scarlett2_level_enum_ctl_put, +}; + +/*** Pad Switch Controls ***/ + +static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = + private->pad_switch[elem->control]; + return 0; +} + +static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->pad_switch[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->pad_switch[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_PAD_SWITCH, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_pad_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_pad_ctl_get, + .put = scarlett2_pad_ctl_put, +}; + +/*** Mute/Dim Controls ***/ + +static int scarlett2_button_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + if (private->vol_updated) { + mutex_lock(&private->data_mutex); + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + } + + ucontrol->value.enumerated.item[0] = private->buttons[elem->control]; + return 0; +} + +static int scarlett2_button_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + + int index = elem->control; + int oval, val, err = 0; + + cancel_delayed_work_sync(&private->work); + mutex_lock(&private->data_mutex); + + oval = private->buttons[index]; + val = !!ucontrol->value.integer.value[0]; + + if (oval == val) + goto unlock; + + private->buttons[index] = val; + + /* Send switch change to the device */ + err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_BUTTONS, + index, val); + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_button_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = snd_ctl_boolean_mono_info, + .get = scarlett2_button_ctl_get, + .put = scarlett2_button_ctl_put +}; + +/*** Create the analogue output controls ***/ + +static int scarlett2_add_line_out_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add R/O HW volume control */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), "Master HW Playback Volume"); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_master_volume_ctl, + 0, 1, s, &private->master_vol_ctl); + if (err < 0) + return err; + } + + /* Add volume controls */ + for (i = 0; i < num_line_out; i++) { + + /* Fader */ + if (info->line_out_descrs[i]) + snprintf(s, sizeof(s), + "Line %02d (%s) Playback Volume", + i + 1, info->line_out_descrs[i]); + else + snprintf(s, sizeof(s), + "Line %02d Playback Volume", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_line_out_volume_ctl, + i, 1, s, &private->vol_ctls[i]); + if (err < 0) + return err; + + /* Make the fader read-only if the SW/HW switch is set to HW */ + if (private->vol_sw_hw_switch[i]) + private->vol_ctls[i]->vd[0].access &= + ~SNDRV_CTL_ELEM_ACCESS_WRITE; + + /* SW/HW Switch */ + if (info->line_out_hw_vol) { + snprintf(s, sizeof(s), + "Line Out %02d Volume Control Playback Enum", + i + 1); + err = scarlett2_add_new_ctl(mixer, + &scarlett2_sw_hw_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + /* Add HW button controls */ + for (i = 0; i < private->info->button_count; i++) { + err = scarlett2_add_new_ctl(mixer, &scarlett2_button_ctl, + i, 1, scarlett2_button_names[i], + &private->button_ctls[i]); + if (err < 0) + return err; + } + + return 0; +} + +/*** Create the analogue input controls ***/ + +static int scarlett2_add_line_in_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + int err, i; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + /* Add input level (line/inst) controls */ + for (i = 0; i < info->level_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Level Capture Enum", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_level_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + /* Add input pad controls */ + for (i = 0; i < info->pad_input_count; i++) { + snprintf(s, sizeof(s), "Line In %d Pad Capture Switch", i + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_pad_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + + return 0; +} + +/*** Mixer Volume Controls ***/ + +static int scarlett2_mixer_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = SCARLETT_MIXER_MAX_VALUE; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_mixer_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.integer.value[0] = private->mix[elem->control]; + return 0; +} + +static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int oval, val, num_mixer_in, mix_num, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mix[elem->control]; + val = ucontrol->value.integer.value[0]; + num_mixer_in = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + mix_num = elem->control / num_mixer_in; + + if (oval == val) + goto unlock; + + private->mix[elem->control] = val; + err = scarlett2_usb_set_mix(mixer, mix_num); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const DECLARE_TLV_DB_MINMAX( + db_scale_scarlett_mixer, + SCARLETT_MIXER_MIN_DB * 100, + SCARLETT_MIXER_MAX_DB * 100 +); + +static const struct snd_kcontrol_new scarlett2_mixer_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .name = "", + .info = scarlett2_mixer_ctl_info, + .get = scarlett2_mixer_ctl_get, + .put = scarlett2_mixer_ctl_put, + .private_value = SCARLETT_MIXER_MAX_DB, /* max value */ + .tlv = { .p = db_scale_scarlett_mixer } +}; + +static int scarlett2_add_mixer_ctls(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int err, i, j; + int index; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + int num_inputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; + int num_outputs = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_IN]; + + for (i = 0, index = 0; i < num_outputs; i++) { + for (j = 0; j < num_inputs; j++, index++) { + snprintf(s, sizeof(s), + "Mix %c Input %02d Playback Volume", + 'A' + i, j + 1); + err = scarlett2_add_new_ctl(mixer, &scarlett2_mixer_ctl, + index, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Mux Source Selection Controls ***/ + +static int scarlett2_mux_src_enum_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + unsigned int item = uinfo->value.enumerated.item; + int items = private->num_mux_srcs; + int port_type; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->count = elem->channels; + uinfo->value.enumerated.items = items; + + if (item >= items) + item = uinfo->value.enumerated.item = items - 1; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + if (item < ports[port_type].num[SCARLETT2_PORT_IN]) { + sprintf(uinfo->value.enumerated.name, + ports[port_type].src_descr, + item + ports[port_type].src_num_offset); + return 0; + } + item -= ports[port_type].num[SCARLETT2_PORT_IN]; + } + + return -EINVAL; +} + +static int scarlett2_mux_src_enum_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct scarlett2_mixer_data *private = elem->head.mixer->private_data; + + ucontrol->value.enumerated.item[0] = private->mux[elem->control]; + return 0; +} + +static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_mixer_data *private = mixer->private_data; + int index = elem->control; + int oval, val, err = 0; + + mutex_lock(&private->data_mutex); + + oval = private->mux[index]; + val = clamp(ucontrol->value.integer.value[0], + 0L, private->num_mux_srcs - 1L); + + if (oval == val) + goto unlock; + + private->mux[index] = val; + err = scarlett2_usb_set_mux(mixer); + if (err == 0) + err = 1; + +unlock: + mutex_unlock(&private->data_mutex); + return err; +} + +static const struct snd_kcontrol_new scarlett2_mux_src_enum_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", + .info = scarlett2_mux_src_enum_ctl_info, + .get = scarlett2_mux_src_enum_ctl_get, + .put = scarlett2_mux_src_enum_ctl_put, +}; + +static int scarlett2_add_mux_enums(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int port_type, channel, i; + + for (i = 0, port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) { + for (channel = 0; + channel < ports[port_type].num[SCARLETT2_PORT_OUT]; + channel++, i++) { + int err; + char s[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + const char *const descr = ports[port_type].dst_descr; + + snprintf(s, sizeof(s) - 5, descr, channel + 1); + strcat(s, " Enum"); + + err = scarlett2_add_new_ctl(mixer, + &scarlett2_mux_src_enum_ctl, + i, 1, s, NULL); + if (err < 0) + return err; + } + } + + return 0; +} + +/*** Meter Controls ***/ + +static int scarlett2_meter_ctl_info(struct snd_kcontrol *kctl, + struct snd_ctl_elem_info *uinfo) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = elem->channels; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 4095; + uinfo->value.integer.step = 1; + return 0; +} + +static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_info *elem = kctl->private_data; + u16 meter_levels[SCARLETT2_NUM_METERS]; + int i, err; + + err = scarlett2_usb_get_meter_levels(elem->head.mixer, meter_levels); + if (err < 0) + return err; + + for (i = 0; i < elem->channels; i++) + ucontrol->value.integer.value[i] = meter_levels[i]; + + return 0; +} + +static const struct snd_kcontrol_new scarlett2_meter_ctl = { + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, + .name = "", + .info = scarlett2_meter_ctl_info, + .get = scarlett2_meter_ctl_get +}; + +static int scarlett2_add_meter_ctl(struct usb_mixer_interface *mixer) +{ + return scarlett2_add_new_ctl(mixer, &scarlett2_meter_ctl, + 0, SCARLETT2_NUM_METERS, + "Level Meter", NULL); +} + +/*** Initialisation ***/ + +static int scarlett2_count_mux_srcs(const struct scarlett2_ports *ports) +{ + int port_type, count = 0; + + for (port_type = 0; + port_type < SCARLETT2_PORT_TYPE_COUNT; + port_type++) + count += ports[port_type].num[SCARLETT2_PORT_IN]; + + return count; +} + +/* Default routing connects PCM outputs and inputs to Analogue, + * S/PDIF, then ADAT + */ +static void scarlett2_init_routing(u8 *mux, + const struct scarlett2_ports *ports) +{ + int i, input_num, input_count, port_type; + int output_num, output_count, port_type_connect_num; + + static const int connect_order[] = { + SCARLETT2_PORT_TYPE_ANALOGUE, + SCARLETT2_PORT_TYPE_SPDIF, + SCARLETT2_PORT_TYPE_ADAT, + -1 + }; + + /* Assign PCM inputs (routing outputs) */ + output_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_OUT, + SCARLETT2_PORT_TYPE_PCM); + output_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_OUT]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + input_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_IN, port_type); + input_count = ports[port_type].num[SCARLETT2_PORT_IN]; + for (i = 0; + i < input_count && output_count; + i++, output_count--) + mux[output_num++] = input_num++; + } + + /* Assign PCM outputs (routing inputs) */ + input_num = scarlett2_get_port_start_num(ports, + SCARLETT2_PORT_IN, + SCARLETT2_PORT_TYPE_PCM); + input_count = ports[SCARLETT2_PORT_TYPE_PCM].num[SCARLETT2_PORT_IN]; + + for (port_type = connect_order[port_type_connect_num = 0]; + port_type >= 0; + port_type = connect_order[++port_type_connect_num]) { + output_num = scarlett2_get_port_start_num( + ports, SCARLETT2_PORT_OUT, port_type); + output_count = ports[port_type].num[SCARLETT2_PORT_OUT]; + for (i = 0; + i < output_count && input_count; + i++, input_count--) + mux[output_num++] = input_num++; + } +} + +/* Initialise private data, routing, sequence number */ +static int scarlett2_init_private(struct usb_mixer_interface *mixer, + const struct scarlett2_device_info *info) +{ + struct scarlett2_mixer_data *private = + kzalloc(sizeof(struct scarlett2_mixer_data), GFP_KERNEL); + + if (!private) + return -ENOMEM; + + mutex_init(&private->usb_mutex); + mutex_init(&private->data_mutex); + INIT_DELAYED_WORK(&private->work, scarlett2_config_save); + private->info = info; + private->num_mux_srcs = scarlett2_count_mux_srcs(info->ports); + private->scarlett2_seq = 0; + private->mixer = mixer; + mixer->private_data = private; + mixer->private_free = snd_scarlett_gen2_private_free; + mixer->private_suspend = snd_scarlett_gen2_private_suspend; + + /* Setup default routing */ + scarlett2_init_routing(private->mux, info->ports); + + /* Initialise the sequence number used for the proprietary commands */ + return scarlett2_usb(mixer, SCARLETT2_USB_INIT_SEQ, + NULL, 0, NULL, 0); +} + +/* Read line-in config and line-out volume settings on start */ +static int scarlett2_read_configs(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_device_info *info = private->info; + const struct scarlett2_ports *ports = info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + u8 level_switches[SCARLETT2_LEVEL_SWITCH_MAX]; + u8 pad_switches[SCARLETT2_PAD_SWITCH_MAX]; + struct scarlett2_usb_volume_status volume_status; + int err, i; + + if (info->level_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_LEVEL_SWITCH, + info->level_input_count, + level_switches); + if (err < 0) + return err; + for (i = 0; i < info->level_input_count; i++) + private->level_switch[i] = level_switches[i]; + } + + if (info->pad_input_count) { + err = scarlett2_usb_get_config( + mixer, + SCARLETT2_CONFIG_PAD_SWITCH, + info->pad_input_count, + pad_switches); + if (err < 0) + return err; + for (i = 0; i < info->pad_input_count; i++) + private->pad_switch[i] = pad_switches[i]; + } + + err = scarlett2_usb_get_volume_status(mixer, &volume_status); + if (err < 0) + return err; + + private->master_vol = clamp( + volume_status.master_vol + SCARLETT_VOLUME_BIAS, + 0, SCARLETT_VOLUME_BIAS); + + for (i = 0; i < num_line_out; i++) { + int volume; + + private->vol_sw_hw_switch[i] = + info->line_out_hw_vol + && volume_status.sw_hw_switch[i]; + + volume = private->vol_sw_hw_switch[i] + ? volume_status.master_vol + : volume_status.sw_vol[i]; + volume = clamp(volume + SCARLETT_VOLUME_BIAS, + 0, SCARLETT_VOLUME_BIAS); + private->vol[i] = volume; + } + + for (i = 0; i < info->button_count; i++) + private->buttons[i] = !!volume_status.buttons[i]; + + return 0; +} + +/* Notify on volume change */ +static void scarlett2_mixer_interrupt_vol_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + const struct scarlett2_ports *ports = private->info->ports; + int num_line_out = + ports[SCARLETT2_PORT_TYPE_ANALOGUE].num[SCARLETT2_PORT_OUT]; + int i; + + private->vol_updated = 1; + + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->master_vol_ctl->id); + + for (i = 0; i < num_line_out; i++) { + if (!private->vol_sw_hw_switch[i]) + continue; + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->vol_ctls[i]->id); + } +} + +/* Notify on button change */ +static void scarlett2_mixer_interrupt_button_change( + struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + int i; + + private->vol_updated = 1; + + for (i = 0; i < private->info->button_count; i++) + snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, + &private->button_ctls[i]->id); +} + +/* Interrupt callback */ +static void scarlett2_mixer_interrupt(struct urb *urb) +{ + struct usb_mixer_interface *mixer = urb->context; + int len = urb->actual_length; + int ustatus = urb->status; + u32 data; + + if (ustatus != 0) + goto requeue; + + if (len == 8) { + data = le32_to_cpu(*(u32 *)urb->transfer_buffer); + if (data & SCARLETT2_USB_INTERRUPT_VOL_CHANGE) + scarlett2_mixer_interrupt_vol_change(mixer); + if (data & SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE) + scarlett2_mixer_interrupt_button_change(mixer); + } else { + usb_audio_err(mixer->chip, + "scarlett mixer interrupt length %d\n", len); + } + +requeue: + if (ustatus != -ENOENT && + ustatus != -ECONNRESET && + ustatus != -ESHUTDOWN) { + urb->dev = mixer->chip->dev; + usb_submit_urb(urb, GFP_ATOMIC); + } +} + +static int scarlett2_mixer_status_create(struct usb_mixer_interface *mixer) +{ + void *transfer_buffer; + + if (mixer->urb) { + usb_audio_err(mixer->chip, + "%s: mixer urb already in use!\n", __func__); + return 0; + } + + mixer->urb = usb_alloc_urb(0, GFP_KERNEL); + if (!mixer->urb) + return -ENOMEM; + + transfer_buffer = kmalloc(SCARLETT2_USB_INTERRUPT_MAX_DATA, GFP_KERNEL); + if (!transfer_buffer) + return -ENOMEM; + + usb_fill_int_urb( + mixer->urb, + mixer->chip->dev, + usb_rcvintpipe(mixer->chip->dev, + SCARLETT2_USB_INTERRUPT_ENDPOINT), + transfer_buffer, + SCARLETT2_USB_INTERRUPT_MAX_DATA, + scarlett2_mixer_interrupt, + mixer, + SCARLETT2_USB_INTERRUPT_INTERVAL); + + return usb_submit_urb(mixer->urb, GFP_KERNEL); +} + +/* Entry point */ +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) +{ + const struct scarlett2_device_info *info; + int err; + + /* only use UAC_VERSION_2 */ + if (!mixer->protocol) + return 0; + + switch (mixer->chip->usb_id) { + case USB_ID(0x1235, 0x8203): + info = &s6i6_gen2_info; + break; + case USB_ID(0x1235, 0x8204): + info = &s18i8_gen2_info; + break; + case USB_ID(0x1235, 0x8201): + info = &s18i20_gen2_info; + break; + default: /* device not (yet) supported */ + return -EINVAL; + } + + if (!scarlett_gen2_mixer_enable) { + usb_audio_err(mixer->chip, + "Focusrite Scarlett Gen 2 Mixer Driver disabled; use " + "options snd_usb_audio scarlett_gen2_mixer_enable=1 " + "to enable and report any issues to g(a)b4.vu"); + return 0; + } + + /* Initialise private data, routing, sequence number */ + err = scarlett2_init_private(mixer, info); + if (err < 0) + return err; + + /* Read volume levels and controls from the interface */ + err = scarlett2_read_configs(mixer); + if (err < 0) + return err; + + /* Create the analogue output controls */ + err = scarlett2_add_line_out_ctls(mixer); + if (err < 0) + return err; + + /* Create the analogue input controls */ + err = scarlett2_add_line_in_ctls(mixer); + if (err < 0) + return err; + + /* Create the input, output, and mixer mux input selections */ + err = scarlett2_add_mux_enums(mixer); + if (err < 0) + return err; + + /* Create the matrix mixer controls */ + err = scarlett2_add_mixer_ctls(mixer); + if (err < 0) + return err; + + /* Create the level meter controls */ + err = scarlett2_add_meter_ctl(mixer); + if (err < 0) + return err; + + /* Set up the interrupt polling if there are hardware buttons */ + if (info->button_count) { + err = scarlett2_mixer_status_create(mixer); + if (err < 0) + return err; + } + + return 0; +} + +static void snd_scarlett_gen2_private_free(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + cancel_delayed_work_sync(&private->work); + kfree(private); + mixer->private_data = NULL; +} + +static void snd_scarlett_gen2_private_suspend(struct usb_mixer_interface *mixer) +{ + struct scarlett2_mixer_data *private = mixer->private_data; + + cancel_delayed_work_sync(&private->work); +} diff --git a/sound/usb/mixer_scarlett_gen2.h b/sound/usb/mixer_scarlett_gen2.h new file mode 100644 index 000000000000..52e1dad77afd --- /dev/null +++ b/sound/usb/mixer_scarlett_gen2.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __USB_MIXER_SCARLETT_GEN2_H +#define __USB_MIXER_SCARLETT_GEN2_H + +int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer); + +#endif /* __USB_MIXER_SCARLETT_GEN2_H */

2 1

[alsa-devel] [PATCH] sound: ppc: snd_ps3: Remove Unneeded variable: "ret"
by Hariprasad Kelam 10 Jul '19

10 Jul '19

This patch fixes below issue reported by coccicheck sound/ppc/snd_ps3.c:631:5-8: Unneeded variable: "ret". Return "0" on line 668 We cannot change return type of snd_ps3_pcm_trigger as it is registered with snd_pcm_ops->trigger Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/ppc/snd_ps3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 71b7fd3..c213eb7 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -628,7 +628,6 @@ static int snd_ps3_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_ps3_card_info *card = snd_pcm_substream_chip(substream); - int ret = 0; switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -665,7 +664,7 @@ static int snd_ps3_pcm_trigger(struct snd_pcm_substream *substream, } - return ret; + return 0; }; /* -- 2.7.4

2 1

[alsa-devel] [PATCH] sound: pci: lx6464es: Remove unneeded variable err
by Hariprasad Kelam 10 Jul '19

10 Jul '19

This patch fixes below issue reported by coccicheck sound/pci/lx6464es/lx6464es.c:256:5-8: Unneeded variable: "err". Return "0" on line 258 We cannot change return value as its registered with snd_pcm_ops->close Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/pci/lx6464es/lx6464es.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index 1771a6d..583ca73 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -253,9 +253,8 @@ static int lx_pcm_open(struct snd_pcm_substream *substream) static int lx_pcm_close(struct snd_pcm_substream *substream) { - int err = 0; dev_dbg(substream->pcm->card->dev, "->lx_pcm_close\n"); - return err; + return 0; } static snd_pcm_uframes_t lx_pcm_stream_pointer(struct snd_pcm_substream -- 2.7.4

2 2

[alsa-devel] [PATCH] ALSA: pcm: Enable MMAP status and control for ARMv7 and ARMv8
by twischer＠de.adit-jv.com 10 Jul '19

10 Jul '19

From: Timo Wischer <twischer(a)de.adit-jv.com> Since ARMv7 hardware cache coherence is supported. "The SCU maintains coherency between the individual data caches in the Cortex-A5 MPCore processor using a variation of the MOESI protocol" [1]. Therefore this patch enables the MMAP access to the status and control structures. This avoids HWSYYNC ioctl calls and therefore lowers the CPU usage. [1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0434c/ BABJECBF.html Signed-off-by: Timo Wischer <twischer(a)de.adit-jv.com> --- sound/core/pcm_native.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 1d84529..b8019ef 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3225,7 +3225,8 @@ static __poll_t snd_pcm_poll(struct file *file, poll_table *wait) * Only on coherent architectures, we can mmap the status and the control records * for effcient data transfer. On others, we have to use HWSYNC ioctl... */ -#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA) +#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA) || \ + (defined(CONFIG_ARM) && defined(CONFIG_CPU_V7)) || defined(CONFIG_ARM64) /* * mmap status record */ -- 2.7.4

3 4

[alsa-devel] [PATCH v2 0/4] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 10 Jul '19

10 Jul '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. Changes from v1 to v2: - hdmi-codec.c: cleanup the sequence of hdmi_codec_jack_report and hdmi_codec_set_jack_detect. - dw-hdmi.c: change argument of hdmi_codec_plugged_cb so it takes a generic device which has hdmi_codec_priv in its drvdata. - dw-hdmi.c: add a helper function handle_plugged_change to check audio platform device and codec platform device before calling callback. - dw-hdmi-c: avoid setting callback function if audio platform device or codec platform device is missing. - rockchip_max98090: fix the checking of return code when setting sysclk on cpu_dai and codec_dai. cpu_dai error should be reported. For HDMI codec_dai, there is no need to set sysclk. Cheng-Yi Chiang (4): ASoC: hdmi-codec: Add an op to set callback function for plug event drm: bridge: dw-hdmi: Report connector status using callback ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip_max98090: Add HDMI jack support .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 3 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 ++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 55 ++++++++- include/sound/hdmi-codec.h | 16 +++ sound/soc/codecs/hdmi-codec.c | 45 +++++++ sound/soc/rockchip/rockchip_max98090.c | 116 ++++++++++++++---- 6 files changed, 221 insertions(+), 24 deletions(-) -- 2.22.0.410.gd8fdbe21b5-goog

1 4

[alsa-devel] [PATCH 0/7] Add HDMI audio support on RK3288 veyron board
by Cheng-Yi Chiang 10 Jul '19

10 Jul '19

This patch series is to support HDMI audio on RK3288 veyron board. To support jack reporting, there are two old patches: video: add HDMI state notifier support <https://lore.kernel.org/linux-media/20161213150813.37966-2-hverkuil@xs4all.…> ASoC: hdmi-codec: use HDMI state notifier to add jack support <https://patchwork.kernel.org/patch/9430355/> They are modified to pass checkpatch checking based on latest ASoC tree https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next branch. With these two patches at hand, hdmi-notifier support is then added to dw-hdmi driver so the plug/unplug event can be passed to codec driver. The rest patches are about machine driver rockchip_max98090. A HDMI DAI link is added for HDMI playback so there will be two devices on this sound card. One for max98090 and one for HDMI. The HDMI node is passed from DTS so machine driver can set the correct hdmi-notifier on codec driver. Cheng-Yi Chiang (5): drm/bridge/synopsys: dw-hdmi: Add HDMI notifier support ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip: rockchip-max98090: Add node for HDMI ASoC: rockchip_max98090: Add HDMI jack support ARM: dts: rockchip: Specify HDMI node to sound card node Hans Verkuil (1): video: add HDMI state notifier support Philipp Zabel (1): ASoC: hdmi-codec: use HDMI state notifier to add jack support .../bindings/sound/rockchip-max98090.txt | 2 + MAINTAINERS | 6 + .../boot/dts/rk3288-veyron-analog-audio.dtsi | 1 + drivers/gpu/drm/bridge/synopsys/Kconfig | 1 + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 28 +++- drivers/video/Kconfig | 3 + drivers/video/Makefile | 1 + drivers/video/hdmi-notifier.c | 145 ++++++++++++++++++ include/linux/hdmi-notifier.h | 112 ++++++++++++++ include/sound/hdmi-codec.h | 7 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdmi-codec.c | 104 ++++++++++++- sound/soc/rockchip/rockchip_max98090.c | 123 ++++++++++++--- 13 files changed, 508 insertions(+), 26 deletions(-) create mode 100644 drivers/video/hdmi-notifier.c create mode 100644 include/linux/hdmi-notifier.h -- 2.22.0.rc1.257.g3120a18244-goog

5 29

[alsa-devel] [PATCH] sound: soc: codecs: wcd9335: add irqflag IRQF_ONESHOT flag
by Hariprasad Kelam 10 Jul '19

10 Jul '19

Add IRQF_ONESHOT to ensure "Interrupt is not reenabled after the hardirq handler finished". fixes below issue reported by coccicheck sound/soc/codecs/wcd9335.c:4068:8-33: ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/soc/codecs/wcd9335.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 85737fe..7ab9bf6f 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -4056,6 +4056,9 @@ static struct wcd9335_irq wcd9335_irqs[] = { static int wcd9335_setup_irqs(struct wcd9335_codec *wcd) { int irq, ret, i; + unsigned long irqflags; + + irqflags = IRQF_TRIGGER_RISING | IRQF_ONESHOT; for (i = 0; i < ARRAY_SIZE(wcd9335_irqs); i++) { irq = regmap_irq_get_virq(wcd->irq_data, wcd9335_irqs[i].irq); @@ -4067,7 +4070,7 @@ static int wcd9335_setup_irqs(struct wcd9335_codec *wcd) ret = devm_request_threaded_irq(wcd->dev, irq, NULL, wcd9335_irqs[i].handler, - IRQF_TRIGGER_RISING, + irqflags, wcd9335_irqs[i].name, wcd); if (ret) { dev_err(wcd->dev, "Failed to request %s\n", -- 2.7.4

2 2

[alsa-devel] Reminder: 4 open syzbot bugs in sound subsystem
by Eric Biggers 09 Jul '19

09 Jul '19

[This email was generated by a script. Let me know if you have any suggestions to make it better, or if you want it re-generated with the latest status.] Of the currently open syzbot reports against the upstream kernel, I've manually marked 4 of them as possibly being bugs in the sound subsystem. I've listed these reports below, sorted by an algorithm that tries to list first the reports most likely to be still valid, important, and actionable. If you believe a bug is no longer valid, please close the syzbot report by sending a '#syz fix', '#syz dup', or '#syz invalid' command in reply to the original thread, as explained at https://goo.gl/tpsmEJ#status If you believe I misattributed a bug to the sound subsystem, please let me know, and if possible forward the report to the correct people or mailing list. Here are the bugs: -------------------------------------------------------------------------------- Title: INFO: rcu detected stall in snd_seq_write Last occurred: 72 days ago Reported: 316 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=33501520944e11adedf1c454eec4cb818bee16… Original thread: https://lkml.kernel.org/lkml/000000000000e5050205746dcbb0@google.com/T/#u This bug has a syzkaller reproducer only. The original thread for this bug received 1 reply, 315 days ago. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+97aae04ce27e39cbfca9(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/000000000000e5050205746dcbb0@google.com -------------------------------------------------------------------------------- Title: WARNING: suspicious RCU usage in line6_pcm_acquire Last occurred: 44 days ago Reported: 75 days ago Branches: Mainline (with usb-fuzzer patches) Dashboard link: https://syzkaller.appspot.com/bug?id=a0ea128a37bfe56208042c02d080873dcbdf69… Original thread: https://lkml.kernel.org/lkml/0000000000007cb1ee0587591549@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one has replied to the original thread for this bug yet. This looks like a bug in a sound USB driver. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+06b7a5a8c4acc0445995(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000007cb1ee0587591549@google.com -------------------------------------------------------------------------------- Title: KASAN: use-after-free Read in wake_up_if_idle Last occurred: 117 days ago Reported: 253 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=b1e300cd7b124fc83dd4199d4d1df26310111b… Original thread: https://lkml.kernel.org/lkml/00000000000066ab7105795f245e@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one replied to the original thread for this bug. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+2c1253bc508adef78a7f(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/00000000000066ab7105795f245e@google.com -------------------------------------------------------------------------------- Title: INFO: task hung in snd_seq_write Last occurred: 110 days ago Reported: 315 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=9366cef8455b032553567ce096a5b31d8307b7… Original thread: https://lkml.kernel.org/lkml/0000000000001f74de0574710d3e@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one replied to the original thread for this bug. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+4c595632b98bb8ffcc66(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000001f74de0574710d3e@google.com

1 0

[alsa-devel] [PATCH] sound: soc: codecs: wcd9335: fix Unneeded variable: "ret"
by Hariprasad Kelam 09 Jul '19

09 Jul '19

this fixes below issues reported by coccicheck sound/soc/codecs/wcd9335.c:3611:5-8: Unneeded variable: "ret". Return "0" on line 3625 sound/soc/codecs/wcd9335.c:3941:5-8: Unneeded variable: "ret". Return "0" on line 3971 sound/soc/codecs/wcd9335.c:3745:5-8: Unneeded variable: "ret". Return "0" on line 3784 sound/soc/codecs/wcd9335.c:3896:5-8: Unneeded variable: "ret". Return "0" on line 3934 sound/soc/codecs/wcd9335.c:3026:5-8: Unneeded variable: "ret". Return "0" on line 3038 We cannot change return of these functions as they are callback functions. Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/soc/codecs/wcd9335.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 1bbbe42..e13af36 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -3018,7 +3018,6 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = snd_soc_component_get_drvdata(comp); struct wcd_slim_codec_dai_data *dai = &wcd->dai[w->shift]; - int ret = 0; switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -3030,7 +3029,7 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, break; } - return ret; + return 0; } static int wcd9335_codec_enable_mix_path(struct snd_soc_dapm_widget *w, @@ -3603,7 +3602,6 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, { struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -3617,7 +3615,7 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static void wcd9335_codec_hph_post_pa_config(struct wcd9335_codec *wcd, @@ -3737,7 +3735,6 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); int hph_mode = wcd->hph_mode; - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -3776,7 +3773,7 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w, @@ -3888,7 +3885,6 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); int hph_mode = wcd->hph_mode; - int ret = 0; switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -3926,14 +3922,13 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kc, int event) { struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); - int ret = 0; switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -3963,7 +3958,7 @@ static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, break; }; - return ret; + return 0; } static irqreturn_t wcd9335_slimbus_irq(int irq, void *data) -- 2.7.4

1 0

[alsa-devel] [PATCH] MLK-22197 sound: asoc: add micfil dc remover amixer control
by Irina Patru 09 Jul '19

09 Jul '19

Add control for DC Remover Control register: 11b - DC Remover is bypassed 00b - DC Remover is cut-off at 21Hz 01b - DC Remover is cut-off at 83Hz 10b - DC Remover is cut-off at 152Hz This control modifies DC mode for all channels. For more information see DC Remover Block Diagram in micfil reference manual. Signed-off-by: Irina Patru <ioana-irina.patru(a)nxp.com> --- sound/soc/fsl/fsl_micfil.c | 59 ++++++++++++++++++++++++++++++++++++++ sound/soc/fsl/fsl_micfil.h | 10 +++++++ 2 files changed, 69 insertions(+) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index 7bb8d4cb5f71..2eaf9fda4865 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -45,6 +45,7 @@ struct fsl_micfil { bool slave_mode; int channel_gain[8]; int clk_src_id; + int dc_remover; int vad_sound_gain; int vad_noise_gain; int vad_input_gain; @@ -140,6 +141,17 @@ static const char * const micfil_clk_src_texts[] = { "Auto", "AudioPLL1", "AudioPLL2", "ExtClk3", }; +/* DC Remover Control + * Filter Bypassed 1 1 + * Cut-off @21Hz 0 0 + * Cut-off @83Hz 0 1 + * Cut-off @152HZ 1 0 + */ +static const char * const micfil_dc_remover_texts[] = { + "Cut-off @21Hz", "Cut-off @83Hz", + "Cut-off @152Hz", "Bypass", +}; + static const struct soc_enum fsl_micfil_quality_enum = SOC_ENUM_SINGLE(REG_MICFIL_CTRL2, MICFIL_CTRL2_QSEL_SHIFT, @@ -168,6 +180,10 @@ static const struct soc_enum fsl_micfil_hwvad_rate_enum = static const struct soc_enum fsl_micfil_clk_src_enum = SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(micfil_clk_src_texts), micfil_clk_src_texts); +static const struct soc_enum fsl_micfil_dc_remover_enum = + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(micfil_dc_remover_texts), + micfil_dc_remover_texts); + static int micfil_put_clk_src(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) @@ -194,6 +210,45 @@ static int micfil_get_clk_src(struct snd_kcontrol *kcontrol, return 0; } +static int micfil_put_dc_remover_state(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; + struct fsl_micfil *micfil = snd_soc_component_get_drvdata(comp); + unsigned int *item = ucontrol->value.enumerated.item; + int val = snd_soc_enum_item_to_val(e, item[0]); + int i = 0, ret = 0; + u32 reg_val = 0; + + if (val < 0 || val > 3) + return -1; + micfil->dc_remover = val; + + /* Calculate total value for all channels */ + for (i = 0; i < 8; i++) + reg_val |= MICFIL_DC_MODE(val, i); + + /* Update DC Remover mode for all channels */ + ret = snd_soc_component_update_bits(comp, + REG_MICFIL_DC_CTRL, + MICFIL_DC_CTRL_MASK, + reg_val); + return ret; +} + +static int micfil_get_dc_remover_state(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol); + struct fsl_micfil *micfil = snd_soc_component_get_drvdata(comp); + + ucontrol->value.enumerated.item[0] = micfil->dc_remover; + + return 0; +} + + static int hwvad_put_init_mode(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -676,6 +731,10 @@ static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = { SOC_ENUM_EXT("Clock Source", fsl_micfil_clk_src_enum, micfil_get_clk_src, micfil_put_clk_src), + SOC_ENUM_EXT("MICFIL DC Remover Control", + fsl_micfil_dc_remover_enum, + micfil_get_dc_remover_state, + micfil_put_dc_remover_state), { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "HWVAD Input Gain", diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h index 792187b717f0..e47dba9b90b8 100644 --- a/sound/soc/fsl/fsl_micfil.h +++ b/sound/soc/fsl/fsl_micfil.h @@ -278,6 +278,16 @@ #define MICFIL_HWVAD_HPF_102HZ 3 #define MICFIL_HWVAD_FRAMET_DEFAULT 10 +/* MICFIL DC Remover Control Register -- REG_MICFIL_DC_CTRL */ +#define MICFIL_DC_CTRL_SHIFT 0 +#define MICFIL_DC_CTRL_MASK 0xFFFF +#define MICFIL_DC_CTRL_WIDTH 2 +#define MICFIL_DC_CHX_SHIFT(v) (2 * (v)) +#define MICFIL_DC_CHX_MASK(v) ((BIT(MICFIL_DC_CTRL_WIDTH) - 1) \ + << MICFIL_DC_CHX_SHIFT(v)) +#define MICFIL_DC_MODE(v1, v2) (((v1) << MICFIL_DC_CHX_SHIFT(v2)) \ + & MICFIL_DC_CHX_MASK(v2)) + /* MICFIL Output Control Register */ #define MICFIL_OUTGAIN_CHX_SHIFT(v) (4 * (v)) -- 2.21.0

4 3

[alsa-devel] [PATCH 1/4] ALSA: compress: Fix regression on compressed capture streams
by Charles Keepax 09 Jul '19

09 Jul '19

A previous fix to the stop handling on compressed capture streams causes some knock on issues. The previous fix updated snd_compr_drain_notify to set the state back to PREPARED for capture streams. This causes some issues however as the handling for snd_compr_poll differs between the two states and some user-space applications were relying on the poll failing after the stream had been stopped. To correct this regression whilst still fixing the original problem the patch was addressing, update the capture handling to skip the PREPARED state rather than skipping the SETUP state as it has done until now. Fixes: 4f2ab5e1d13d ("ALSA: compress: Fix stop handling on compressed capture streams") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- include/sound/compress_driver.h | 5 +---- sound/core/compress_offload.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index c5188ff724d12..bc88d6f964da9 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -173,10 +173,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - if (stream->direction == SND_COMPRESS_PLAYBACK) - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - else - stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + stream->runtime->state = SNDRV_PCM_STATE_SETUP; wake_up(&stream->runtime->sleep); } diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index a1a6fd75cfe50..f031495311ee4 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -587,10 +587,7 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) stream->metadata_set = false; stream->next_track = false; - if (stream->direction == SND_COMPRESS_PLAYBACK) - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - else - stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + stream->runtime->state = SNDRV_PCM_STATE_SETUP; } else { return -EPERM; } @@ -706,8 +703,17 @@ static int snd_compr_start(struct snd_compr_stream *stream) { int retval; - if (stream->runtime->state != SNDRV_PCM_STATE_PREPARED) + switch (stream->runtime->state) { + case SNDRV_PCM_STATE_SETUP: + if (stream->direction != SND_COMPRESS_CAPTURE) + return -EPERM; + break; + case SNDRV_PCM_STATE_PREPARED: + break; + default: return -EPERM; + } + retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_START); if (!retval) stream->runtime->state = SNDRV_PCM_STATE_RUNNING; -- 2.11.0

2 5

[alsa-devel] [PATCH 0/4] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 09 Jul '19

09 Jul '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. Cheng-Yi Chiang (4): ASoC: hdmi-codec: Add an op to set callback function for plug event drm: bridge: dw-hdmi: Report connector status using callback ASoC: rockchip_max98090: Add dai_link for HDMI ASoC: rockchip_max98090: Add HDMI jack support .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 3 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 ++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 32 ++++- include/sound/hdmi-codec.h | 16 +++ sound/soc/codecs/hdmi-codec.c | 52 ++++++++ sound/soc/rockchip/rockchip_max98090.c | 112 ++++++++++++++---- 6 files changed, 201 insertions(+), 24 deletions(-) -- 2.22.0.410.gd8fdbe21b5-goog

6 19

Re: [alsa-devel] [PATCH V2 2/2] ASoC: fsl_esai: recover the channel swap after xrun
by S.j. Wang 09 Jul '19

09 Jul '19

> > > > + > > > > + /* restore registers by regcache_sync */ > > > > + fsl_esai_register_restore(esai_priv); > > > > + > > > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, > > > > + ESAI_xCR_xPR_MASK, 0); > > > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, > > > > + ESAI_xCR_xPR_MASK, 0); > > > > > > And just for curious, can (or shall) we stuff this personal reset to > > > the reset() function? I found this one is a part of the reset > > > routine being mentioned in the RM -- it was done after ESAI reset is > done via ECR register. > > > > > > > There is a problem to do this, TPR/RPR need to be clear after > > configure the control register. (TCCR, TCR). So it seems not only one > > place (reset function) need to be changed. > > Do you know (or remember) why we suddenly involve this TPR/PRP? > The driver has no problem so far, even if we don't have them. > > The "personal reset" sounds like a feature that we would use to reset TX or > RX individually, while this hw_reset() does a full reset for both TX and RX. > So I wonder whether they're necessary. The hw_reset flow is suggested by design team, so involve TRP/RPP is from them, I don't know the detail. Best regards Wang shengjiu

1 0

Re: [alsa-devel] [PATCH V2 2/2] ASoC: fsl_esai: recover the channel swap after xrun
by S.j. Wang 09 Jul '19

09 Jul '19

> > > + > > + /* restore registers by regcache_sync */ > > + fsl_esai_register_restore(esai_priv); > > + > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, > > + ESAI_xCR_xPR_MASK, 0); > > + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, > > + ESAI_xCR_xPR_MASK, 0); > > And just for curious, can (or shall) we stuff this personal reset to the reset() > function? I found this one is a part of the reset routine being mentioned in > the RM -- it was done after ESAI reset is done via ECR register. > There is a problem to do this, TPR/RPR need to be clear after configure the control register. (TCCR, TCR). So it seems not only one place (reset function) need to be changed. Best regards Wang shengjiu

2 1

[alsa-devel] [PATCH] ALSA: hda: Simplify snd_hdac_refresh_widgets()
by Takashi Iwai 08 Jul '19

08 Jul '19

Along with the recent fix for the races of snd_hdac_refresh_widgets() it turned out that the instantiation of widgets sysfs at snd_hdac_sysfs_reinit() could cause a race. The race itself was already covered later by extending the mutex protection range, the commit 98482377dc72 ("ALSA: hda: Fix widget_mutex incomplete protection"), but this also indicated that the call of *_reinit() is basically superfluous, as the widgets shall be created sooner or later from snd_hdac_device_register(). This patch removes the redundant call of snd_hdac_sysfs_reinit() at first. By this removal, the sysfs argument itself in snd_hdac_refresh_widgets() becomes superfluous, too, because the only case sysfs=false is always with codec->widgets=NULL. So, we drop this redundant argument as well. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hdaudio.h | 2 +- sound/hda/hdac_device.c | 13 +++++-------- sound/hda/hdac_sysfs.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/soc/codecs/hdac_hdmi.c | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index e8346784cf3f..f475293d0668 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -120,7 +120,7 @@ void snd_hdac_device_unregister(struct hdac_device *codec); int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name); int snd_hdac_codec_modalias(struct hdac_device *hdac, char *buf, size_t size); -int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs); +int snd_hdac_refresh_widgets(struct hdac_device *codec); unsigned int snd_hdac_make_cmd(struct hdac_device *codec, hda_nid_t nid, unsigned int verb, unsigned int parm); diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index 11050bfd8068..a265c1d68876 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -89,7 +89,7 @@ int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus, fg = codec->afg ? codec->afg : codec->mfg; - err = snd_hdac_refresh_widgets(codec, false); + err = snd_hdac_refresh_widgets(codec); if (err < 0) goto error; @@ -394,9 +394,8 @@ static void setup_fg_nodes(struct hdac_device *codec) /** * snd_hdac_refresh_widgets - Reset the widget start/end nodes * @codec: the codec object - * @sysfs: re-initialize sysfs tree, too */ -int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs) +int snd_hdac_refresh_widgets(struct hdac_device *codec) { hda_nid_t start_nid; int nums, err = 0; @@ -414,11 +413,9 @@ int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs) goto unlock; } - if (sysfs) { - err = hda_widget_sysfs_reinit(codec, start_nid, nums); - if (err < 0) - goto unlock; - } + err = hda_widget_sysfs_reinit(codec, start_nid, nums); + if (err < 0) + goto unlock; codec->num_nodes = nums; codec->start_nid = start_nid; diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c index 909d5ef1179c..e56e83325903 100644 --- a/sound/hda/hdac_sysfs.c +++ b/sound/hda/hdac_sysfs.c @@ -428,7 +428,7 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec, int i; if (!codec->widgets) - return hda_widget_sysfs_init(codec); + return 0; tree = kmemdup(codec->widgets, sizeof(*tree), GFP_KERNEL); if (!tree) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index fcdf2cd3783b..d1a0e0de80ac 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1016,7 +1016,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec) hda_nid_t fg; int err; - err = snd_hdac_refresh_widgets(&codec->core, true); + err = snd_hdac_refresh_widgets(&codec->core); if (err < 0) return err; diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 660e0587f399..6302ad5b7128 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -2043,7 +2043,7 @@ static int hdac_hdmi_dev_probe(struct hdac_device *hdev) "Failed in parse and map nid with err: %d\n", ret); return ret; } - snd_hdac_refresh_widgets(hdev, true); + snd_hdac_refresh_widgets(hdev); /* ASoC specific initialization */ ret = devm_snd_soc_register_component(&hdev->dev, &hdmi_hda_codec, -- 2.16.4

2 2

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Recover BXT FW on DSP boot timeout error
by Pawel Harlozinski 08 Jul '19

08 Jul '19

When DSP boots with timeout error, reinitialize, transfer and boot firmware to recover audio. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek(a)intel.com> --- sound/soc/intel/skylake/bxt-sst.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 440bca7afbf1..a2844bdca1b8 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -455,13 +455,18 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id) /* If core 1 was turned on for booting core 0, turn it off */ skl_dsp_core_power_down(ctx, SKL_DSP_CORE_MASK(1)); if (ret == 0) { - dev_err(ctx->dev, "%s: DSP boot timeout\n", __func__); - dev_err(ctx->dev, "Error code=0x%x: FW status=0x%x\n", + dev_warn(ctx->dev, + "DSP boot timeout: Error code=0x%x: FW status=0x%x\n", sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE), sst_dsp_shim_read(ctx, BXT_ADSP_FW_STATUS)); - dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); - ret = -EIO; - goto err; + + ret = bxt_sst_init_fw(skl->dev, skl); + dev_warn(ctx->dev, "Reload fw status: %d\n", ret); + if (ret < 0) { + dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); + ret = -EIO; + goto err; + } } } -- 2.17.1

3 2

[alsa-devel] [PATCH 0/7] ALSA: firewire-lib: some fixes for tracepoints events
by Takashi Sakamoto 08 Jul '19

08 Jul '19

Hi, This kernel module, firewire-lib, adds 'amdtp_packet' tracepoints events to Linux system. After heavy code refactoring for v5.3, some event parameters include invalid values. This patchset is to fix them, and the last part of my refactoring work in this development period. Takashi Sakamoto (7): ALSA: firewire-lib: fix invalid length of tx packet payload for tracepoint events ALSA: firewire-lib/ficeface: fix initial value of data block counter for IR context with CIP_NO_HEADER ALSA: firewire-lib: fix initial value of data block count for IR context without CIP_DBC_IS_END_EVENT ALSA: firewire-lib: fix different data block counter between probed event and transferred isochronous packet ALSA: firewire-lib: code refactoring for error path of parser for CIP header ALSA: firewire-lib: code refactoring for post operation to data block counter ALSA: firewire-lib: code refactoring for local variables sound/firewire/amdtp-stream.c | 59 ++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 28 deletions(-) -- 2.20.1

2 8

[alsa-devel] [GIT PULL] ASoC updates for v5.3
by Mark Brown 08 Jul '19

08 Jul '19

The following changes since commit 6fbc7275c7a9ba97877050335f290341a1fd8dbf: Linux 5.2-rc7 (2019-06-30 11:25:36 +0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.3 for you to fetch changes up to a98429acadefc2b36611220f51659ecb3c1f35d2: Merge remote-tracking branch 'asoc/topic/meson' into asoc-next (2019-07-06 12:25:28 +0100) ---------------------------------------------------------------- ASoC: Updates for v5.3 This is a very big update, mainly thanks to Morimoto-san's refactoring work and some fairly large new drivers. - Lots more work on moving towards a component based framework from Morimoto-san. - Support for force disconnecting muxes from Jerome Brunet. - New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant CX2072X, Realtek RT1011 and RT1308. ---------------------------------------------------------------- Amadeusz Sławiński (12): ASoC: core: Tell codec that jack is being removed ASoC: Intel: Skylake: Initialize lists before access so they are safe to use ALSA: hdac: Fix codec name after machine driver is unloaded and reloaded ASoC: compress: Fix memory leak from snd_soc_new_compress ASoC: Intel: Skylake: Don't return failure on machine driver reload ASoC: Intel: Skylake: Add function to cleanup debugfs interface ASoC: Intel: Skylake: Properly cleanup on component removal ASoC: Intel: Skylake: Fix NULL ptr dereference when unloading clk dev ASoC: Intel: hdac_hdmi: Set ops to NULL on remove ASoC: topology: Consolidate how dtexts and dvalues are freed ASoC: topology: Consolidate and fix asoc_tplg_dapm_widget_*_create flow ASoC: Intel: Skylake: Reset pipeline before its deletion Amir Goldstein (1): ASoC: rename functions that pollute the simple_xxx namespace Andy Shevchenko (1): ASoC: Intel: Skylake: Switch to modern UUID API Arnd Bergmann (3): ASoC: rockchip: pdm: select CONFIG_RATIONAL ASoC: cx2072x: mark PM function as __maybe_unused ASoC: SOF: disallow building without CONFIG_PCI again Bard Liao (1): ASoC: SOF: dont wake dsp up in kcontrol IO Bard liao (1): ASoC: SOF: send time stamp to FW for alignment Ben Zhang (2): ASoC: rt5677: clear interrupts by polarity flip ASoC: rt5677: handle concurrent interrupts Bjorn Andersson (2): ASoC: qcom: common: Mark links as nonatomic ASoC: qcom: common: Fix NULL pointer in of parser Cezary Rojewski (3): ASoC: Intel: Skylake: Fix incorrect capture position reporting ASoC: Intel: Skylake: Read HIPCT extension before clearing DONE bit ASoC: Intel: Common: Fix NULL dereference in tx_wait_done Charles Keepax (1): ASoC: madera: Update SPDX headers Clément Péron (4): dt-bindings: sound: sun4i-spdif: Add Allwinner H6 compatible ASoC: sun4i-spdif: Move quirks to the top ASoC: sun4i-spdif: Add TX fifo bit flush quirks ASoC: sun4i-spdif: Add support for H6 SoC Codrin Ciubotariu (3): ASoC: codecs: ad193x: Fix memory corruption on BE 64b systems ASoC: codecs: ad193x: Group register initialization at probe ASoC: codecs: ad193x: Reset used registers at probe Colin Ian King (5): ASoC: cx2072x: remove redundant assignment to pulse_len ASoC: cx2072x: fix integer overflow on unsigned int multiply ASoC: cx2072x: fix spelling mistake "configued" -> "configured" ASoC: topology: fix memory leaks on sm, se and sbe ASoC: rt5665: remove redundant assignment to variable idx Curtis Malainey (4): ASoC: rt5677-spi: Rename driver to differentiate from main codec ASoC: rt5677: Add component driver name ASoC: rt5677: Add missing voice activation register definitions ASoC: rt5677: depop stereo dac Daniel Baluta (1): ASoC: SOF: Do not send cmd via SHIM register David Lin (1): ASoC: nau8822: support master mode Derek Fang (1): ASoC: rt1308: Add RT1308 amplifier driver Dragos Tarcatu (1): ASOC: SOF: ipc: prevent logging trace messages Dylan Reid (1): ASoC: rt5677: use more of the volume range from DACs Enric Balletbo i Serra (1): ASoC: rk3399_gru_sound: Support 32, 44.1 and 88.2 kHz sample rates Evan Green (2): ASoC: SOF: Add Comet Lake PCI IDs ASoC: Intel: Skylake: Add Cometlake PCI IDs Fletcher Woodruff (2): ASoC: rt5677: fall back to DT prop names on error ASoC: rt5677: move jack-detect init to i2c probe Geert Uytterhoeven (1): ASoC: Add missing newline at end of file Gen Zhang (1): wcd9335: fix a incorrect use of kstrndup() Greg Kroah-Hartman (2): ASoC: wm_adsp: no need to check return value of debugfs_create functions ASoC: fsl: no need to check return value of debugfs_create functions Gustavo A. R. Silva (5): ASoC: dapm: Use struct_size() in krealloc() ASoC: Intel: Skylake: Use struct_size() helper ASoC: qdsp6: q6core: Use struct_size() in kmemdup() ASoC: SOF: topology: Use struct_size() helper ASoC: SOF: Use struct_size() in kmemdup() Gustaw Lewandowski (1): ASoC: Intel: Fix race condition in IPC rx list Janusz Krzysztofik (1): ASoC: ti: Fix SDMA users not providing channel names Jaska Uimonen (2): ASoC: SOF: uapi: remove unused sof header files ASoC: SOF: topology: add support for mux/demux component Jerome Brunet (21): ASoC: hdmi-codec: remove function name debug traces ASoC: hdmi-codec: remove reference to the current substream ASoC: hdmi-codec: remove reference to the dai drivers in the private data ASoC: hdmi-codec: remove ops dependency on the dai id ASoC: hdmi-codec: re-introduce mutex locking ASoC: meson: axg-card: set link name based on link node name ASoC: dapm: allow muxes to force a disconnect ASoC: meson: add tohdmitx DT bindings ASoC: meson: axg-card: add basic codec-to-codec link support ASoC: meson: add g12a tohdmitx control ASoC: meson: axg-card: fix null pointer dereference in clean up ASoC: meson: axg-tdmin: right_j is not supported ASoC: meson: axg-tdmout: right_j is not supported ASoC: meson: axg-tdm: fix sample clock inversion ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines ASoC: meson: add tohdmitx DT bindings ASoC: soc-core: defer card registration if codec component is missing ASoC: soc-core: support dai_link with platforms_num != 1 ASoC: meson: axg-card: remove useless check on codec ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation ASoC: meson: axg-tdm-formatter: add reset Jiaxin Yu (3): ASoC: Mediatek: MT8183: fix compile error ASoC: Mediatek: MT8183: fix compile error ASoC: Mediatek: MT8183: enable dev runtime suspend and resume John Hsu (1): ASoC: nau8825: fix fake interruption when booting Kai Vehmanen (8): ASoC: SOF: trace: remove code duplication in sof_wait_trace_avail() ASoC: SOF: force end-of-file for debugfs trace at suspend ASoC: codec: hdac_hdmi: fix pin connections at cvt enable ASoC: SOF: intel: extend IPC dump information ASoC: SOF: ignore unrecoverable CTX_SAVE IPC errors at suspend ASoC: hdac_hdmi: report codec link up/down status to bus ASoC: SOF: add runtime idle callback ASoC: SOF: Intel: implement runtime idle for CNL/APL Kamil Lulko (1): ASoC: Intel: Skylake: Strip T and L from TLV IPCs Keyon Jie (3): ASoC: Intel: bxt-da7219-max98357a: add BE dailink for dmic16k ASoC: SOF: Intel: hda-stream: fix a deadlock with bus->reg_lock ASoC: Intel: sof-rt5682: correct naming for dmic16k Krzysztof Kozlowski (1): Revert "ASoC: core: use component driver name as component name" Kuninori Morimoto (268): ASoC: soc-core: use i on snd_soc_resume() ASoC: soc-core: don't use codec_dais on soc_bind_dai_link() ASoC: soc-core: tidyup soc_bind_dai_link() comment balance ASoC: soc-core: add soc_component_to_node() ASoC: soc-core: use soc_find_component() at snd_soc_get_dai_id() ASoC: soc.h: fe_compr can be bit field ASoC: soc-pcm: do cpu_dai related operation at same place ASoC: soc-pcm: add missing cpu_dai->rate = 0 ASoC: soc-pcm: add soc_pcm_components_open() ASoC: rsnd: move pcm_new from snd_soc_component_driver to snd_soc_dai_driver ASoC: soc-core: WARN() is not related to component->driver->probe ASoC: soc-pcm: fixup try_module_get()/module_put() timing ASoC: soc-core: use snd_soc_dai_link_component for CPU ASoC: simple-card: support snd_soc_dai_link_component style for cpu ASoC: soc.h: add sound dai_link connection macro ASoC: mediatek: mt6797-mt6351: use modern dai_link style ASoC: mediatek: mt2701-wm8960: use modern dai_link style ASoC: mediatek: mt2701-cs42448: use modern dai_link style ASoC: mediatek: mt8173-max98090: use modern dai_link style ASoC: mediatek: mt8173-rt5650: use modern dai_link style ASoC: mediatek: mt8173-rt5650-rt5676: use modern dai_link style ASoC: mediatek: mt8173-rt5650-rt5514: use modern dai_link style ASoC: mediatek: mt8183-da7219-max98357: use modern dai_link style ASoC: mediatek: mt8183-mt6358-ts3a227-max98357: use modern dai_link style ASoC: samsung: bells: use modern dai_link style ASoC: samsung: smdk_wm8580: use modern dai_link style ASoC: samsung: smdk_wm8994: use modern dai_link style ASoC: samsung: smdk_wm8994pcm: use modern dai_link style ASoC: samsung: smdk_spdif: use modern dai_link style ASoC: samsung: h1940_uda1380: use modern dai_link style ASoC: samsung: arndale_rt5631: use modern dai_link style ASoC: samsung: tobermory: use modern dai_link style ASoC: samsung: tm2_wm5110: use modern dai_link style ASoC: samsung: speyside: use modern dai_link style ASoC: samsung: snow: use modern dai_link style ASoC: samsung: smartq_wm8987: use modern dai_link style ASoC: samsung: s3c24xx_uda134x: use modern dai_link style ASoC: samsung: s3c24xx_simtec_tlv320aic23: use modern dai_link style ASoC: samsung: s3c24xx_simtec_hermes: use modern dai_link style ASoC: samsung: rx1950_uda1380: use modern dai_link style ASoC: samsung: odroid: use modern dai_link style ASoC: samsung: neo1973_wm8753: use modern dai_link style ASoC: samsung: lowland: use modern dai_link style ASoC: samsung: littlemill: use modern dai_link style ASoC: samsung: jive_wm8750: use modern dai_link style ASoC: pxa: brownstone: use modern dai_link style ASoC: pxa: corgi: use modern dai_link style ASoC: pxa: e740_wm9705: use modern dai_link style ASoC: pxa: e750_wm9705: use modern dai_link style ASoC: pxa: e800_wm9712: use modern dai_link style ASoC: pxa: em-x270: use modern dai_link style ASoC: pxa: hx4700: use modern dai_link style ASoC: pxa: imote2: use modern dai_link style ASoC: pxa: magician: use modern dai_link style ASoC: pxa: mioa701_wm9713: use modern dai_link style ASoC: pxa: palm27x: use modern dai_link style ASoC: pxa: zylonite: use modern dai_link style ASoC: pxa: z2: use modern dai_link style ASoC: pxa: ttc-dkb: use modern dai_link style ASoC: pxa: tosa: use modern dai_link style ASoC: pxa: spitz: use modern dai_link style ASoC: pxa: poodle: use modern dai_link style ASoC: kirkwood: armada-370-db: use modern dai_link style ASoC: ti: n810: use modern dai_link style ASoC: ti: osk5912: use modern dai_link style ASoC: ti: ams-delta: use modern dai_link style ASoC: ti: omap3pandora: use modern dai_link style ASoC: ti: davinci-evm: use modern dai_link style ASoC: ti: omap-hdmi: use modern dai_link style ASoC: ti: omap-abe-twl6040: use modern dai_link style ASoC: ti: omap-twl4030: use modern dai_link style ASoC: ti: rx51: use modern dai_link style ASoC: sh: migor: use modern dai_link style ASoC: sh: sh7760-ac97: use modern dai_link style ASoC: amd: acp-da7219-max98357a: use modern dai_link style ASoC: amd: acp-rt5645: use modern dai_link style ASoC: atmel: mikroe-proto: use modern dai_link style ASoC: atmel: sam9x5_wm8731: use modern dai_link style ASoC: atmel: sam9g20_wm8731: use modern dai_link style ASoC: atmel: tse850-pcm5142: use modern dai_link style ASoC: atmel: atmel-wm8904: use modern dai_link style ASoC: atmel: atmel-pdmic: use modern dai_link style ASoC: atmel: atmel-classd: use modern dai_link style ASoC: au1x: db1000: use modern dai_link style ASoC: au1x: db1200: use modern dai_link style ASoC: cirrus: edb93xx: use modern dai_link style ASoC: cirrus: simone: use modern dai_link style ASoC: cirrus: snappercl15: use modern dai_link style ASoC: fsl: efika-audio-fabric: use modern dai_link style ASoC: fsl: imx-spdif: use modern dai_link style ASoC: fsl: mx27vis-aic32x4: use modern dai_link style ASoC: fsl: phycore-ac97: use modern dai_link style ASoC: fsl: wm1133-ev1: use modern dai_link style ASoC: fsl: fsl-asoc-card: use modern dai_link style ASoC: fsl: mpc8610_hpcd/p1022_ds/p1022_rdk: use modern dai_link style ASoC: fsl: imx-es8328: use modern dai_link style ASoC: fsl: eukrea-tlv320: use modern dai_link style ASoC: fsl: imx-sgtl5000: use modern dai_link style ASoC: fsl: imx-mc13783: use modern dai_link style ASoC: fsl: pcm030-audio-fabric: use modern dai_link style ASoC: fsl: imx-audmix: use modern dai_link style ASoC: jz4740: qi_lb60: use modern dai_link style ASoC: meson: axg-card: use modern dai_link style ASoC: mxs: mxs-sgtl5000: use modern dai_link style ASoC: nuc900: nuc900-audio: use modern dai_link style ASoC: qcom: storm: use modern dai_link style ASoC: qcom: common: use modern dai_link style ASoC: qcom: apq8016_sbc: use modern dai_link style ASoC: rockchip: rk3399_gru_sound: use modern dai_link style ASoC: rockchip: rk3288_hdmi_analog: use modern dai_link style ASoC: rockchip: rockchip_rt5645: use modern dai_link style ASoC: rockchip: rockchip_max98090: use modern dai_link style ASoC: sirf: sirf-audio: use modern dai_link style ASoC: ux500: mop500: use modern dai_link style ASoC: sunxi: sun4i-codec: use modern dai_link style ASoC: txx9: txx9aclc-generic: use modern dai_link style ASoC: tegra: tegra_rt5677: use modern dai_link style ASoC: tegra: tegra_wm8753: use modern dai_link style ASoC: tegra: trimslice: use modern dai_link style ASoC: tegra: tegra_alc5632: use modern dai_link style ASoC: tegra: tegra_sgtl5000: use modern dai_link style ASoC: tegra: tegra_rt5640: use modern dai_link style ASoC: tegra: tegra_wm8903: use modern dai_link style ASoC: tegra: tegra_wm9712: use modern dai_link style ASoC: tegra: tegra_max98090: use modern dai_link style ASoC: soc-topology: use modern dai_link style ASoC: vc4: vc4_htmi: use modern dai_link style ASoC: sof: use modern dai_link style ASoC: Intel: bdw-rt5677: use modern dai_link style ASoC: Intel: haswell: use modern dai_link style ASoC: Intel: broadwell: use modern dai_link style ASoC: Intel: bxt_da7219_max98357a: use modern dai_link style ASoC: Intel: bxt_rt298: use modern dai_link style ASoC: Intel: byt-rt5640: use modern dai_link style ASoC: Intel: byt-max98090: use modern dai_link style ASoC: Intel: bytcht_es8316: use modern dai_link style ASoC: Intel: bytcht_nocodec: use modern dai_link style ASoC: Intel: bytcht_da7213: use modern dai_link style ASoC: Intel: bytcht_cx2072x: use modern dai_link style ASoC: Intel: bytcr_rt5651: use modern dai_link style ASoC: Intel: bytcr_rt5640: use modern dai_link style ASoC: Intel: cht_bsw_rt5645: use modern dai_link style ASoC: Intel: cht_bsw_max98090_ti: use modern dai_link style ASoC: Intel: cht_bsw_rt5672: use modern dai_link style ASoC: Intel: cht_bsw_nau8824: use modern dai_link style ASoC: Intel: kbl_rt5660: use modern dai_link style ASoC: Intel: kbl_rt5663_max98927: use modern dai_link style ASoC: Intel: kbl_rt5663_rt5514_max98927: use modern dai_link style ASoC: Intel: kbl_da7219_max98927: use modern dai_link style ASoC: Intel: kbl_da7219_max98357a: use modern dai_link style ASoC: Intel: skl_nau88l25_ssm4567: use modern dai_link style ASoC: Intel: skl_rt286: use modern dai_link style ASoC: Intel: skl_nau88l25_max98357a: use modern dai_link style ASoC: Intel: skl-pcm: use modern dai_link style ASoC: Intel: skl_hda_dsp_common: use modern dai_link style ASoC: Intel: glk_rt5682_max98357a: use modern dai_link style ASoC: Intel: sof_rt5682: use modern dai_link style ASoC: soc-core: remove legacy style dai_link ASoC: soc.h: fixup for_each_card_links() macro ASoC: soc-core: allow no Platform on dai_link ASoC: vc4: vc4_hdmi: don't select unnecessary Platform ASoC: atmel: atmel-classd: don't select unnecessary Platform ASoC: atmel: atmel-pdmic: don't select unnecessary Platform ASoC: atmel: atmel_wm8904: don't select unnecessary Platform ASoC: atmel: mikroe-proto: don't select unnecessary Platform ASoC: atmel: sam9g20_wm8731: don't select unnecessary Platform ASoC: atmel: sam9x5_wm8731: don't select unnecessary Platform ASoC: atmel: tse850-pcm5142: don't select unnecessary Platform ASoC: fsl: eukrea-tlv320: don't select unnecessary Platform ASoC: fsl: fsl-asoc-card: don't select unnecessary Platform ASoC: fsl: imx-es8328: don't select unnecessary Platform ASoC: fsl: imx-sgtl5000: don't select unnecessary Platform ASoC: fsl: imx-spdif: don't select unnecessary Platform ASoC: fsl: imx-audmix: don't select unnecessary Platform ASoC: kirkwood: armada-370-db: don't select unnecessary Platform ASoC: mxs: mxs-sgtl5000: don't select unnecessary Platform ASoC: qcom: apq8016_sbc: don't select unnecessary Platform ASoC: qcom: storm: don't select unnecessary Platform ASoC: rockchip: rk3288_hdmi_analog: don't select unnecessary Platform ASoC: rockchip: rockchip_max98090: don't select unnecessary Platform ASoC: rockchip: rockchip_rt5645: don't select unnecessary Platform ASoC: samsung: arndale_rt5631: don't select unnecessary Platform ASoC: samsung: smdk_wm8994: don't select unnecessary Platform ASoC: samsung: snow: don't select unnecessary Platform ASoC: samsung: tm2_wm5110: don't select unnecessary Platform ASoC: sirf: sirf-audio: don't select unnecessary Platform ASoC: sunxi: sun4i-codec: don't select unnecessary Platform ASoC: tegra: tegra_alc5632: don't select unnecessary Platform ASoC: tegra: tegra_max98090: don't select unnecessary Platform ASoC: tegra: tegra_rt5640: don't select unnecessary Platform ASoC: tegra: tegra_rt5677: don't select unnecessary Platform ASoC: tegra: tegra_sgtl5000: don't select unnecessary Platform ASoC: tegra: tegra_wm8753: don't select unnecessary Platform ASoC: tegra: tegra_wm8903: don't select unnecessary Platform ASoC: tegra: tegra_wm9712: don't select unnecessary Platform ASoC: tegra: trimslice: don't select unnecessary Platform ASoC: ti: davinci-evm: don't select unnecessary Platform ASoC: ti: omap-abe-twl6040: don't select unnecessary Platform ASoC: ti: omap-hdmi: don't select unnecessary Platform ASoC: ti: omap-twl4030: don't select unnecessary Platform ASoC: ti: rx51: don't select unnecessary Platform ASoC: ux500: mop500: don't select unnecessary Platform ASoC: simple-card-utils: don't select unnecessary Platform ASoC: qcom: don't select unnecessary Platform ASoC: rockchip: rk3399_gru_sound: don't select unnecessary Platform ASoC: soc-utils: remove dummy Platform ASoC: rt5514-spi: don't use snd_soc_lookup_component() ASoC: soc-core: call snd_soc_unbind_card() under mutex_lock; ASoC: soc-core: move soc_find_component() ASoC: soc-core: soc_find_component() uses snd_soc_is_matching_component() ASoC: soc-core: soc_find_component() uses snd_soc_dai_link_component ASoC: soc-core: use soc_find_component() at snd_soc_find_dai() ASoC: rsnd: ssiu: tidyup SSI_MODE1/2 settings ASoC: rsnd: add missing pin sharing with SSI9 ASoC: soc-core: don't use soc_find_component() at snd_soc_find_dai() ASoC: atmel: atmel-pcm-dma.c: use devm_snd_dmaengine_pcm_register() ASoC: vc4: vc4_htmi: consider CPU-Platform possibility ASoC: atmel: atmel-classd: consider CPU-Platform possibility ASoC: atmel: atmel-pdmic: consider CPU-Platform possibility ASoC: atmel: atmel_wm8904: consider CPU-Platform possibility unnecessary Platform" ASoC: amtel: mikroe-proto: consider CPU-Platform possibility ASoC: atmel: sam9g20_wm8731: consider CPU-Platform possibility ASoC: atmel: sam9x5_wm8731: consider CPU-Platform possibility ASoC: atmel: tse850-pcm5142: consider CPU-Platform possibility ASoC: fsl: eukrea-tlv320: consider CPU-Platform possibility ASoC: fsl: fsl-asoc-card: consider CPU-Platform possibility ASoC: fsl: imx-es8328: consider CPU-Platform possibility ASoC: fsl: imx-sgtl5000: consider CPU-Platform possibility ASoC: fsl: imx-spdif: consider CPU-Platform possibility ASoC: fsl: imx-audmix: consider CPU-Platform possibility ASoC: kirkwood: armada-370-db: consider CPU-Platform possibility ASoC: mxs: mxs-sgtl5000: consider CPU-Platform possibility ASoC: qcom: apq8016_sbc: consider CPU-Platform possibility ASoC: qcom: storm: consider CPU-Platform possibility ASoC: rockchip: rk3288_hdmi_analog: consider CPU-Platform possibility ASoC: rockchip: rockchip_max98090: consider CPU-Platform possibility ASoC: rockchip: rockchip_rt5645: consider CPU-Platform possibility ASoC: samsung: arndale_rt5631: consider CPU-Platform possibility ASoC: samsung: smdk_wm8994: consider CPU-Platform possibility ASoC: samsung: snow: consider CPU-Platform possibility ASoC: samsung: tm2_wm5110: consider CPU-Platform possibility ASoC: sirf: sirf-audio: consider CPU-Platform possibility ASoC: sunxi: sun4i-codec: consider CPU-Platform possibility ASoC: tegra: tegra_alc5632: consider CPU-Platform possibility ASoC: tegra: tegra_max98090: consider CPU-Platform possibility ASoC: tegra: tegra_rt5640: consider CPU-Platform possibility ASoC: tegra: tegra_rt5677: consider CPU-Platform possibility ASoC: tegra: tegra_sgtl5000: consider CPU-Platform possibility ASoC: tegra: tegra_wm8753: consider CPU-Platform possibility ASoC: tegra: tegra_wm8903: consider CPU-Platform possibility ASoC: tegra: tegra_wm9712: consider CPU-Platform possibility ASoC: tegra: trimslice: consider CPU-Platform possibility ASoC: ti: davinci-evm: consider CPU-Platform possibility ASoC: ti: omap-abe-twl6040: consider CPU-Platform possibility ASoC: ti: omap-hdmi: consider CPU-Platform possibility ASoC: ti: omap-twl4030: consider CPU-Platform possibility ASoC: ti: rx51: consider CPU-Platform possibility ASoC: ux500: mop500: consider CPU-Platform possibility ASoC: simple-card-utils: consider CPU-Platform possibility ASoC: qcom: consider CPU-Platform possibility ASoC: rockchip: rk3399_gru_sound: consider CPU-Platform possibility ASoC: soc-utils: respawn dummy Platform ASoC: au1x: psc-i2s.c: use devm_snd_soc_register_component() ASoC: cirrus: ep93xx-i2s.c: use devm_snd_soc_register_component() ASoC: rt5682: use devm_snd_soc_register_component() ASoC: ak4118: use devm_snd_soc_register_component() ASoC: cros_ec_codec: use devm_snd_soc_register_component() ASoC: pxa: pxa2xx-ac97.c: use devm_snd_soc_register_component() Luca Weiss (1): ASoC: sunxi: sun50i-codec-analog: Add earpiece Mac Chiang (2): ASoC: Intel: boards: kbl_da7219_max98927: add dai_trigger function ASoC: max98357a: avoid speaker pop when playback startup Mark Brown (11): Merge tag 'v5.2-rc1' into asoc-5.3 Merge branch 'for-5.2' of https://git.kernel.org/.../broonie/sound into asoc-5.3 Merge branch 'asoc-5.2' into asoc-5.3 Merge branch 'asoc-5.2' into asoc-5.3 Merge branch 'asoc-5.2' into asoc-5.3 ASoC: core: Adapt for debugfs API change ASoC: dapm: Adapt for debugfs API change Merge tag 'v5.2-rc6' into asoc-5.3 Merge branch 'asoc-5.2' into asoc-linus Merge branch 'asoc-5.3' into asoc-next Merge remote-tracking branch 'asoc/topic/meson' into asoc-next Mauro Carvalho Chehab (1): ASoC: dt-bindings: fix some broken links from txt->yaml conversion Maxime Jourdan (1): ASoC: max98357a: Show KConfig entry Maxime Ripard (5): dt-bindings: sound: Convert Allwinner SPDIF binding to YAML dt-bindings: sound: sun4i-spdif: Document that the RX channel can be missing dt-bindings: sound: Convert Allwinner I2S binding to YAML dt-bindings: sound: sun4i-i2s: Document that the RX channel can be missing ASoC: sun4i-i2s: Change SR and WSS computation Nathan Chancellor (1): ASoC: rt1011: Mark format integer literals as unsigned Nathan Huckleberry (1): ASoC: tas571x: Fix -Wunused-const-variable Nilkanth Ahirrao (1): ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_ Olivier Moysan (4): ASoC: stm32: spdifrx: manage identification registers ASoC: stm32: i2s: manage identification registers ASoC: stm32: sai: manage identification registers ASoC: stm32: dfsdm: add 16 bits audio record support Pan Xiuli (1): ASoC: SOF: soundwire: add initial soundwire support Paul Gortmaker (1): ASoC: soc-acpi: fix implicit header use of module.h/export.h Paweł Harłoziński (1): ASoC: Intel: Skylake: Use recommended SDxFMT programming sequence Peter Ujfalusi (7): ASoC: pcm3168a: Implement set_tdm_slot callback bindings: sound: davinci-mcasp: Add support for optional auxclk-fs-ratio ASoC: ti: davinci-mcasp: Support for auxclk-fs-ratio ASoC: ti: davinci-mcasp: Set unused serializers as INACTIVE ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs ASoC: pcm3168a: Rename min_frame_size to slot_width ASoC: pcm3168a: Add support for multi DIN/DOUT with TDM slots parameter Pierre-Louis Bossart (15): ASoC: Intel: boards: remove unnecessary inclusion of skl.h ASoC: Intel: sof-rt5682: fix undefined references with Baytrail-only support ASoC: Intel: use common helpers to detect CPUs ASoC: Intel: boards: remove dependency on asm/platform_sst_audio.h ASoC: Intel: boards: Add COMPILE_TEST for new machine drivers ASoC: SOF: add COMPILE_TEST for PCI options ASoC: SOF: Intel: cnl-ipc: read all IPC registers first ASoC: SOF: Intel: cnl-ipc: move code around for clarity ASoC: SOF: Intel: cnl-ipc: re-enable IPC IRQ at end of handler ASoC: SOF: Intel: hda-ipc: read all IPC registers first ASoC: SOF: Intel: hda-ipc: re-enable IPC IRQ at end of handler ASoC: SOF: Intel: ipc: don't check for HIPCCTL register value ASoC: soc-topology: fix modern dai link style ASoC: SOF: uapi: align comments with firmware files ASoC: SOF: ipc: clarify operator precedence Randy Dunlap (1): ASoc: fix sound/soc/intel/skylake/slk-ssp-clk.c build error on IA64 Ranjani Sridharan (13): ASoC: SOF: pcm: remove runtime PM calls during pcm open/close ASoC: SOF: add mode parameter for snd_sof_debugfs_buf_item ASoC: SOF: ipc: Introduce SOF_IPC_GLB_TEST_MSG IPC command ASoC: SOF: debug: add new debugfs entries for IPC flood test ASoC: SOF: Intel: hda: save handle to sdev in sof_intel_hda_stream ASoC: SOF: Intel: hda: add new macro hstream_to_sof_hda_stream() ASoC: SOF: topology: add cpu_dai_name for DAIs ASoC: SOF: Intel: hda: assign link DMA channel at run-time ASoC: SOF: Intel: hda: reserve host DMA channel for hostless streams ASoC: SOF: Intel: hda: release link DMA for paused streams during suspend ASoC: SOF: Intel: hda: couple host and link DMA during FE hw_free ASoC: SOF: Intel: hda: modify stream interrupt handler ASoC: SOF: Intel: hda: clear stream status and wakests properly Ravulapati Vishnu vardhan rao (1): ASoC: amd: Reporting accurate hw_ptr for acp3x dma Richard Fitzgerald (5): ASoC: madera: Add DT bindings for Cirrus Logic Madera codecs ASoC: madera: Add common support for Cirrus Logic Madera codecs ASoC: cs47l35: Add codec driver for Cirrus Logic CS47L35 ASoC: cs47l85: Add codec driver for Cirrus Logic CS47L85 ASoC: cs47l90: Add codec driver for Cirrus Logic CS47L90 S.j. Wang (5): ASoC: fsl_esai: Add pm runtime function ASoC: fsl_asrc: replace the process_option table with function ASoC: cs42xx8: Add reset gpio handling ASoC: cs42xx8: add reset-gpios in binding document ASoC: fsl_asrc: Unify the supported input and output rate Saravanan Sekar (1): ASoC: tlv320aic3x: Add support for high power analog output Sathya Prakash M R (1): ASoC: Intel: sof-rt5682: add newline for clarity Seppo Ingalsuo (1): ASoC: SOF: Add DMIC token for unmute gain ramp time Shengjiu Wang (2): ASoC: fsl_sai: Move clock operation to PM runtime ASoC: cs42xx8: Fix build error with CONFIG_GPIOLIB is not set Shuming Fan (2): ASoC: rt1011: Add RT1011 amplifier driver ASoC: rt1011: fix warning reported by kbuild test robot and minor issue Shunli Wang (3): ASoC: Mediatek: add memory interface data align ASoC: Mediatek: MT8183: set data align ASoC: Mediatek: MT8183: enable IIR filter Simon Ho (1): ASoC: Add support for Conexant CX2072X CODEC Srinivas Kandagatla (4): ASoC: msm8916-wcd-digital: Add sidetone support ASoC: core: Return -ENOTSUPP from set_channel_map() if no operation provided ASoC: qdsp6: q6afe-dai: Add missing Slimbus0 audio route ASoC: wcd9335: remove multiple defines. Sylwester Nawrocki (1): ASoC: Remove erroneous soc_cleanup_card_resources() call Takashi Iwai (1): ASoC: Intel: Add machine driver for CX2072X on BYT/CHT platforms Tzung-Bi Shih (5): ASoC: max98357a: request GPIO when device get probed ASoC: mediatek: mt8183: remove unused DAPM pins ASoC: mediatek: mt8183: move card registration to the end of probe ASoC: core: use component driver name as component name ASoC: Intel: sof_rt5682: use GFP_KERNEL instead of GFP_ATOMIC Wei Yongjun (1): ASoC: SOF: debug: fix possible memory leak in sof_dfsentry_write() Wen Yang (1): ASoC: audio-graph-card: fix use-after-free in graph_for_each_link Xun Zhang (1): ASoC: Intel: sof-rt5682: add MCLK support for BYT platform Yong Zhi (1): ASoC: Intel: glk_rt5682_max98357a: Remap button control-function YueHaibing (5): ASoC: cx2072x: remove set but not used variable 'is_right_j ' ASoC: mediatek: Make some symbols static ASoC: SOF: Intel: hda: remove duplicated include from hda.c ASoC: madera: Remove duplicated include from cs47l35.c ASoC: rt1308: Fix platform_no_drv_owner.cocci warnings Zhu Yingjiang (10): ASoC: SOF: Intel: ICL: add Icelake SSP count ASoC: SOF: Intel: ICL add Icelake chip info struct ASoC: SOF: Intel: hda: use the defined ppcap functions ASoC: SOF: topology: add min/max step for volume_table ASoC: SOF: topology: pass volume min/max linear value to FW ASoC: SOF: Intel: hda: use the SOF defined ppcap functions ASoC: SOF: Intel: hda: add function for hda stop chip ASoC: SOF: Intel: hda: use the defined stop chip in suspend ASoC: SOF: Intel: hda: make sure DMA is start/stop by read the RUN bit ASoC: SOF: Intel: hda: make sure RUN bit setting to 0 during clear stream status .../devicetree/bindings/media/st,stm32-dcmi.txt | 2 +- .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 132 + .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 120 + .../bindings/sound/amlogic,axg-tdm-formatters.txt | 6 +- .../bindings/sound/amlogic,g12a-tohdmitx.txt | 55 + .../devicetree/bindings/sound/cs42xx8.txt | 6 + .../bindings/sound/davinci-mcasp-audio.txt | 3 + Documentation/devicetree/bindings/sound/madera.txt | 67 + .../devicetree/bindings/sound/max98357a.txt | 4 + Documentation/devicetree/bindings/sound/rt1011.txt | 32 + Documentation/devicetree/bindings/sound/rt1308.txt | 17 + .../devicetree/bindings/sound/st,stm32-i2s.txt | 2 +- .../devicetree/bindings/sound/st,stm32-sai.txt | 2 +- .../devicetree/bindings/sound/sun4i-i2s.txt | 45 - .../bindings/sound/sunxi,sun4i-spdif.txt | 42 - MAINTAINERS | 7 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 19 +- include/dt-bindings/sound/madera.h | 25 + include/dt-bindings/sound/meson-g12a-tohdmitx.h | 13 + include/linux/mfd/madera/pdata.h | 4 + include/sound/hda_codec.h | 3 + include/sound/madera-pdata.h | 59 + include/sound/simple_card_utils.h | 20 +- include/sound/soc.h | 165 +- include/sound/sof/dai-intel.h | 3 +- include/sound/sof/header.h | 7 +- include/sound/sof/topology.h | 7 +- include/sound/sof/trace.h | 14 +- include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/eq.h | 172 - include/uapi/sound/sof/manifest.h | 188 - include/uapi/sound/sof/tokens.h | 1 + include/uapi/sound/sof/tone.h | 21 - include/uapi/sound/sof/trace.h | 66 - sound/hda/ext/hdac_ext_bus.c | 8 +- sound/soc/amd/acp-da7219-max98357a.c | 42 +- sound/soc/amd/acp-rt5645.c | 21 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 43 +- sound/soc/atmel/atmel-classd.c | 21 +- sound/soc/atmel/atmel-pcm-dma.c | 9 +- sound/soc/atmel/atmel-pcm-pdc.c | 5 - sound/soc/atmel/atmel-pcm.h | 8 - sound/soc/atmel/atmel-pdmic.c | 21 +- sound/soc/atmel/atmel_ssc_dai.c | 11 - sound/soc/atmel/atmel_wm8904.c | 17 +- sound/soc/atmel/mikroe-proto.c | 21 +- sound/soc/atmel/sam9g20_wm8731.c | 22 +- sound/soc/atmel/sam9x5_wm8731.c | 20 +- sound/soc/atmel/tse850-pcm5142.c | 13 +- sound/soc/au1x/db1000.c | 10 +- sound/soc/au1x/db1200.c | 50 +- sound/soc/au1x/psc-i2s.c | 6 +- sound/soc/cirrus/edb93xx.c | 10 +- sound/soc/cirrus/ep93xx-i2s.c | 7 +- sound/soc/cirrus/simone.c | 10 +- sound/soc/cirrus/snappercl15.c | 11 +- sound/soc/codecs/Kconfig | 45 +- sound/soc/codecs/Makefile | 14 + sound/soc/codecs/ad193x.c | 68 +- sound/soc/codecs/ak4118.c | 11 +- sound/soc/codecs/cros_ec_codec.c | 2 +- sound/soc/codecs/cs42xx8.c | 13 + sound/soc/codecs/cs47l35.c | 1777 +++++++++ sound/soc/codecs/cs47l85.c | 2730 +++++++++++++ sound/soc/codecs/cs47l90.c | 2653 +++++++++++++ sound/soc/codecs/cx2072x.c | 1725 ++++++++ sound/soc/codecs/cx2072x.h | 314 ++ sound/soc/codecs/hdac_hdmi.c | 39 + sound/soc/codecs/hdmi-codec.c | 188 +- sound/soc/codecs/madera.c | 4177 ++++++++++++++++++++ sound/soc/codecs/madera.h | 442 +++ sound/soc/codecs/max98357a.c | 74 +- sound/soc/codecs/msm8916-wcd-digital.c | 282 ++ sound/soc/codecs/nau8822.c | 18 + sound/soc/codecs/nau8822.h | 7 + sound/soc/codecs/nau8825.c | 4 + sound/soc/codecs/nau8825.h | 2 + sound/soc/codecs/pcm3168a.c | 91 +- sound/soc/codecs/rt1011.c | 2244 +++++++++++ sound/soc/codecs/rt1011.h | 672 ++++ sound/soc/codecs/rt1308.c | 898 +++++ sound/soc/codecs/rt1308.h | 291 ++ sound/soc/codecs/rt5514-spi.c | 4 +- sound/soc/codecs/rt5665.c | 2 +- sound/soc/codecs/rt5677-spi.c | 4 +- sound/soc/codecs/rt5677.c | 336 +- sound/soc/codecs/rt5677.h | 46 +- sound/soc/codecs/rt5682.c | 13 +- sound/soc/codecs/tas571x.c | 4 +- sound/soc/codecs/tlv320aic3x.c | 14 +- sound/soc/codecs/wcd9335.c | 7 +- sound/soc/codecs/wm_adsp.c | 37 +- sound/soc/fsl/efika-audio-fabric.c | 22 +- sound/soc/fsl/eukrea-tlv320.c | 19 +- sound/soc/fsl/fsl-asoc-card.c | 47 +- sound/soc/fsl/fsl_asrc.c | 103 +- sound/soc/fsl/fsl_esai.c | 141 +- sound/soc/fsl/fsl_sai.c | 54 +- sound/soc/fsl/fsl_ssi.c | 4 +- sound/soc/fsl/fsl_ssi.h | 8 +- sound/soc/fsl/fsl_ssi_dbg.c | 18 +- sound/soc/fsl/fsl_utils.c | 2 +- sound/soc/fsl/imx-audmix.c | 45 +- sound/soc/fsl/imx-audmux.c | 10 +- sound/soc/fsl/imx-es8328.c | 23 +- sound/soc/fsl/imx-mc13783.c | 10 +- sound/soc/fsl/imx-sgtl5000.c | 23 +- sound/soc/fsl/imx-spdif.c | 20 +- sound/soc/fsl/mpc8610_hpcd.c | 33 +- sound/soc/fsl/mx27vis-aic32x4.c | 11 +- sound/soc/fsl/p1022_ds.c | 36 +- sound/soc/fsl/p1022_rdk.c | 35 +- sound/soc/fsl/pcm030-audio-fabric.c | 20 +- sound/soc/fsl/phycore-ac97.c | 10 +- sound/soc/fsl/wm1133-ev1.c | 10 +- sound/soc/generic/audio-graph-card.c | 36 +- sound/soc/generic/simple-card-utils.c | 21 +- sound/soc/generic/simple-card.c | 47 +- sound/soc/intel/Kconfig | 25 + sound/soc/intel/atom/sst/sst_acpi.c | 65 +- sound/soc/intel/boards/Kconfig | 18 +- sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bdw-rt5677.c | 22 +- sound/soc/intel/boards/broadwell.c | 46 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 163 +- sound/soc/intel/boards/bxt_rt298.c | 135 +- sound/soc/intel/boards/byt-max98090.c | 10 +- sound/soc/intel/boards/byt-rt5640.c | 10 +- sound/soc/intel/boards/bytcht_cx2072x.c | 270 ++ sound/soc/intel/boards/bytcht_da7213.c | 38 +- sound/soc/intel/boards/bytcht_es8316.c | 51 +- sound/soc/intel/boards/bytcht_nocodec.c | 30 +- sound/soc/intel/boards/bytcr_rt5640.c | 60 +- sound/soc/intel/boards/bytcr_rt5651.c | 58 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 32 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 41 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 59 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 39 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 145 +- sound/soc/intel/boards/haswell.c | 46 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 115 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 286 +- sound/soc/intel/boards/kbl_rt5660.c | 83 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 184 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 126 +- sound/soc/intel/boards/skl_hda_dsp_common.c | 67 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 120 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 132 +- sound/soc/intel/boards/skl_rt286.c | 118 +- sound/soc/intel/boards/sof_rt5682.c | 165 +- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 8 + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 + sound/soc/intel/common/soc-intel-quirks.h | 115 + sound/soc/intel/common/sst-ipc.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 2 +- sound/soc/intel/skylake/skl-debug.c | 9 + sound/soc/intel/skylake/skl-messages.c | 39 +- sound/soc/intel/skylake/skl-pcm.c | 44 +- sound/soc/intel/skylake/skl-ssp-clk.c | 16 +- sound/soc/intel/skylake/skl-sst-dsp.h | 6 +- sound/soc/intel/skylake/skl-sst-ipc.c | 4 +- sound/soc/intel/skylake/skl-sst-utils.c | 23 +- sound/soc/intel/skylake/skl-sst.c | 4 +- sound/soc/intel/skylake/skl-topology.c | 72 +- sound/soc/intel/skylake/skl-topology.h | 8 +- sound/soc/intel/skylake/skl.c | 38 +- sound/soc/intel/skylake/skl.h | 6 + sound/soc/jz4740/qi_lb60.c | 10 +- sound/soc/kirkwood/armada-370-db.c | 42 +- sound/soc/mediatek/common/Makefile | 2 +- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 6 + sound/soc/mediatek/common/mtk-base-afe.h | 2 + sound/soc/mediatek/common/mtk-btcvsd.c | 22 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 95 +- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 34 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 115 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 34 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 51 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 85 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 74 +- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 23 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 197 +- sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 14 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 193 +- sound/soc/meson/Kconfig | 8 + sound/soc/meson/Makefile | 2 + sound/soc/meson/axg-card.c | 87 +- sound/soc/meson/axg-tdm-formatter.c | 29 + sound/soc/meson/axg-tdm-interface.c | 4 +- sound/soc/meson/axg-tdm.h | 2 +- sound/soc/meson/axg-tdmin.c | 1 - sound/soc/meson/axg-tdmout.c | 1 - sound/soc/meson/g12a-tohdmitx.c | 413 ++ sound/soc/mxs/mxs-sgtl5000.c | 27 +- sound/soc/nuc900/nuc900-audio.c | 10 +- sound/soc/pxa/brownstone.c | 10 +- sound/soc/pxa/corgi.c | 10 +- sound/soc/pxa/e740_wm9705.c | 20 +- sound/soc/pxa/e750_wm9705.c | 20 +- sound/soc/pxa/e800_wm9712.c | 21 +- sound/soc/pxa/em-x270.c | 20 +- sound/soc/pxa/hx4700.c | 10 +- sound/soc/pxa/imote2.c | 11 +- sound/soc/pxa/magician.c | 22 +- sound/soc/pxa/mioa701_wm9713.c | 20 +- sound/soc/pxa/palm27x.c | 20 +- sound/soc/pxa/poodle.c | 10 +- sound/soc/pxa/pxa2xx-ac97.c | 3 +- sound/soc/pxa/spitz.c | 10 +- sound/soc/pxa/tosa.c | 20 +- sound/soc/pxa/ttc-dkb.c | 10 +- sound/soc/pxa/z2.c | 10 +- sound/soc/pxa/zylonite.c | 30 +- sound/soc/qcom/apq8016_sbc.c | 19 +- sound/soc/qcom/common.c | 34 +- sound/soc/qcom/qdsp6/q6afe-dai.c | 1 + sound/soc/qcom/qdsp6/q6core.c | 16 +- sound/soc/qcom/storm.c | 17 +- sound/soc/rockchip/Kconfig | 1 + sound/soc/rockchip/rk3288_hdmi_analog.c | 21 +- sound/soc/rockchip/rk3399_gru_sound.c | 65 +- sound/soc/rockchip/rockchip_max98090.c | 17 +- sound/soc/rockchip/rockchip_rt5645.c | 33 +- sound/soc/samsung/arndale_rt5631.c | 25 +- sound/soc/samsung/bells.c | 87 +- sound/soc/samsung/h1940_uda1380.c | 10 +- sound/soc/samsung/jive_wm8750.c | 10 +- sound/soc/samsung/littlemill.c | 19 +- sound/soc/samsung/lowland.c | 26 +- sound/soc/samsung/neo1973_wm8753.c | 18 +- sound/soc/samsung/odroid.c | 29 +- sound/soc/samsung/rx1950_uda1380.c | 11 +- sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 +- sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 +- sound/soc/samsung/s3c24xx_uda134x.c | 10 +- sound/soc/samsung/smartq_wm8987.c | 10 +- sound/soc/samsung/smdk_spdif.c | 10 +- sound/soc/samsung/smdk_wm8580.c | 20 +- sound/soc/samsung/smdk_wm8994.c | 30 +- sound/soc/samsung/smdk_wm8994pcm.c | 10 +- sound/soc/samsung/snow.c | 40 +- sound/soc/samsung/speyside.c | 26 +- sound/soc/samsung/tm2_wm5110.c | 42 +- sound/soc/samsung/tobermory.c | 10 +- sound/soc/sh/migor.c | 10 +- sound/soc/sh/rcar/adg.c | 1 + sound/soc/sh/rcar/core.c | 120 +- sound/soc/sh/rcar/ctu.c | 2 +- sound/soc/sh/rcar/ssi.c | 1 + sound/soc/sh/rcar/ssiu.c | 92 +- sound/soc/sh/sh7760-ac97.c | 11 +- sound/soc/sirf/sirf-audio.c | 13 +- sound/soc/soc-acpi.c | 2 + sound/soc/soc-compress.c | 17 +- sound/soc/soc-core.c | 382 +- sound/soc/soc-dapm.c | 23 +- sound/soc/soc-pcm.c | 88 +- sound/soc/soc-topology.c | 146 +- sound/soc/sof/Kconfig | 8 + sound/soc/sof/control.c | 270 +- sound/soc/sof/debug.c | 247 +- sound/soc/sof/intel/Kconfig | 32 + sound/soc/sof/intel/apl.c | 2 + sound/soc/sof/intel/byt.c | 5 +- sound/soc/sof/intel/cnl.c | 79 +- sound/soc/sof/intel/hda-ctrl.c | 77 +- sound/soc/sof/intel/hda-dai.c | 293 +- sound/soc/sof/intel/hda-dsp.c | 63 +- sound/soc/sof/intel/hda-ipc.c | 43 +- sound/soc/sof/intel/hda-stream.c | 157 +- sound/soc/sof/intel/hda.c | 30 +- sound/soc/sof/intel/hda.h | 22 +- sound/soc/sof/ipc.c | 18 +- sound/soc/sof/loader.c | 10 +- sound/soc/sof/nocodec.c | 21 +- sound/soc/sof/ops.h | 24 +- sound/soc/sof/pcm.c | 36 +- sound/soc/sof/pm.c | 43 +- sound/soc/sof/sof-acpi-dev.c | 59 +- sound/soc/sof/sof-pci-dev.c | 32 +- sound/soc/sof/sof-priv.h | 23 +- sound/soc/sof/topology.c | 156 +- sound/soc/sof/trace.c | 66 +- sound/soc/stm/stm32_adfsdm.c | 49 +- sound/soc/stm/stm32_i2s.c | 60 +- sound/soc/stm/stm32_sai.c | 44 +- sound/soc/stm/stm32_sai.h | 54 +- sound/soc/stm/stm32_sai_sub.c | 14 +- sound/soc/stm/stm32_spdifrx.c | 37 +- sound/soc/sunxi/sun4i-codec.c | 20 +- sound/soc/sunxi/sun4i-i2s.c | 71 +- sound/soc/sunxi/sun4i-spdif.c | 49 +- sound/soc/sunxi/sun50i-codec-analog.c | 50 + sound/soc/tegra/Makefile | 2 +- sound/soc/tegra/tegra_alc5632.c | 37 +- sound/soc/tegra/tegra_max98090.c | 17 +- sound/soc/tegra/tegra_rt5640.c | 17 +- sound/soc/tegra/tegra_rt5677.c | 37 +- sound/soc/tegra/tegra_sgtl5000.c | 37 +- sound/soc/tegra/tegra_wm8753.c | 17 +- sound/soc/tegra/tegra_wm8903.c | 17 +- sound/soc/tegra/tegra_wm9712.c | 14 +- sound/soc/tegra/trimslice.c | 19 +- sound/soc/ti/ams-delta.c | 10 +- sound/soc/ti/davinci-evm.c | 105 +- sound/soc/ti/davinci-mcasp.c | 81 +- sound/soc/ti/n810.c | 11 +- sound/soc/ti/omap-abe-twl6040.c | 36 +- sound/soc/ti/omap-hdmi.c | 20 +- sound/soc/ti/omap-mcbsp.c | 2 +- sound/soc/ti/omap-twl4030.c | 36 +- sound/soc/ti/omap3pandora.c | 20 +- sound/soc/ti/osk5912.c | 11 +- sound/soc/ti/rx51.c | 23 +- sound/soc/txx9/txx9aclc-generic.c | 10 +- sound/soc/ux500/mop500.c | 36 +- sound/usb/bcd2000/Makefile | 2 +- 318 files changed, 26455 insertions(+), 4825 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt create mode 100644 Documentation/devicetree/bindings/sound/madera.txt create mode 100644 Documentation/devicetree/bindings/sound/rt1011.txt create mode 100755 Documentation/devicetree/bindings/sound/rt1308.txt delete mode 100644 Documentation/devicetree/bindings/sound/sun4i-i2s.txt delete mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt create mode 100644 include/dt-bindings/sound/madera.h create mode 100644 include/dt-bindings/sound/meson-g12a-tohdmitx.h create mode 100644 include/sound/madera-pdata.h delete mode 100644 include/uapi/sound/sof/eq.h delete mode 100644 include/uapi/sound/sof/manifest.h delete mode 100644 include/uapi/sound/sof/tone.h delete mode 100644 include/uapi/sound/sof/trace.h create mode 100644 sound/soc/codecs/cs47l35.c create mode 100644 sound/soc/codecs/cs47l85.c create mode 100644 sound/soc/codecs/cs47l90.c create mode 100644 sound/soc/codecs/cx2072x.c create mode 100644 sound/soc/codecs/cx2072x.h create mode 100644 sound/soc/codecs/madera.c create mode 100644 sound/soc/codecs/madera.h create mode 100644 sound/soc/codecs/rt1011.c create mode 100644 sound/soc/codecs/rt1011.h create mode 100755 sound/soc/codecs/rt1308.c create mode 100755 sound/soc/codecs/rt1308.h create mode 100644 sound/soc/intel/boards/bytcht_cx2072x.c create mode 100644 sound/soc/intel/common/soc-intel-quirks.h create mode 100644 sound/soc/meson/g12a-tohdmitx.c

2 1

[alsa-devel] [PATCH v2] ALSA: usb-audio: fix Line6 Helix audio format rates
by Nicola Lunghi 07 Jul '19

07 Jul '19

Line6 Helix and HX stomp devices don't support retrieving the number of clock sample rate. Add a quirk to set it to 48Khz by default. Signed-off-by: Nicola Lunghi <nick83ola(a)gmail.com> --- sound/usb/format.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/sound/usb/format.c b/sound/usb/format.c index c02b51a82775..31780dfb8eb9 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -285,6 +285,33 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip, return nr_rates; } +/* Line6 Helix series don't support the UAC2_CS_RANGE usb function + * call. Return a static table of known clock rates. + */ +static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip, + struct audioformat *fp) +{ + switch (chip->usb_id) { + case USB_ID(0x0E41, 0x4241): /* Line6 Helix */ + case USB_ID(0x0E41, 0x4242): /* Line6 Helix Rack */ + case USB_ID(0x0E41, 0x4244): /* Line6 Helix LT */ + case USB_ID(0x0E41, 0x4246): /* Line6 HX-Stomp */ + /* supported rates: 48Khz */ + kfree(fp->rate_table); + fp->rate_table = kmalloc(sizeof(int), GFP_KERNEL); + if (!fp->rate_table) + return -ENOMEM; + fp->nr_rates = 1; + fp->rate_min = 48000; + fp->rate_max = 48000; + fp->rates = SNDRV_PCM_RATE_48000; + fp->rate_table[0] = 48000; + return 0; + } + + return -ENODEV; +} + /* * parse the format descriptor and stores the possible sample rates * on the audioformat table (audio class v2 and v3). @@ -294,7 +321,7 @@ static int parse_audio_format_rates_v2v3(struct snd_usb_audio *chip, { struct usb_device *dev = chip->dev; unsigned char tmp[2], *data; - int nr_triplets, data_size, ret = 0; + int nr_triplets, data_size, ret, ret_l6 = 0; int clock = snd_usb_clock_find_source(chip, fp->protocol, fp->clock, false); @@ -313,9 +340,22 @@ static int parse_audio_format_rates_v2v3(struct snd_usb_audio *chip, tmp, sizeof(tmp)); if (ret < 0) { - dev_err(&dev->dev, - "%s(): unable to retrieve number of sample rates (clock %d)\n", + /* line6 helix devices don't support UAC2_CS_CONTROL_SAM_FREQ call */ + ret_l6 = line6_parse_audio_format_rates_quirk(chip, fp); + if (ret_l6 == -ENODEV) { + /* no line6 device found continue showing the error */ + dev_err(&dev->dev, + "%s(): unable to retrieve number of sample rates (clock %d)\n", + __func__, clock); + goto err; + } + if (ret_l6 == 0) { + dev_info(&dev->dev, + "%s(): unable to retrieve number of sample rates: set it to a predefined value (clock %d).\n", __func__, clock); + return 0; + } + ret = ret_l6; goto err; } -- 2.19.1

2 1

[alsa-devel] [PATCH 0/6] ALSA: firewire: fix wrong reference count for stream functionality at error path of rawmidi interface
by Takashi Sakamoto 07 Jul '19

07 Jul '19

Hi, All of drivers in ALSA firewire stack maintain packet streaming by reference count. However at error path of MIDI interface, some drivers have a bug that the count remains at error path of rawmidi interface. This causes the drivers don't stop packet streaming even if it's not required. This patchset fixes drivers including the bug. Takashi Sakamoto (6): ALSA: bebob: fix wrong reference count for stream functionality at error path of rawmidi interface ALSA: fireworks: fix wrong reference count for stream functionality at error path of rawmidi interface ALSA: oxfw: fix wrong reference count for stream functionality at error path of rawmidi interface ALSA: dice: fix wrong reference count for stream functionality at error path of rawmidi interface ALSA: firewire-digi00x: fix wrong reference count for stream functionality at error path of rawmidi interface firewire-motu: fix wrong reference count for stream functionality at error path of rawmidi interface sound/firewire/bebob/bebob_midi.c | 2 ++ sound/firewire/dice/dice-midi.c | 2 ++ sound/firewire/digi00x/digi00x-midi.c | 2 ++ sound/firewire/fireworks/fireworks_midi.c | 2 ++ sound/firewire/motu/motu-midi.c | 2 ++ sound/firewire/oxfw/oxfw-midi.c | 2 ++ 6 files changed, 12 insertions(+) -- 2.20.1

2 7

[alsa-devel] [PATCH v2 resend 0/3] ASoC: SOF: fix suspend ordering with runtime idle
by Kai Vehmanen 06 Jul '19

06 Jul '19

Hi all, this series addresses issues with ordering of HDA codec and controller suspends in the runtime PM flows. The implemented logic for SOF is similar to what has been used by the Intel AZX HDA driver. To implement this, first a fix is needed to hdac_hdmic ASoC codec driver. SOF framework also needs to be extended to allow SOF devices to implement a runtime_idle callback. Third, concrete implementation is in a separate patch for APL/CNL Intel hardware, for which strict ordering of codec-controller power down sequence needs to be maintained. As this extends the SOF device interface, Pierre asked me to send to the list for wider review. This series has been prereviewd at SOF github as: https://github.com/thesofproject/linux/pull/1003 v2 resend: - no changes since v2 -- resending as 2 weeks has passed and multiple reviewed-by acks already received v2: - Rebased on broonie/for-next, there was a conflict with patch "ASoC: SOF: Intel: hda: release link DMA for paused streams during suspend" - Added Reviewed-by tags from v1 round Kai Vehmanen (3): ASoC: hdac_hdmi: report codec link up/down status to bus ASoC: SOF: add runtime idle callback ASoC: SOF: Intel: implement runtime idle for CNL/APL sound/soc/codecs/hdac_hdmi.c | 2 ++ sound/soc/sof/intel/apl.c | 1 + sound/soc/sof/intel/cnl.c | 1 + sound/soc/sof/intel/hda-dsp.c | 13 +++++++++++++ sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/ops.h | 8 ++++++++ sound/soc/sof/pm.c | 8 ++++++++ sound/soc/sof/sof-acpi-dev.c | 2 +- sound/soc/sof/sof-pci-dev.c | 2 +- sound/soc/sof/sof-priv.h | 2 ++ 10 files changed, 38 insertions(+), 2 deletions(-) -- 2.17.1

2 6

[alsa-devel] [PATCH v2] ASoC: sunxi: sun50i-codec-analog: Add earpiece
by Luca Weiss 05 Jul '19

05 Jul '19

This adds the necessary registers and audio routes to play audio using the Earpiece, that's supported on the A64. Signed-off-by: Luca Weiss <luca(a)z3ntu.xyz> --- Changes v1 -> v2: * Make the earpiece enable register a DAPM widget * Adjust the audio routes to include the new Earpiece Amp widget * Left/Right Analog Mixer => Left/Right Mixer sound/soc/sunxi/sun50i-codec-analog.c | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c index d105c90c3706..6d1de565350e 100644 --- a/sound/soc/sunxi/sun50i-codec-analog.c +++ b/sound/soc/sunxi/sun50i-codec-analog.c @@ -49,6 +49,15 @@ #define SUN50I_ADDA_OR_MIX_CTRL_DACR 1 #define SUN50I_ADDA_OR_MIX_CTRL_DACL 0 +#define SUN50I_ADDA_EARPIECE_CTRL0 0x03 +#define SUN50I_ADDA_EARPIECE_CTRL0_EAR_RAMP_TIME 4 +#define SUN50I_ADDA_EARPIECE_CTRL0_ESPSR 0 + +#define SUN50I_ADDA_EARPIECE_CTRL1 0x04 +#define SUN50I_ADDA_EARPIECE_CTRL1_ESPPA_EN 7 +#define SUN50I_ADDA_EARPIECE_CTRL1_ESPPA_MUTE 6 +#define SUN50I_ADDA_EARPIECE_CTRL1_ESP_VOL 0 + #define SUN50I_ADDA_LINEOUT_CTRL0 0x05 #define SUN50I_ADDA_LINEOUT_CTRL0_LEN 7 #define SUN50I_ADDA_LINEOUT_CTRL0_REN 6 @@ -172,6 +181,10 @@ static const DECLARE_TLV_DB_RANGE(sun50i_codec_lineout_vol_scale, 2, 31, TLV_DB_SCALE_ITEM(-4350, 150, 0), ); +static const DECLARE_TLV_DB_RANGE(sun50i_codec_earpiece_vol_scale, + 0, 1, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1), + 2, 31, TLV_DB_SCALE_ITEM(-4350, 150, 0), +); /* volume / mute controls */ static const struct snd_kcontrol_new sun50i_a64_codec_controls[] = { @@ -225,6 +238,15 @@ static const struct snd_kcontrol_new sun50i_a64_codec_controls[] = { SUN50I_ADDA_LINEOUT_CTRL0_LEN, SUN50I_ADDA_LINEOUT_CTRL0_REN, 1, 0), + SOC_SINGLE_TLV("Earpiece Playback Volume", + SUN50I_ADDA_EARPIECE_CTRL1, + SUN50I_ADDA_EARPIECE_CTRL1_ESP_VOL, 0x1f, 0, + sun50i_codec_earpiece_vol_scale), + + SOC_SINGLE("Earpiece Playback Switch", + SUN50I_ADDA_EARPIECE_CTRL1, + SUN50I_ADDA_EARPIECE_CTRL1_ESPPA_MUTE, 1, 0), + }; static const char * const sun50i_codec_hp_src_enum_text[] = { @@ -257,6 +279,20 @@ static const struct snd_kcontrol_new sun50i_codec_lineout_src[] = { sun50i_codec_lineout_src_enum), }; +static const char * const sun50i_codec_earpiece_src_enum_text[] = { + "DACR", "DACL", "Right Mixer", "Left Mixer", +}; + +static SOC_ENUM_SINGLE_DECL(sun50i_codec_earpiece_src_enum, + SUN50I_ADDA_EARPIECE_CTRL0, + SUN50I_ADDA_EARPIECE_CTRL0_ESPSR, + sun50i_codec_earpiece_src_enum_text); + +static const struct snd_kcontrol_new sun50i_codec_earpiece_src[] = { + SOC_DAPM_ENUM("Earpiece Source Playback Route", + sun50i_codec_earpiece_src_enum), +}; + static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = { /* DAC */ SND_SOC_DAPM_DAC("Left DAC", NULL, SUN50I_ADDA_MIX_DAC_CTRL, @@ -285,6 +321,12 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = { SND_SOC_NOPM, 0, 0, sun50i_codec_lineout_src), SND_SOC_DAPM_OUTPUT("LINEOUT"), + SND_SOC_DAPM_MUX("Earpiece Source Playback Route", + SND_SOC_NOPM, 0, 0, sun50i_codec_earpiece_src), + SND_SOC_DAPM_OUT_DRV("Earpiece Amp", SUN50I_ADDA_EARPIECE_CTRL1, + SUN50I_ADDA_EARPIECE_CTRL1_ESPPA_EN, 0, NULL, 0), + SND_SOC_DAPM_OUTPUT("EARPIECE"), + /* Microphone inputs */ SND_SOC_DAPM_INPUT("MIC1"), @@ -388,6 +430,14 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = { { "Line Out Source Playback Route", "Mono Differential", "Right Mixer" }, { "LINEOUT", NULL, "Line Out Source Playback Route" }, + + /* Earpiece Routes */ + { "Earpiece Source Playback Route", "DACL", "Left DAC" }, + { "Earpiece Source Playback Route", "DACR", "Right DAC" }, + { "Earpiece Source Playback Route", "Left Mixer", "Left Mixer" }, + { "Earpiece Source Playback Route", "Right Mixer", "Right Mixer" }, + { "Earpiece Amp", NULL, "Earpiece Source Playback Route" }, + { "EARPIECE", NULL, "Earpiece Amp" }, }; static const struct snd_soc_component_driver sun50i_codec_analog_cmpnt_drv = { -- 2.22.0

3 2

[alsa-devel] [PATCH] ASoC: rt5665: remove redundant assignment to variable idx
by Colin King 05 Jul '19

05 Jul '19

From: Colin Ian King <colin.king(a)canonical.com> The variable idx is being initialized with a value that is never read and it is being updated later with a new value. The initialization is redundant and can be removed. Addresses-Coverity: ("Unused value") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/rt5665.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 87263317085a..c050d84a6916 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -1478,7 +1478,7 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct rt5665_priv *rt5665 = snd_soc_component_get_drvdata(component); - int pd, idx = -EINVAL; + int pd, idx; pd = rl6231_get_pre_div(rt5665->regmap, RT5665_ADDA_CLK_1, RT5665_I2S_PD1_SFT); -- 2.20.1

2 1

[alsa-devel] [PATCH -next] ASoC: SOF: debug: fix possible memory leak in sof_dfsentry_write()
by Wei Yongjun 05 Jul '19

05 Jul '19

'string' is malloced in sof_dfsentry_write() and should be freed before leaving from the error handling cases, otherwise it will cause memory leak. Fixes: 091c12e1f50c ("ASoC: SOF: debug: add new debugfs entries for IPC flood test") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/sof/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c index 54bb53bfc81b..2388477a965e 100644 --- a/sound/soc/sof/debug.c +++ b/sound/soc/sof/debug.c @@ -162,7 +162,7 @@ static ssize_t sof_dfsentry_write(struct file *file, const char __user *buffer, else ret = kstrtoul(string, 0, &ipc_count); if (ret < 0) - return ret; + goto out; /* limit max duration/ipc count for flood test */ if (flood_duration_test) { @@ -191,7 +191,7 @@ static ssize_t sof_dfsentry_write(struct file *file, const char __user *buffer, "error: debugfs write failed to resume %d\n", ret); pm_runtime_put_noidle(sdev->dev); - return ret; + goto out; } /* flood test */

3 2

[alsa-devel] [PATCH 2/3 v2] pcm_file: improve error checking in write_wav_header function
by Adam Miartus 05 Jul '19

05 Jul '19

previously errno would be returned even for cases where it may have not been populated, for example one of the write functions failing, or writing only partial buffer, now progress through write operations separately and report errno when appropriate Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> --- src/pcm/pcm_file.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 03c1640..da7f087 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -327,6 +327,8 @@ static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt) static int write_wav_header(snd_pcm_t *pcm) { snd_pcm_file_t *file = pcm->private_data; + ssize_t res; + static const char header[] = { 'R', 'I', 'F', 'F', 0x24, 0, 0, 0, @@ -341,15 +343,35 @@ static int write_wav_header(snd_pcm_t *pcm) setup_wav_header(pcm, &file->wav_header); - if (write(file->fd, header, sizeof(header)) != sizeof(header) || - write(file->fd, &file->wav_header, sizeof(file->wav_header)) != - sizeof(file->wav_header) || - write(file->fd, header2, sizeof(header2)) != sizeof(header2)) { - int err = errno; - SYSERR("%s write header failed, file data may be corrupt", file->fname); - return -err; - } + res = write(file->fd, header, sizeof(header)); + if (res != sizeof(header)) + goto write_error; + + res = write(file->fd, &file->wav_header, sizeof(file->wav_header)); + if (res != sizeof(file->wav_header)) + goto write_error; + + res = write(file->fd, header2, sizeof(header2)); + if (res != sizeof(header2)) + goto write_error; + return 0; + +write_error: + /* + * print real errno if available and return EIO, reason for this is + * to block possible EPIPE in case file->fd is a pipe. EPIPE from + * file->fd conflicts with EPIPE from playback stream which should + * be used to signal XRUN on playback device + */ + if (res < 0) + SYSERR("%s write header failed, file data may be corrupt", file->fname); + else + SNDERR("%s write header incomplete, file data may be corrupt", file->fname); + + memset(&file->wav_header, 0, sizeof(struct wav_fmt)); + + return -EIO; } /* fix up the length fields in WAV header */ -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: cs4281: remove redundant assignment to variable val and remove a goto
by Colin King 05 Jul '19

05 Jul '19

From: Colin Ian King <colin.king(a)canonical.com> The variable val is being assigned with a value that is never read and it is being updated later with a new value. The assignment is redundant and can be removed. Also remove a goto statement and a label and replace with a break statement. Addresses-Coverity: ("Unused value") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/pci/cs4281.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index a2cce3ecda6f..04c712647853 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c @@ -694,7 +694,7 @@ static int snd_cs4281_trigger(struct snd_pcm_substream *substream, int cmd) static unsigned int snd_cs4281_rate(unsigned int rate, unsigned int *real_rate) { - unsigned int val = ~0; + unsigned int val; if (real_rate) *real_rate = rate; @@ -707,9 +707,8 @@ static unsigned int snd_cs4281_rate(unsigned int rate, unsigned int *real_rate) case 44100: return 1; case 48000: return 0; default: - goto __variable; + break; } - __variable: val = 1536000 / rate; if (real_rate) *real_rate = 1536000 / val; -- 2.20.1

3 3

[alsa-devel] bug in playing 6-channel sound
by Julian Bradfield 05 Jul '19

05 Jul '19

Some five years ago, the following post https://mailman.alsa-project.org/pipermail/alsa-devel/2014-February/072265.… reported a failure to play six-channel sound, that could be worked around by setting the prealloc value for the device to various values *other than* the default 64. I have just run into this playing a movie from my laptop (Thinkpad Yoga X1, Intel HDA PCH sound card outputting through HDMI) running Xubuntu 18.04, up to date as at the time of posting. I see exactly the same problem as in that post, and the same workaround works for me - I tried prealloc values 63,65,32,128, and any of them is ok. I'm a bit baffled that such a problem has survived for several years. If any developer would like me to provide debugging information, please get in touch - I have some time available at present, but not enough to learn ALSA and debug it myself! I will remain subscribed to the list for a few weeks to read any followups.

2 1

[alsa-devel] [GIT PULL]: soundwire updates for v5.3-rc1
by Vinod Koul 05 Jul '19

05 Jul '19

Hello Greg, Please pull to receive the updates for soundwire for v5.3. The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git tags/soundwire-5.3-rc1 for you to fetch changes up to 2aeac95d1a4cc85aae57ab842d5c3340df0f817f: soundwire: add module_sdw_driver helper macro (2019-07-01 11:52:43 +0530) ---------------------------------------------------------------- soundwire updates for v5.3-rc1 Updates for 5.3 include: - module_sdw_driver macro for drivers - Documentation updates for code-blocks - Improvement from Pierre on intel and cadence driver - Clarification of DisCo properties and updates ---------------------------------------------------------------- Jan Kotas (1): soundwire: cdns: Fix compilation error on arm64 Mauro Carvalho Chehab (1): docs: soundwire: locking: fix tags for a code-block Pierre-Louis Bossart (15): soundwire: intel: filter SoundWire controller device search soundwire: mipi_disco: fix master/link error soundwire: add port-related definitions soundwire: remove master data port properties soundwire: mipi-disco: remove master_count property for masters soundwire: rename 'freq' fields soundwire: mipi-disco: fix clock stop modes soundwire: clarify comment soundwire: rename/clarify MIPI DisCo properties soundwire: cadence_master: use rate_limited dynamic debug soundwire: cadence_master: log Slave status mask on errors soundwire: cadence_master: check the number of bidir PDIs soundwire: Intel: add log for number of PCM and PDM PDIs soundwire: fix typo in comments soundwire: intel_init: add checks on link numbers Srinivas Kandagatla (1): soundwire: add module_sdw_driver helper macro Documentation/driver-api/soundwire/locking.rst | 4 +- drivers/soundwire/bus.c | 6 +- drivers/soundwire/cadence_master.c | 30 +++++---- drivers/soundwire/intel.c | 17 +++-- drivers/soundwire/intel.h | 2 +- drivers/soundwire/intel_init.c | 25 +++++++- drivers/soundwire/mipi_disco.c | 35 +++++----- drivers/soundwire/stream.c | 8 +-- include/linux/soundwire/sdw.h | 88 ++++++++++++++++++++------ include/linux/soundwire/sdw_type.h | 11 ++++ 10 files changed, 162 insertions(+), 64 deletions(-) -- ~Vinod

2 1

[alsa-devel] [PATCH] sound: pci: asihpi: Remove unneeded variable change
by Hariprasad Kelam 05 Jul '19

05 Jul '19

this patch fixes below issue reported by coccicheck sound/pci/asihpi/asihpi.c:1558:5-11: Unneeded variable: "change". Return "1" on line 1564 Signed-off-by: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> --- sound/pci/asihpi/asihpi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index e7234f3..2a21a3d 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c @@ -1519,7 +1519,6 @@ static int snd_asihpi_volume_get(struct snd_kcontrol *kcontrol, static int snd_asihpi_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - int change; u32 h_control = kcontrol->private_value; short an_gain_mB[HPI_MAX_CHANNELS]; @@ -1530,9 +1529,8 @@ static int snd_asihpi_volume_put(struct snd_kcontrol *kcontrol, /* change = asihpi->mixer_volume[addr][0] != left || asihpi->mixer_volume[addr][1] != right; */ - change = 1; hpi_handle_error(hpi_volume_set_gain(h_control, an_gain_mB)); - return change; + return 1; } static const DECLARE_TLV_DB_SCALE(db_scale_100, -10000, VOL_STEP_mB, 0); @@ -1555,13 +1553,12 @@ static int snd_asihpi_volume_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { u32 h_control = kcontrol->private_value; - int change = 1; /* HPI currently only supports all or none muting of multichannel volume ALSA Switch element has opposite sense to HPI mute: on==unmuted, off=muted */ int mute = ucontrol->value.integer.value[0] ? 0 : HPI_BITMASK_ALL_CHANNELS; hpi_handle_error(hpi_volume_set_mute(h_control, mute)); - return change; + return 1; } static int snd_asihpi_volume_add(struct snd_card_asihpi *asihpi, -- 2.7.4

2 1

[alsa-devel] audio lost from speaker after reboot from windows on the device ALC295
by He, Bo 05 Jul '19

05 Jul '19

Hi, patch_realtek.c maintainer: I see one issue that reboot from windows and boot to ubuntu, the audio lost from speaker, I suspect there are some bugs in patch_realtek.c drivers, the device is ALC295 and the device id is 0x10ec0295. I have done the below experiments: 1. reboot from windows to windows, the audio is persist . 2. reboot from windows to ubuntu, the audio lost from speaker, but can hear if I hotplug one earphone. 3. if the issue reproduce after reboot from windows, reboot the ubuntu can't restore the audio, I suspect it's warm reset. 4. if I write the port 0xcf9 with 0xe to do cold reset, the audio can restore. 5. if I do suspend/resume, the audio can restore, I suspect do cold boot and suspend will trigger the platform reset to reset the ALC295. 6. if I do double function reset (write the verb 0x7ff in alc_init), the audio is still can't restore. snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_CODEC_RESET, 0); /* Function reset */ snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_CODEC_RESET, 0); /* double Function reset */ 7. the issue is first found on kernel 4.19.50, I still see the issue with the latest kernel 5.2-rc2, is it possible windows change some default registers, but ALC295 don't initialize the register?

3 4

[alsa-devel] [PATCH 0/7] ASoC: Intel: Skylake: Driver fundaments overhaul
by Cezary Rojewski 04 Jul '19

04 Jul '19

Skylake driver is divided into two modules: - snd_soc_skl - snd_soc_skl_ipc and nothing would be wrong if not for the fact that both cannot exist without one another. IPC module is not some kind of extension, as it is the case for snd_hda_ext_core which is separated from snd_hda_core - legacy hda interface. It's as much core Skylake module as snd_soc_skl is. Statement backup by existence of circular dependency between this two. To eliminate said problem, struct skl_sst has been created. From that momment, Skylake has been plagued by header errors (incomplete sturcts, unknown references etc.) whenever something new is to be added or code is cleaned up. Fix this flawed design by merging snd_soc_skl and snd_soc_skl_ipc. Also, do not forget about struct skl_sst redundancy. Followup changes address harmful assumptions and false logic which driver currently implements e.g.: attempt to take role of master for DSP scheduling when in fact entire control takes place in DSP. Amadeusz Sławiński (2): ASoC: Intel: Skylake: Combine snd_soc_skl_ipc and snd_soc_skl ASoC: Intel: Skylake: Do not disable FW notifications Cezary Rojewski (5): ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct ASoC: Intel: Skylake: Remove MCPS available check ASoC: Intel: Skylake: Remove memory available check ASoC: Intel: Skylake: Make MCPS and CPS params obsolete ASoC: Intel: Skylake: Cleanup skl_module_cfg declaration sound/soc/intel/common/sst-ipc.h | 1 + sound/soc/intel/skylake/Makefile | 12 +- sound/soc/intel/skylake/bxt-sst.c | 50 +-- sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- sound/soc/intel/skylake/cnl-sst.c | 37 +- sound/soc/intel/skylake/skl-debug.c | 14 +- sound/soc/intel/skylake/skl-messages.c | 245 ++++++------- sound/soc/intel/skylake/skl-nhlt.c | 18 +- sound/soc/intel/skylake/skl-pcm.c | 74 ++-- sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- sound/soc/intel/skylake/skl-sst-dsp.h | 29 +- sound/soc/intel/skylake/skl-sst-ipc.c | 8 +- sound/soc/intel/skylake/skl-sst-ipc.h | 52 +-- sound/soc/intel/skylake/skl-sst-utils.c | 37 +- sound/soc/intel/skylake/skl-sst.c | 51 +-- sound/soc/intel/skylake/skl-topology.c | 441 ++++++++---------------- sound/soc/intel/skylake/skl-topology.h | 43 +-- sound/soc/intel/skylake/skl.c | 54 +-- sound/soc/intel/skylake/skl.h | 102 ++++-- 20 files changed, 546 insertions(+), 743 deletions(-) -- 2.17.1

1 7

[alsa-devel] [PATCH v2] ASoC: wcd9335: remove multiple defines.
by Srinivas Kandagatla 04 Jul '19

04 Jul '19

Found during review that there are multiple defines of same constants. This patch removes them! Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes since v1: rebased on top of kernel/git/broonie/sound.git for-next sound/soc/codecs/wcd9335.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 85737fe54474..1bbbe421b999 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -86,11 +86,6 @@ #define WCD9335_DEC_PWR_LVL_HP 0x04 #define WCD9335_DEC_PWR_LVL_DF 0x00 -#define TX_HPF_CUT_OFF_FREQ_MASK 0x60 -#define CF_MIN_3DB_4HZ 0x0 -#define CF_MIN_3DB_75HZ 0x1 -#define CF_MIN_3DB_150HZ 0x2 - #define WCD9335_SLIM_RX_CH(p) \ {.port = p + WCD9335_RX_START, .shift = p,} -- 2.21.0

1 0

[alsa-devel] [PATCH] ASoC: wcd9335: remove multiple defines.
by Srinivas Kandagatla 04 Jul '19

04 Jul '19

Found during review that there are multiple defines of same constants. This patch removes them! Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/wcd9335.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 6f205638a8b8..da6c50ccecd9 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -87,11 +87,6 @@ #define WCD9335_DEC_PWR_LVL_HP 0x04 #define WCD9335_DEC_PWR_LVL_DF 0x00 -#define TX_HPF_CUT_OFF_FREQ_MASK 0x60 -#define CF_MIN_3DB_4HZ 0x0 -#define CF_MIN_3DB_75HZ 0x1 -#define CF_MIN_3DB_150HZ 0x2 - #define WCD9335_MBHC_MAX_BUTTONS (8) #define WCD9335_SLIM_RX_CH(p) \ -- 2.21.0

2 1