From patchwork Wed Nov 8 17:24:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10048885 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D956360247 for ; Wed, 8 Nov 2017 17:25:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB31D2A6B0 for ; Wed, 8 Nov 2017 17:25:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE3592A7C1; Wed, 8 Nov 2017 17:25:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF2782A6B0 for ; Wed, 8 Nov 2017 17:25:05 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E30AC26750E; Wed, 8 Nov 2017 18:24:24 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id B3178267503; Wed, 8 Nov 2017 18:24:21 +0100 (CET) Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by alsa0.perex.cz (Postfix) with ESMTP id 9E576266AE1 for ; Wed, 8 Nov 2017 18:24:16 +0100 (CET) Received: by mail-qt0-f195.google.com with SMTP id 8so4295038qtv.1 for ; Wed, 08 Nov 2017 09:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ymMoNz5qdEctJKR5gTMO/j7sj6MPUGdTfbScS540nRY=; b=V0hoZj0nR+zntET4xaBBhlwiSYvc++NkyZfUn+VqK3I+ukrjnw3UI4OvzWdKslALrv d9e0fLcGaz2Cu240L0I0tSzwzey+5PYT6U8d9yqMid51NzBCbUBvWp0Z9wWaNL6N3rDx cOT3YYw67JeQtokXxSmnppp6b0uMeh8aGwr+nWO51owqZ4a6o+rOBvlmQr9i61Gm2zGu 5c5bwN5dEC3PhbTXCKzZ7JdiMFEApaCzJvMQyeQWRyhFE3vXzCs2llLjkDQJDS54H+78 B8qeUdtj4adat90htAnZ1U2OU1WBJ48a5LagKSyMl07qgkYYgShaNZ4Gzx7vX3yewV14 fbiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ymMoNz5qdEctJKR5gTMO/j7sj6MPUGdTfbScS540nRY=; b=QO/TyygCa6++1zmsKQq6R8OmYkrkDYrPT+1atkeduh9ylnShTDmBMs4El0HUGLUTu5 rUKdqRow2CzgulceU9DAzIDrmUibukv/hZpuaWAGLzggJ+Fi3Od3LDfIxSlfze6rPpso QVIBX3TMTER62KCMfnmVk4SFa89qFeV9Zivoy+Bp5a2HVFNn6TQlc4a0Z6ZGyhVnH4b2 bpG46cLdL+hWrVQTlAxo0uaVtKqCDiuP12vCzqauAycw3Fr2V6MEgVhU09kJWSZyT3nj 8WOWQfqKnhM3VqgTCkfTnFGJMoOBFx1kCx+3W7RgzmYX1+iTjThT4LFHf8cZz53aJR7N 7CZg== X-Gm-Message-State: AJaThX69zXOjoIs1RHjQ2WioWkZKdr4Y5RTVk6i8D5MDs4lqHafqKGkL jwsvNq7sisQ5bPECCN/dBlA= X-Google-Smtp-Source: ABhQp+TRZV4AX/QSaAfuA4ZyEuQMXu+o454EizV6RcXajKejL1DRkILG0Vf4pQoTGuv63RxOWsWEWQ== X-Received: by 10.200.14.139 with SMTP id v11mr1921082qti.166.1510161855352; Wed, 08 Nov 2017 09:24:15 -0800 (PST) Received: from localhost.localdomain (va-67-233-122-109.dhcp.embarqhsd.net. [67.233.122.109]) by smtp.gmail.com with ESMTPSA id k43sm3151324qtc.75.2017.11.08.09.24.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Nov 2017 09:24:15 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, broonie@kernel.org, Vijendar.Mukunda@amd.com Date: Wed, 8 Nov 2017 12:24:02 -0500 Message-Id: <20171108172404.19118-2-alexander.deucher@amd.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171108172404.19118-1-alexander.deucher@amd.com> References: <20171108172404.19118-1-alexander.deucher@amd.com> Cc: tiwai@suse.de, Alex Deucher , lgirdwood@gmail.com, Akshu Agrawal Subject: [alsa-devel] [PATCH 1/3] ASoC: AMD: Make the driver name consistent across files X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Akshu Agrawal 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 BUG=b:62103837 TEST=boot and check for device in lsmod Signed-off-by: Akshu Agrawal Reviewed-on: https://chromium-review.googlesource.com/678278 Tested-by: Jason Clinton Reviewed-by: Jason Clinton Signed-off-by: Alex Deucher --- sound/soc/amd/Makefile | 4 ++-- sound/soc/amd/acp-pcm-dma.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/Makefile b/sound/soc/amd/Makefile index eed64ff6c73e..f07fd2e2870a 100644 --- a/sound/soc/amd/Makefile +++ b/sound/soc/amd/Makefile @@ -1,5 +1,5 @@ -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 diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index e19f281afeaa..13d040a4d26f 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -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);