Unverified Commit e5879d98 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.10' of... 

Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.11
parents 645be01d f9d8ae0b

Documentation/devicetree/bindings/sound/rt1015.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,10 +8,16 @@ Required properties: 


- reg : The I2C address of the device.



Optional properties:



- realtek,power-up-delay-ms

  Set a delay time for flush work to be completed,

  this value is adjustable depending on platform.



Example:



rt1015: codec@28 {

	compatible = "realtek,rt1015";

	reg = <0x28>;

	realtek,power-up-delay-ms = <50>;

};

include/sound/rt1015.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * linux/sound/rt1015.h -- Platform data for RT1015

 *

 * Copyright 2020 Realtek Microelectronics

 */



#ifndef __LINUX_SND_RT1015_H

#define __LINUX_SND_RT1015_H



struct rt1015_platform_data {

	unsigned int power_up_delay_ms;

};



#endif

sound/soc/amd/raven/pci-acp3x.c

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, 
		break;

	default:

		dev_info(&pci->dev, "ACP audio mode : %d\n", val);

		break;

	}

	pm_runtime_set_autosuspend_delay(&pci->dev, 2000);

	pm_runtime_use_autosuspend(&pci->dev);

sound/soc/amd/renoir/rn-pci-acp3x.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int snd_rn_acp_probe(struct pci_dev *pci, 
		handle = ACPI_HANDLE(&pci->dev);

		ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);

		if (ACPI_FAILURE(ret)) {

			ret = -EINVAL;

			ret = -ENODEV;

			goto de_init;

		}

		if (!dmic_status) {

sound/soc/atmel/mchp-spdiftx.c

+0 −1
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream, 
	}

	mchp_spdiftx_channel_status_write(dev);

	spin_unlock_irqrestore(&ctrl->lock, flags);

	mr |= SPDIFTX_MR_VALID1 | SPDIFTX_MR_VALID2;



	if (dev->gclk_enabled) {

		clk_disable_unprepare(dev->gclk);