From patchwork Fri May 3 18:55:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13653331 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 57376C4345F for ; Fri, 3 May 2024 18:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :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=jt0LoAjikcnHeEV3gu02esIVsaGhashtG8haBv17HVE=; b=CPzHDEcPwca7ty yTJJgx1ssUYIaXeQtmR+jDMmZdB7UbWGVOpA9hnE6/83yhAUWnr5F9WJgvj4fQZK8TustschlzQh3 BTDWWZFeVo5gWHfNQK+kGXERh72UkQjmfiNnit3FMiLhQze61Ze0ypLM/vxxJmjSPY6dNwnThDyG9 cXBi4g7fTiCBeW98CSaBfyzAGOYHQOBr9rQeHrlqWcC4YGF72i0vmn6MVZEM8iacr9xW1ruHTn3Lt jQFfFbbs5782aDT/gOWdQ5wk28WDN4MNsFtfdWUydigdpSWV+rSilxBzC9A2SnYWrlrq42pUN8es+ CXivbli7At9NLuwqO4Ag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2y4B-000000004Zl-2x8L; Fri, 03 May 2024 18:55:31 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2y46-000000004XU-4BRS for linux-arm-kernel@lists.infradead.org; Fri, 03 May 2024 18:55:28 +0000 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a595c61553cso566747666b.1 for ; Fri, 03 May 2024 11:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714762525; x=1715367325; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=F4JYeUr0dOQRMVbNboqjhvtximVshCSVg7z47+X+6e4=; b=RCGd2mQ0soSDT6ENB4M9npijniJJR2TL+9mh+XOZCDQBmvGRpOAkd2YYuVZuCpCZLn S3xycSwHgim5SLlksZEhbhlUYqm0DU0RidXq5qlebLqXNp/52Rwcv7274LX30hxW0Rz7 qQpEYybvv9+3inGxJUteW2EM6R6Js4IuQV9pv6r05zDeLmqL02Cf2vKpN3eV7g8eYL7b X6kpYhGKGTHN08jhDwC+o8oiVnlW0dxpj8rMEDpSt8PsN9TfLDYydW2VwE44mPekXmFt rJjPK9APJkGH6l8nVioC+b1e3xwrkpBaLUE6o/FvwQ7XrUHd6xxmKgC+SJbLWecj/S1i 6hxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714762525; x=1715367325; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F4JYeUr0dOQRMVbNboqjhvtximVshCSVg7z47+X+6e4=; b=XGeabcCT0yZLEf3FZDwznbfCnEgASB3XQB+2iNKSmt0asrvuqrGxWHwsnSAp6tvxys +ucrRtkAVa9aReLNLPxilR5nS0BYenrI/qi0kkREUOFs4COnbNAzDa3y8aRccooc8LgN dh8AAFGIm844l68n2ZtjwsYwTkcud5FoV3n1DhniJZx3FTp6DKig7sKf0+3+Yojk/SuK zbGq/AHciM9BG4DBVkTZ3vrgIobgdmyewl0uYWEBsWojXxjjmYlEXPlg2i3YsJYAHxWO /K5N1ct4Cz6Gqg1KLNjGVEoijrQ/QJeEDa8aMMrwCNW7awLETJXL2OrKDJvVLL8zaWoX P1NA== X-Forwarded-Encrypted: i=1; AJvYcCWlPguWcB001fW0rjvJPuQwt1j2976Ld7KiIobogBKd33eiw5BVy+reswp3aD2WcxoQv87mQF2QPm7CbsJB6qGWMcJOPo1s2LJev/edu16s/r/8ox4= X-Gm-Message-State: AOJu0Yxp04Uxq4ad2fpDn1sKIu13UBlqi1y1NIwFg6GyezrDc+15wPqm Cpu0KwgvDFlLYn3TOSupZ+BcbE578lkRcVdDpFHGSIvPQk2gq+szlNj17Q== X-Google-Smtp-Source: AGHT+IGl6b9e2HFGYnhoAnaljhI1GQ0PiFI5MbCO2zuMHmb1huwM89XxkBc/QIEubt+jlSDtr2i80w== X-Received: by 2002:a17:906:fc20:b0:a55:b487:5676 with SMTP id ov32-20020a170906fc2000b00a55b4875676mr2228045ejb.72.1714762525087; Fri, 03 May 2024 11:55:25 -0700 (PDT) Received: from hex.my.domain (83.25.185.84.ipv4.supernova.orange.pl. [83.25.185.84]) by smtp.gmail.com with ESMTPSA id l8-20020a170906078800b00a598d3ddf8dsm1104618ejc.28.2024.05.03.11.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 May 2024 11:55:24 -0700 (PDT) From: Artur Weber Date: Fri, 03 May 2024 20:55:13 +0200 Subject: [PATCH 3/3] ARM: dts: samsung: exynos4212-tab3: Fix headset mic, add jack detection MIME-Version: 1.0 Message-Id: <20240503-midas-wm1811-gpio-jack-v1-3-e8cddbd67cbf@gmail.com> References: <20240503-midas-wm1811-gpio-jack-v1-0-e8cddbd67cbf@gmail.com> In-Reply-To: <20240503-midas-wm1811-gpio-jack-v1-0-e8cddbd67cbf@gmail.com> To: Sylwester Nawrocki , Krzysztof Kozlowski Cc: Liam Girdwood , Mark Brown , Rob Herring , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Alim Akhtar , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1714762519; l=2229; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=3kNvXvkN6naoI7GD4sRzPfHePGAYfimaGj1maVSZXX8=; b=agat+hgkRN9DNTowBNeEtXOd2WrfzFQ9JevjJtvYwfVfxYh/0eH8GkWG0msG//Zw21Hq4/csU Qr4xAZ+ecQdCWUpolpGSUoMlA8eRC4nR1P0KeIVHHJ6gqm3OzlAOxIG X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240503_115527_077699_B44E1E01 X-CRM114-Status: GOOD ( 12.18 ) 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 the necessary properties to the samsung,midas-audio node to allow for headset jack detection, set up the mic bias regulator GPIO and fix some other small issues with the sound setup. Signed-off-by: Artur Weber --- arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index e5254e32aa8f..a059857e3054 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -285,6 +285,8 @@ mic_bias_reg: voltage-regulator-4 { regulator-name = "MICBIAS_LDO_2.8V"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; + gpio = <&gpm0 0 GPIO_ACTIVE_HIGH>; + enable-active-high; }; submic_bias_reg: voltage-regulator-5 { @@ -297,8 +299,17 @@ submic_bias_reg: voltage-regulator-5 { sound: sound { compatible = "samsung,midas-audio"; model = "TAB3"; + mic-bias-supply = <&mic_bias_reg>; submic-bias-supply = <&submic_bias_reg>; + lineout-sel-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>; + + headset-detect-gpios = <&gpx0 4 GPIO_ACTIVE_LOW>; + headset-key-gpios = <&gpx3 6 GPIO_ACTIVE_LOW>; + headset-4pole-threshold-microvolt = <710 2000>; + headset-button-threshold-microvolt = <0 130 260>; + io-channel-names = "headset-detect"; + io-channels = <&adc 0>; audio-routing = "HP", "HPOUT1L", "HP", "HPOUT1R", @@ -345,6 +356,11 @@ wlan_pwrseq: sdhci3-pwrseq { }; }; +&adc { + vdd-supply = <&ldo3_reg>; + status = "okay"; +}; + &bus_acp { devfreq = <&bus_dmc>; status = "okay"; @@ -505,12 +521,11 @@ &i2c_4 { wm1811: audio-codec@1a { compatible = "wlf,wm1811"; reg = <0x1a>; - clocks = <&pmu_system_controller 0>; - clock-names = "MCLK1"; + clocks = <&pmu_system_controller 0>, + <&s5m8767_osc S2MPS11_CLK_BT>; + clock-names = "MCLK1", "MCLK2"; interrupt-controller; #interrupt-cells = <2>; - interrupt-parent = <&gpx3>; - interrupts = <6 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; #gpio-cells = <2>;