From patchwork Thu Sep 14 15:25:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 139909 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp693193vqi; Thu, 14 Sep 2023 16:41:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEToFqVDgcBuW4UTvaPMzs/2Lrof+MUmbBh3iWev8eRjwaCWGydsh+UxogbEUPrVkZ3D51E X-Received: by 2002:a17:903:2345:b0:1c3:a4f2:7cc1 with SMTP id c5-20020a170903234500b001c3a4f27cc1mr28111plh.5.1694734895785; Thu, 14 Sep 2023 16:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694734895; cv=none; d=google.com; s=arc-20160816; b=g+Pl8MSmtCQPd56ZIwVkCS3Q9fJqZpc2hKWZXw+3gDn/wCL2+f7EKEA/Rmik9Kfo+D RFSkZ0V2eM5QQc26XI+HDye+7B87Ds7yCJggkSyT+bX41AK1p0D2jILwvuhJmjWyfKGX BzofxI0zm6DRDyeFPC98cWovnjF/SQ0YUWUQFS5wMm3oczNmU/VnXlWqnsataMSjNdbA 1X4XKWR4zQ4U9GXkrMIV3W1qMnYiogwes4dETAfVKlt3/QisrX0ZRlCvBeAygYwMnmRJ 2eezVZPKjihSFGO4xo2qkMu1BOqdqLdnxIk38HorkHNaw283KZro+LHy19gqkDzv6wnf 67kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=qygg2TVwFG6lKmZeeKC9INbE7+tFtemrFvcVvzZt+To=; fh=SyhPsGKNo/JGCZgOgs8oor82YQAWZ9kc5f/0PFOAxm0=; b=sYCG6mbaErLIoCBD5o6TnwyTjAG69ADrEOpRjK5pH47CiMB1eCwBQbtxG+H0gVJFRt XRgNqZhV4h6vMDmKnqqo6AM7TzbeGn9eULd9T/CwOV1u+T/6qq4auuIEmFnCjjFHO5ED HPMaVa2UCx0NbU/JFHdCjFagz1G2Qdbxjlen1g31KZnhdbKdaDt6JGCGt1NA6K6bIfdB +JnnegWUxF7OnOUIGu6kkAsvj7bqVPvIz0L45WdlPA1kJb6jdkhswbaB+yrhSYhAzrCY JdkYR9kWL6YE/a4iNrMz4v2YpxtzemGyXfTC9tM3fyOWgZ2Fq44oxybF+MyUXqnO7G1U r7xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=qi+ZUMqO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u6-20020a170903124600b001bbc7b6492fsi2529840plh.8.2023.09.14.16.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 16:41:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=qi+ZUMqO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B0D0781E14E5; Thu, 14 Sep 2023 08:25:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240873AbjINPZk (ORCPT + 35 others); Thu, 14 Sep 2023 11:25:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235048AbjINPZk (ORCPT ); Thu, 14 Sep 2023 11:25:40 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA35DC6 for ; Thu, 14 Sep 2023 08:25:35 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 38ECunMr020490; Thu, 14 Sep 2023 10:25:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=q ygg2TVwFG6lKmZeeKC9INbE7+tFtemrFvcVvzZt+To=; b=qi+ZUMqO1tU9ij+0V q5mfM2KtEBchrQTsq7seqoCFLjCKcjm+SFrzGAdgLhQqjy98CzRPVv8oo4SY1aLH vW1OdwLMZUwSbCkfV1bOt7mINd+t+w0Dd8PtqLZuKxY3KzOeDzLCL1/TsS7Bicq5 BW6v57nqHwhdVeiNoiHt2zdNxwcBuZqQdNMAsyEHrvfUqDtP+8+SVQgYiqlIJwNK +u8Qlu2wG0KUwCwxd020b01ZHh3sO2Blg0x+NEINStyYH5d/++1dmChKSpkF/UBC +bq4ZTP72TYMfyX9J54+V8cV5CBPxcmlBotpen3Fsu1Cml5a/EYFMcgWWgo+FCGQ 9tqPA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3t2y7sj9g5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Sep 2023 10:25:28 -0500 (CDT) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Thu, 14 Sep 2023 16:25:27 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.37 via Frontend Transport; Thu, 14 Sep 2023 16:25:27 +0100 Received: from EDIN4L06LR3.ad.cirrus.com (EDIN4L06LR3.ad.cirrus.com [198.61.65.215]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id E561F3563; Thu, 14 Sep 2023 15:25:26 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Richard Fitzgerald Subject: [PATCH v2] ALSA: hda: cs35l56: Fix missing RESET GPIO if _SUB is missing Date: Thu, 14 Sep 2023 16:25:25 +0100 Message-ID: <20230914152525.20829-1-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Proofpoint-GUID: hvb46J8ibE00wLVH5auGSVmnOad4e6AQ X-Proofpoint-ORIG-GUID: hvb46J8ibE00wLVH5auGSVmnOad4e6AQ X-Proofpoint-Spam-Reason: safe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 14 Sep 2023 08:25:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777058338158689525 X-GMAIL-MSGID: 1777058338158689525 In cs35l56_hda_read_acpi() do not return if ACPI _SUB is missing. A missing _SUB means that the driver cannot load a system-specific firmware, because the firmware is identified by the _SUB. But it can fallback to a generic firmware. Unfortunately this was being handled by immediately returning 0, which would skip the remaining ACPI configuration in cs35l56_hda_read_acpi() and so it would not get the RESET GPIO. Signed-off-by: Richard Fitzgerald Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") --- sound/pci/hda/cs35l56_hda.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c index bc75865b5de8..87ffe8fbff99 100644 --- a/sound/pci/hda/cs35l56_hda.c +++ b/sound/pci/hda/cs35l56_hda.c @@ -865,15 +865,13 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int id) sub = acpi_get_subsystem_id(ACPI_HANDLE(cs35l56->base.dev)); if (IS_ERR(sub)) { - /* If no ACPI SUB, return 0 and fallback to legacy firmware path, otherwise fail */ - if (PTR_ERR(sub) == -ENODATA) - return 0; - else - return PTR_ERR(sub); + dev_info(cs35l56->base.dev, + "Read ACPI _SUB failed(%ld): fallback to generic firmware\n", + PTR_ERR(sub)); + } else { + cs35l56->system_name = sub; } - cs35l56->system_name = sub; - cs35l56->base.reset_gpio = devm_gpiod_get_index_optional(cs35l56->base.dev, "reset", cs35l56->index,