Unverified Commit bdd2a858 authored by Akshu Agrawal's avatar Akshu Agrawal Committed by Mark Brown
Browse files

ASoC: amd: Make the driver name consistent across files 



This fixes the issue of driver not getting auto loaded with
MODULE_ALIAS.
find /sys/devices -name modalias -print0 | xargs -0 grep 'audio'
/sys/devices/pci0000:00/0000:00:01.0/acp_audio_dma.0.auto/modalias:platform:acp_audio_dma

TEST=boot and check for device in lsmod

[Removed yet more ChromeOS crap from the changelog -- broonie]

Signed-off-by: default avatarAkshu Agrawal <akshu.agrawal@amd.com>
Tested-by: default avatarJason Clinton <jclinton@chromium.org>
Reviewed-by: default avatarJason Clinton <jclinton@chromium.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 61add814

sound/soc/amd/Makefile

+2 −2
Original line number Diff line number Diff line 
snd-soc-acp-pcm-objs	:= acp-pcm-dma.o

acp_audio_dma-objs := acp-pcm-dma.o

snd-soc-acp-rt5645-mach-objs := acp-rt5645.o



obj-$(CONFIG_SND_SOC_AMD_ACP) += snd-soc-acp-pcm.o

obj-$(CONFIG_SND_SOC_AMD_ACP) += acp_audio_dma.o

obj-$(CONFIG_SND_SOC_AMD_CZ_RT5645_MACH) += snd-soc-acp-rt5645-mach.o

sound/soc/amd/acp-pcm-dma.c

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#define ST_MAX_BUFFER (ST_PLAYBACK_MAX_PERIOD_SIZE * PLAYBACK_MAX_NUM_PERIODS)

#define ST_MIN_BUFFER ST_MAX_BUFFER



#define DRV_NAME "acp_audio_dma"



static const struct snd_pcm_hardware acp_pcm_hardware_playback = {

	.info = SNDRV_PCM_INFO_INTERLEAVED |

		SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP |
@@ -1189,7 +1191,7 @@ static struct platform_driver acp_dma_driver = { 
	.probe = acp_audio_probe,

	.remove = acp_audio_remove,

	.driver = {

		.name = "acp_audio_dma",

		.name = DRV_NAME,

		.pm = &acp_pm_ops,

	},

};
@@ -1200,4 +1202,4 @@ MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); 
MODULE_AUTHOR("Maruthi.Bayyavarapu@amd.com");

MODULE_DESCRIPTION("AMD ACP PCM Driver");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:acp-dma-audio");
 
MODULE_ALIAS("platform:"DRV_NAME);

CRA Git | Maintained and supported by SUSTech CRA and CCSE