From patchwork Wed Jan 2 19:39:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 10746661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B67F414DE for ; Wed, 2 Jan 2019 19:42:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A03ED27F94 for ; Wed, 2 Jan 2019 19:42:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E05227F9F; Wed, 2 Jan 2019 19:42:04 +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.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham 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 312CB27F94 for ; Wed, 2 Jan 2019 19:42:03 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2E262267BFC; Wed, 2 Jan 2019 20:42:02 +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 8FBC0267C02; Wed, 2 Jan 2019 20:41:59 +0100 (CET) Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [85.215.255.50]) by alsa0.perex.cz (Postfix) with ESMTP id 06B27267B31 for ; Wed, 2 Jan 2019 20:41:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1546458117; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=bd6AReIogEGdNbJdyjFTR261dt9FLTLog+Xyzy36ggE=; b=jrDkHN5TYzLfj6bo6I28WLanzk2l6FxkrMYoEy71ZTWmZyRY4sJIZ1DIwAltoVWiIv v76lk5L8lE4yY9DhT/jvax5Z/vF6YH6mRWdkUL2Dh78rNQs9+MFJKpg8OjkBQFbDF2yI 6+2tHJbyO09f6inPz0T2V5QtBwUU/dJY8BzmkWrazQRzLc8assCMaWG+y6lOJoATzBAr ozSF48eX5YkJrW1yoCHfBm4ag2lh6z++ZWZnXfmWxFUGbV5AXe9mP6fQluSh3HvV5+TH aZg5qLSU3pqob4zP5IH7Ij7r2HzdTKNq5J1Oiv7slw0d5jnPCKDiNRJGJbm0vIFI5veV MY4Q== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXQ7IOGU5qzCBxbN3sROm3" X-RZG-CLASS-ID: mo00 Received: from localhost.localdomain by smtp.strato.de (RZmta 44.9 AUTH) with ESMTPSA id K07128v02JfvHvp (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Wed, 2 Jan 2019 20:41:57 +0100 (CET) From: Stephan Gerhold To: Pierre-Louis Bossart , Mark Brown Date: Wed, 2 Jan 2019 20:39:06 +0100 Message-Id: <20190102193904.50123-2-stephan@gerhold.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190102193904.50123-1-stephan@gerhold.net> References: <20190102193904.50123-1-stephan@gerhold.net> MIME-Version: 1.0 Cc: Liam Girdwood , Hans de Goede , alsa-devel@alsa-project.org, Jie Yang , Stephan Gerhold Subject: [alsa-devel] [PATCH v2 2/3] ASoC: Intel: sst: Fallback to BYT-CR if IRQ 5 is missing 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Some devices detected as BYT-T by the PMIC-type based detection have only a single IRQ listed in the 80860F28 ACPI device. This causes -ENXIO later when attempting to get the IRQ at index 5. It turns out these devices behave more like BYT-CR devices, and using the IRQ at index 0 makes sound work correctly. This patch adds a fallback for these devices to is_byt_cr(): If there is no IRQ resource at index 5, treating the device as BYT-T is guaranteed to fail later, so we can safely treat these devices as BYT-CR without breaking any working device. Link: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-December/143176.html Signed-off-by: Stephan Gerhold --- Changes in v2: Always run pmic-based detection, apply fallback last (if it wasn't positive). sound/soc/intel/atom/sst/sst_acpi.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index 9eaac450f864..ae17ce4677a5 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -255,8 +255,9 @@ static int is_byt(void) return status; } -static bool is_byt_cr(struct device *dev) +static bool is_byt_cr(struct platform_device *pdev) { + struct device *dev = &pdev->dev; int status = 0; if (!is_byt()) @@ -285,6 +286,17 @@ static bool is_byt_cr(struct device *dev) } else { dev_info(dev, "IOSF_MBI not available, no BYT-CR detection\n"); } + + if (platform_get_resource(pdev, IORESOURCE_IRQ, 5) == NULL) { + /* + * Some devices detected as BYT-T have only a single IRQ listed, + * causing platform_get_irq with index 5 to return -ENXIO. + * The correct IRQ in this case is at index 0, as on BYT-CR. + */ + dev_info(dev, "Falling back to Baytrail-CR platform\n"); + return true; + } + return false; } @@ -331,7 +343,7 @@ static int sst_acpi_probe(struct platform_device *pdev) if (ret < 0) return ret; - if (is_byt_cr(dev)) { + if (is_byt_cr(pdev)) { /* override resource info */ byt_rvp_platform_data.res_info = &bytcr_res_info; }