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

[RFC PATCH v2 0/2] Enable using multiple kcontrol types in a widget
by Jaska Uimonen 13 Jan '21

13 Jan '21

Hi, I'm requesting comments to this small series to enable multiple different kcontrol types for a single widget. Currently asoc allows to define and parse multiple same type kcontrols for single widget. So you can have for example two volume controls in a widget but not for example one byte and one enum control. I personally had this kind of use case where I wanted to set filter coefficients with bytes and something else with an enum in one processing widget. I don't have that good perspective on the asoc history on this part so I don't know is there some reason for the existing logic or is it just ok to change it like in this series. I've been told some drivers use virtual widget for this kind of situation, so they define two widget's (one virtual) with separate controls, but in reality bind the controls into the same component in lower level. Or can we just actually use separate types in one widget? First patch is changing the kcontrol_type uint in dapm widget to a pointer to hold an array of kcontrol types and then creating these different types in a loop in dapm widget load. Second patch is me utilizing this in sof driver. Changes since v1: - don't add kcontrol type to core i.e. to kcontrol and kcontrol_news - extend existing dapm widget kcontrol_type into holding an array of types Jaska Uimonen (2): ASoC: soc-dapm: enable use of multiple control types ASoC: SOF: topology: use individual kcontrol types include/sound/soc-topology.h | 2 +- sound/soc/soc-topology.c | 466 +++++++++++++++++------------------ sound/soc/sof/topology.c | 13 +- 3 files changed, 232 insertions(+), 249 deletions(-) -- 2.24.1

1 2

[RFC PATCH 0/3] Enable using multiple kcontrol types in a widget
by Jaska Uimonen 13 Jan '21

13 Jan '21

Hi, I'm requesting comments to this small series to enable multiple different kcontrol types for a single widget. Currently asoc allows to define and parse multiple same type kcontrols for single widget. So you can have for example two volume controls in a widget but not for example one byte and one enum control. I personally had this kind of use case where I wanted to set filter coefficients with bytes and something else with an enum in one processing widget. I don't have that good perspective on the asoc history on this part so I don't know is there some reason for the existing logic or is it just ok to change it like in this series. I've been told some drivers use virtual widget for this kind of situation, so they define two widget's (one virtual) with separate controls, but in reality bind the controls into the same component in lower level. Or can we just actually use separate types in one widget? First patch is just adding the type field to kcontrol struct. Second patch is a refactoring to take into account the different control types in parsing the topology. So it looks a little bit messy, but is just actually looping through the types in the kcontrol creation. Third patch is me using this in sof driver, so not so directly needed here. I've tested this thing personally up from topology down till the dsp and for me it seems to work, but as said I can't be sure if I'm breaking something else here. Jaska Uimonen (3): ALSA: control: add kcontrol_type to control ASoC: soc-topology: enable use of multiple control types ASoC: SOF: topology: use individual kcontrol types include/sound/control.h | 2 + sound/core/control.c | 2 + sound/soc/soc-topology.c | 462 ++++++++++++++++++--------------------- sound/soc/sof/topology.c | 13 +- 4 files changed, 230 insertions(+), 249 deletions(-) -- 2.24.1

3 6

Re: [Sound-open-firmware] SoF support for 8086:9d71?
by Amadeusz Sławiński 13 Jan '21

13 Jan '21

