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

Merge tag 'asoc-fix-v6.17-merge-window' of... 

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

ASoC: Fixes for v6.17

This is a relatively small set of fixes and device quirks that came in
during the merge window, the AMD changes adding support for ACP 7.2
systems are all just adding IDs for the devices rather than any
substantial code - the actual code is the same as for prior versions of
the platform.
parents 9f320dfb 614d416d

include/sound/tas2781-tlv.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#ifndef __TAS2781_TLV_H__

#define __TAS2781_TLV_H__



static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 50, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);



#endif

sound/soc/amd/acp/acp-sdw-legacy-mach.c

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
			break;

		case ACP70_PCI_REV:

		case ACP71_PCI_REV:

		case ACP72_PCI_REV:

			ret = get_acp70_cpu_pin_id(ffs(soc_end->link_mask - 1),

						   *be_id, &cpu_pin_id, dev);

			if (ret)
@@ -264,6 +265,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card, 
	case ACP63_PCI_REV:

	case ACP70_PCI_REV:

	case ACP71_PCI_REV:

	case ACP72_PCI_REV:

		sdw_platform_component->name = "amd_ps_sdw_dma.0";

		break;

	default:
@@ -311,6 +313,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card, 
	case ACP63_PCI_REV:

	case ACP70_PCI_REV:

	case ACP71_PCI_REV:

	case ACP72_PCI_REV:

		pdm_cpu->name = "acp_ps_pdm_dma.0";

		pdm_platform->name = "acp_ps_pdm_dma.0";

		break;

sound/soc/amd/acp/acp-sdw-sof-mach.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
			break;

		case ACP70_PCI_REV:

		case ACP71_PCI_REV:

		case ACP72_PCI_REV:

			ret = get_acp70_cpu_pin_id(ffs(sof_end->link_mask - 1),

						   *be_id, &cpu_pin_id, dev);

			if (ret)

sound/soc/amd/acp/soc_amd_sdw_common.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#define ACP63_PCI_REV			0x63

#define ACP70_PCI_REV			0x70

#define ACP71_PCI_REV			0x71

#define ACP72_PCI_REV			0x72



#define SOC_JACK_JDSRC(quirk)		((quirk) & GENMASK(3, 0))

#define ASOC_SDW_FOUR_SPK		BIT(4)

#define ASOC_SDW_ACP_DMIC		BIT(5)

sound/soc/amd/ps/acp63.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define ACP63_PCI_REV		0x63

#define ACP70_PCI_REV		0x70

#define ACP71_PCI_REV		0x71

#define ACP72_PCI_REV		0x72



#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK	0x00010001

#define ACP63_PGFSM_CNTL_POWER_ON_MASK	1