From patchwork Mon Mar 8 22:18:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ward X-Patchwork-Id: 396113 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D4FFC433DB for ; Tue, 9 Mar 2021 07:05:17 +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 52D96652A4 for ; Tue, 9 Mar 2021 07:05:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52D96652A4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gatech.edu 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 C9A4817D5; Tue, 9 Mar 2021 08:04:24 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C9A4817D5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1615273514; bh=5NND8fD7aenwqPv48d7y96RipxSlAYKosA8+fm888Yc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=dLrfNK2XioKcufW5hEIY9a6WDqM7bL/4Sd1MxTJIjjxe3SqxzEuLrsdAyapK8tvbe ZqJ7v8bs/26avjhIOjRjEhZZk2cHwtdEjwoPWWXJdnlWONuJOCQkbcGyTWXjGaJdWi mgHsQZTg1MGiuD1LDXmeqHB9wyS0lJvppTi5/CzE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id DE0E1F80482; Tue, 9 Mar 2021 08:02:07 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F0074F8020D; Mon, 8 Mar 2021 23:20:30 +0100 (CET) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 A701AF8016C for ; Mon, 8 Mar 2021 23:20:19 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A701AF8016C Received: by mail-qk1-f178.google.com with SMTP id 130so11062578qkh.11 for ; Mon, 08 Mar 2021 14:20:19 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8wLOjkx8Aw550chRq6bfwY018S+0d9yEzCRGLO7c+iQ=; b=U0CbguTkA1oFIprH6jS2uU/LjC6paGcmdFhNuWT6NKh4Z3aC5eJJu5NWdwwoFo3lnR wIXGmf6Dtw/m5vllFAlmGw8GAWEO2YRgwLRGgaRgfAQ7IZTzD9GAkg5uiqiZI9gZ4Rqc qT7kkDsagXvLOiTZMXoDxpoSBVwEP31Zg6z0m/6YKle5Zedvs+HfTuNpXl/xnrFyW7bw CwCKPeTB/OTbQGyqAVaXur+87mO7jouumv5pqpepu7WSPsIq3VIufLos8Ad/7hLk8y72 MNf+ZKDPj3eygyBov2ju5M578XwVFGJ21mtoQMBLwybN+CjRMyFEUX71jWotHtc7n9Cj ONhw== X-Gm-Message-State: AOAM531UQkx7BeU+g7X1BZHIOlMVR/mCYFVTcSdFeAbC+Yar5J9oKQ+x RtzuemVtgRQ+BaFQJ+hHClE= X-Google-Smtp-Source: ABdhPJyS8AAwQdPfiGOCRS0IAxVVrVOhiSmcAytyZVzRDxD1L6MUq7d5NA65ij86KE7L9uJtRo2utQ== X-Received: by 2002:a37:630a:: with SMTP id x10mr22334583qkb.326.1615242018237; Mon, 08 Mar 2021 14:20:18 -0800 (PST) Received: from dpward-laptop.. ([2601:184:417f:5914::53e7:ddc3]) by smtp.gmail.com with ESMTPSA id y1sm8676722qki.9.2021.03.08.14.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 14:20:17 -0800 (PST) From: David Ward To: Oder Chiou , alsa-devel@alsa-project.org Subject: [PATCH 1/3] ASoC: rt286: Make RT286_SET_GPIO_* readable and writable Date: Mon, 8 Mar 2021 17:18:15 -0500 Message-Id: <20210308221817.12908-2-david.ward@gatech.edu> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210308221817.12908-1-david.ward@gatech.edu> References: <20210308221817.12908-1-david.ward@gatech.edu> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 09 Mar 2021 08:01:59 +0100 Cc: "Rafael J. Wysocki" , Bard Liao , David Ward 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" Otherwise, the GPIO configuration for the Dell XPS 13 9343 is not actually applied, so the headset microphone does not work. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=114171 Signed-off-by: David Ward --- sound/soc/codecs/rt286.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index f9b29782b62a..e16e7237156f 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -171,6 +171,9 @@ static bool rt286_readable_register(struct device *dev, unsigned int reg) case RT286_PROC_COEF: case RT286_SET_AMP_GAIN_ADC_IN1: case RT286_SET_AMP_GAIN_ADC_IN2: + case RT286_SET_GPIO_MASK: + case RT286_SET_GPIO_DIRECTION: + case RT286_SET_GPIO_DATA: case RT286_SET_POWER(RT286_DAC_OUT1): case RT286_SET_POWER(RT286_DAC_OUT2): case RT286_SET_POWER(RT286_ADC_IN1): From patchwork Mon Mar 8 22:18:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ward X-Patchwork-Id: 396808 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CCF0C433E0 for ; Tue, 9 Mar 2021 07:05:25 +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 CB1CF65295 for ; Tue, 9 Mar 2021 07:05:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB1CF65295 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gatech.edu 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 5EBEC17E5; Tue, 9 Mar 2021 08:04:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5EBEC17E5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1615273523; bh=Gehff9iHWGvx7ATHbSnmG8ZBKt+j59/AVy/KMFfBIis=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=pyidA2m80htM+zOnZ139ws6Nl0jFOqt3Otw2pIsee5Dttwb8sQLz//Vi19yjX+1N4 MGBlDzutAt0wM7FRzn/KelBXtpEPGkY97EnFYBuw7ZLIabKy8XIBqvJDYvx7DrOSa0 ldzlJS0066vMFzxEp7UoHbvDSOaS7pN4kEEgZKks= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 69478F804A9; Tue, 9 Mar 2021 08:02:09 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EA378F80217; Mon, 8 Mar 2021 23:20:35 +0100 (CET) Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (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 EF0F8F80139 for ; Mon, 8 Mar 2021 23:20:20 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EF0F8F80139 Received: by mail-qt1-f179.google.com with SMTP id j3so8785201qtj.12 for ; Mon, 08 Mar 2021 14:20:20 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kh63xNP2rFUorHbRt/iOikDoSbwbtGsuwnseqg/5ouI=; b=iuP1XuurEN9bOWe4CgQgu6Bxho+xGpAmrs32uKnF4ew1f9FvJ5QAYmSl6HRcuaQzph +1RuAkOYTB9IS59VQpHA3mpTU4byu1Ve9KqJOZAhYDGUoFrk94ftbuDD0zrI18XtLCx5 rr59R+p7IVtG5gBY24D0WnYcAAE8UzhXl3heZ2cbhjaTrIYQNF475txfZNPIdSpHzh3H nONNzf242iIVACPkG4sqXqkXEvHIDPOlr5+HELzlQq24IwpbqFJzVuMRBX5Q638DsD8e WLK2Dmb/zwS5vUpCxzU7Kthd4kj6iU3Yi6K4m8JjnM+DYI+/8+3wS67ZYKEfxpOrZXP8 AhBg== X-Gm-Message-State: AOAM533Trxp0dISOECu48qn6SN2LDWjnFI9WSTAi5vrGTHlVoDn+s/Ch EQvhzAunkTDbuzyhkouRhM4= X-Google-Smtp-Source: ABdhPJx5YE0IQ7xt/j2XQquGI//n6VXdEE1/FcFbXFJqfvw2u+1ZHql1sXfwR5W9kigXGw0coinv1Q== X-Received: by 2002:ac8:6695:: with SMTP id d21mr3134038qtp.269.1615242019475; Mon, 08 Mar 2021 14:20:19 -0800 (PST) Received: from dpward-laptop.. ([2601:184:417f:5914::53e7:ddc3]) by smtp.gmail.com with ESMTPSA id y1sm8676722qki.9.2021.03.08.14.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 14:20:19 -0800 (PST) From: David Ward To: Oder Chiou , alsa-devel@alsa-project.org Subject: [PATCH 2/3] ASoC: rt286: Handle all devices with ALC3263 codec Date: Mon, 8 Mar 2021 17:18:16 -0500 Message-Id: <20210308221817.12908-3-david.ward@gatech.edu> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210308221817.12908-1-david.ward@gatech.edu> References: <20210308221817.12908-1-david.ward@gatech.edu> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 09 Mar 2021 08:01:59 +0100 Cc: "Rafael J. Wysocki" , Bard Liao , David Ward 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" The ALC3263 codec on the Dell XPS 13 9343 is also on the Dell Latitude 7350 and the Dell Venue 11 Pro 7140. These require the same handling: GPIO pin 6 needs to be set for a headset or microphone to work in the combo jack. This is implemented for the HDA driver, which always sets GPIO pin 6 on the ALC3263. It is detected using the codec vendor/device ID 0x10ec0288 and the PCI subsystem vendor ID 0x1028 (Dell). Because the I2S codec driver doesn't use PCI, adapt this by using DMI to check if Dell is the system vendor. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=150601 BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=205961 Signed-off-by: David Ward --- sound/soc/codecs/rt286.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index e16e7237156f..c0129edf5993 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -1120,12 +1120,11 @@ static const struct dmi_system_id force_combo_jack_table[] = { { } }; -static const struct dmi_system_id dmi_dell_dino[] = { +static const struct dmi_system_id dmi_dell[] = { { - .ident = "Dell Dino", + .ident = "Dell", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9343") } }, { } @@ -1136,7 +1135,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c, { struct rt286_platform_data *pdata = dev_get_platdata(&i2c->dev); struct rt286_priv *rt286; - int i, ret, val; + int i, ret, vendor_id; rt286 = devm_kzalloc(&i2c->dev, sizeof(*rt286), GFP_KERNEL); @@ -1152,14 +1151,15 @@ static int rt286_i2c_probe(struct i2c_client *i2c, } ret = regmap_read(rt286->regmap, - RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &val); + RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &vendor_id); if (ret != 0) { dev_err(&i2c->dev, "I2C error %d\n", ret); return ret; } - if (val != RT286_VENDOR_ID && val != RT288_VENDOR_ID) { + if (vendor_id != RT286_VENDOR_ID && vendor_id != RT288_VENDOR_ID) { dev_err(&i2c->dev, - "Device with ID register %#x is not rt286\n", val); + "Device with ID register %#x is not rt286\n", + vendor_id); return -ENODEV; } @@ -1183,8 +1183,8 @@ static int rt286_i2c_probe(struct i2c_client *i2c, if (pdata) rt286->pdata = *pdata; - if (dmi_check_system(force_combo_jack_table) || - dmi_check_system(dmi_dell_dino)) + if ((vendor_id == RT288_VENDOR_ID && dmi_check_system(dmi_dell)) || + dmi_check_system(force_combo_jack_table)) rt286->pdata.cbj_en = true; regmap_write(rt286->regmap, RT286_SET_AUDIO_POWER, AC_PWRST_D3); @@ -1223,7 +1223,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c, regmap_update_bits(rt286->regmap, RT286_DEPOP_CTRL3, 0xf777, 0x4737); regmap_update_bits(rt286->regmap, RT286_DEPOP_CTRL4, 0x00ff, 0x003f); - if (dmi_check_system(dmi_dell_dino)) { + if (vendor_id == RT288_VENDOR_ID && dmi_check_system(dmi_dell)) { regmap_update_bits(rt286->regmap, RT286_SET_GPIO_MASK, 0x40, 0x40); regmap_update_bits(rt286->regmap, From patchwork Mon Mar 8 22:18:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ward X-Patchwork-Id: 396112 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34943C433DB for ; Tue, 9 Mar 2021 07:06:00 +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 81A3865295 for ; Tue, 9 Mar 2021 07:05:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81A3865295 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gatech.edu 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 00A8A17E9; Tue, 9 Mar 2021 08:05:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 00A8A17E9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1615273558; bh=OptlZg6irweDLctm99cGstYl95Oy0uWL8IJIiBiSFNI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=IdaZ1GmMovM/UKCdEKntI9yAheR3sUpmD7xH04vbX4NWjlrOini28Fm+ZDDuPON7y Q0F/wOjsgNgQxmFzKtU0gr+RxQiYemYsK050l2Mrkp1UK8ZetFsNT5KU/iRnh9uvfm XX8GQ0uqDnTeHNRLN1j+QFcqs1Z0LgrG4xgnCdPc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7B597F804AF; Tue, 9 Mar 2021 08:02:10 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 009DCF80139; Mon, 8 Mar 2021 23:20:35 +0100 (CET) Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (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 0C7E3F801D8 for ; Mon, 8 Mar 2021 23:20:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0C7E3F801D8 Received: by mail-qk1-f175.google.com with SMTP id z190so11072598qka.9 for ; Mon, 08 Mar 2021 14:20:21 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2nLGhU249ZcCP41v2AJxxfRKP+1L9wkodIps38S1Daw=; b=ZICvejszlSQfBDGsqoxmicnBpbnPEqjr9UVE76g4pVEM//kaqws9e/9NhbW2Lh5mIG RiJhxgZUV8o1M3IBCwmyCw+ufsyGAAZzs31P5NZmX0EOrCNCtuvU4tmbjagPPBohp49s jMK40SgMH5JrmP0dXZjMK08N5/LQcm3YYltgXCcjHqoerPZE7Fbg2aOS+9y7qg3Qhb9h 0yJQvinuVocwATNx8lUnsosr/S08yzbe0vDT7oPtm+zOpgQeHlArBP3CzeUI9kqEa531 EB1fKfJGxK++oRxo0DfuKocZbW3wM6Ve1sUIRrA+i9v0bWjTo9bfmbKws65vQBfqsbI8 hjMw== X-Gm-Message-State: AOAM533WuS7hkMjM+ZfOOHcQj6tpakgam3GWj7Bke8DuXCmkMAG187ws fh587A1g0ryr28pViO4FiXk= X-Google-Smtp-Source: ABdhPJxZZkNlwdpEdg5eSzwb7QmqKDFtwZRFwL1HSRj+FmieLqM/u98NqPXzCamN/MJa9PmTrM+fhQ== X-Received: by 2002:a05:620a:20db:: with SMTP id f27mr23557222qka.51.1615242020625; Mon, 08 Mar 2021 14:20:20 -0800 (PST) Received: from dpward-laptop.. ([2601:184:417f:5914::53e7:ddc3]) by smtp.gmail.com with ESMTPSA id y1sm8676722qki.9.2021.03.08.14.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 14:20:20 -0800 (PST) From: David Ward To: Oder Chiou , alsa-devel@alsa-project.org Subject: [PATCH 3/3] ASoc: rt286: Handle headphones in combo jack correctly Date: Mon, 8 Mar 2021 17:18:17 -0500 Message-Id: <20210308221817.12908-4-david.ward@gatech.edu> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210308221817.12908-1-david.ward@gatech.edu> References: <20210308221817.12908-1-david.ward@gatech.edu> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 09 Mar 2021 08:01:59 +0100 Cc: "Rafael J. Wysocki" , Bard Liao , David Ward 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 headphones are detected in the combo jack instead of a headset, set the index register RT286_CBJ_CTRL1 to the correct value (from the HDA driver). Signed-off-by: David Ward --- sound/soc/codecs/rt286.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index c0129edf5993..7e67165a43e6 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -260,6 +260,12 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) else *mic = false; } + + if (!*mic) { + regmap_update_bits(rt286->regmap, + RT286_CBJ_CTRL1, 0xfcc0, 0xc400); + } + regmap_update_bits(rt286->regmap, RT286_DC_GAIN, 0x200, 0x0);