From patchwork Fri Feb 14 17:18:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975537 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 71ABFC021A6 for ; Fri, 14 Feb 2025 18:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wDA3tQ1b7n+5GlP2UC0q0O5SgA/zkF4porktAWg3d0k=; b=cqMwh/iDc3vNNwn3n1+vqy687j L43uX3+hxICOtNi6RAtZF7IQ+e4xYo4o5vkUuhNMIa0SoM08O/KbJLcYoAGcUJZmGQFDqfk28rJ+F 1eV4X88Hs4E7/zrsjprNszXrNslpoegoMaWnPwjhzoUammwvDTzWbpGOHJXVOQmS+Oi9rQcahytB1 78UhFlp8NgQInAU3pPqe3YD/GkAZUHuO1xrTm8OKUmdDG1nWbHmh+INYYABgq5qsWVAOwIFX3+KYC qnD46O8p9gti9aJ9wyoHY6bFyvyUaEghY7n20HkOTSualaiNX03hX+8ITT+4hfCVWdOOYho0dJI/r emzbrsog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0rU-0000000Fx4t-1LTH; Fri, 14 Feb 2025 18:56:28 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizLV-0000000FfqC-1Xuu; Fri, 14 Feb 2025 17:19:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553559; bh=0R9z82uYLHvZq/ZMlFXfZkW3m4VdLNpXjo+5ho6sUN0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fyVuWwIzp04LN5oANUcC1i84G4bqMTDULj87UfWPrvUvacBfKFAb/xweQUyLiCL/m dWM/GxLwrIu+qgwET9T902Ckh6Or9NWwq245VMX51O+/fBsZMiLsW9ENrWuvLPKiM3 zUczZ/KfbOyaRH6M2w2ZjlUk/EAla8zx/cs9t7DfH68VpUo5YqNJKrMFxw7zvJ8/hx 4RyxAm02E08doRQB1fR96GuOaLFvq2JQk8QOTclE9QHiCOmhJiR8IIVC4lRm6Hrz1J AmdCcsOOvgs5sZdFVze+RWesFQMbK/A11LfE7rXSQjM05sWUJJPI+q4PsDB6furluc kuFcYRXmgeliA== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 4759717E0FC1; Fri, 14 Feb 2025 18:19:15 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:32 -0300 Subject: [PATCH 01/13] ASoC: dt-bindings: Add document for mt6359-accdet MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-1-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091921_554764_001F489C X-CRM114-Status: GOOD ( 11.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add dt-binding for the MT6359 ACCDET hardware block. Signed-off-by: Nícolas F. R. A. Prado --- .../bindings/sound/mediatek,mt6359-accdet.yaml | 293 +++++++++++++++++++++ 1 file changed, 293 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/mediatek,mt6359-accdet.yaml b/Documentation/devicetree/bindings/sound/mediatek,mt6359-accdet.yaml new file mode 100644 index 0000000000000000000000000000000000000000..8922003d3b9d039d2a0355add7a90cf42b1a9da6 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mediatek,mt6359-accdet.yaml @@ -0,0 +1,293 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/mediatek,mt6359-accdet.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MT6359 Accessory Detection + +maintainers: + - Nícolas F. R. A. Prado + +description: | + The MT6359 Accessory Detection block is part of the MT6359 PMIC and allows + detecting audio jack insertion and removal, as well as identifying the type of + events connected to the jack. + +properties: + compatible: + const: mediatek,mt6359-accdet + + mediatek,mic-vol: + $ref: /schemas/types.yaml#/definitions/uint32 + description: MIC bias1 output voltage setting + enum: + - 0 # 1.7V + - 1 # 1.8V + - 2 # 1.9V + - 3 # 2.0V + - 4 # 2.1V + - 5 # 2.5V + - 6 # 2.6V + - 7 # 2.7V + - 8 # 2.8V + - 9 # 2.85V + + mediatek,mic-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Mic mode setting + enum: + - 1 # ACC + - 2 # DCC mode. Low cost mode without internal bias + - 6 # DCC mode. Low cost mode with internal bias + + mediatek,eint-cmpmen-pwm-width: + $ref: /schemas/types.yaml#/definitions/uint32 + description: EINT CMPMEN PWM width + enum: + - 0 # 50ms + - 1 # 80ms + - 2 # 100ms + - 3 # 200ms + - 4 # 400ms + - 5 # 500ms + - 6 # 800ms + - 7 # 1000ms + + mediatek,eint-cmpmen-pwm-thresh: + $ref: /schemas/types.yaml#/definitions/uint32 + description: EINT CMPMEN PWM threshold + enum: + - 0 # 1ms + - 1 # 2ms + - 2 # 4ms + - 3 # 5ms + - 4 # 8ms + - 5 # 10ms + - 6 # 20ms + - 7 # 30ms + + mediatek,pwm-width: + $ref: /schemas/types.yaml#/definitions/uint32 + description: PWM width + minimum: 0 + maximum: 65535 + + mediatek,pwm-thresh: + $ref: /schemas/types.yaml#/definitions/uint32 + description: PWM threshold + minimum: 0 + maximum: 65535 + + mediatek,pwm-rise-delay: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Rise delay for PWM + minimum: 0 + maximum: 65535 + + mediatek,pwm-fall-delay: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Fall delay for PWM + minimum: 0 + maximum: 65535 + + mediatek,debounce0: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for state 0 + minimum: 0 + maximum: 65535 + + mediatek,debounce1: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for state 1 + minimum: 0 + maximum: 65535 + + mediatek,debounce3: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for state 3 + minimum: 0 + maximum: 65535 + + mediatek,debounce-auxadc: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for AUXADC + minimum: 0 + maximum: 65535 + + mediatek,eint-debounce0: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for EINT state 0 + enum: + - 0 # 0ms + - 1 # 0.12ms + - 2 # 0.25ms + - 3 # 0.5ms + - 4 # 0.75ms + - 5 # 1ms + - 6 # 2ms + - 7 # 4ms + - 8 # 8ms + - 9 # 16ms + - 10 # 32ms + - 11 # 48ms + - 12 # 64ms + - 13 # 128ms + - 14 # 256ms + - 15 # 512ms + + mediatek,eint-debounce1: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for EINT state 1 + enum: + - 0 # 0ms + - 1 # 0.5ms + - 2 # 0.75ms + - 3 # 0.9ms + - 4 # 1.5ms + - 5 # 1.8ms + - 6 # 3ms + - 7 # 3.5ms + - 8 # 3.8ms + - 9 # 16ms + - 10 # 32ms + - 11 # 48ms + - 12 # 64ms + - 13 # 128ms + - 14 # 256ms + - 15 # 512ms + + mediatek,eint-debounce2: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for EINT state 2 + enum: + - 0 # 0ms + - 1 # 0.5ms + - 2 # 0.75ms + - 3 # 0.9ms + - 4 # 1.5ms + - 5 # 1.8ms + - 6 # 3ms + - 7 # 3.5ms + - 8 # 3.8ms + - 9 # 4ms + - 10 # 4.5ms + - 11 # 5ms + - 12 # 7ms + - 13 # 9ms + - 14 # 19ms + - 15 # 25ms + + mediatek,eint-debounce3: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for EINT state 3 + enum: + - 0 # 0ms + - 1 # 0.12ms + - 2 # 0.25ms + - 3 # 0.5ms + - 4 # 0.75ms + - 5 # 1ms + - 6 # 2ms + - 7 # 4ms + - 8 # 8ms + - 9 # 16ms + - 10 # 32ms + - 11 # 48ms + - 12 # 64ms + - 13 # 128ms + - 14 # 256ms + - 15 # 512ms + + mediatek,eint-inverter-debounce: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Debounce time for EINT inverter + enum: + - 0 # 0ms + - 1 # 0.12ms + - 2 # 0.25ms + - 3 # 0.5ms + - 4 # 0.75ms + - 5 # 1ms + - 6 # 2ms + - 7 # 4ms + - 8 # 8ms + - 9 # 16ms + - 10 # 32ms + - 11 # 48ms + - 12 # 64ms + - 13 # 128ms + - 14 # 256ms + - 15 # 512ms + + mediatek,eint-detect-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + description: EINT detection mode + enum: + - 0 # Higher detection power + - 1 # Lower detection power + - 2 # SW moisture detection mode1 + - 3 # HW moisture detection mode1 + - 4 # HW moisture detection mode2 + + mediatek,eint-num: + $ref: /schemas/types.yaml#/definitions/uint32 + description: EINT interrupt that should be enabled + enum: + - 0 # EINT0 + - 1 # EINT1 + - 2 # EINT0 | EINT1 + + mediatek,eint-use-ext-res: + type: boolean + description: + Whether an external resistor should be used for the HP_EINT signal. + By default an internal pull-up resistor is used. + + mediatek,eint-comp-vth: + $ref: /schemas/types.yaml#/definitions/uint32 + description: EINT comparator threshold + enum: + - 0 # 2.4V + - 1 # 2V + - 2 # 1.6V + - 3 # 1.2V + - 4 # 0.8V + + mediatek,eint-level-pol: + $ref: /schemas/types.yaml#/definitions/uint32 + description: EINT interrupt polarity + +required: + - compatible + +additionalProperties: false + +examples: + - | + #include + + accdet: accdet { + compatible = "mediatek,mt6359-accdet"; + mediatek,mic-vol = <8>; + mediatek,mic-mode = <2>; + mediatek,pwm-width = <0x500>; + mediatek,pwm-thresh = <0x500>; + mediatek,pwm-fall-delay = <1>; + mediatek,pwm-rise-delay = <0x1f0>; + mediatek,debounce0 = <0x800>; + mediatek,debounce1 = <0x800>; + mediatek,debounce3 = <0x20>; + mediatek,debounce-auxadc = <0x44>; + mediatek,eint-cmpmen-pwm-width = <4>; + mediatek,eint-cmpmen-pwm-thresh = <1>; + mediatek,eint-debounce0 = <5>; + mediatek,eint-debounce1 = <3>; + mediatek,eint-debounce2 = <3>; + mediatek,eint-debounce3 = <5>; + mediatek,eint-inverter-debounce = <0xe>; + mediatek,eint-detect-mode = <4>; + mediatek,eint-num = <0>; + mediatek,eint-comp-vth = <2>; + mediatek,eint-level-pol = ; + }; From patchwork Fri Feb 14 17:18:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975536 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A6298C021A4 for ; Fri, 14 Feb 2025 18:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EYu/Xqo8FCI3CC9WJcK4NA+I/CMKIk9XFrlcNIYdZuY=; b=LAzLQ7VGFqbbg6ryEIBth6TWEy qVc+owCKN78lqigdBJAd/GvizrZ2Zg+buGpa0rGafrSxQTp/z6Jzsf/6BH/8N9bEOsgaIa16zUtsZ QfwzulsdVDjflAvyF2//YZqbE0hVkJGW8D+gMJMlqBLlKxN7+UM3Kc48fjXfIEtQzFHm+Kv1XuJ6T PEU0BuPkHh4ZkWMkqmHHogdVyvbCQ5pwuw/qc2lq1K6XxsS+b4lueaB4dUdxtCbw9sOprQWfqcqYm zNQYFUBbpvSBGcufIl0IyVQ7+3+hpYK8MDsFC61Fw/EyvgiRyBDWdWWJk6gazBMg9ANHCQvwr3l+A L/3a3LjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0rV-0000000Fx5x-11kh; Fri, 14 Feb 2025 18:56:29 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizLa-0000000Ffrz-13PM; Fri, 14 Feb 2025 17:19:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553564; bh=EjrwtqxQ5bYCEJ01b8/loccYAmWqyhZVlY3k8ihmFqI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jKmhFCT46G4ZE7VKoaQa1t7STDOnJBGHbZz5o2FD5c26nn3bYRQTHsxFyI842N1cS 3U2IAhk+gjlqqF3bK4f2Bm2izUkzaB6yb9XecmSNgfC7kBnVK8LSdivk5DF7z+wtxv iaqkAej46RbvRahRMOT4SEgv1iqQVm/4FuEjH1bKEcU5Eo0LWM6VKgQjeB+fZV2A11 RINMMuvTSvk6qAomCfWRS38Cjeus1m9t7Hpfn50h+WNc0C3UlJcNdN2AzAfla683sF SWVxlbZmH+xNaS9qXEvJisd6DlPy4Tp3o/AozJgDUgDVMGWvMIBJvoeDl4Xa4lItEu 8dokj70spGieQ== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 63F0E17E1507; Fri, 14 Feb 2025 18:19:20 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:33 -0300 Subject: [PATCH 02/13] dt-bindings: mfd: mediatek: mt6397: Add accdet subnode MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-2-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091926_432025_72A3C83D X-CRM114-Status: UNSURE ( 6.47 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Describe the accdet as a possible subnode of the MT6359 PMIC. Signed-off-by: Nícolas F. R. A. Prado --- Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml b/Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml index 6a89b479d10fad3c8b61cab5a3af1453baca4d1a..1a8c5748a28da6ad8aa091f8c0a74bc1dc709644 100644 --- a/Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml +++ b/Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml @@ -224,6 +224,13 @@ properties: description: Pin controller + accdet: + type: object + $ref: /schemas/sound/mediatek,mt6359-accdet.yaml + unevaluatedProperties: false + description: + Accessory Detection + required: - compatible - regulators From patchwork Fri Feb 14 17:18:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975538 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8789AC02198 for ; Fri, 14 Feb 2025 18:56:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=otrCHsdfao2kVoDQN7xHYLDJvx8Ap1uHO6er0CH61hU=; b=ygyzeGTGAmi/x9UQSpbTRP2ZNS b1mXFew7ZaoodVgZeaf1ICkzPOvY02yM61aMvHNvUlks0uMVnTSk/bVXO9xA4NTIFbpu3FBy6KDan BNb9/BZKAlDVCveNYLWUjhLohlVA7ZkX0dk1vIV+YZnDkOCYZOA2EYYgEIsuj8Soox9xGBaZPgCD3 My5Fz0wBVM5J0F87Q/ZgN3VJFKchmrXdYzfJUc5Chf0P18QP70Hr/AekBBSNFjP3W9XzwALeCBZL4 8u5dU0xQj6s+0HokzzNfR8+nmoS9e7Ii8kzbnECAihee8UWq/F7p2Wd1BJtP1sg4VNYGawWld+e2A 4E62vs6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0rW-0000000Fx7X-1ICx; Fri, 14 Feb 2025 18:56:30 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizLf-0000000Ffts-3Cov; Fri, 14 Feb 2025 17:19:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553570; bh=wI++aCyUGB25LBiHVhu7McH+lo9hKNW4TKBihjV2t5U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IWrbobA7J++IfnQOw9xWZ2+m4v9jqen7hW+JDSNXSiUOt6shIZyidH35E3W9NNlrd IVPMdIiT1MYRz9LAv6Wq9JPOpm+Vl1JlzCsiiihVBAcSQfKC7u3o2ZRkHKlec4WZJx a9AE5x0r6RX7ca2y8nl7R/uFH3nfMO65JSeovN35VY/oBEoEu1zxzKeKkXzx6FoCDy LNOxSpkcjeSUNPD41iPJDBJhtnTdywV3hyKhCncWMwSu3MCdtCb6e9b/v4zmZuDOoP 6+XqrVWcRpKBHwk0KkXN2fmUdZpj7+m809W0K1f/mIuJnvZl4PnN+nrOoSnR/BJ/UO a+RGSXpTfQiKA== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8109E17E0239; Fri, 14 Feb 2025 18:19:25 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:34 -0300 Subject: [PATCH 03/13] mfd: mt6397-core: Add mfd_cell for mt6359-accdet MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-3-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , Andrew Perepech X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091931_974385_94CEC240 X-CRM114-Status: UNSURE ( 9.33 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Andrew Perepech Add an mfd_cell for mt6359-accdet and describe its IRQ resources to allow the mt6359-accdet driver to probe. Signed-off-by: Andrew Perepech Signed-off-by: Nícolas F. R. A. Prado --- drivers/mfd/mt6397-core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 0e5d59ae064a696ae2111e2b558b316667c14773..5f8ed898890783c0ce4e34c7eae0d8f678e7d7bc 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -84,6 +84,12 @@ static const struct resource mt6359_keys_resources[] = { DEFINE_RES_IRQ_NAMED(MT6359_IRQ_HOMEKEY_R, "homekey_r"), }; +static const struct resource mt6359_accdet_resources[] = { + DEFINE_RES_IRQ_NAMED(MT6359_IRQ_ACCDET, "accdet_irq"), + DEFINE_RES_IRQ_NAMED(MT6359_IRQ_ACCDET_EINT0, "accdet_eint0"), + DEFINE_RES_IRQ_NAMED(MT6359_IRQ_ACCDET_EINT1, "accdet_eint1"), +}; + static const struct resource mt6323_keys_resources[] = { DEFINE_RES_IRQ_NAMED(MT6323_IRQ_STATUS_PWRKEY, "powerkey"), DEFINE_RES_IRQ_NAMED(MT6323_IRQ_STATUS_FCHRKEY, "homekey"), @@ -239,6 +245,12 @@ static const struct mfd_cell mt6359_devs[] = { .resources = mt6359_keys_resources, .of_compatible = "mediatek,mt6359-keys" }, + { + .name = "mt6359-accdet", + .of_compatible = "mediatek,mt6359-accdet", + .num_resources = ARRAY_SIZE(mt6359_accdet_resources), + .resources = mt6359_accdet_resources, + }, }; static const struct mfd_cell mt6397_devs[] = { From patchwork Fri Feb 14 17:18:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975539 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DAF5CC021A7 for ; Fri, 14 Feb 2025 18:56:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=b0MWFk+dTHQBz1p7Hv/WwHFEEiTXSBr4DDoFyvcQqzI=; b=XaHNj+AOeTkt7L3zSxYJ1ovLH5 97zjwVniyJW5weKkoO6OnLap6r4/t2PoO0Gz+5ZY872X+vrkfJiofpnz7ANIausvO4v86lglu/6GE 0W8dGLNs4ej2GP2nS8n1Z8h0De8cJ78nkttNe9dS3qFU1z87JOq3B+r0IR0Dj15+P3mUptCBYrtcn C8sfDV5vS1BlCBXhQn7xQpLBpTQ3Y/W5Jp/g2+lmbs3AAWoOp6xN4Ksa4HEYhhfmFt4wEvURrRSEb t7ga0J2F9wN9FeX5RgKWgQZLJzJpcc8JPCIvB2ZtRWmQPf3r4f4XtLvA6NvNCEIROJdzU1353h7FC DFKk9gtg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0rX-0000000Fx95-1kPW; Fri, 14 Feb 2025 18:56:31 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizLk-0000000Ffvr-3b2g; Fri, 14 Feb 2025 17:19:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553575; bh=lPL1S5SCW1+PI23N/jcgP12hMhBfoTHib8FSUQooe88=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gIesuFvpOQ7/iFIFngOzZTm6MMmukdjPv3X0ec+jjsVWTpHWiOj8ZTRn4iHbg8i6n lkHkV3Gk83RNtg/wMlqz+n34f+cNavlirn+ucU7LgH3qNPZIQ/byWB7VHvRFpy6asJ /0awctKwFeOOnw7M5HSD16qVlUHQQiG2NRMlP5bb8QndM4gG4fbhUKOo9cUlYKKrd+ XKjboOZrfkQVV4KWAsMK018sUEq2pj77ABcw33a7Xg9JlZGdYeoU20IGYXP8YJPNkY Fya6ZtvLW8cMLAxUaGFpiDqtOBwbe1z0iDECm6R2IJ4c6jGAg39NeV6qZbCvq5rAFV fjnRMsE8Wp+sA== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id B7F8417E1551; Fri, 14 Feb 2025 18:19:30 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:35 -0300 Subject: [PATCH 04/13] ASoC: mediatek: mt6359-accdet: Add compatible property MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-4-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , Andrew Perepech X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091937_045118_69DB34C1 X-CRM114-Status: GOOD ( 13.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a compatible property and add it to the module device table for the mt6359-accdet platform driver to allow automatic module loading and probing when the compatible is present in DT. Co-developed-by: Andrew Perepech Signed-off-by: Andrew Perepech Signed-off-by: Nícolas F. R. A. Prado Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/codecs/mt6359-accdet.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index ed34cc15b80e856356c07fd53af22207124e0d19..6f07db879c6a56ce4843954f51bb9602373e4aa5 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -1047,9 +1047,19 @@ static int mt6359_accdet_probe(struct platform_device *pdev) return ret; } +const struct of_device_id accdet_of_match[] = { + { + .compatible = "mediatek,mt6359-accdet", + }, { + /* sentinel */ + }, +}; +MODULE_DEVICE_TABLE(of, accdet_of_match); + static struct platform_driver mt6359_accdet_driver = { .driver = { .name = "pmic-codec-accdet", + .of_match_table = accdet_of_match, }, .probe = mt6359_accdet_probe, }; From patchwork Fri Feb 14 17:18:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975586 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3B84C02198 for ; Fri, 14 Feb 2025 20:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KeFm5uN/dcweRabrSluxP8oPq78OsF2hf9MOMtJHy/M=; b=gCA43oB2Zqj1iJmYwH64SERQ2t FDVwXllrLcCi02UKC/iPsbZ1gQj4/dFuB+d3bKJwXp6xlb7GSafvbTsObWlD/UxRzUpM0FZWSzUGE 8mCbxdd1K6ot5L/DnzStmX0PY/01B9Q9QUgCLLkEl4ZAulihjl07W0ev/pq0/8IgrxjztytfTqi7L C6uGlx4wVeRGp/aIvZpf7idhY4mhX2s0jjclU4RlLw0QKloXlFASG8kRjJFCxM1NYezoV7OxLj8Tr 6zPlHa3KFGUOv/8TkZHgkhDV/pZpQ/KmVsKXrneoucyvPSuS2jZ6RqzWNkvZVgaAIZ3K4+1T5jT9m 27OFsdaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj2GZ-0000000GA4C-3HjM; Fri, 14 Feb 2025 20:26:27 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizLq-0000000Ffx1-0YeR; Fri, 14 Feb 2025 17:19:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553580; bh=mp9J76YP/HsVdMmLzZKcE6D8+8zelpiTKlZzw4q9iyA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DkS1ptnka7mTCYFzCt3C4eiZfK5/Fs4EOLoFJO0U41PpywCfMKAg3Pr0SRh1YfFF3 auBkT7X170y7/8M7Bg/XDOPQ5zGbgE185dqRq/vYhJp+NIOszHfEkcV3cZ2NzcH6KX D3cyMpA4QWEW/OHg2fNWHls6kyqxv+F6z8HjrhEE7scfSDQFgFfx59004VR9biWlbJ j9TJNcBWG/kR9FkSPIpMMRq+IGymWkCJOYX9U9L75KETufkN6vBs25XI4LBGNqNQQL gAx24d/z6dOT70sK4rzsI2hqelWHdcabQezFkNV4rGDJHdq/xKNHrAGdFL2/L65VaB xdlBCVBAKnTBg== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 1287E17E0239; Fri, 14 Feb 2025 18:19:35 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:36 -0300 Subject: [PATCH 05/13] ASoC: mediatek: mt6359-accdet: Implement EINT IRQ polarity configuration MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-5-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , Andrew Perepech X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091942_317832_BF860FB5 X-CRM114-Status: GOOD ( 10.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Andrew Perepech The driver currently reads the EINT IRQ polarity from the "mediatek,eint-level-pol" property but never actually configures the hardware accordingly. Implement the IRQ polarity configuration in hardware. Signed-off-by: Andrew Perepech Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index 6f07db879c6a56ce4843954f51bb9602373e4aa5..eee676d1faef2076bc837a12a2ee3615216752b7 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -733,6 +733,22 @@ static void config_digital_init_by_mode(struct mt6359_accdet *priv) BIT(ACCDET_EINT1_INVERTER_SW_EN_SFT)); } } + + if (priv->data->eint_pol == IRQ_TYPE_LEVEL_LOW) { + /* EINT polarity normal */ + regmap_update_bits(priv->regmap, + ACCDET_EINT_IN_INVERSE_ADDR, + ACCDET_EINT_IN_INVERSE_MASK_SFT, + 0); + } else if (priv->data->eint_pol == IRQ_TYPE_LEVEL_HIGH) { + /* EINT polarity inverse */ + regmap_update_bits(priv->regmap, + ACCDET_EINT_IN_INVERSE_ADDR, + ACCDET_EINT_IN_INVERSE_MASK_SFT, + BIT(ACCDET_EINT_IN_INVERSE_SFT)); + } else { + dev_warn(priv->dev, "Unacceptable EINT level type, using default\n"); + } } static void config_eint_init_by_mode(struct mt6359_accdet *priv) From patchwork Fri Feb 14 17:18:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975445 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C754C021A6 for ; Fri, 14 Feb 2025 17:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Vlq54jWBVD9Rm0zHtwMOcSIjo2+gkktdxezngWCjnSI=; b=j3uIwrSS8bUjVN+labvXG6y2yG MaYcPeGj8mpP7DWH3e6WPeXBd3OFNvOnQmz2FfpdEAB45F5oXHWzS/BTg5n7rmiRZJTey2hEvc7ul Lrwiy6dRVshufZzUstCwDTTDPF6jmnA7BYTFEUMhCQc0LN4+U+VuM3P6BXqbZ2lMIA0csgGfm+mo4 zyNUdqSzq5AnLxDe7w2w/EI9KMCwpRSaWfB544jEhXLl3bznWRrvDZ21CwBqnfjPGasPDClNmEy1L FhujYyUCfD0MeInJcSsB1+7GI1+7A+o5RJjktpyCGxUbcakDxstyw6JsNUC6p6ASyPlxcIutiUzyH A8/Z0h7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tizxP-0000000FnBe-1Iuo; Fri, 14 Feb 2025 17:58:31 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizLv-0000000Ffz3-1EuK; Fri, 14 Feb 2025 17:19:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553585; bh=vJ93fyDfMroysl58pmK4LB0ei52PWUbfp+wax1ulrhk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iRu7SqZnHmZMxyu8W02fGyQa/wGbL/cGVz4tnGT41QMdkwm5K4om+wH1Z0TbKS25L vevjesfWzwLfXnc5iovD6wAsDrI0baCey402OdpA/mLYf77xkCd2Y8oGOmqqY7r94t 1hdfIrUTJk6fRVFI9lwD08R7/wa9lzaWhDCaWIdBVa4MQxqDtcwzlpKKu06oPFeEZd HQdUa15mIJzyiBCHAeboi/rnPCtVNuK6K22LB0lIbjKzHDOJYHNQUFNXDAqk96ZuAy t0eKrMigLmMpKKXFPBIXh1e7cJQ+XHNX6+Kal7Rq13rQVaGOJshaypy30Ql4QdjXpm kKH9KKEKvDVTg== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 4931E17E1553; Fri, 14 Feb 2025 18:19:41 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:37 -0300 Subject: [PATCH 06/13] ASoC: mediatek: mt6359-accdet: Use IRQ_TYPE_LEVEL_LOW not raw value MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-6-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , Andrew Perepech X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091947_505170_C1F94419 X-CRM114-Status: GOOD ( 10.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Andrew Perepech The symbol IRQ_TYPE_LEVEL_LOW is equivalent to 8, but the former should be used for legibility. Update the code accordingly. Signed-off-by: Andrew Perepech Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index eee676d1faef2076bc837a12a2ee3615216752b7..b71957f7a2edb352add23884fd9e231e36b08621 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -581,7 +581,7 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) ret = of_property_read_u32(node, "mediatek,eint-level-pol", &priv->data->eint_pol); if (ret) - priv->data->eint_pol = 8; + priv->data->eint_pol = IRQ_TYPE_LEVEL_LOW; ret = of_property_read_u32(node, "mediatek,eint-use-ap", &tmp); if (ret) From patchwork Fri Feb 14 17:18:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975446 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9AC7C02198 for ; Fri, 14 Feb 2025 18:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=c+1tmObYapMIF6Mb//DliiEqyJHtafMOQuHhyP2cPmE=; b=FoepNUsygGcoAZcUEeTV0cCF0f 5WC4HHaUqFBMJE8cMhPn4SDFXFCsqrGCbfWMlT7AdcAHK6+mEwoVWSRIlo01lnSeVRoZlaNTlJ4fr wBLJdQL8bGLA+YW0F6QDAXCV2xsc0596E7+/sYSvQC5WOjZDsuu6tU2uY3vs5/HLS76WTP7yOzKl9 an1cjEP+Aojkazp0SqRr4MM1VH8UUwKxRW/998P9/Y8HwyENsj9VguytGJlF+xzlidkPzMCDbuAUG 7mQXPQiXABOnwEdx0SWnC7N1tnr9m9QVfQyWsVpcIXN5GcLDgsvsiwPT8fE5Is9bM9BXarzBj6e+e lQUMFCIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tizyp-0000000FnXu-16I6; Fri, 14 Feb 2025 17:59:59 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizM0-0000000Fg0Y-1EaM; Fri, 14 Feb 2025 17:19:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553591; bh=00LuyQwthdh+8uIpImTyvsn+9nWVCxHN/HdOPIE73Mc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Nu/Nyn5abae0kdlvkimaIaT1dlXXVOhx4s5ajeC1Hs4tM/knyuv8wJ1doPmItwuId 1McNTYmOrE/rUCQ6EOcJuBlmRhk62VBC5G/v7KzwcIkBXdkuXOSnMjscKTlUSutlN0 HMQMTbK4YM83FcMgtV5tIcyVs28IrtvsOGPoSyGb8vZ85vRH3vE6kMzPBncq3N7FQ3 7xJfSM+d3GIcgOBNimcw1fEVt892CB+cqxerpNO8OWwkZzfq649PzGkaH59Pj+uotj lJyKv8j/0jJLlgNR0xNISh1b8lhWWmRPUciXPJMbqyrxIlww37EXXzar4kmWD0V0fw CBzCzy5Iiwxkw== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 4DBAA17E0239; Fri, 14 Feb 2025 18:19:46 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:38 -0300 Subject: [PATCH 07/13] ASoC: mediatek: mt6359-accdet: Drop dead code for EINT/GPIO IRQ handling MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-7-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091952_477123_A4B6E24A X-CRM114-Status: GOOD ( 12.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ACCDET supports two modes for IRQ generation: PMIC EINT or AP GPIO, which in principle could be configured through a DT property. However this DT property has no user nor is documented in a binding, and the driver only implements the PMIC EINT case, so drop the unused code intended to handle both cases. Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index b71957f7a2edb352add23884fd9e231e36b08621..57a70867b4b80fc904ae07ee05d0e554495ed6e7 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -31,9 +31,6 @@ #define REGISTER_VAL(x) ((x) - 1) /* mt6359 accdet capability */ -#define ACCDET_PMIC_EINT_IRQ BIT(0) -#define ACCDET_AP_GPIO_EINT BIT(1) - #define ACCDET_PMIC_EINT0 BIT(2) #define ACCDET_PMIC_EINT1 BIT(3) #define ACCDET_PMIC_BI_EINT BIT(4) @@ -448,8 +445,7 @@ static void mt6359_accdet_jd_work(struct work_struct *work) mt6359_accdet_recover_jd_setting(priv); } - if (priv->caps & ACCDET_PMIC_EINT_IRQ) - recover_eint_setting(priv); + recover_eint_setting(priv); mutex_unlock(&priv->res_lock); } @@ -583,14 +579,6 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) if (ret) priv->data->eint_pol = IRQ_TYPE_LEVEL_LOW; - ret = of_property_read_u32(node, "mediatek,eint-use-ap", &tmp); - if (ret) - tmp = 0; - if (tmp == 0) - priv->caps |= ACCDET_PMIC_EINT_IRQ; - else if (tmp == 1) - priv->caps |= ACCDET_AP_GPIO_EINT; - ret = of_property_read_u32(node, "mediatek,eint-detect-mode", &priv->data->eint_detect_mode); if (ret) { @@ -910,10 +898,8 @@ static void mt6359_accdet_init(struct mt6359_accdet *priv) 0x3 << RG_ANALOGFDEN_SFT); } - if (priv->caps & ACCDET_PMIC_EINT_IRQ) { - config_eint_init_by_mode(priv); - config_digital_init_by_mode(priv); - } + config_eint_init_by_mode(priv); + config_digital_init_by_mode(priv); } int mt6359_accdet_enable_jack_detect(struct snd_soc_component *component, From patchwork Fri Feb 14 17:18:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975587 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 999D6C021A4 for ; Fri, 14 Feb 2025 20:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=llW5p/2cU9pyD6O50zTC+JdR5W3cKNUgmxri3DfiRBg=; b=fSzGFtc6lezsHllDtsc3E0w5LJ NYz7nhZmtGOWY0NGaJeNUYB5A8EbdExLw290StU6vjzKDXfSnw6xwWXimCELDzvckTt2vd+l0fpLa TeJscYjufrtncCqkU9uxu03dQlYdFmq2kOBwrb5Upg1UzRapmEMHwU4LtJDJO2fWEEOcwJSMTVLRX afegXDtnHVgsRQ8SI0V5J0Ai5U3nG9kWISqwMEjb7OqUIp3TEKUV8bBr1Sf0GfJRJgb0Jr1zTLfAC xBvciwUM0kXBhT/KceCXt6hhSNDD8yXxmSu7GzG6O/mztTmfjvuXgxlfjzOFHDva1kkNYVzAEWL1W iset/Rjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj2Ga-0000000GA4j-2T6M; Fri, 14 Feb 2025 20:26:28 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizM5-0000000Fg1g-16WN; Fri, 14 Feb 2025 17:19:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553596; bh=dllF4OZS+fykAk4GG2xX2cZG/gu45NNSuP+Q2RiVATk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=i+JH/wh04YHiTTELCcPDvcxhtx7aSVDAI/6vzARmHr1S9N/g2EGH0i4tqWOhd6D5y HLwnhk+cyfXsOK2kYWFjreNP1YqwV3D3EKrUtn/JrZK92mGfQDcPxB1CzKAXaZpmrp N5ekz9gh9m4Tr1GCwFOA9zca6xYen2gRPqFFsq5cM1mGz2Nc9cbvFR4SmjO63Wbz78 iHsVH+oAx6EvMtZJF8cL6MWQoqe2I445Xxao/4eJDs8zRJpIcpwfMspc/oYNwPa5mT GxeQ3FX1CLzRTWvvEaoei9yzk7rsEjbZEgB2K2HifLLPPoVwCZTqmJ/f7hHuY+u5r1 gQBIn/RH8NwYw== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6AF4517E0FC1; Fri, 14 Feb 2025 18:19:51 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:39 -0300 Subject: [PATCH 08/13] ASoC: mediatek: mt6359-accdet: Drop dead code for EINT trigger setting MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-8-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_091957_444618_35C5A5DB X-CRM114-Status: UNSURE ( 9.41 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org None of the EINT trigger options are implemented and the DT property is not described in the binding. Remove the unused code. Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index 57a70867b4b80fc904ae07ee05d0e554495ed6e7..e45630a134bb3a27bb52a80f43901c9fe4eac105 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -35,8 +35,6 @@ #define ACCDET_PMIC_EINT1 BIT(3) #define ACCDET_PMIC_BI_EINT BIT(4) -#define ACCDET_PMIC_GPIO_TRIG_EINT BIT(5) -#define ACCDET_PMIC_INVERTER_TRIG_EINT BIT(6) #define ACCDET_PMIC_RSV_EINT BIT(7) #define ACCDET_THREE_KEY BIT(8) @@ -596,15 +594,6 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) else if (tmp == 2) priv->caps |= ACCDET_PMIC_BI_EINT; - ret = of_property_read_u32(node, "mediatek,eint-trig-mode", - &tmp); - if (ret) - tmp = 0; - if (tmp == 0) - priv->caps |= ACCDET_PMIC_GPIO_TRIG_EINT; - else if (tmp == 1) - priv->caps |= ACCDET_PMIC_INVERTER_TRIG_EINT; - ret = of_property_read_u32(node, "mediatek,eint-use-ext-res", &priv->data->eint_use_ext_res); if (ret) { From patchwork Fri Feb 14 17:18:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975588 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6447C021A6 for ; Fri, 14 Feb 2025 20:26:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=WnVM151i0nVora0z7tRlLA9fgDXmT4xC1SQ5LMzsotY=; b=N9+vRdV7hoq/UxnRF7oENLtBdy 0x2lVKas+cts2vYGz1iVU2m7p+3oFtidkgUWMS2uLKs4wBYRVlKUFzho5+EFMzf0Ix80181544RH/ vZ2wCC/wuFnJHTafyuFOwjKpG+rE7+EBYpKBrv+g83jCZxsj0AGm6l2XSpKWsnN4j+xKCe/yNJpZT QEU61LbOoFIS4hRz4Fj4ERQ4bxClxRAiw1XldN+9WqloIHXi+Vrg/EYwfTXHNoIwKzrS9dmPP4sWG 5D0TtCvsIAt6IzbOKzF0ihbjQ6bYukLT1mrsNdu7dnJMf+Ysllp0qaysNdI8Afg/RPRuawjr5B74e FTJ9SBVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj2Gb-0000000GA5b-1nU7; Fri, 14 Feb 2025 20:26:29 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizMA-0000000Fg2r-1qwO; Fri, 14 Feb 2025 17:20:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553601; bh=e4vX1ANCZsil8oa3grPqu+Rm/8SSkvhXYxIqWE5LhdU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eVog1OR+93NsZ9uwafXhJ+tm84LtMXB9c1/OKQWR4BdurEO7+St6XVjcJMG+6vXFd lx2loLHC4zxJEnTYdu0FwfivKwrD+mbKrtljPJK8upkVdrIHaqbE+L3Vc+3vrak3ts bbko7xftvycY6liPVStAe4+MyfeosDIsAM6oh5QcGhLEEdD3u0bxjt3vgpyPbEoZ/S FWa0c+JsY6DoSk7qomK2PXnqnNmAD+U5iA8L5vFO4suxPqMQMVb923aCpEmbw5u5XI olzmK1NZJ1nHiBLFU5J8DDc4+zdkuoVzL23MRcRXtx+nxY5DVL1ZRQ3hbgqySO7AA9 tlsEEJIQjj2aA== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6F2CE17E0239; Fri, 14 Feb 2025 18:19:56 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:40 -0300 Subject: [PATCH 09/13] ASoC: mediatek: mt6359-accdet: Drop dead code for button detection MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-9-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_092002_629431_1B2F6E87 X-CRM114-Status: GOOD ( 14.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The button detection functionality depends on a calibration voltage value which is currently not updated anywhere in the driver code, and hence it doesn't actually do anything. Remove this unused code. Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 88 +--------------------------------------- sound/soc/codecs/mt6359-accdet.h | 15 ------- 2 files changed, 2 insertions(+), 101 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index e45630a134bb3a27bb52a80f43901c9fe4eac105..d2841b1385c7cbc5603100a56576eae3b6273b20 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -37,9 +37,6 @@ #define ACCDET_PMIC_RSV_EINT BIT(7) -#define ACCDET_THREE_KEY BIT(8) -#define ACCDET_FOUR_KEY BIT(9) -#define ACCDET_TRI_KEY_CDD BIT(10) #define ACCDET_RSV_KEY BIT(11) #define ACCDET_ANALOG_FASTDISCHARGE BIT(12) @@ -322,41 +319,6 @@ static void mt6359_accdet_jack_report(struct mt6359_accdet *priv) snd_soc_jack_report(priv->jack, report, MT6359_ACCDET_JACK_MASK); } -static unsigned int check_button(struct mt6359_accdet *priv, unsigned int v) -{ - if (priv->caps & ACCDET_FOUR_KEY) { - if (v < priv->data->four_key.down && - v >= priv->data->four_key.up) - priv->btn_type = SND_JACK_BTN_1; - if (v < priv->data->four_key.up && - v >= priv->data->four_key.voice) - priv->btn_type = SND_JACK_BTN_2; - if (v < priv->data->four_key.voice && - v >= priv->data->four_key.mid) - priv->btn_type = SND_JACK_BTN_3; - if (v < priv->data->four_key.mid) - priv->btn_type = SND_JACK_BTN_0; - } else { - if (v < priv->data->three_key.down && - v >= priv->data->three_key.up) - priv->btn_type = SND_JACK_BTN_1; - if (v < priv->data->three_key.up && - v >= priv->data->three_key.mid) - priv->btn_type = SND_JACK_BTN_2; - if (v < priv->data->three_key.mid) - priv->btn_type = SND_JACK_BTN_0; - } - return 0; -} - -static void is_key_pressed(struct mt6359_accdet *priv, bool pressed) -{ - priv->btn_type = priv->jack_type & ~MT6359_ACCDET_BTN_MASK; - - if (pressed) - check_button(priv, priv->cali_voltage); -} - static inline void check_jack_btn_type(struct mt6359_accdet *priv) { unsigned int val = 0; @@ -368,15 +330,11 @@ static inline void check_jack_btn_type(struct mt6359_accdet *priv) switch (priv->accdet_status) { case 0: - if (priv->jack_type == SND_JACK_HEADSET) - is_key_pressed(priv, true); - else + if (priv->jack_type != SND_JACK_HEADSET) priv->jack_type = SND_JACK_HEADPHONE; break; case 1: - if (priv->jack_type == SND_JACK_HEADSET) { - is_key_pressed(priv, false); - } else { + if (priv->jack_type != SND_JACK_HEADSET) { priv->jack_type = SND_JACK_HEADSET; accdet_set_debounce(priv, eint_state011, 0x1); } @@ -606,48 +564,6 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) if (ret) priv->data->eint_comp_vth = 0x0; - ret = of_property_read_u32(node, "mediatek,key-mode", &tmp); - if (ret) - tmp = 0; - if (tmp == 0) { - int three_key[4]; - - priv->caps |= ACCDET_THREE_KEY; - ret = of_property_read_u32_array(node, - "mediatek,three-key-thr", - three_key, - ARRAY_SIZE(three_key)); - if (!ret) - memcpy(&priv->data->three_key, three_key + 1, - sizeof(struct three_key_threshold)); - } else if (tmp == 1) { - int four_key[5]; - - priv->caps |= ACCDET_FOUR_KEY; - ret = of_property_read_u32_array(node, - "mediatek,four-key-thr", - four_key, - ARRAY_SIZE(four_key)); - if (!ret) { - memcpy(&priv->data->four_key, four_key + 1, - sizeof(struct four_key_threshold)); - } else { - dev_warn(priv->dev, - "accdet no 4-key-thrsh dts, use efuse\n"); - } - } else if (tmp == 2) { - int three_key[4]; - - priv->caps |= ACCDET_TRI_KEY_CDD; - ret = of_property_read_u32_array(node, - "mediatek,tri-key-cdd-thr", - three_key, - ARRAY_SIZE(three_key)); - if (!ret) - memcpy(&priv->data->three_key, three_key + 1, - sizeof(struct three_key_threshold)); - } - of_node_put(node); dev_warn(priv->dev, "accdet caps=%x\n", priv->caps); diff --git a/sound/soc/codecs/mt6359-accdet.h b/sound/soc/codecs/mt6359-accdet.h index c234f2f4276a12853a6fe0b13c4198dfc551b6b4..0ad5c8660a0bf4a87136a700698b04dff121b175 100644 --- a/sound/soc/codecs/mt6359-accdet.h +++ b/sound/soc/codecs/mt6359-accdet.h @@ -50,19 +50,6 @@ enum { eint_inverter_state000, }; -struct three_key_threshold { - unsigned int mid; - unsigned int up; - unsigned int down; -}; - -struct four_key_threshold { - unsigned int mid; - unsigned int voice; - unsigned int up; - unsigned int down; -}; - struct pwm_deb_settings { unsigned int pwm_width; unsigned int pwm_thresh; @@ -88,8 +75,6 @@ struct dts_data { unsigned int plugout_deb; unsigned int eint_pol; struct pwm_deb_settings *pwm_deb; - struct three_key_threshold three_key; - struct four_key_threshold four_key; unsigned int moisture_detect_enable; unsigned int eint_detect_mode; unsigned int eint_use_ext_res; From patchwork Fri Feb 14 17:18:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975452 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65D03C021A6 for ; Fri, 14 Feb 2025 18:04:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hZNd/cxw6shuVN4G9gJ34d9wiNtJaZ9pqvd5hkDH6Xo=; b=EXF4FiisGn+baO0ePsnJPqQkeT G6vP3nciQfrbvc1lDDTwSbhVAcia0bVfwCq4uvb6HMZAmTo2ACK22FxnX0QKtwyXofyHVQgzX21cb Z/LHnb3DYKlnW9TN2FZw1Ir+cENcX2xj5AwSbFwO4+0hnON8oInQUUWq8ky1Ms7w2xADYWoFhQ/Mn Qq8/Hf4nFfW0mC6HYptkOcnr4SSlFtuz7MsBZ0UqsS6WKYsbPp5ZQjwusG9k05pq5I4SY2bQ8Wqcz QhnQiKmNbe6oZbmmobe/U+YBolnX9XJMRJKfMPFS1+8naJsqgWpjBf7PoGzHl2AcI04naO1TaMDRL FfJPMqtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj034-0000000FoFc-03Ee; Fri, 14 Feb 2025 18:04:22 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizMF-0000000Fg4N-03do; Fri, 14 Feb 2025 17:20:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553605; bh=fvWy4uz+V/+JDM2O3ZKqvPv58h/Ey85tbYBXNegYFRc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZoQlY4m9HOBzemahk3IJNV7TjpXXHwLq+snwgYRM5N6G1F2m7TuIZMzKXxhzKg4XJ oixwGlbKVYTGXh6nDCXUYlUiiXd9GiNTJzQV2cm+f4CKXhpMdYNJ4yHrgaxAPsqOEn YzUin/vriuey76s1qgxBqEdr91hAAoxvSzon0G1YqgFITNkBLEzqPNKacBqC3KyncC gLXJueLAYRh6er1CgaP6lcCehtWuZcyypj/veBYsDK+sIhL+9f7QVNRG/E1x/TJG3L yJzC2aUZBA5CgijQnj2JQjtNbCVktlQRzadl0z6n/c5ZfRctqsUNwknFCDFJtvXpNL BbZ1Pl4cmN/qg== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8569E17E0FC1; Fri, 14 Feb 2025 18:20:01 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:41 -0300 Subject: [PATCH 10/13] ASoC: mediatek: mt6359-accdet: Drop dead code for plugout-debounce MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-10-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_092007_231867_3C286EA2 X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The mediatek,plugout-debounce property is undocumented in the binding and unhandled by the driver. Remove it. Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 5 ----- sound/soc/codecs/mt6359-accdet.h | 1 - 2 files changed, 6 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index d2841b1385c7cbc5603100a56576eae3b6273b20..c3d51c0753c815cd92935736300f57fd18e033f7 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -514,11 +514,6 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) if (ret) priv->data->mic_vol = 8; - ret = of_property_read_u32(node, "mediatek,plugout-debounce", - &priv->data->plugout_deb); - if (ret) - priv->data->plugout_deb = 1; - ret = of_property_read_u32(node, "mediatek,mic-mode", &priv->data->mic_mode); if (ret) diff --git a/sound/soc/codecs/mt6359-accdet.h b/sound/soc/codecs/mt6359-accdet.h index 0ad5c8660a0bf4a87136a700698b04dff121b175..148e181fc00048ea349c029b382507542a33202e 100644 --- a/sound/soc/codecs/mt6359-accdet.h +++ b/sound/soc/codecs/mt6359-accdet.h @@ -72,7 +72,6 @@ struct pwm_deb_settings { struct dts_data { unsigned int mic_vol; unsigned int mic_mode; - unsigned int plugout_deb; unsigned int eint_pol; struct pwm_deb_settings *pwm_deb; unsigned int moisture_detect_enable; From patchwork Fri Feb 14 17:18:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975589 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7CD4DC021A7 for ; Fri, 14 Feb 2025 20:26:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2ZfhZ+gGKT0tAP9EW1J9t4agSVKOHiQWCEqR28O1Vfk=; b=SFIXBZWjAgKov4ZiAaPmqdlXlK jD20yj0myftF2ulXV50HIacee9iJXzjsR5W1kSreQLDG0Xh7RIpIbV04VLJ8AOJ8W79RPpLNUY5Nd NKW6x0DFQkFs7JDhMWR0v46pPs5BKO5nrpdwrXMY8kBkLd4171UhbE890bXRdm4TP7dYVBgypAwJj JNCVExSF4Ol4+vRJcw6s7Wo2Cg2PEr1R3nEREUd5PRSLuP1obRRhZ0JgmATNHiQRV4gV6Z9Ef6Vso xnqaAgDThaetUB+1SHn1O0FCiDKz4I/VMdo3B6IsFcj4uKw9gajcuzjMPKK/WLa3axyb4sFJ2/J1D G/5nrKmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj2Gc-0000000GA75-1p3Y; Fri, 14 Feb 2025 20:26:30 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizMJ-0000000Fg7s-3SLJ; Fri, 14 Feb 2025 17:20:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553610; bh=daPg2Fccz1EsxoSOHSS26SMyam1GJAwCnpk0jrud1Jc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZDIWifHGTNohT2atoseUGMlz2wV56E7UPz45PLkn29wGPTh841/hlaVfWyCXPpFgJ HVwQ/XU+eSG1tUTwse6mW/3Nz5hMBLWU31dEUDjnVA3ljsKiZzO3CGHHg/9GB2V46t oss2kceiK/DYUuDt6ACSrEKRYjZ25sj+3nsrdRQ7YAu4uat9tMwq5UCoUVi2vNRbz3 /otgmvMRGUR7iegJuheY7HFcQGoCJeOO3Fm6IE+3ewFZSIzNlJ7yjTj3ATHBgstJe7 GxrmN7eS77a4UIjhkZqQg5FxfKvBcR5zKRGTbipeiBG0Ew/4q2OyeujIXsDJooriWs tV/ojXxwRwrug== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 00C1017E0239; Fri, 14 Feb 2025 18:20:05 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:42 -0300 Subject: [PATCH 11/13] ASoC: mediatek: mt6359-accdet: Handle mediatek,eint-use-ext-res as bool MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-11-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_092012_038289_4FFB0E0A X-CRM114-Status: GOOD ( 12.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The code currently allows for values between 0 and 4 for the eint_use_ext_res property, but it should be handled as a boolean, either configuring the internal resistor to be used or not. Update the code accordingly. Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 12 +++--------- sound/soc/codecs/mt6359-accdet.h | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index c3d51c0753c815cd92935736300f57fd18e033f7..646cdd4e0b57f2a007fdcfcaecb7534e08ae61c4 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -82,8 +82,7 @@ static unsigned int adjust_eint_analog_setting(struct mt6359_accdet *priv) RG_EINT1CONFIGACCDET_MASK_SFT, BIT(RG_EINT1CONFIGACCDET_SFT)); } - if (priv->data->eint_use_ext_res == 0x3 || - priv->data->eint_use_ext_res == 0x4) { + if (!priv->data->eint_use_ext_res) { /*select 500k, use internal resistor */ regmap_update_bits(priv->regmap, RG_EINT0HIRENB_ADDR, @@ -547,12 +546,7 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) else if (tmp == 2) priv->caps |= ACCDET_PMIC_BI_EINT; - ret = of_property_read_u32(node, "mediatek,eint-use-ext-res", - &priv->data->eint_use_ext_res); - if (ret) { - /* eint use internal resister */ - priv->data->eint_use_ext_res = 0x0; - } + priv->data->eint_use_ext_res = of_property_read_bool(node, "mediatek,eint-use-ext-res"); ret = of_property_read_u32(node, "mediatek,eint-comp-vth", &priv->data->eint_comp_vth); @@ -660,7 +654,7 @@ static void config_eint_init_by_mode(struct mt6359_accdet *priv) if (priv->data->eint_detect_mode == 0x1 || priv->data->eint_detect_mode == 0x2 || priv->data->eint_detect_mode == 0x3) { - if (priv->data->eint_use_ext_res == 0x1) { + if (priv->data->eint_use_ext_res) { if (priv->caps & ACCDET_PMIC_EINT0) { regmap_update_bits(priv->regmap, RG_EINT0CONFIGACCDET_ADDR, diff --git a/sound/soc/codecs/mt6359-accdet.h b/sound/soc/codecs/mt6359-accdet.h index 148e181fc00048ea349c029b382507542a33202e..1a255a360b2319396e9b7a5a145a9317e575587f 100644 --- a/sound/soc/codecs/mt6359-accdet.h +++ b/sound/soc/codecs/mt6359-accdet.h @@ -76,7 +76,7 @@ struct dts_data { struct pwm_deb_settings *pwm_deb; unsigned int moisture_detect_enable; unsigned int eint_detect_mode; - unsigned int eint_use_ext_res; + bool eint_use_ext_res; unsigned int eint_comp_vth; unsigned int moisture_detect_mode; unsigned int moisture_comp_vth; From patchwork Fri Feb 14 17:18:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975483 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BA1BAC021A4 for ; Fri, 14 Feb 2025 18:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=i5I057EwsM9dm/8zKehPLXZGKKJS10uPtxocqaP3/pI=; b=Iic68aT9fC1NVPbjLHHE/sUNTt H4o57HGk4F+uKy2RhWKz0J/7hI/7UDTkKd0kvyOF3OvBwXL7Ay9LuNSSThSkeaE0JBv7Z6d67h/Qt nGCZwV4QWF5Mfav/jlnBcuVvmyp2cqmT/+Msn9zftmdCzB/xG0VHa8vBNNAkG9TiZYtn+Uo1jWTG5 gBgbgivMe6BZsyiEPEC9uheDZq1R9PajeTsMoJmmyyK4vTipDwO6cKY/CQE3Zfxsw7WTN2LX0SVmb HjIMm7x3DEEYPn7zX9rlG7Gr1wa3HZkx8vPiw0cTt470cLK2dnUAX45yda4rLhxE/dnc411v5HKDT 7fcr7ZBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj05u-0000000FoeX-0i5F; Fri, 14 Feb 2025 18:07:18 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizMO-0000000FgAY-44R3; Fri, 14 Feb 2025 17:20:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553615; bh=vSj0waEcx17dh7fvzqeAr6f2FKcw3vDK6V0f2tcErhs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ryz+EwqXUQc8bryYPPZtwdHaMkEyfPKmTk+BW6/8Hfl+FzlC2+s/y+yJk9vFI8bH0 KNCowMDpEMe62aG3YNlFW43bFJ7rXGBBO3M0VGXDKjOcTMxNuh54+8XwaaGwQDR1OU EI/MJS+gZJnvhAijOzLHK4xm5vVeyJ3/XlDoEr5/oIWWJkq+jDZ88eysEtLNweLx0K jPlzKL8qo0Q7if3Gh4gNA1oqLIigLV2UI67LSU5oDGQu9N79075ufAoNhAZDSWXCKd HQ8BLJkmGGDk9QbrZBBckXBhT066MzsBiRf5uwhp0PMfwIFMti7x0MFsB/5gye2TP1 ow68EqiFADeog== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id DA84917E0FC1; Fri, 14 Feb 2025 18:20:10 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:43 -0300 Subject: [PATCH 12/13] ASoC: mediatek: mt6359-accdet: Split mediatek,pwm-deb-setting properties MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-12-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_092017_182013_27E123AF X-CRM114-Status: GOOD ( 11.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Instead of parsing an array of 15 integers from the mediatek,pwm-deb-setting property, which makes them harder to identify, parse each value individually from its own property. Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 44 +++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index 646cdd4e0b57f2a007fdcfcaecb7534e08ae61c4..eca8a0eeb1f868a41c808cc0b853e77db3b0bf59 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -501,9 +501,13 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) int ret; struct device *dev = priv->dev; struct device_node *node = NULL; - int pwm_deb[15] = {0}; + struct pwm_deb_settings *pwm_deb; unsigned int tmp = 0; + pwm_deb = devm_kzalloc(dev, sizeof(struct pwm_deb_settings), GFP_KERNEL); + if (!pwm_deb) + return -ENOMEM; + node = of_get_child_by_name(dev->parent->of_node, "accdet"); if (!node) return -EINVAL; @@ -518,11 +522,33 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) if (ret) priv->data->mic_mode = 2; - ret = of_property_read_u32_array(node, "mediatek,pwm-deb-setting", - pwm_deb, ARRAY_SIZE(pwm_deb)); - /* debounce8(auxadc debounce) is default, needn't get from dts */ - if (!ret) - memcpy(priv->data->pwm_deb, pwm_deb, sizeof(pwm_deb)); + of_property_read_u32(node, "mediatek,pwm-width", &pwm_deb->pwm_width); + of_property_read_u32(node, "mediatek,pwm-thresh", &pwm_deb->pwm_thresh); + of_property_read_u32(node, "mediatek,pwm-rise-delay", + &pwm_deb->rise_delay); + of_property_read_u32(node, "mediatek,pwm-fall-delay", + &pwm_deb->fall_delay); + of_property_read_u32(node, "mediatek,debounce0", &pwm_deb->debounce0); + of_property_read_u32(node, "mediatek,debounce1", &pwm_deb->debounce1); + of_property_read_u32(node, "mediatek,debounce3", &pwm_deb->debounce3); + of_property_read_u32(node, "mediatek,debounce-auxadc", + &pwm_deb->debounce4); + of_property_read_u32(node, "mediatek,eint-cmpmen-pwm-width", + &pwm_deb->eint_pwm_width); + of_property_read_u32(node, "mediatek,eint-cmpmen-pwm-thresh", + &pwm_deb->eint_pwm_thresh); + of_property_read_u32(node, "mediatek,eint-debounce0", + &pwm_deb->eint_debounce0); + of_property_read_u32(node, "mediatek,eint-debounce1", + &pwm_deb->eint_debounce1); + of_property_read_u32(node, "mediatek,eint-debounce2", + &pwm_deb->eint_debounce2); + of_property_read_u32(node, "mediatek,eint-debounce3", + &pwm_deb->eint_debounce3); + of_property_read_u32(node, "mediatek,eint-inverter-debounce", + &pwm_deb->eint_inverter_debounce); + + priv->data->pwm_deb = pwm_deb; ret = of_property_read_u32(node, "mediatek,eint-level-pol", &priv->data->eint_pol); @@ -834,12 +860,6 @@ static int mt6359_accdet_probe(struct platform_device *pdev) if (!priv->data) return -ENOMEM; - priv->data->pwm_deb = devm_kzalloc(&pdev->dev, - sizeof(struct pwm_deb_settings), - GFP_KERNEL); - if (!priv->data->pwm_deb) - return -ENOMEM; - priv->regmap = mt6397->regmap; if (IS_ERR(priv->regmap)) { ret = PTR_ERR(priv->regmap); From patchwork Fri Feb 14 17:18:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 13975484 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FC57C021A4 for ; Fri, 14 Feb 2025 18:08:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=S49iaesdMmDgotoaLFpfWznFLyv7MEsbmzFOp6EW91E=; b=I0xBlFH772ddlWeKqd87wLdZO2 8rm5u2M9wEgozX2MhV4U4RlCON065fFV5KZ1rAl7RPF5QzKV4B0T/cHPlfacu1icE+/AU8LEF63DT fW0LUJjqwOslWcHivbg9gCvEqhapAe/OlXLH+Wt0ymINNr2DKQM3DbjXC9kynLVvmkpeIqvqdJWxz VuEHdqHv/nUdYYcgTMHYbWFEXAYvPEDTv4FBI6WPWV+303x2PWk6kHg14CZQ5Tzvo6Cdr/7s/F9MW jvQkEqC6NyXNCAVM1VHax0Hc8VUhhMKsAmHiw/HekqvT4B4h5Nv+IrJdBBF6DviahRbUvetB7U3Yd P0Tr6/DQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj07J-0000000Fp0e-2YvU; Fri, 14 Feb 2025 18:08:45 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizMU-0000000FgDL-1RDP; Fri, 14 Feb 2025 17:20:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739553621; bh=L2T4ek7h+Mjl4qzzgisy3XYBCi228hsxzedCePnCexI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=auKxJJZUPekOf9Bnx36fTulkRnQEg57CiyhOlb3MLcwskpDf4OLbEmACcNzodrjVv z8m6OC+B8VMgW5gauE6O0YI1A0JIF8fu/JzqBhybz8r3Nydud4toCYg/9y2+ekliqh LRP9j9v7WRVbDsvBf/JX9MsINIB6f19McQlsXTMBlB3VvHR870Y2jj4WOuop/st5Y7 ajH6r6i/1KCLYTAkNtbRIwApOljMpDJfQ4JRnd/+AUVWfQhLF+10qR+kx2LgebCt8v Lr/iqezRlm/pVtPiyDZXGRGFryzYu2vOdom6keujVmNlUlAUULsPgIoNEi3sH0c1xn uvQaD7sO9c6PQ== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1003]) (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: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 1CDA817E0239; Fri, 14 Feb 2025 18:20:15 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Fri, 14 Feb 2025 14:18:44 -0300 Subject: [PATCH 13/13] arm64: dts: mt6359: Add accessory detect node MIME-Version: 1.0 Message-Id: <20250214-mt6359-accdet-dts-v1-13-677a151b9b4c@collabora.com> References: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> In-Reply-To: <20250214-mt6359-accdet-dts-v1-0-677a151b9b4c@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , Andrew Perepech X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_092022_524737_32A907C0 X-CRM114-Status: UNSURE ( 8.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add audio jack detection node. PMIC accessory detect driver will create an input device that will send key events on jack insertion/removal or accessory device key presses. Co-developed-by: Andrew Perepech Signed-off-by: Andrew Perepech Signed-off-by: Nícolas F. R. A. Prado --- arch/arm64/boot/dts/mediatek/mt6359.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt6359.dtsi b/arch/arm64/boot/dts/mediatek/mt6359.dtsi index 150ad84d5d2b30ab6064c71e1375ce5df5ae4b36..44631fa046b88fffe888d94bfb9b5943b8a66b24 100644 --- a/arch/arm64/boot/dts/mediatek/mt6359.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt6359.dtsi @@ -15,6 +15,30 @@ pmic_adc: adc { #io-channel-cells = <1>; }; + accdet: accdet { + compatible = "mediatek,mt6359-accdet"; + mediatek,mic-vol = <8>; + mediatek,mic-mode = <2>; + mediatek,pwm-width = <0x500>; + mediatek,pwm-thresh = <0x500>; + mediatek,pwm-fall-delay = <1>; + mediatek,pwm-rise-delay = <0x1f0>; + mediatek,debounce0 = <0x800>; + mediatek,debounce1 = <0x800>; + mediatek,debounce3 = <0x20>; + mediatek,debounce-auxadc = <0x44>; + mediatek,eint-cmpmen-pwm-width = <4>; + mediatek,eint-cmpmen-pwm-thresh = <1>; + mediatek,eint-debounce0 = <5>; + mediatek,eint-debounce1 = <3>; + mediatek,eint-debounce2 = <3>; + mediatek,eint-debounce3 = <5>; + mediatek,eint-inverter-debounce = <0xe>; + mediatek,eint-detect-mode = <4>; + mediatek,eint-num = <0>; + mediatek,eint-comp-vth = <2>; + }; + mt6359codec: mt6359codec { };