Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6027C61DA4 for ; Thu, 9 Mar 2023 10:43:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230021AbjCIKnV (ORCPT ); Thu, 9 Mar 2023 05:43:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230509AbjCIKmu (ORCPT ); Thu, 9 Mar 2023 05:42:50 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1A4B4DE05 for ; Thu, 9 Mar 2023 02:41:37 -0800 (PST) Received: from cryzen.lan (cpc87451-finc19-2-0-cust61.4-2.cable.virginm.net [82.11.51.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: tanureal) by madras.collabora.co.uk (Postfix) with ESMTPSA id 7F9956600367; Thu, 9 Mar 2023 10:41:36 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1678358496; bh=rDJinSTUl2SsH8QxrfLak8PdCTIdyoUhmTvkTCGkzYo=; h=From:To:Cc:Subject:Date:From; b=fQJfGcZyxHN9NztsOTxKsUDBJzvCBZkVDSAAIKlQDt9L7iXyQeJ4AMHAt6gQrr512 M53fwrObR19IFUblv8aG6YmKgUJUmgdKYaqxtPhhQNJ+W/+QqC5bSnCitbbLxkNs0f qoF5sGNGHeY9cKWGqXYFvs+BsbcmgQt6MPE3UK5XxBhcHrSTsYFXDHwYpingZRLsT8 3ob296muTtPud5Cb6B+q+OsCoRejKQiq5GiEwPI6nqsSSCh1IQwKNm7ACoFEuMOxCU xtsVV7SiVaN0KjlJXrJRYf3VhFUcPZdLOftRYP56pc95gQKEbkzm2GoxkRdyQHT/b5 7SKOk8J6sD6qg== From: Lucas Tanure To: David Rhodes , Charles Keepax , Liam Girdwood , Krzysztof Kozlowski , Mark Brown , Rob Herring , Jaroslav Kysela , "Takashi Iwai --cc=alsa-devel @ alsa-project . org" Cc: patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, kernel@collabora.com, Lucas Tanure Subject: [PATCH v4] ASoC: cs35l41: Steam Deck Shared boost properties quirk Date: Thu, 9 Mar 2023 10:41:33 +0000 Message-Id: <20230309104133.537056-1-lucas.tanure@collabora.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for Steam Deck bios old properties. If a Steam deck didn't upgrade the BIOS, the driver should be able to handle the previous properties for shared boost types. Signed-off-by: Lucas Tanure Acked-by: Charles Keepax --- Changes since V3: - Fixed missing space in if statement - Fix the build issue, as dependency patches are already merged Changes since V2: - sent the wrong patch with missing fixed lines Changes since V1: - else in same line as { --- sound/soc/codecs/cs35l41.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 1624510d09c0..2803ff0f0003 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -1022,9 +1022,15 @@ static int cs35l41_handle_pdata(struct device *dev, struct cs35l41_hw_cfg *hw_cf unsigned int val; int ret; - ret = device_property_read_u32(dev, "cirrus,boost-type", &val); - if (ret >= 0) - hw_cfg->bst_type = val; + if (device_property_read_bool(dev, "cirrus,shared-boost-active")) { + hw_cfg->bst_type = CS35L41_SHD_BOOST_ACTV; + } else if (device_property_read_bool(dev, "cirrus,shared-boost-passive")) { + hw_cfg->bst_type = CS35L41_SHD_BOOST_PASS; + } else { + ret = device_property_read_u32(dev, "cirrus,boost-type", &val); + if (ret >= 0) + hw_cfg->bst_type = val; + } ret = device_property_read_u32(dev, "cirrus,boost-peak-milliamp", &val); if (ret >= 0) -- 2.39.2