Commit c5a9df92 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.14-rc2' of... 

Merge tag 'asoc-fix-v6.14-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.14

More fixes and deviec quirks, most of them driver specific including a
few SOF robustness fixes.  Nothing super remarkable individually.
parents 174448ba 571b69f2

sound/soc/codecs/arizona.c

+7 −7
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
		case ARIZONA_OUT3L_ENA_SHIFT:

		case ARIZONA_OUT3R_ENA_SHIFT:

			priv->out_up_pending++;

			priv->out_up_delay += 17;

			priv->out_up_delay += 17000;

			break;

		case ARIZONA_OUT4L_ENA_SHIFT:

		case ARIZONA_OUT4R_ENA_SHIFT:
@@ -977,7 +977,7 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
			case WM8997:

				break;

			default:

				priv->out_up_delay += 10;

				priv->out_up_delay += 10000;

				break;

			}

			break;
@@ -999,7 +999,7 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
			if (!priv->out_up_pending && priv->out_up_delay) {

				dev_dbg(component->dev, "Power up delay: %d\n",

					priv->out_up_delay);

				msleep(priv->out_up_delay);

				fsleep(priv->out_up_delay);

				priv->out_up_delay = 0;

			}

			break;
@@ -1017,7 +1017,7 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
		case ARIZONA_OUT3L_ENA_SHIFT:

		case ARIZONA_OUT3R_ENA_SHIFT:

			priv->out_down_pending++;

			priv->out_down_delay++;

			priv->out_down_delay += 1000;

			break;

		case ARIZONA_OUT4L_ENA_SHIFT:

		case ARIZONA_OUT4R_ENA_SHIFT:
@@ -1028,10 +1028,10 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
				break;

			case WM8998:

			case WM1814:

				priv->out_down_delay += 5;

				priv->out_down_delay += 5000;

				break;

			default:

				priv->out_down_delay++;

				priv->out_down_delay += 1000;

				break;

			}

			break;
@@ -1053,7 +1053,7 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
			if (!priv->out_down_pending && priv->out_down_delay) {

				dev_dbg(component->dev, "Power down delay: %d\n",

					priv->out_down_delay);

				msleep(priv->out_down_delay);

				fsleep(priv->out_down_delay);

				priv->out_down_delay = 0;

			}

			break;

sound/soc/codecs/cs35l41.c

+23 −7
Original line number Diff line number Diff line
@@ -1148,21 +1148,31 @@ static int cs35l41_dsp_init(struct cs35l41_private *cs35l41) 
	return ret;

}



#ifdef CONFIG_ACPI

static int cs35l41_acpi_get_name(struct cs35l41_private *cs35l41)

{

	acpi_handle handle = ACPI_HANDLE(cs35l41->dev);

	struct acpi_device *adev = ACPI_COMPANION(cs35l41->dev);

	acpi_handle handle = acpi_device_handle(adev);

	const char *hid;

	const char *sub;



	/* If there is no ACPI_HANDLE, there is no ACPI for this system, return 0 */

	if (!handle)

	/* If there is no acpi_device, there is no ACPI for this system, return 0 */

	if (!adev)

		return 0;



	sub = acpi_get_subsystem_id(handle);

	if (IS_ERR(sub)) {

		/* If bad ACPI, return 0 and fallback to legacy firmware path, otherwise fail */

		if (PTR_ERR(sub) == -ENODATA)

		/* If no _SUB, fallback to _HID, otherwise fail */

		if (PTR_ERR(sub) == -ENODATA) {

			hid = acpi_device_hid(adev);

			/* If dummy hid, return 0 and fallback to legacy firmware path */

			if (!strcmp(hid, "device"))

				return 0;

		else

			sub = kstrdup(hid, GFP_KERNEL);

			if (!sub)

				sub = ERR_PTR(-ENOMEM);



		} else

			return PTR_ERR(sub);

	}
@@ -1171,6 +1181,12 @@ static int cs35l41_acpi_get_name(struct cs35l41_private *cs35l41) 


	return 0;

}

#else

static int cs35l41_acpi_get_name(struct cs35l41_private *cs35l41)

{

	return 0;

}

#endif /* CONFIG_ACPI */



int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *hw_cfg)