On 1/13/2021 5:48 AM, Kai-Heng Feng wrote: > On Tue, Jan 12, 2021 at 9:25 PM Amadeusz Sławiński > <amadeuszx.slawinski(a)linux.intel.com> wrote: >> >> On 12/17/2020 9:25 AM, Kai-Heng Feng wrote: >> (...) >>>>> >>>>> Can you try this instead, the dependencies are indeed wrong in the Makefile: >>>> >>>> Ok, compiling a kernel for user to test... >>> >>> Well, this happens: >>> ERROR: modpost: "skl_dsp_set_dma_control" >>> [sound/soc/intel/skylake/snd-soc-skl-ssp-clk.ko] undefined! >>> make[1]: *** [scripts/Makefile.modpost:111: sound/Module.symvers] Error 1 >>> make[1]: *** Deleting file 'sound/Module.symvers' >>> make: *** [Makefile:1709: modules] Error 2 >>> >>> Kai-Heng >>> >>>> >>>> Kai-Heng >>>> >>>>> >>>>> diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile >>>>> index 4e0248d2accc..7c5038803be7 100644 >>>>> --- a/sound/soc/intel/Makefile >>>>> +++ b/sound/soc/intel/Makefile >>>>> @@ -5,7 +5,7 @@ obj-$(CONFIG_SND_SOC) += common/ >>>>> # Platform Support >>>>> obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/ >>>>> obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/ >>>>> -obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/ >>>>> +obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += skylake/ >>>>> obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/ >>>>> >>>>> # Machine support >>>>> >>>>> >> >> Hi, >> >> what is the status of this issue? > > Still the same, unresolved. > >> Does it now work with usptream kernel? > > No it doesn't. > Can you try with following patch: diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index 4e0248d2accc..7c5038803be7 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_SND_SOC) += common/ # Platform Support obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/ obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/ -obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/ +obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += skylake/ obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/ # Machine support diff --git a/sound/soc/intel/skylake/Makefile b/sound/soc/intel/skylake/Makefile index dd39149b89b1..1c4649bccec5 100644 --- a/sound/soc/intel/skylake/Makefile +++ b/sound/soc/intel/skylake/Makefile @@ -7,7 +7,7 @@ ifdef CONFIG_DEBUG_FS snd-soc-skl-objs += skl-debug.o endif -obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl.o +obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += snd-soc-skl.o #Skylake Clock device support snd-soc-skl-ssp-clk-objs := skl-ssp-clk.o

1 0

[PATCH v5] ASoC: cros_ec_codec: Reset I2S RX when probing
by Yu-Hsuan Hsu 13 Jan '21

13 Jan '21

It is not guaranteed that I2S RX is disabled when the kernel booting. For example, if the kernel crashes while it is enabled, it will keep enabled until the next time EC reboots. Reset I2S RX when probing to fix this issue. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> --- This patch checks the return value. If it is -ENOPROTOOPT (EC_RES_INVALID_VERSION), it will ask clients to update EC firmware. Previous patches v1: https://patchwork.kernel.org/project/alsa-devel/patch/20200708071117.307070… v2: https://patchwork.kernel.org/project/alsa-devel/patch/20200716170914.362306… v3: https://patchwork.kernel.org/project/alsa-devel/patch/20210106050559.145902… v4: https://patchwork.kernel.org/project/alsa-devel/patch/20210107085942.289152… include/linux/platform_data/cros_ec_commands.h | 1 + sound/soc/codecs/cros_ec_codec.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h index 86376779ab31..95889ada83a3 100644 --- a/include/linux/platform_data/cros_ec_commands.h +++ b/include/linux/platform_data/cros_ec_commands.h @@ -4600,6 +4600,7 @@ enum ec_codec_i2s_rx_subcmd { EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH = 0x2, EC_CODEC_I2S_RX_SET_DAIFMT = 0x3, EC_CODEC_I2S_RX_SET_BCLK = 0x4, + EC_CODEC_I2S_RX_RESET = 0x5, EC_CODEC_I2S_RX_SUBCMD_COUNT, }; diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c index f33a2a9654e7..d35c57724b45 100644 --- a/sound/soc/codecs/cros_ec_codec.c +++ b/sound/soc/codecs/cros_ec_codec.c @@ -1011,6 +1011,17 @@ static int cros_ec_codec_platform_probe(struct platform_device *pdev) } priv->ec_capabilities = r.capabilities; + /* Reset EC codec i2s rx. */ + p.cmd = EC_CODEC_I2S_RX_RESET; + ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX, + (uint8_t *)&p, sizeof(p), NULL, 0); + if (ret == -ENOPROTOOPT) { + dev_info(dev, + "Command not found. Please update the EC firmware.\n"); + } else if (ret) { + dev_err(dev, "failed to EC_CODEC_I2S_RESET: %d\n", ret); + } + platform_set_drvdata(pdev, priv); ret = devm_snd_soc_register_component(dev, &i2s_rx_component_driver, -- 2.30.0.284.gd98b1dd5eaa7-goog

