The patch
ASoC: amd: Additional DAI for I2S SP instance.
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From a174a6c226796824cb2f78157c0b183ed472fa3f Mon Sep 17 00:00:00 2001
From: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com Date: Fri, 17 Jan 2020 17:15:09 +0530 Subject: [PATCH] ASoC: amd: Additional DAI for I2S SP instance.
I2S SP instance has separate BCLK and LRCLK for Tx and Rx. Creating additional DAI for Rx.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com Link: https://lore.kernel.org/r/1579261510-12580-1-git-send-email-Vishnuvardhanrao... Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/amd/raven/acp3x.h | 2 +- sound/soc/amd/raven/pci-acp3x.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index b6a80dc0b641..21e7ac017f2b 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -13,7 +13,7 @@ #define TDM_ENABLE 1 #define TDM_DISABLE 0
-#define ACP3x_DEVS 3 +#define ACP3x_DEVS 4 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 #define ACP3x_REG_START 0x1240000 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 2f9f52905853..65330bb50e74 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -225,7 +225,13 @@ static int snd_acp3x_probe(struct pci_dev *pci, pdevinfo[2].id = 1; pdevinfo[2].parent = &pci->dev; pdevinfo[2].num_res = 1; - pdevinfo[2].res = &adata->res[2]; + pdevinfo[2].res = &adata->res[1]; + + pdevinfo[3].name = "acp3x_i2s_playcap"; + pdevinfo[3].id = 2; + pdevinfo[3].parent = &pci->dev; + pdevinfo[3].num_res = 1; + pdevinfo[3].res = &adata->res[2]; for (i = 0; i < ACP3x_DEVS; i++) { adata->pdev[i] = platform_device_register_full(&pdevinfo[i]);