Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp4997469rwb; Wed, 21 Sep 2022 01:28:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7tC7g9vPI5/m9GQutvo3bUCfF0hGFWVA1tggZs7i0GM6/lUfwimilJXVPKqEaQ0sW3W9De X-Received: by 2002:a17:907:7f05:b0:781:e579:46b5 with SMTP id qf5-20020a1709077f0500b00781e57946b5mr3834961ejc.102.1663748880184; Wed, 21 Sep 2022 01:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663748880; cv=none; d=google.com; s=arc-20160816; b=SKhuV4mc7e7l2t56EiS4Soo3HnIo7wgcW4e8bYbvK4GK8C+TV33oCrGlE936gTxV3B fAqPN9mgGbVQZzksxmGEkUfRe52CfEinats8hJB5HP0oJv+X5dcuS+L/NHq5jVXvxx53 Xkc6Rvfs8YngTwnJgc+p6ab+wkm26ApzHsup28GoKcWihcOtWdN7VHWhL4UE3G4w+KmE ydfSDNnDt/3WjH+xT/rc+4VgkzHnclyVa0mb8Ci2O8znVQfSZlmAsdEIhJZWUr1MKTZR zXODq37syI9PTRp+XU2uj4F0TBUWeKr9cogeE5+Rv8MOeqHs4Hd0ufb0BAKJ94xsd27I QmgQ== 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=wabbL0RF4cqJkhaKeIa2nvuu2KpYvr0mfs1CAwHKPh0=; b=fkIgzL1xx9ZrjNB7ZDVrpQ+OV3wA1b3QsBW+LFQyCbxOhxRRl/mlLTe16fXspRe+v/ 4fzhGsVG/DsQ+CUItR/NKvyMoW1oHz9zgc4OvtwIyfPhlEa9LJgUEl+BTjlZayLmYhFv bdFW4wzd06GoKuhR7TE+9/4rAzRTzLGPNyu5V/JL6sDwhsj7RBpDSaXqSdNOl+BO/iWn 2X8UWmrsoE5hEOzyyrZASZHBwAvYlD9Nx93RRnxVhtHY8oqjxYJK8DC+msxlnIu00ug1 oke0SBRYVlwZcEtZNrwiizvqGMhIVAJ76gkFycPrrtgLeQBL28/D6o0/5B7P9HOaTXdb flWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=Z+70AptG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l14-20020a170906794e00b00781377fa4d3si2102751ejo.88.2022.09.21.01.27.33; Wed, 21 Sep 2022 01:28:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=Z+70AptG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbiIUISr (ORCPT + 99 others); Wed, 21 Sep 2022 04:18:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbiIUISm (ORCPT ); Wed, 21 Sep 2022 04:18:42 -0400 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40A20B9F for ; Wed, 21 Sep 2022 01:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1663748321; x=1695284321; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wabbL0RF4cqJkhaKeIa2nvuu2KpYvr0mfs1CAwHKPh0=; b=Z+70AptGUIo3t7evTKhYVxfWqfGJT2Q8PdlF2tJYBWwnqy6WJmg5R1bB Pfcj63mbYbpOn1Q+PnmIgtoK/GN7RltLHsFul9xPVuddCdeTg+UAQlBE1 20U9oXJxPoZzCBroo1L11JMPAJCB1XOMvX+AC/hS/kKdh8irWnVJx4Kmp QcsZbvYywx0FznTcdI7UXlmaOfmReD47jR8LLm1CmrNy+O4X+E919oahk A0DflC+5Bhr/HobaowYTBQVc5d+yjIPDltjhz0X4EEklkS8f2TXCPFTH4 OPP0SJsAbc5al8bFt3WSD7zm5S0t+03YspYVLY6faYLQMGOpAwDQwm3Qv Q==; From: Astrid Rost To: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai CC: , , , Astrid Rost , Astrid Rost Subject: [PATCH v4 3/3] ASoC: ts3a227e: add parameters to control debounce times Date: Wed, 21 Sep 2022 10:18:34 +0200 Message-ID: <20220921081834.22009-4-astrid.rost@axis.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220921081834.22009-1-astrid.rost@axis.com> References: <20220921081834.22009-1-astrid.rost@axis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add devicetree parameters to control the insert, release and press debounce times. Signed-off-by: Astrid Rost --- sound/soc/codecs/ts3a227e.c | 61 +++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c index d8ab0810fceb..2305a472d132 100644 --- a/sound/soc/codecs/ts3a227e.c +++ b/sound/soc/codecs/ts3a227e.c @@ -78,12 +78,20 @@ static const int ts3a227e_buttons[] = { #define ADC_COMPLETE_INT_DISABLE 0x04 #define INTB_DISABLE 0x08 +/* TS3A227E_REG_SETTING_1 0x4 */ +#define DEBOUNCE_INSERTION_SETTING_SFT (0) +#define DEBOUNCE_INSERTION_SETTING_MASK (0x7 << DEBOUNCE_PRESS_SETTING_SFT) + /* TS3A227E_REG_SETTING_2 0x05 */ #define KP_ENABLE 0x04 /* TS3A227E_REG_SETTING_3 0x06 */ -#define MICBIAS_SETTING_SFT (3) +#define MICBIAS_SETTING_SFT 3 #define MICBIAS_SETTING_MASK (0x7 << MICBIAS_SETTING_SFT) +#define DEBOUNCE_RELEASE_SETTING_SFT 2 +#define DEBOUNCE_RELEASE_SETTING_MASK (0x1 << DEBOUNCE_RELEASE_SETTING_SFT) +#define DEBOUNCE_PRESS_SETTING_SFT 0 +#define DEBOUNCE_PRESS_SETTING_MASK (0x3 << DEBOUNCE_PRESS_SETTING_SFT) /* TS3A227E_REG_ACCESSORY_STATUS 0x0b */ #define TYPE_3_POLE 0x01 @@ -136,7 +144,7 @@ static bool ts3a227e_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { case TS3A227E_REG_INTERRUPT ... TS3A227E_REG_INTERRUPT_DISABLE: - case TS3A227E_REG_SETTING_2: + case TS3A227E_REG_SETTING_1 ... TS3A227E_REG_SETTING_2: case TS3A227E_REG_SWITCH_STATUS_1 ... TS3A227E_REG_ADC_OUTPUT: return true; default: @@ -269,14 +277,55 @@ static const struct regmap_config ts3a227e_regmap_config = { static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e, struct device *dev) { - u32 micbias; + u32 value; + u32 value_ms; + u32 setting3_value = 0; + u32 setting3_mask = 0; int err; - err = device_property_read_u32(dev, "ti,micbias", &micbias); + err = device_property_read_u32(dev, "ti,micbias", &value); + if (!err) { + setting3_mask = MICBIAS_SETTING_MASK; + setting3_value = (value << MICBIAS_SETTING_SFT) & + MICBIAS_SETTING_MASK; + } + + err = device_property_read_u32(dev, "ti,debounce-release-ms", + &value_ms); if (!err) { + value = (value_ms > 10); + setting3_mask |= DEBOUNCE_RELEASE_SETTING_MASK; + setting3_value |= (value << DEBOUNCE_RELEASE_SETTING_SFT) & + DEBOUNCE_RELEASE_SETTING_MASK; + } + + err = device_property_read_u32(dev, "ti,debounce-press-ms", &value_ms); + if (!err) { + value = (value_ms + 20) / 40; + if (value > 3) + value = 3; + setting3_mask |= DEBOUNCE_PRESS_SETTING_MASK; + setting3_value |= (value << DEBOUNCE_PRESS_SETTING_SFT) & + DEBOUNCE_PRESS_SETTING_MASK; + } + + if (setting3_mask) regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3, - MICBIAS_SETTING_MASK, - (micbias & 0x07) << MICBIAS_SETTING_SFT); + setting3_mask, setting3_value); + + err = device_property_read_u32(dev, "ti,debounce-insertion-ms", + &value_ms); + if (!err) { + if (value_ms < 165) + value = (value_ms + 15) / 30; + else if (value_ms < 1500) + value = 6; + else + value = 7; + regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_1, + DEBOUNCE_INSERTION_SETTING_MASK, + (value << DEBOUNCE_INSERTION_SETTING_SFT) & + DEBOUNCE_INSERTION_SETTING_MASK); } return 0; -- 2.20.1