2 1

[PATCH v2 0/7] PinePhone BT audio bringup
by Samuel Holland 13 Jan '21

13 Jan '21

This series makes use of the additional DAIs recently added to the sun8i-codec driver to add hardware routing for BT SCO (headset) audio on the PinePhone. The BT audio connection is represented by the "dummy" bt-sco codec. The connection to the Quectel EG-25G modem via AIF2 works as well, but I do not include it here because there is no appropriate codec driver in tree. We have been using an out-of-tree "dummy" codec driver for the modem similar to bt-sco, and I'm not sure if such a driver would be desired upstream. Changes from v1: - Fixed DT binding example to follow new binding Arnaud Ferraris (1): arm64: dts: allwinner: pinephone: Set audio card name Samuel Holland (6): ASoC: dt-bindings: sun8i-codec: Increase #sound-dai-cells ARM: dts: sun8i-a33: Allow using multiple codec DAIs arm64: dts: allwinner: a64: Allow using multiple codec DAIs arm64: dts: allwinner: a64: Add pinmux nodes for AIF2/AIF3 arm64: dts: allwinner: a64: Allow multiple DAI links arm64: dts: allwinner: pinephone: Add support for Bluetooth audio .../sound/allwinner,sun8i-a33-codec.yaml | 4 +- arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- .../dts/allwinner/sun50i-a64-pinephone.dtsi | 25 +++++++++++++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 37 ++++++++++++++----- 4 files changed, 56 insertions(+), 14 deletions(-) -- 2.26.2

2 8

[PATCH 1/2] cros_ec_commands: Add EC_CODEC_I2S_RX_RESET
by Yu-Hsuan Hsu 13 Jan '21

13 Jan '21

Add the new command EC_CODEC_I2S_RX_RESET in ec_codec_i2s_rx_subcmd, which is used for resetting the EC codec. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> --- include/linux/platform_data/cros_ec_commands.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h index 86376779ab31..95889ada83a3 100644 --- a/include/linux/platform_data/cros_ec_commands.h +++ b/include/linux/platform_data/cros_ec_commands.h @@ -4600,6 +4600,7 @@ enum ec_codec_i2s_rx_subcmd { EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH = 0x2, EC_CODEC_I2S_RX_SET_DAIFMT = 0x3, EC_CODEC_I2S_RX_SET_BCLK = 0x4, + EC_CODEC_I2S_RX_RESET = 0x5, EC_CODEC_I2S_RX_SUBCMD_COUNT, }; -- 2.29.2.729.g45daf8777d-goog

4 9

[PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support
by Perry Yuan 13 Jan '21

13 Jan '21

From: Perry Yuan <perry_yuan(a)dell.com> Some new Dell system is going to support audio internal micphone privacy setting from hardware level with micmute led state changing When micmute hotkey pressed by user, soft mute will need to be enabled firstly in case of pop noise, and codec driver need to react to mic mute event to EC notifying that SW mute is completed. Then EC will do the HW mute physically. This patch allow codec rt715 driver to ack EC when micmute key pressed through this micphone led control interface like hda_generic provided. Signed-off-by: Perry Yuan <perry_yuan(a)dell.com> Signed-off-by: Limonciello Mario <mario_limonciello(a)dell.com> --- sound/soc/codecs/rt715-sdca.c | 19 ++++++++++++++++++- sound/soc/codecs/rt715-sdca.h | 1 + sound/soc/codecs/rt715.c | 19 ++++++++++++++++++- sound/soc/codecs/rt715.h | 1 + 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c index b43ac8559e45..e168ef6efcf5 100644 --- a/sound/soc/codecs/rt715-sdca.c +++ b/sound/soc/codecs/rt715-sdca.c @@ -12,6 +12,7 @@ #include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/leds.h> #include <linux/pm_runtime.h> #include <linux/pm.h> #include <linux/soundwire/sdw.h> @@ -268,6 +269,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, unsigned int reg2 = mc->rreg; unsigned int reg = mc->reg; unsigned int max = mc->max; + unsigned int val0, val1; int err; val = ucontrol->value.integer.value[0]; @@ -286,7 +288,22 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, if (err < 0) return err; } - +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + /* Privacy LED Trigger State Changed by muted/unmute switch */ + if (mc->invert) { + val0 = ucontrol->value.integer.value[0]; + val1 = ucontrol->value.integer.value[1]; + if (val0 == 1 && val1 == 1) { + rt715->micmute_led = LED_OFF; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } else if (val0 == 0 && val1 == 0) { + rt715->micmute_led = LED_ON; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } + } +#endif return 0; } diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h index 840c237895dd..2ab8724ae50b 100644 --- a/sound/soc/codecs/rt715-sdca.h +++ b/sound/soc/codecs/rt715-sdca.h @@ -31,6 +31,7 @@ struct rt715_sdca_priv { int l_is_unmute; int r_is_unmute; int hw_sdw_ver; + int micmute_led; }; struct rt715_sdw_stream_data { diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index cdcba70146da..faa4dee6b39a 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/leds.h> #include <linux/pm_runtime.h> #include <linux/pm.h> #include <linux/soundwire/sdw.h> @@ -88,13 +89,29 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, RT715_SET_GAIN_MIX_ADC2_L}; unsigned int addr_h, addr_l, val_h, val_ll, val_lr; unsigned int read_ll, read_rl, i, j, loop_cnt; + unsigned int val0, val1; if (strstr(ucontrol->id.name, "Main Capture Switch") || strstr(ucontrol->id.name, "Main Capture Volume")) loop_cnt = 4; else loop_cnt = 1; - +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + /* Privacy micmute led trigger for muted/unmute switch */ + if (mc->invert) { + val0 = ucontrol->value.integer.value[0]; + val1 = ucontrol->value.integer.value[1]; + if (val0 == 1 && val1 == 1) { + rt715->micmute_led = LED_OFF; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } else if (val0 == 0 && val1 == 0) { + rt715->micmute_led = LED_ON; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } + } +#endif for (j = 0; j < loop_cnt; j++) { /* Can't use update bit function, so read the original value first */ if (loop_cnt == 1) { diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h index 009a8266f606..2d3b5b299514 100644 --- a/sound/soc/codecs/rt715.h +++ b/sound/soc/codecs/rt715.h @@ -22,6 +22,7 @@ struct rt715_priv { struct sdw_bus_params params; bool hw_init; bool first_hw_init; + int micmute_led; }; struct sdw_stream_data { -- 2.25.1

5 9

[PATCH 00/10] Remove support for TX49xx
by Thomas Bogendoerfer 13 Jan '21

13 Jan '21

I couldn't find any buyable product other than reference boards using TX49xx CPUs. And since nobody showed interest in keeping support for it, it's time to remove it. I've split up the removal into seperate parts for different maintainers. So if the patch fits your needs, please take it via your tree or give me an ack so I can apply them the mips-next tree. Thomas Bogendoerfer (10): MIPS: TX49xx: Drop support net: tc35815: Drop support for TX49XX boards net: 8390: Drop support for TX49XX boards spi: txx9: Remove driver dma: tx49 removal mtd: Remove drivers used by TX49xx char: hw_random: Remove tx4939 driver rtc: tx4939: Remove driver ide: tx4938ide: Remove driver ASoC: txx9: Remove driver arch/mips/Kbuild.platforms | 1 - arch/mips/Kconfig | 23 - arch/mips/Makefile | 1 - arch/mips/configs/rbtx49xx_defconfig | 98 --- arch/mips/include/asm/cpu-type.h | 4 - arch/mips/include/asm/cpu.h | 2 +- .../asm/mach-tx49xx/cpu-feature-overrides.h | 26 - arch/mips/include/asm/mach-tx49xx/ioremap.h | 30 - arch/mips/include/asm/mach-tx49xx/kmalloc.h | 7 - .../include/asm/mach-tx49xx/mangle-port.h | 27 - arch/mips/include/asm/mach-tx49xx/spaces.h | 17 - arch/mips/include/asm/mipsregs.h | 6 - arch/mips/include/asm/txx9/boards.h | 10 - arch/mips/include/asm/txx9/generic.h | 9 - arch/mips/include/asm/txx9/rbtx4927.h | 92 --- arch/mips/include/asm/txx9/rbtx4938.h | 145 ---- arch/mips/include/asm/txx9/rbtx4939.h | 142 ---- arch/mips/include/asm/txx9/tx4927.h | 273 -------- arch/mips/include/asm/txx9/tx4927pcic.h | 203 ------ arch/mips/include/asm/txx9/tx4938.h | 312 --------- arch/mips/include/asm/txx9/tx4939.h | 524 --------------- arch/mips/include/asm/vermagic.h | 2 - arch/mips/kernel/cpu-probe.c | 10 - arch/mips/kernel/idle.c | 3 - arch/mips/mm/c-r4k.c | 77 --- arch/mips/mm/page.c | 1 - arch/mips/mm/tlbex.c | 1 - arch/mips/pci/Makefile | 6 - arch/mips/pci/fixup-rbtx4927.c | 73 -- arch/mips/pci/fixup-rbtx4938.c | 53 -- arch/mips/pci/ops-tx4927.c | 524 --------------- arch/mips/pci/pci-tx4927.c | 91 --- arch/mips/pci/pci-tx4938.c | 142 ---- arch/mips/pci/pci-tx4939.c | 107 --- arch/mips/txx9/Kconfig | 89 --- arch/mips/txx9/Makefile | 8 - arch/mips/txx9/Platform | 3 - arch/mips/txx9/generic/7segled.c | 123 ---- arch/mips/txx9/generic/Makefile | 4 - arch/mips/txx9/generic/irq_tx4927.c | 49 -- arch/mips/txx9/generic/irq_tx4938.c | 37 -- arch/mips/txx9/generic/irq_tx4939.c | 216 ------ arch/mips/txx9/generic/mem_tx4927.c | 75 --- arch/mips/txx9/generic/setup.c | 158 +---- arch/mips/txx9/generic/setup_tx4927.c | 337 ---------- arch/mips/txx9/generic/setup_tx4938.c | 485 -------------- arch/mips/txx9/generic/setup_tx4939.c | 568 ---------------- arch/mips/txx9/rbtx4927/Makefile | 2 - arch/mips/txx9/rbtx4927/irq.c | 198 ------ arch/mips/txx9/rbtx4927/prom.c | 42 -- arch/mips/txx9/rbtx4927/setup.c | 380 ----------- arch/mips/txx9/rbtx4938/Makefile | 2 - arch/mips/txx9/rbtx4938/irq.c | 157 ----- arch/mips/txx9/rbtx4938/prom.c | 22 - arch/mips/txx9/rbtx4938/setup.c | 372 ----------- arch/mips/txx9/rbtx4939/Makefile | 2 - arch/mips/txx9/rbtx4939/irq.c | 95 --- arch/mips/txx9/rbtx4939/prom.c | 29 - arch/mips/txx9/rbtx4939/setup.c | 554 --------------- drivers/char/hw_random/Kconfig | 13 - drivers/char/hw_random/Makefile | 1 - drivers/char/hw_random/tx4939-rng.c | 157 ----- drivers/dma/Kconfig | 2 +- drivers/dma/txx9dmac.h | 10 - drivers/ide/Kconfig | 10 - drivers/ide/Makefile | 3 - drivers/ide/tx4938ide.c | 209 ------ drivers/ide/tx4939ide.c | 628 ------------------ drivers/mtd/maps/Kconfig | 6 - drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/rbtx4939-flash.c | 133 ---- drivers/mtd/nand/raw/Kconfig | 7 - drivers/mtd/nand/raw/Makefile | 1 - drivers/mtd/nand/raw/txx9ndfmc.c | 423 ------------ drivers/net/ethernet/8390/Kconfig | 2 +- drivers/net/ethernet/8390/ne.c | 7 +- drivers/net/ethernet/toshiba/tc35815.c | 29 - drivers/rtc/Kconfig | 7 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc-tx4939.c | 303 --------- drivers/spi/Kconfig | 6 - drivers/spi/Makefile | 1 - drivers/spi/spi-txx9.c | 477 ------------- drivers/watchdog/Kconfig | 2 +- include/linux/platform_data/txx9/ndfmc.h | 28 - sound/soc/Kconfig | 1 - sound/soc/Makefile | 1 - sound/soc/txx9/Kconfig | 30 - sound/soc/txx9/Makefile | 12 - sound/soc/txx9/txx9aclc-ac97.c | 230 ------- sound/soc/txx9/txx9aclc-generic.c | 88 --- sound/soc/txx9/txx9aclc.c | 422 ------------ sound/soc/txx9/txx9aclc.h | 71 -- 93 files changed, 6 insertions(+), 10365 deletions(-) delete mode 100644 arch/mips/configs/rbtx49xx_defconfig delete mode 100644 arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h delete mode 100644 arch/mips/include/asm/mach-tx49xx/ioremap.h delete mode 100644 arch/mips/include/asm/mach-tx49xx/kmalloc.h delete mode 100644 arch/mips/include/asm/mach-tx49xx/mangle-port.h delete mode 100644 arch/mips/include/asm/mach-tx49xx/spaces.h delete mode 100644 arch/mips/include/asm/txx9/rbtx4927.h delete mode 100644 arch/mips/include/asm/txx9/rbtx4938.h delete mode 100644 arch/mips/include/asm/txx9/rbtx4939.h delete mode 100644 arch/mips/include/asm/txx9/tx4927.h delete mode 100644 arch/mips/include/asm/txx9/tx4927pcic.h delete mode 100644 arch/mips/include/asm/txx9/tx4938.h delete mode 100644 arch/mips/include/asm/txx9/tx4939.h delete mode 100644 arch/mips/pci/fixup-rbtx4927.c delete mode 100644 arch/mips/pci/fixup-rbtx4938.c delete mode 100644 arch/mips/pci/ops-tx4927.c delete mode 100644 arch/mips/pci/pci-tx4927.c delete mode 100644 arch/mips/pci/pci-tx4938.c delete mode 100644 arch/mips/pci/pci-tx4939.c delete mode 100644 arch/mips/txx9/generic/7segled.c delete mode 100644 arch/mips/txx9/generic/irq_tx4927.c delete mode 100644 arch/mips/txx9/generic/irq_tx4938.c delete mode 100644 arch/mips/txx9/generic/irq_tx4939.c delete mode 100644 arch/mips/txx9/generic/mem_tx4927.c delete mode 100644 arch/mips/txx9/generic/setup_tx4927.c delete mode 100644 arch/mips/txx9/generic/setup_tx4938.c delete mode 100644 arch/mips/txx9/generic/setup_tx4939.c delete mode 100644 arch/mips/txx9/rbtx4927/Makefile delete mode 100644 arch/mips/txx9/rbtx4927/irq.c delete mode 100644 arch/mips/txx9/rbtx4927/prom.c delete mode 100644 arch/mips/txx9/rbtx4927/setup.c delete mode 100644 arch/mips/txx9/rbtx4938/Makefile delete mode 100644 arch/mips/txx9/rbtx4938/irq.c delete mode 100644 arch/mips/txx9/rbtx4938/prom.c delete mode 100644 arch/mips/txx9/rbtx4938/setup.c delete mode 100644 arch/mips/txx9/rbtx4939/Makefile delete mode 100644 arch/mips/txx9/rbtx4939/irq.c delete mode 100644 arch/mips/txx9/rbtx4939/prom.c delete mode 100644 arch/mips/txx9/rbtx4939/setup.c delete mode 100644 drivers/char/hw_random/tx4939-rng.c delete mode 100644 drivers/ide/tx4938ide.c delete mode 100644 drivers/ide/tx4939ide.c delete mode 100644 drivers/mtd/maps/rbtx4939-flash.c delete mode 100644 drivers/mtd/nand/raw/txx9ndfmc.c delete mode 100644 drivers/rtc/rtc-tx4939.c delete mode 100644 drivers/spi/spi-txx9.c delete mode 100644 include/linux/platform_data/txx9/ndfmc.h delete mode 100644 sound/soc/txx9/Kconfig delete mode 100644 sound/soc/txx9/Makefile delete mode 100644 sound/soc/txx9/txx9aclc-ac97.c delete mode 100644 sound/soc/txx9/txx9aclc-generic.c delete mode 100644 sound/soc/txx9/txx9aclc.c delete mode 100644 sound/soc/txx9/txx9aclc.h -- 2.29.2

6 17

[PATCH] ASoC: imx-hdmi: Fix warning of the uninitialized variable ret
by Shengjiu Wang 12 Jan '21

12 Jan '21

From: shengjiu wang <shengjiu.wang(a)nxp.com> When condition ((hdmi_out && hdmi_in) || (!hdmi_out && !hdmi_in)) is true, then goto fail, the uninitialized variable ret will be returned. Signed-off-by: shengjiu wang <shengjiu.wang(a)nxp.com> Reported-by: kernel test robot <lkp(a)intel.com> --- sound/soc/fsl/imx-hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/imx-hdmi.c b/sound/soc/fsl/imx-hdmi.c index 2c2a76a71940..ede4a9ad1054 100644 --- a/sound/soc/fsl/imx-hdmi.c +++ b/sound/soc/fsl/imx-hdmi.c @@ -164,6 +164,7 @@ static int imx_hdmi_probe(struct platform_device *pdev) if ((hdmi_out && hdmi_in) || (!hdmi_out && !hdmi_in)) { dev_err(&pdev->dev, "Invalid HDMI DAI link\n"); + ret = -EINVAL; goto fail; } -- 2.17.1

5 7

[PATCH] ALSA: hda: fix SND_INTEL_DSP_CONFIG dependency
by Arnd Bergmann 12 Jan '21

12 Jan '21

From: Arnd Bergmann <arnd(a)arndb.de> The sof-pci-dev driver fails to link when built into the kernel and CONFIG_SND_INTEL_DSP_CONFIG is set to =m: arm-linux-gnueabi-ld: sound/soc/sof/sof-pci-dev.o: in function `sof_pci_probe': sof-pci-dev.c:(.text+0x1c): undefined reference to `snd_intel_dsp_driver_probe' All other drivers using this interface already use a 'select SND_INTEL_DSP_CONFIG' statement to force the it to be present, so it seems reasonable to do the same here. The stub implementation in the header makes the problem harder to find, as it avoids the link error when SND_INTEL_DSP_CONFIG is completely disabled, without any obvious upsides. Remove these stubs to make it clearer that the driver is in fact needed here. Fixes: 82d9d54a6c0e ("ALSA: hda: add Intel DSP configuration / probe code") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- include/sound/intel-dsp-config.h | 17 ----------------- sound/soc/sof/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/include/sound/intel-dsp-config.h b/include/sound/intel-dsp-config.h index d4609077c258..94667e870029 100644 --- a/include/sound/intel-dsp-config.h +++ b/include/sound/intel-dsp-config.h @@ -18,24 +18,7 @@ enum { SND_INTEL_DSP_DRIVER_LAST = SND_INTEL_DSP_DRIVER_SOF }; -#if IS_ENABLED(CONFIG_SND_INTEL_DSP_CONFIG) - int snd_intel_dsp_driver_probe(struct pci_dev *pci); int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN]); -#else - -static inline int snd_intel_dsp_driver_probe(struct pci_dev *pci) -{ - return SND_INTEL_DSP_DRIVER_ANY; -} - -static inline -int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN]) -{ - return SND_INTEL_DSP_DRIVER_ANY; -} - -#endif - #endif diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index 031dad5fc4c7..051fd3d27047 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -12,6 +12,7 @@ if SND_SOC_SOF_TOPLEVEL config SND_SOC_SOF_PCI tristate "SOF PCI enumeration support" depends on PCI + select SND_INTEL_DSP_CONFIG select SND_SOC_SOF select SND_SOC_ACPI if ACPI help @@ -23,6 +24,7 @@ config SND_SOC_SOF_PCI config SND_SOC_SOF_ACPI tristate "SOF ACPI enumeration support" depends on ACPI || COMPILE_TEST + select SND_INTEL_DSP_CONFIG select SND_SOC_SOF select SND_SOC_ACPI if ACPI select IOSF_MBI if X86 && PCI -- 2.29.2

6 15