{

sound/soc/codecs/madera.c

+5 −5
Original line number Diff line number Diff line
@@ -2323,10 +2323,10 @@ int madera_out_ev(struct snd_soc_dapm_widget *w, 
	case CS42L92:

	case CS47L92:

	case CS47L93:

		out_up_delay = 6;

		out_up_delay = 6000;

		break;

	default:

		out_up_delay = 17;

		out_up_delay = 17000;

		break;

	}
@@ -2357,7 +2357,7 @@ int madera_out_ev(struct snd_soc_dapm_widget *w, 
		case MADERA_OUT3R_ENA_SHIFT:

			priv->out_up_pending--;

			if (!priv->out_up_pending) {

				msleep(priv->out_up_delay);

				fsleep(priv->out_up_delay);

				priv->out_up_delay = 0;

			}

			break;
@@ -2376,7 +2376,7 @@ int madera_out_ev(struct snd_soc_dapm_widget *w, 
		case MADERA_OUT3L_ENA_SHIFT:

		case MADERA_OUT3R_ENA_SHIFT:

			priv->out_down_pending++;

			priv->out_down_delay++;

			priv->out_down_delay += 1000;

			break;

		default:

			break;
@@ -2393,7 +2393,7 @@ int madera_out_ev(struct snd_soc_dapm_widget *w, 
		case MADERA_OUT3R_ENA_SHIFT:

			priv->out_down_pending--;

			if (!priv->out_down_pending) {

				msleep(priv->out_down_delay);

				fsleep(priv->out_down_delay);

				priv->out_down_delay = 0;

			}

			break;

sound/soc/codecs/tas2781-i2c.c

+1 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
//

// ALSA SoC Texas Instruments TAS2563/TAS2781 Audio Smart Amplifier

//

// Copyright (C) 2022 - 2024 Texas Instruments Incorporated

// Copyright (C) 2022 - 2025 Texas Instruments Incorporated

// https://www.ti.com

//

// The TAS2563/TAS2781 driver implements a flexible and configurable
@@ -1260,8 +1260,6 @@ static int tasdevice_create_cali_ctrls(struct tasdevice_priv *priv) 
		(cali_data->cali_dat_sz_per_dev + 1) + 1 + 15 + 1;

	priv->cali_data.total_sz = priv->ndev *

		(cali_data->cali_dat_sz_per_dev + 1);

	priv->cali_data.data = devm_kzalloc(priv->dev,

		ext_cali_data->max, GFP_KERNEL);

	cali_ctrls[i].name = cali_name;

	cali_ctrls[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;

	cali_ctrls[i].info = snd_soc_bytes_info_ext;

sound/soc/codecs/wm5110.c

+4 −4
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int wm5110_hp_pre_enable(struct snd_soc_dapm_widget *w) 
		} else {

			wseq = wm5110_no_dre_left_enable;

			nregs = ARRAY_SIZE(wm5110_no_dre_left_enable);

			priv->out_up_delay += 10;

			priv->out_up_delay += 10000;

		}

		break;

	case ARIZONA_OUT1R_ENA_SHIFT:
@@ -312,7 +312,7 @@ static int wm5110_hp_pre_enable(struct snd_soc_dapm_widget *w) 
		} else {

			wseq = wm5110_no_dre_right_enable;

			nregs = ARRAY_SIZE(wm5110_no_dre_right_enable);

			priv->out_up_delay += 10;

			priv->out_up_delay += 10000;

		}

		break;

	default:
@@ -338,7 +338,7 @@ static int wm5110_hp_pre_disable(struct snd_soc_dapm_widget *w) 
			snd_soc_component_update_bits(component,

						      ARIZONA_SPARE_TRIGGERS,

						      ARIZONA_WS_TRG1, 0);

			priv->out_down_delay += 27;

			priv->out_down_delay += 27000;

		}

		break;

	case ARIZONA_OUT1R_ENA_SHIFT:
@@ -350,7 +350,7 @@ static int wm5110_hp_pre_disable(struct snd_soc_dapm_widget *w) 
			snd_soc_component_update_bits(component,

						      ARIZONA_SPARE_TRIGGERS,

						      ARIZONA_WS_TRG2, 0);

			priv->out_down_delay += 27;

			priv->out_down_delay += 27000;

		}

		break;

	default: