From patchwork Fri Jan 3 23:34:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Curtis Malainey X-Patchwork-Id: 11317535 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69DB3138D for ; Fri, 3 Jan 2020 23:35:44 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80BD9222C3 for ; Fri, 3 Jan 2020 23:35:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="LIgQqvyc"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="AdDUVBka" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80BD9222C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2C2221780; Sat, 4 Jan 2020 00:34:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2C2221780 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1578094541; bh=y24ibNwu59NghVMulc/iDRulRbMe8iGmoWHpMUymlxM=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=LIgQqvycocBO0ThxUEFLO5fcHMKGXzr0UV6qKXvpFBTN4w60ZnPfE0TAbbsuPRsxM BzUGEMcn+8jN3I6I5yov3aXA/W3nHKcukIEFn9qJhiyTjjbqPchSDiyxnJxhmc03Nj 7oHL+59GpUhZ98WR1pWLAlte3ortbafmPCCzIz14= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9ADEDF8015C; Sat, 4 Jan 2020 00:34:50 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id B63EEF8015D; Sat, 4 Jan 2020 00:34:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 53757F8013E for ; Sat, 4 Jan 2020 00:34:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 53757F8013E Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="AdDUVBka" Received: by mail-pg1-x544.google.com with SMTP id q127so24064960pga.4 for ; Fri, 03 Jan 2020 15:34:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ecAAqTTQEDsJhq1d+GQeh/so67WQS1s8AlS7zowLxCI=; b=AdDUVBkafB2Jykix7nUumiXV1CiNDBqmBeYyBep89Myp/9vTmDXDTP8YK6sGJU2M2Q gazpp1k/0A6raFhM9Fa4iaTx5CqTyZ258tiCmbY+qWjIQvtf5K4yzwZHZI6nEOVyduJf 4LWp5dG34vdq0C9gMX2sAsYtXVYTNhSXjvCb4= 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:mime-version :content-transfer-encoding; bh=ecAAqTTQEDsJhq1d+GQeh/so67WQS1s8AlS7zowLxCI=; b=eMf1tcvbymSerOJg8Qb3WGQfQGZfO4LIkJj6/JorbxDjhcUoqzShfLqjKR8gGF+cmk 3OAkQsGKnAhTn3lrVLYBqzrh/X6ra9d+5Qgo+EZbs2UUz9iRVegBL5PgyOfd57Gf6pY9 Uwu+tOw5+KxK0M8xOdZI+8x3aHp0VGrTc+5K3YRTq2ccu+WivTguR2cVu601QPS6CkQO 6llEx+PkbeLQO6zbKCmMcmXm2/VAVs0qNUcwMGZ98pxKcWIV/VVuO4GcXqytPejHDycl 4Y8nmYHY/POwX8Zp89T5DDXYURC+2E5UQtyyXgROz8DpSpnjiiiF7IlN78l+l3zuZ2KQ tU3w== X-Gm-Message-State: APjAAAWnx2zM4s/o+4IHLELc/lrQq0CvSXDYlfuZSkmhBW7GLn1YVYsN muyGFxS7+XhXBMq+Nj7QNwDM0GN/kQ== X-Google-Smtp-Source: APXvYqzuQCZ+dSfjMG6Sy3Rt29INVsCzEfqR56eOT09vzs9UnB6kn5FBS2tna+tZehGRTT44CkfFAQ== X-Received: by 2002:a62:a515:: with SMTP id v21mr98240158pfm.128.1578094482563; Fri, 03 Jan 2020 15:34:42 -0800 (PST) Received: from localhost ([2620:15c:202:201:c87a:31ae:9107:f63d]) by smtp.gmail.com with ESMTPSA id j125sm67774804pfg.160.2020.01.03.15.34.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 03 Jan 2020 15:34:42 -0800 (PST) From: Curtis Malainey To: alsa-devel@alsa-project.org Date: Fri, 3 Jan 2020 15:34:00 -0800 Message-Id: <20200103233401.160654-1-cujomalainey@chromium.org> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog MIME-Version: 1.0 Cc: Cezary Rojewski , Kuninori Morimoto , Ben Zhang , Jie Yang , Takashi Iwai , Pan Xiuli , Pierre-Louis Bossart , Liam Girdwood , Alexios Zavras , Mark Brown , Greg Kroah-Hartman , Curtis Malainey , Thomas Gleixner Subject: [alsa-devel] [PATCH] ASoC: bdw-rt5677: add spi driver compile switches X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" If the SPI driver is not compiled in then the RT5677_SPI driver will not be included as well which will cause the bdw-rt5677 driver to fail to probe since the DSP components are managed by the RT5677_SPI driver. The solution is to remove them when the driver is not present as part of the build. Signed-off-by: Curtis Malainey Cc: Pierre-Louis Bossart CC: Pan Xiuli --- sound/soc/intel/boards/bdw-rt5677.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 2af8e5a62da84..d5ded2c545d2c 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -74,11 +74,13 @@ static const struct snd_soc_dapm_route bdw_rt5677_map[] = { /* CODEC BE connections */ {"SSP0 CODEC IN", NULL, "AIF1 Capture"}, {"AIF1 Playback", NULL, "SSP0 CODEC OUT"}, +#if IS_ENABLED(CONFIG_SND_SOC_RT5677_SPI) {"DSP Capture", NULL, "DSP Buffer"}, /* DSP Clock Connections */ { "DSP Buffer", NULL, "SSP0 CODEC IN" }, { "SSP0 CODEC IN", NULL, "DSPTX" }, +#endif }; static const struct snd_kcontrol_new bdw_rt5677_controls[] = { @@ -319,6 +321,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { SND_SOC_DAILINK_REG(fe, dummy, platform), }, +#if IS_ENABLED(CONFIG_SND_SOC_RT5677_SPI) /* Non-DPCM links */ { .name = "Codec DSP", @@ -326,6 +329,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .ops = &bdw_rt5677_dsp_ops, SND_SOC_DAILINK_REG(dsp), }, +#endif /* Back End DAI links */ {