From patchwork Fri Nov 2 11:24:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 150027 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1952086ljp; Fri, 2 Nov 2018 04:25:23 -0700 (PDT) X-Google-Smtp-Source: AJdET5eO1tNGGH0q9MEYegNsYg9s+KPlrpB824PJP35B0o9NuMh5UdfqHoMfPu0smctyLvUBekqP X-Received: by 2002:a1c:1a48:: with SMTP id a69-v6mr404140wma.9.1541157923581; Fri, 02 Nov 2018 04:25:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541157923; cv=none; d=google.com; s=arc-20160816; b=b2i3qoHLDyFk7sEg40Y+itWd0O06JtRva0kYFDgtlgRuwWAJ8f6cfjc74h65n3ud8J pyY2zNRtIac1EF/m4h3v7z0V3EOgMzbPCyKHhB27yaRx5Gcf2IgJX8U4rKkGOxBmxDJe pG5a9hnGS8FmVvjXs5ohzySfonVvhvk/OPMypsrhhdyRlGp5/WloKOU3fcIb3fktDuDb 6eW+X22UOaiNwYHqIYU/BnedWjLE0PkQaPu4px6JPl2lO6IraLyJSD0+QYOgaCOZSYG2 KtsOAnBm6M4BCdzN7RgpwDrzxVe+xCvL7JnQ+r3MvpxwY9vvUx5NTUrVF3R3696gIoc/ pFNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to; bh=y6p6HNbKFZu2No5Vin42156tH2O8QUeCVTR61qKHxaY=; b=C7uxJVK58a8aVdCToLdyf1RL3eQ14cAGBKSmmGLJ56RdGUnc4mijrbsyn+DR6cadkA pkToUwBRWNbKOnc9uu8BdURp59KW5klp8UYTYw+TZwNyaZdkH4BQc8vz54rWpGq7aJ8r gfcWQY8xGtEVnrWtowuEXR5hde3BBAbYeFFlgPLS2O/Q4IZl7rJoV0LG8RizBLtQol+N P3W3zMdhDnZllWzGVxGmFjPa1TBPN02mhd7j8JKRrKgypjODwlhiahimsehTWBqInOtv EOTGzpFCA2qTxR9BsBBHcnD52MCCfRx9rTnJ56MD/DoCIv0tny+lz038rwU2KnCezUSC PCFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id q10-v6si24996717wrs.3.2018.11.02.04.25.23; Fri, 02 Nov 2018 04:25:23 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9A0C2267955; Fri, 2 Nov 2018 12:25:17 +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 949F726796C; Fri, 2 Nov 2018 12:25:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by alsa0.perex.cz (Postfix) with ESMTP id D2C60267950 for ; Fri, 2 Nov 2018 12:25:13 +0100 (CET) Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MRnXY-1g88X32I4w-00THDc; Fri, 02 Nov 2018 12:24:59 +0100 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MRnXY-1g88X32I4w-00THDc; Fri, 02 Nov 2018 12:24:59 +0100 From: Arnd Bergmann To: Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown Date: Fri, 2 Nov 2018 12:24:08 +0100 Message-Id: <20181102112456.780127-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:T80YnorbcQmUCUVvOwTXqWgrMAg7L9NqE6kXrUEsq+B/vtI+lNc /0u4xWCI0CcGxoSz3Vg9AOL6tJwP4hdu6sD5glr91H9ZiCSCLEBq1bD4NF7IkIxgDqxY60W t+m0LuaxxC8ccQcH+mk66dJDbsKlDXTwUiGZBYW51dc0Zwi3ex5rRtYA1L0CG4LFG35A1BA 5RJ7AYhrruBfRRH6uWEOw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ES2BeJGS/3g=:XF7xhICaacYvmwM3sTBSHg I6rHV18XN8DC67EHfN2QHkOiNAc1angFCudLTJmtMzYaoueA7h4Z8jPfDf6mff6uknc2GeFO7 bNk27pdtagJlPloYvCx1c73J/Gx0+vjHOMp1G5Cc0cFjjaXhOllQZh6NReHAXPtKk4C1WWYdA GIsnIlFNtSgLUlpilJgaS7GqB42DJRNr63GvJsNOESs8aR+97zKLNUpev0x/DbGXnAL9C8Sxn oYfZET6yOpV2KxIlaO4xqoFRntHuWvwViBMCBzhMi8LYBX+oxRmAUXxhprw93vdCSb74rhAi3 T0kZO0kLKCig9kWftUB1IhZrq8uWJ6f417xeqlouRDvb/KJGM8a/ykhZ/5O3S889kyKCuKk5t 2fojkenuGAfaEhQj7xH2qIvE+hAmE6DlnO3PbVyfZvFUGUpH49IsPCCkvOfUYcLveWYfpxeze Bb5ktAxikFGLSJ3FS2mfOJHbQ6AoBh5LgQlT2bCwwJAJMXeNV6vsuWuoDK5a8IE5CHbqt/qnw Kgli3QVEIH6o5BJU+RiOzK/MSfP13qgf5VXJge6Sp78ZuE7Vll/RpyFg0PDd2XeI6DP5MxUq4 BWjyAEaogmkVuflAvYHIlT8lDs2VkAZqTQMYlobnZwvMo5SibIWJ/YP9bvv6WE0XPLiRY28Ze xckTymZeIALBqFM/PdkogY+h15FrD+J5aeS3dZz8cX30hpjKGrlcVio7vxl09jruvPUis4EUz UD1rCYhmxc+c2EcwZ0aEleu92HcZ7Tne9bvBMP634geZUVEQ1ZtSlaGrGEpIM2+vC+8L7BtrS xP32Guk Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Sriram Periyasamy , Guneshwor Singh , Takashi Iwai , Vinod Koul , Rakesh Ughreja , Pankaj Bharadiya , Naveen Manohar , Sanyog Kale , Andy Shevchenko , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH] ASoC: skl: always select SND_SOC_HDAC_HDA 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 The skylake sound support is written to work both with or without CONFIG_SND_SOC_HDAC_HDA, and uses an #ifdef to decide whether it should link against that. However, this fails with SND_SOC_ALL_CODECS=m or SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m when the Skylake support itself is built-in, with this link error: sound/soc/intel/skylake/skl.o: In function `skl_probe': skl.c:(.text+0x56c): undefined reference to `snd_soc_hdac_hda_get_ops' Using an explicit 'select' here simplifies the logic and prevents it from happening, at the cost of always including the compile time dependency. Signed-off-by: Arnd Bergmann --- sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/skl.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 0caa1f4eb94d..c21ce7624af1 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -109,6 +109,7 @@ config SND_SOC_INTEL_SKYLAKE depends on PCI && ACPI select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER + select SND_SOC_HDAC_HDA select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST select SND_SOC_ACPI_INTEL_MATCH diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 29225623b4b4..1069ee265ce5 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -870,9 +870,7 @@ static int skl_create(struct pci_dev *pci, hbus = skl_to_hbus(skl); bus = skl_to_bus(skl); -#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDA) ext_ops = snd_soc_hdac_hda_get_ops(); -#endif snd_hdac_ext_bus_init(bus, &pci->dev, &bus_core_ops, io_ops, ext_ops); bus->use_posbuf = 1; skl->pci = pci;