From patchwork Fri Nov 3 20:35:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10041179 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 A954A6032D for ; Fri, 3 Nov 2017 20:36:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C00528632 for ; Fri, 3 Nov 2017 20:36:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90B2F29920; Fri, 3 Nov 2017 20:36:03 +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=-2.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D99028632 for ; Fri, 3 Nov 2017 20:36:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 097726EB24; Fri, 3 Nov 2017 20:36:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id B626D6EB22; Fri, 3 Nov 2017 20:35:58 +0000 (UTC) Received: by mail-io0-x242.google.com with SMTP id 134so8966643ioo.0; Fri, 03 Nov 2017 13:35:58 -0700 (PDT) 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=ntn9NzOQUEQy892uLFJU89OO9N32PnAr9S0Uv6Lb2Vg=; b=T0dLUe+OMmhu31Uvn3bqPz6VefQdjZ9We8kHu0gahwiimejO3+6r51HpbYw5GZne4t hNeaU6fzoZtfowyaxwtQDD3fSHEO7iluKyzMVFce4OlBx5o6RX5nh4zL2mCiqHDVF9Xf bkb4N8Rep4rpgT2KgJyOP/nY3hmvC30wWLNVbzkwI7RHY54dF7UOScZ6ANoeAVHDJnKs NUnmQaqJ+zY3dczrDPd17THKBhrUX0ANLI5PKONAA0lv8nL8IrWyOVqk2OzSeSFLxTPH RYPb/o+I0dc+xjiLS+nqk08ALIN9OimbJcUy+W96Q7hWV+ii92gle0aA+QQQNEbCHmzB /MaQ== 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=ntn9NzOQUEQy892uLFJU89OO9N32PnAr9S0Uv6Lb2Vg=; b=cJhVDcI3YHgx38X/oPIma9G+Lt/wIBTreBQO+WiMCQmgnnhQg2Mc5QGnMUn0dEhsIc dSuAyNfaZuJ/c4yhm21V8Y+5UTXnaCLVLUJ2j52SOzjUbFZjJnn0AnhQtBhuVGecL1xl Jb6OTquFHK0HNQKdr+f4AiwSGmgGhSKFJOc9NSpnuZVsc5NQ8z2VfzV/6fRlEn0FHA+0 hYUPrbcKPcOpESW96b4MeAkGstBYPniYqDfsnVkxE6dTYbF3DbpPue+29p0JhzsEC1fM d8YcA9fIRIPy/VI9yN+w+HE0dgVma81eg/HOBNRLkJ38Iw69qTYACKb+aKdfmnU3gMHZ /6jg== X-Gm-Message-State: AMCzsaWtLDZZGUFOJB+Hbvkk4d5HuyoEkHfJ1pDRg7XHSsMQm/y5DgTZ 9QSPO+6pfPYOLZeZoNJEs9OXZw== X-Google-Smtp-Source: ABhQp+RIIVEUmOotTjILbJh6d9ACPzFqkakbQJpJs9bfwdTOF9d9CmsAZCYDI5aJcgufPy14brop/Q== X-Received: by 10.107.111.14 with SMTP id k14mr9683704ioc.282.1509741357883; Fri, 03 Nov 2017 13:35:57 -0700 (PDT) Received: from cm.amd.com ([165.204.55.251]) by smtp.gmail.com with ESMTPSA id y16sm1571946ita.11.2017.11.03.13.35.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Nov 2017 13:35:57 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, airlied@gmail.com, alsa-devel@alsa-project.org, broonie@kernel.org, Vijendar.Mukunda@amd.com Subject: [PATCH 2/3] ASoC: AMD: Make the driver name consistent across files Date: Fri, 3 Nov 2017 16:35:44 -0400 Message-Id: <1509741345-1589-3-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1509741345-1589-1-git-send-email-alexander.deucher@amd.com> References: <1509741345-1589-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher , lgirdwood@gmail.com, Akshu Agrawal X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 eed64ff..f07fd2e 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 e19f281..13d040a 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);