Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3753858pxv; Mon, 26 Jul 2021 11:06:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwL+JYt0rPeS7QnUA3RcMYd9KMHj+2bThgB7kKm+UZlpdQv8qPDbqnAlS61v1k1KjCe/AHI X-Received: by 2002:a17:906:5d0b:: with SMTP id g11mr18609230ejt.437.1627322760355; Mon, 26 Jul 2021 11:06:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627322760; cv=none; d=google.com; s=arc-20160816; b=CR+ubR4B4eFkp2DqnmJ8AHUw+b2oC6xWpSfAP8c+Flbr0xDHNceBXopmkopj4D2ECn UZqhYXHmFKwjbTcQrgUw9mtmWRD6FjwMzMVM0xEfNEX7nEEiqaJZn1pUnK+onqZ2uMcq eCCyVKRX8LutY88PWtkD0kVzT2M2Uad7lGHo+7cJecBR/AMRDHCz7sCeaoN3Xbul4jO0 i4p0WYmuZ47aJNMdAq7IslRftgX8zRJlWlBIPBvMqesaXDoppIHubowIgDpdCPJCXx1r poFxpPxCMwK7hIUxcBWVlR1Zfb6U6YF7olOuxx6DfxMCgjnyRh76d1f3AWw7cxzs6vLX tTfw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/hrLdsNQMo8ArenDXk1eJO5DvHhh/7Pp00ThrnIFGPg=; b=RlJDU63LyGa+vFQDpY0jASO6OBMcncTQOW5A2+qHzoyA+UPOKs01Tp/D3AolkWfigH Rak6jQwCoRg1QhF4ZOw0dVhZfaw0vXtd1I0W01GhVO7/SSIsCvis/QWfn5f8/xGXJ5SX hZD6F/PCXRXUKpYbiLUlPC+Db9B79jz55kxoDb/Xm3RajxCRSLvs+YYETF19cpTCj6nB MMiuql7TUYx5JJqnvKy4cNIYETHlCSrdZzWvD3gLZx9yfOsE6vdczLXC4ivp7bw4oNFv eLyHFoLLN2ihxMSqTuqmRZ1us4odA1ixgvF2A9u4tjEJUiEQpAFe7Ehd92ORJUfIP/Wt j+BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=WHG55oiT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y24si547591ejf.454.2021.07.26.11.05.37; Mon, 26 Jul 2021 11:06:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=WHG55oiT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233070AbhGZRXM (ORCPT + 99 others); Mon, 26 Jul 2021 13:23:12 -0400 Received: from mx0a-001ae601.pphosted.com ([67.231.149.25]:53068 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232927AbhGZRWy (ORCPT ); Mon, 26 Jul 2021 13:22:54 -0400 Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 16Q2DYd7012545; Mon, 26 Jul 2021 13:03:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=/hrLdsNQMo8ArenDXk1eJO5DvHhh/7Pp00ThrnIFGPg=; b=WHG55oiT0AmzlfqBVW0Tqi/lGIiKxMTsOHQSr1z2GdbTcCSEG1Y5iOCMfoP0LNCRIDrX VOeIDZq4msJikP0/yyV9qyogJwg8mm0uXs71QR2OiN354kRY+5/3pgjy8+dPbS8sWFOk M+Th5GbjqRyiV3ShXi7TSvjyLKmEj6m+tEJMKOzqt2qvPGv3mlt7OjaiDj9algw9YHCd FYd3WdLj8tjyMPDz0i0+z9q8y5aoH/Oodut+fXkIPh3ZPUcBQ4IriI6yt8ynwK+6412W u6H7GhxaKVilsu/ZXh1NWznPQ9RZ8o2iP0A2cz8fIXZUgV9v4J5QGS+N1RtLaNOpslEe Pw== Received: from ediex01.ad.cirrus.com ([87.246.76.36]) by mx0a-001ae601.pphosted.com with ESMTP id 3a17cvhhau-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 26 Jul 2021 13:03:09 -0500 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Mon, 26 Jul 2021 18:47:06 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.2242.4 via Frontend Transport; Mon, 26 Jul 2021 18:47:06 +0100 Received: from vitaly-Inspiron-5415.ad.cirrus.com (unknown [198.90.238.32]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 77EC445D; Mon, 26 Jul 2021 17:47:05 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai CC: , , , Stefan Binding Subject: [PATCH 10/27] ALSA: hda/cs8409: Simplify CS42L42 jack detect. Date: Mon, 26 Jul 2021 18:46:23 +0100 Message-ID: <20210726174640.6390-11-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726174640.6390-1-vitalyr@opensource.cirrus.com> References: <20210726174640.6390-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: kYHRllnn1LinxhYSiFMC8I3npOJflEs7 X-Proofpoint-ORIG-GUID: kYHRllnn1LinxhYSiFMC8I3npOJflEs7 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 adultscore=0 impostorscore=0 mlxlogscore=855 spamscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107260105 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Binding Cleanup interrupt masks. Remove unnecessary read/writes. Ensure Tip Sense/Type Detection interrupts are enabled/disabled when needed. Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov --- sound/pci/hda/patch_cs8409.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index f4401c1e8572..4ad832f5c4ba 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -406,10 +406,8 @@ static void cs8409_cs42l42_enable_jack_detect(struct hda_codec *codec) cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1b71, 0x00C0, 1); /* Clear interrupts status */ cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x130f, 1); - cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x1b7b, 1); /* Enable interrupt */ - cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1320, 0x03, 1); - cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1b79, 0x00, 1); + cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1320, 0xF3, 1); mutex_unlock(&spec->cs8409_i2c_mux); } @@ -424,11 +422,13 @@ static void cs8409_cs42l42_run_jack_detect(struct hda_codec *codec) /* Clear interrupts */ cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x1308, 1); cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x1b77, 1); + cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1320, 0xFF, 1); + cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x130f, 1); cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1102, 0x87, 1); cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1f06, 0x86, 1); cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1b74, 0x07, 1); - cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x131b, 0x01, 1); + cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x131b, 0xFD, 1); cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1120, 0x80, 1); /* Wait ~110ms*/ usleep_range(110000, 200000); @@ -487,9 +487,6 @@ static void cs8409_jack_unsol_event(struct hda_codec *codec, unsigned int res) reg_hs_status = cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x1124, 1); reg_ts_status = cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x130f, 1); - /* Clear interrupts, by reading interrupt status registers */ - cs8409_i2c_read(codec, CS42L42_I2C_ADDR, 0x1b7b, 1); - mutex_unlock(&spec->cs8409_i2c_mux); /* If status values are < 0, read error has occurred. */ @@ -499,6 +496,11 @@ static void cs8409_jack_unsol_event(struct hda_codec *codec, unsigned int res) /* HSDET_AUTO_DONE */ if (reg_cdc_status & CS42L42_HSDET_AUTO_DONE) { + mutex_lock(&spec->cs8409_i2c_mux); + /* Disable HSDET_AUTO_DONE */ + cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x131b, 0xFF, 1); + mutex_unlock(&spec->cs8409_i2c_mux); + type = ((reg_hs_status & CS42L42_HSTYPE_MASK) + 1); /* CS42L42 reports optical jack as type 4 * We don't handle optical jack @@ -521,6 +523,11 @@ static void cs8409_jack_unsol_event(struct hda_codec *codec, unsigned int res) } } + mutex_lock(&spec->cs8409_i2c_mux); + /* Re-Enable Tip Sense Interrupt */ + cs8409_i2c_write(codec, CS42L42_I2C_ADDR, 0x1320, 0xF3, 1); + mutex_unlock(&spec->cs8409_i2c_mux); + } else { /* TIP_SENSE INSERT/REMOVE */ switch (reg_ts_status) { -- 2.25.1