From patchwork Fri Aug 16 07:50:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13765647 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 A6CE4C3DA4A for ; Fri, 16 Aug 2024 07:52:33 +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=wyOu5xh1aD+Hvn+LnU8RfXLmSimiRmcKh0k9fq9YE00=; b=PxMFXCQavyUcCr1OLOBtUq1/dQ 50DyJ9oBN54U35BQyX2kEm9vEcfGz1WpFLYIjHIhmZqxvuXFlR9Cd7qLFOpwFb7CdcKOJeD6tD6Op amZPre5gACnp0VtgPlHpcyISW+iTCqqyILkin6gPSkVGIAIKI/ZPWT15oq4iVNlbm4hXxcAWy4rjy dhCb+z2Gn+7cEpmU27tcW/fFersRfXMgizlNtgVZQo8UM1qRu55OdlO7kg85LhxzHc91CmZtwI1SW 6eJW8WPYIsO3Cb6rBbsPmTgUq3MQNtW2tqy4KaTQl0A1p1bTkOuSeCW+N+6U90X7gA6hKOXpo3Jbm 5/pf5hJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1serku-0000000CAqi-1ugF; Fri, 16 Aug 2024 07:52:16 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1serjy-0000000CAa5-3z5B for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:51:20 +0000 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3718eaf4046so665550f8f.3 for ; Fri, 16 Aug 2024 00:51:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723794677; x=1724399477; 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=wyOu5xh1aD+Hvn+LnU8RfXLmSimiRmcKh0k9fq9YE00=; b=PRjOfGiljOcP7QQZmIBiro3wydpKcvAuOq3rgDDCTS4s7i83nHzQqVJ1z9gG4HjamQ 7/Iv8rNBl01HKRqcW15WbwqszLck15zmb/visZfmHMYa0si3t1Y1OWh+kVWJRF/SvaG0 XIAR6VrNSJgSH0DNQqjT0x/sJdtGkYIUSwZUvxqcSYiWU4/va6GkR/VNdykUMbo1Yhe7 dW8ldBilTMIfE1OgR3ztJ3hBN8wvHTpFQm+hw9KqbMpSnLLuETCCUteYlrFjyOTPwSm8 khkLtvvaD7LmzMBd++C5NM+B8lzzmToel/X9uZAn5rlBAiOKNR2zYn0ZpBKkiWtFZ3PM qqQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723794677; x=1724399477; 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=wyOu5xh1aD+Hvn+LnU8RfXLmSimiRmcKh0k9fq9YE00=; b=oJ3AnNhDGkxy7TZfXsxlSyPm6WW7fB7iPBIqLWaGbODe8HJBKxwUMsLJqiuLxmXn7B sU6zj0g7Mya0IGyeThTduDrx/guiCCEI0N0VRrqjlCpIHy+JJgE16xicKhgkhyXOfFaa 1YAG3FzijlcxHMlUjpYNd2U+jWF9PNvUGd9unVvQwtuLfxwR+8ZMLcqF4ZFhRPPi6YTt l02IaOTpr9gaoQEZpChHZ/kE8dfpXzq/iJS12Zaydy+qSZKJdqhwMKRm3jfUJZHk1HD/ ysNAm0JG5lxiJxULqMhl/zRRJDCOBw8zBWr4S/stMDZH3amuANEeBapmMvjI9lBcchou 0fRw== X-Forwarded-Encrypted: i=1; AJvYcCV0r6SMz0hd5PM+ptotGojRzHG6eNZmCYwoez06anQrITuJ6wtQs/NBBA/MrCbYCsIoRE7AV+RQLMtUIde/4RwaeK3mLg6c5ukFKO8dLgzhRxi2wWQ= X-Gm-Message-State: AOJu0Yw5MFlpyGp+4uICzQVWj9R3N5APb8UFHUpVMnR5U43L4bGPURCi qD9Ye2z4bDU1huiOxvkeqVX5jUzqN2BvNZVUpT+u/VKHalrG4IWM X-Google-Smtp-Source: AGHT+IHywpP31x3vB3Q29gUAbKdQEV2oUwRHXp0YJ5LMoyXhgaFv5T2z+t1ZD3jER6jPEg2htLbhLA== X-Received: by 2002:a5d:69cc:0:b0:368:3782:c2b3 with SMTP id ffacd0b85a97d-3719464ddbfmr1430804f8f.29.1723794676676; Fri, 16 Aug 2024 00:51:16 -0700 (PDT) Received: from tablet.my.domain ([37.30.8.221]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6c4sm3026201f8f.52.2024.08.16.00.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:51:16 -0700 (PDT) From: Artur Weber Date: Fri, 16 Aug 2024 09:50:58 +0200 Subject: [PATCH RESEND v2 1/6] ASoC: dt-bindings: midas-audio: Declare required properties for GPIO jack det MIME-Version: 1.0 Message-Id: <20240816-midas-audio-tab3-v2-1-48ee7f2293b3@gmail.com> References: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> In-Reply-To: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1806; i=aweber.kernel@gmail.com; h=from:subject:message-id; bh=iV+M9xizwvmZx1O7iSf9l6DHKdHcEZAQiXWFY1PnmrY=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmvwTmEGjYoH5a0h0jF9Zer/NMFym7Mqel3/LMQ CmbFgGA8K6JAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZr8E5gAKCRCzu/ihE6BR aKa3D/9D6JLWduoKlwrIuFmu2456p9viU5lFCbPcV+Nx1skh9KCVTHUG1/x8xKGd/Zmo6oJW6ev XFiez92qBEXk5+EgEXapAQLGEy1xhcCYBDUZ3jg3sCzEBhXHBcr0TZa5zy6nlIWYobX3RQjHQVA pSHpWyZMNZ5vYZPVVJ7mSnZvb8D0ruSOa+5+Ytpo1V9n0lukB3zqLP5BiAatnPh0drKNRqaHLAA GDEC4OpV3NkO6oYbsPvb8lUzaEtoKtN49VbRyBwUzQ7sSyKY/v3RhYniuMj7iwVgI3p+5DXy1bL r6/7RvcvbtUEe0uarpBtjFac1z3/FCenJxcQItjX+uQe0tru5xgUMBxPlk3LiRQZpN+VvwyUar+ cs8H9eniyOOgVCkc7gJju7fhKregPwV67MKxes5FPlJRKclNrh45wkK01nb2HWqAUQz7UGjj3UY SmIXhbsSFC1A1gFEcsKVHnVcpAd+UhgNlVStyQSQxxEciICxQjk+HxHj9Sg0KInMa5JeN4VzWf3 4lZa5yM5jWyr1In365tP3q54i89vcRgnzhLNorh3Ab8u6q3YB/HXLgpdyGnY49iFXLBc62LM7tA nSY7JItBJVDowVs1Q8bhxqeLq5NMXG1dTRmtfJAEuP8rzkwe8qFFHm5xn6TSZolFO0BQ2E6HtGD AOJEIGsdx1zGFsQ== X-Developer-Key: i=aweber.kernel@gmail.com; a=openpgp; fpr=E663000EAC1DECCD6AD2890DB3BBF8A113A05168 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_005119_025430_AB75BDBF X-CRM114-Status: GOOD ( 10.29 ) 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 GPIO jack detection requires an IIO channel and the detection threshold to work. Explicitly declare the requirement in DT schema. Fixes: 0a590ecc672a ("ASoC: dt-bindings: samsung,midas-audio: Add GPIO-based headset jack detection") Signed-off-by: Artur Weber Reviewed-by: Rob Herring (Arm) --- Changes in v2: - Use anyOf instead of oneOf in headset-detect-gpios/headset-key-gpios if: statement --- .../bindings/sound/samsung,midas-audio.yaml | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml index 69ddfd4afdcd..5483421a6fd3 100644 --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml @@ -9,9 +9,6 @@ title: Samsung Midas audio complex with WM1811 codec maintainers: - Sylwester Nawrocki -allOf: - - $ref: sound-card-common.yaml# - properties: compatible: const: samsung,midas-audio @@ -102,6 +99,32 @@ required: - mic-bias-supply - submic-bias-supply +allOf: + - $ref: sound-card-common.yaml# + + - if: + anyOf: + - required: [ headset-detect-gpios ] + - required: [ headset-key-gpios ] + then: + required: + - io-channels + - io-channel-names + + - if: + required: + - headset-detect-gpios + then: + required: + - samsung,headset-4pole-threshold-microvolt + + - if: + required: + - headset-key-gpios + then: + required: + - samsung,headset-button-threshold-microvolt + unevaluatedProperties: false examples: From patchwork Fri Aug 16 07:50:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13765648 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 19E99C531DC for ; Fri, 16 Aug 2024 07:53:05 +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=Nv52bY0EFnPEnlQPn67LspBrmp168OKPFuY1wn3c8Y0=; b=MKpUOEUcs2Wo6iioF5+MPJHjoH jY1QncKIEJiKB/L0Pmyj1jCErRpONNknWWgTJQJMMJkmCLNwZpoYY+ftJYrOfDiWbwL6Z+rzf4m6P YCz3Qydy3Gh7eQvPX9h2GLYVUk2ub/XJxv9djjEefaAEPrzqMSBmoxWkU/w8h1wBcAs4fz0v6LxoI 1m+DPOpZPforYM5/QXcChYHIpuDAgkwdIP2/6N5xTqVueLTLqAqu2Z2XAZB+Cax2MrARR/itPpphi lRrWDIBvLe9ozAB2a3eQA+7gUJ4828WMciyuj65Pr7D4ez6Bo/0LTfmsH7LRfT2Cwq9EtUSjqBLmL Mf31jwNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1serlW-0000000CB1o-1ZxQ; Fri, 16 Aug 2024 07:52:54 +0000 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1serk1-0000000CAac-1XSH for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:51:22 +0000 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4281d812d3eso16935425e9.3 for ; Fri, 16 Aug 2024 00:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723794679; x=1724399479; 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=Nv52bY0EFnPEnlQPn67LspBrmp168OKPFuY1wn3c8Y0=; b=kBzuZBoV2YnFfZQ6Dfva+UvnUmedek3wnipw0tjyuUzfn2yHSmLCxWoHYgi6BNqZB0 kM4Y/ZwanYaiLXkqRRkg8fPqU8MynK731+evskwcaqeZaSiRacWN+VTiY0+voLU7NnHL s1Ek6SmH6Y9VEyBEvON6wQAxBQTH5rChtqnsPvN2lgo5rgzrRF7b7b8832JFVL6BWBEf LlTNH7iXZ7niGzD6NLIfg9HlcBi1/nYPX4Tquk/lnPxdS2jA7m6iz/4/WF5kRooQnYKq YsbJUVTmNmdbRJSbc6LbiPkknqspTiP3yo5JCr+KvEa4KuehcMvIdVjnaYQQGYpjrbYN 1cxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723794679; x=1724399479; 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=Nv52bY0EFnPEnlQPn67LspBrmp168OKPFuY1wn3c8Y0=; b=sxygSQoyxuGTy7EFcq8iCvBgsfMMVSlEtTlNJL5PW1XMIauRyQwwo7u7zFwof3ggY9 NaWH2TLz9xbuyNYY24vftp5NiZUotmxI1BdSUO239OG5crIrkN1hoOSpJuTmrOFA/Kwu u2S9e2rbr2evfdW2SufNpjqIu35t9MB9ZtdBa96rdGtkcdsGEs31kZ+eipq8x4yVc02u 3ElNYvHZGH0oHdFRikHDrmuaPG24Fo2wW9FqNeiao17i9c6TM5eSnemjxuoWGflDdpDE j8wRvyabQPjH+g7rRQwROaBz3CoOD8yaDQdAWx/5CMlDYBe5IPxRHvPH56wRaQoOs5b5 wwjg== X-Forwarded-Encrypted: i=1; AJvYcCUwsndYedrA0rdTpC2eeYMssfC7A9R8e5qX6rYkj/m4PvAt/3J/4zGKh4AAi3AOI3sDe9S9sor7sQMKzJRfoh4KMep+eXHplew7sZpA5x7ZQK4GOqo= X-Gm-Message-State: AOJu0YxBa/Wxfsd9KgQ9p0h3uEnRorEzOYAZdZnadeuz3pFmfF2M46mi CIy9hbXz29mxNlYbmj+NTM8Pi8MMFuDSmHUZ6XINBQh9ZbGs+LDH X-Google-Smtp-Source: AGHT+IHxlk9O301eBiH5iSAuhU7SaBr9TuAH/N3Vlxr1jlIQybW8sbp8cOihJ627hwOLaKwZSo+w5A== X-Received: by 2002:a05:6000:e4e:b0:371:8750:41a1 with SMTP id ffacd0b85a97d-371946aafcdmr1562452f8f.54.1723794678778; Fri, 16 Aug 2024 00:51:18 -0700 (PDT) Received: from tablet.my.domain ([37.30.8.221]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6c4sm3026201f8f.52.2024.08.16.00.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:51:18 -0700 (PDT) From: Artur Weber Date: Fri, 16 Aug 2024 09:50:59 +0200 Subject: [PATCH RESEND v2 2/6] ASoC: dt-bindings: midas-audio: Add separate compatible for tab3 audio MIME-Version: 1.0 Message-Id: <20240816-midas-audio-tab3-v2-2-48ee7f2293b3@gmail.com> References: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> In-Reply-To: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber , Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1905; i=aweber.kernel@gmail.com; h=from:subject:message-id; bh=Xe/TeA+AqUFagpOwh/MxUzaXugTMKRQK8JWn91rUokE=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmvwTnJNIkRw8GVodWAgJWPOfKBdCJAnZQbOuSc WfGPXlHnYGJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZr8E5wAKCRCzu/ihE6BR aLmnEACfIN2oDUT6Oi9VkEB5Kjoa/UPsY0NUr48cjf8uDVVfdGKrGvduJbLTvbE7SqqjgHCndp5 xZcOWX9HsmwvQRkOp2nQoGfvH59v1MvtCjftmhrCUt8Xs3bI1+KvFZ05w/++tZIMHG85QTC1FLi qs+xxJFtGp4O1Fd1gLPVmdmkC6PhJwz6gOJdkKn1nxoDQeLfw85QVKB+zHlcnPFqF0aPjAIa+yw dSYhdC55kKQ9VrNiHbV4eUyZWxD8C/r1HDFX4g9R26VUzxaKB70cvneHEpEbjDQxwfPo+Rtyqj2 gwWqeI1K2cTDrH5bez9zQyFVsSjQ8tIPDKz8nqDEdk946SxHWbt4qot5SjDcZY+70gUPzkd3h1g 1yauOqyEAGdw8BDOeiK1kNVGijdIkzHNfikNKLPg8DRZ8Ov7734ikKy3LUZoqLjAgOIqvsoANaW 9fad+ip6W/WQszMmRxL3so2DVH1I+Kfc5bAMr57CBnDOjgcmh8dgungzubTqr8MZBd/PzKUobp4 luYNnpPPsdAiJmAf3op+ljhsHv43PnPwR+H2OxbN2MC/laSozX9oVQKz0tTYNL25Z89lSu/xaWM M+h1R7+e/om0YWWCYTi2A/CsKy4THIUyiqs/MAsW/n8LWGBDqTruS8O3zCZyHKHfOC+Psz8sWID hSm86kpN8v+m1QA== X-Developer-Key: i=aweber.kernel@gmail.com; a=openpgp; fpr=E663000EAC1DECCD6AD2890DB3BBF8A113A05168 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_005121_439927_FB8C2576 X-CRM114-Status: GOOD ( 10.90 ) 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 Unlike the Midas, the Galaxy Tab 3 8.0 does not have a main/sub mic bias regulator, but it does have a separate headset mic bias regulator. Add a new compatible for the Tab 3's audio and declare required regulators separately based on the provided compatible. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Artur Weber --- .../bindings/sound/samsung,midas-audio.yaml | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml index 5483421a6fd3..cb6105a6b216 100644 --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml @@ -11,7 +11,11 @@ maintainers: properties: compatible: - const: samsung,midas-audio + oneOf: + - const: samsung,midas-audio + - items: + - const: samsung,tab3-audio + - const: samsung,midas-audio cpu: type: object @@ -96,8 +100,6 @@ required: - cpu - codec - audio-routing - - mic-bias-supply - - submic-bias-supply allOf: - $ref: sound-card-common.yaml# @@ -125,6 +127,28 @@ allOf: required: - samsung,headset-button-threshold-microvolt + - if: + properties: + compatible: + const: samsung,midas-audio + + then: + required: + - mic-bias-supply + - submic-bias-supply + + - if: + properties: + compatible: + contains: + const: samsung,tab3-audio + + then: + required: + - headset-mic-bias-supply + - headset-detect-gpios + - headset-key-gpios + unevaluatedProperties: false examples: From patchwork Fri Aug 16 07:51:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13765650 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 04097C3DA4A for ; Fri, 16 Aug 2024 07:54:19 +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=pNY+wb1THjo+CnMw7VM5lVjKwdkOwb5ze/davWuQ93Q=; b=p8dX5bq1ztpv9cuXphYlUdsGoM sVBykB+zSWZftGXOWHwpSg6LB/Zoaux+t9xvVeaaF7WtCbkomod5EgZO3aqIeS+q3J9S78sh6fmAu Jg2tG9yh7LssNYbMcDJTVMkNl/2PAtcKI1SRI/OG0GgUKwAi199sgFMWj/WbTMpC1WIkEFbctmXpx zjWap4LkWwDX3S1tOk0n54TomXp3PycieUsOa2H3lUxZJVloyIJEpRArNGNWvY1NaDNu7ey+kaD5Z kC0wu/C5W6izxX4mggujVcQ2SuR1YjQOc7p48cQWUe5DZX9+basaxlWWCqyC/9qzshCgYY1T/ssI3 +Hv1c2eg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1serml-0000000CBOp-1xqS; Fri, 16 Aug 2024 07:54:11 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1serk2-0000000CAb0-2wQO for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:51:24 +0000 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-428243f928cso12122055e9.3 for ; Fri, 16 Aug 2024 00:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723794680; x=1724399480; 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=pNY+wb1THjo+CnMw7VM5lVjKwdkOwb5ze/davWuQ93Q=; b=DybJK2t78KXyNyWlnc4v+rSnRgEJHT9AyeFar3UOzvq23YJw3dsi+D+TfoEFz2qfJM tt/wDuletIZf6tFwVynfFiDalecIYo69Hq0rgevwCRxKHa0Gl1AQUjEbIpy676Lyvzgt +OuX1AESR1IKcUWlXY2ZFVpHePI7mWpzg/tbbp4bbDhdko469hocmNvMiK5SDQpV03q8 K4b4R+xtqxbs1cqkswS/c/EnVrnTS/QKh69sCKQkI48oIo1Y7DNHHBaQRhEC2IwZGW+f yoLYcIX3C/wD7cCeV9UjzP8GhCnjNeuD/B+nZnYPWT1u9btP7fllTDAkZzMT6egfmyVm 1J6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723794680; x=1724399480; 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=pNY+wb1THjo+CnMw7VM5lVjKwdkOwb5ze/davWuQ93Q=; b=slM/5SxUjRmsSni25WINfIHc090bKn6MpchiU1D+QwS+oLoyxtX8Sw6iMsMID6GLcW HTl0ao+C9p/ZT6mhqGO/hA+flUSzsrgamluJ8KufEKep8VGOKgGfgYn4T6cR4ZUpx/7v H7igAF1bAN2Q/5mok70EMZqz1xeyIzsyiSIQCD9Fjv52C1CPULIlRDEj5y4U2QcOu/NT Jo/3sBwExQIap7NnahIx2Hxfy51vHNNCzl3g9ijDNky+EFemIV2KelqXPT0+mg34xjsp 6k+BKVAkTKfjApCUrHdoce5NDO3T1qYvXbIGwjE9UEsS0ej1E0vHtfBymVOZRx5oDtvv tLLg== X-Forwarded-Encrypted: i=1; AJvYcCUubrHKfku9NvYixWIdjhu07dT/0vT78yJ5/PrI9aYrBRZty7YRa97J0eErO2tx7Qb5XGSF8GZk5l//8rKrOIYSi2fKxCAW3TQBLI+6tNjHYP/YCZI= X-Gm-Message-State: AOJu0YxHPA48ovYmmDhAY46wUQKs3Sv3z+A09KSGq+jN6n2PKUXviFCq E7hdmVwSRB8DH2klwHd5j8u2bl73PYhJZwzMw5F2ra5y/EtF2p4K X-Google-Smtp-Source: AGHT+IHoMO3uR084/TiqjhUtxamfnpPtywMOr7j0FvJycWCXr+USVcWGJpeWl2Dc8mghKV2E22gUHA== X-Received: by 2002:a5d:634b:0:b0:367:f281:260e with SMTP id ffacd0b85a97d-3719431740dmr985335f8f.3.1723794680334; Fri, 16 Aug 2024 00:51:20 -0700 (PDT) Received: from tablet.my.domain ([37.30.8.221]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6c4sm3026201f8f.52.2024.08.16.00.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:51:20 -0700 (PDT) From: Artur Weber Date: Fri, 16 Aug 2024 09:51:00 +0200 Subject: [PATCH RESEND v2 3/6] ARM: dts: samsung: exynos4212-tab3: Fix headset mic, add jack detection MIME-Version: 1.0 Message-Id: <20240816-midas-audio-tab3-v2-3-48ee7f2293b3@gmail.com> References: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> In-Reply-To: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1894; i=aweber.kernel@gmail.com; h=from:subject:message-id; bh=+nFLsCufZiehL/eoxteKF41dGYjzTzQkmxtyml5HKb4=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmvwTnD8mC1+GqmOFwbcqhYHG1kNpEk6YJMfvpd XNKhd2qpnWJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZr8E5wAKCRCzu/ihE6BR aMq6EACX5TK44WyC4yotUx8Uk6fAbxLrKb3R3+UVLasScimI1hY0ykcN+GR5rdVLF3MVfpsug+3 QogmFc3/HFpZAkMa/OJlzaYqeSWzFlkJv4n/3o1yzPAuYNqy7f+uwFvZw9DTD6+psS0thYtca/N eSDHnPTgof6myPwVVVIkc5mzAgQRBiRewu6XES3WHo0YxBBM/HQ1VZPYTAFtTb76xzbLK0GQjK0 IdSvj581xNebmEN6sIEWMvWi4O6hWhlvadWbbXA0CfFlZbnpdFNV5P0OCi3TOsyfc7i4UHQYtUY qyY8DruZbh4eTzhOeHWRT75YAaQZYUfLWxVFSyXvFDVP3iUNzug2tAZn2iWbzaQlNyVdc6d3yqe ImdmCYARXk7Uo6NfolCttxIgfIQ4hXnOJJpXQbE4T2Z5sfbbth9i/3mr3u6zY8DS2Q07GUqka3/ YqOMLsHf2offj3l5ePAacI0WLMJv5fCIoIWF49CGceRlCHm52W7PCzEIijyzhzJEYXUOLguOxXX wwuDoByetpGFhKJjls8Lx8TSWifNvJJMzhWEEybwcPkqAc5tHXqc95a0/v+Twxk2e1+Zb0VOCbv JeJfgN+BflWJasx3WBDf0znA6PDdXFS6687+nmgqOQsIMue7Ml11mBmNssu77CAiZIIzCa43pMQ 2hxnr9dr6Bdt2KQ== X-Developer-Key: i=aweber.kernel@gmail.com; a=openpgp; fpr=E663000EAC1DECCD6AD2890DB3BBF8A113A05168 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_005122_788690_2452CF4F X-CRM114-Status: GOOD ( 10.47 ) 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 Set up headset mic bias regulator and add the necessary properties to the samsung,midas-audio node to allow for headset jack detection. Signed-off-by: Artur Weber --- Changes in v2: - Move headset-mic-bias-supply property next to other headset properties --- arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index 9bc05961577d..bbafd4ece5f7 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -300,12 +300,31 @@ submic_bias_reg: voltage-regulator-5 { regulator-max-microvolt = <2800000>; }; + earmic_bias_reg: voltage-regulator-6 { + compatible = "regulator-fixed"; + regulator-name = "EAR_MICBIAS_LDO_2.8V"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + gpio = <&gpm0 0 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + 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-mic-bias-supply = <&earmic_bias_reg>; + headset-detect-gpios = <&gpx0 4 GPIO_ACTIVE_LOW>; + headset-key-gpios = <&gpx3 6 GPIO_ACTIVE_LOW>; + samsung,headset-4pole-threshold-microvolt = <710 2000>; + samsung,headset-button-threshold-microvolt = <0 130 260>; + io-channel-names = "headset-detect"; + io-channels = <&adc 0>; + audio-routing = "HP", "HPOUT1L", "HP", "HPOUT1R", @@ -351,6 +370,11 @@ wlan_pwrseq: sdhci3-pwrseq { }; }; +&adc { + vdd-supply = <&ldo3_reg>; + status = "okay"; +}; + &bus_acp { devfreq = <&bus_dmc>; status = "okay"; From patchwork Fri Aug 16 07:51:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13765651 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 7CF38C531DC for ; Fri, 16 Aug 2024 07:55:05 +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=60xK5Hc6/1+V6wZvBlbkRog8IQheNoyVjo2ziuG+8Yk=; b=Mb7QHpJRMt/rqcC7PQZYG2Pbq0 nrl0lQrqFqR9jywUrHsUlKEmmDtFU7RpK3O086s1+IA4c8j55SgfqweNcnhyGtsb1uUEWY/UyyYkq LkS3JoHbUeKgMgQR8iPb+qQQ/1oF05ZN2ptiYwb6vhVrd24UBvFxaj/zOgYRxJfFJqVBJ7EJTg/zs XKycXOpwAZJBDANrsUBFJB4ED3n8srZF0y/7Qaw09o2/yts2JgqsmUcYLWbRwrF2NXfVK/qES9lWX k72a1UnrBDNckypku7ySB/uPiQclSJ+J09sxSSiNmHkFxENyTVyOjW21+siq2qsgxxr+IczCKGHu1 9xHvJ2WA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sernN-0000000CBZu-1bYo; Fri, 16 Aug 2024 07:54:49 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1serk4-0000000CAbN-0iMM for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:51:25 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-428163f7635so13058005e9.2 for ; Fri, 16 Aug 2024 00:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723794682; x=1724399482; 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=60xK5Hc6/1+V6wZvBlbkRog8IQheNoyVjo2ziuG+8Yk=; b=WFiB9rHOshJrTyV5W/4qeEPDvABeyyEyrhCGQUEQNs9vvhOaola9TyXUfPHuzli96t bygMJGXC5Gg2cJ46vsz9/DzlkVSwJtXdS0uGzP65QitMGjN5cDcV8CMzKrTUuCE+y89z IeFSg885bm2j+9+lDKMRjpIul3ayXCQwuiZyJ1I7AbfRR1QSyppQiORZf2ewiVOjGP5z JT2Uxy3QNK7Mqqt+7FpUZItboLJURI9SLJRpqwxwFA6hhPzNtOwJNP1h/daZOOEXfz9c ffHPt6i9ynzE5lJo2n2lwlAMO2FVIYKdNFan7mgSB0/7GqHH0+J93VLBOhtVTT0axGwh VOcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723794682; x=1724399482; 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=60xK5Hc6/1+V6wZvBlbkRog8IQheNoyVjo2ziuG+8Yk=; b=kQlw4RbGjseESxAoaM9F6F8WflXlE/XqjRh+YaspcOPR0QHXXISWx4c0UCMhbKjhRt qH9ilTPZH78bzfYQNu5resCF7mhxp0LBkZQas1bCN+72QWirS1PEnqsNSiQhgDMf4xOZ dElsV5k87K8SodMBfEpJ5IUDtdye3SEfMJyI2mINwBPdGR0Ft9sjGusNJsy3lY0BcWy3 6rdddRN1QoHDCwG4P00tA/OAZsV+ogve0sEx1Ge4WkCZ6IEOJZ8Sv6jSRU7WEZ/l3pcA LHyMGGCo9810fDngZPGeSz0rE6AJq3wcMG8zyEdm4YbMESUGNCiYaZM0xFLRnis5s/3Y igmA== X-Forwarded-Encrypted: i=1; AJvYcCW/of/nubqcqTH0wUcBfS4t2cHYUfElkNumcJ1Sr65wEoixXP2zgL3BTl7TV7x/X3PpoAevjyVKZgTJojjWq73bY5S1JMxPA/yiNKeawMnx0aFM+Ic= X-Gm-Message-State: AOJu0YxhJ4QXq1AlZsYPFCbngLVwna4dFAk2SYcew5OgPuxTYUu0W9wJ iz9+HRl0PxJKq4vUMvElGzpuSw9VH2VjMLXmp//jtvmCEjgn6TXv X-Google-Smtp-Source: AGHT+IE5or+p8N3pv0ta/7lWZxGlQK4fBtEzl6g6QTBj5XXkc6qikzCLHFw0ocw/UwtRfnEg1OtnSw== X-Received: by 2002:adf:ed01:0:b0:368:68d3:32b3 with SMTP id ffacd0b85a97d-37194649a85mr1291305f8f.26.1723794681900; Fri, 16 Aug 2024 00:51:21 -0700 (PDT) Received: from tablet.my.domain ([37.30.8.221]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6c4sm3026201f8f.52.2024.08.16.00.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:51:21 -0700 (PDT) From: Artur Weber Date: Fri, 16 Aug 2024 09:51:01 +0200 Subject: [PATCH RESEND v2 4/6] ARM: dts: samsung: exynos4212-tab3: Add MCLK2 clock to WM1811 codec config MIME-Version: 1.0 Message-Id: <20240816-midas-audio-tab3-v2-4-48ee7f2293b3@gmail.com> References: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> In-Reply-To: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1158; i=aweber.kernel@gmail.com; h=from:subject:message-id; bh=8Gwq4xkMrX/EEDfhj3DuiQn/fL2hhjypD7XNTLT/JkA=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmvwTnahzSs8X6AK2fEG8dRiS3h4Lutmxj7DmOl KArkb65MI6JAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZr8E5wAKCRCzu/ihE6BR aLlxD/0Q+hDUWhUZIsxgW67vCiSedZkUVg76OZnorZN+/MnaIwqE9v1OcjD6+Hl4drdGGeyFjra YKO8lnZMYF520dJmfvS2Zwj18coMllOY6hlP5qwBA+YFt21ybJfJ/xH/xrWuzUMp4zTE719AVag cR/HykwL+4b9AFDE0Y4lmIm06391QTAsuUQ8pNZNVNvjOnGih05NbP5b0XELX9hmbtqzZE2hMxb ygIxwyZV3JdzoIJHvgEmd3G6yssDmYoAzJyqYeg/bBQmYeZbyoqzqedLw8J3bG6OXXifoVvBmye J5jX+HV3y75JgYLzg6c1xOpgvYl8m0vU7bkOlt/7VNz/cgiceVaySXPMhTUh8rLjbT4tQQTgXxf 710sC0XrZ3zQmq0uLalEvuvMpLgPbaoUqSD52JFXN5nHRNVU34+VPzLXcQswxTDfPFWi4XuVDId zfYXmycB8JKu0sqU/rSxlXebvw9JuM+VHE+aq+XR222AmXT4Jlpf7nXHdSUbFpcHSNib2wM8YF+ T9L7XeJYS1NLTcY41Qrn++vENu1y0qKHcSMloPbfq4eEIaUqMw9TSzU53MZXZLqP0GLdzV5cF26 myIZwROHOZCz5ZbSS3WGV/Zm6DB5su4BZbT8aXLzUZVkWGdHLx3VEjwCJ/WhtdKdcf2rB1gTPcF o/r99NcGBUIEl1A== X-Developer-Key: i=aweber.kernel@gmail.com; a=openpgp; fpr=E663000EAC1DECCD6AD2890DB3BBF8A113A05168 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_005124_250724_917A7CC1 X-CRM114-Status: GOOD ( 12.26 ) 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 In the schematics, the MCLK2 pin is shown as connected to CODEC_CLK32K, which is derived from the same 32KHZ_PMIC clock as Bluetooth/WiFi and GPS clocks. 32KHZ_PMIC is connected to the BTCLK pin, represented in mainline as S2MPS11_CLK_BT. Add the MCLK2 clock to the WM1811 codec clock property to properly describe the hardware. Signed-off-by: Artur Weber --- arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index bbafd4ece5f7..5106bb752b7d 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -535,8 +535,9 @@ &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>; From patchwork Fri Aug 16 07:51:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13765652 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 2A0ABC531DC for ; Fri, 16 Aug 2024 07: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: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=0IunwWJytaRslMINJvXl7msOQ8aykw8LsNbHsg4ezH8=; b=u+Pp1K9PGQfmMsrJNB8dOK5J8k DyAmtoRMK9YjjolWo5Zg1Wu3lH5UC+xsVgvPGFuC9nCH8S4ZiAXrTC/12dGez/utVQm+Od7QOee2O wTtEPic8wnLG7o+8jHCPrxqMMR5si7X04cXYFnIWlL5OngKSju9aEaHhMerEIoexACvw8Euft+Ugj 50wKneecuCENDXKpML6gxd7YONf0R1cl1Ufp+my4eoFXVkIzRUStv1MJh1trdaBcb3AdA4mvRZomS wwXvNYUSm3Bh9UDXGMdOH467t3TiKZYNvYghBtSZj2NIcxbraGZjdeoQm2DPf7mXZdsZuvc/cbPLz bfTewCnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sero1-0000000CBkY-1dtd; Fri, 16 Aug 2024 07:55:29 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1serk5-0000000CAcG-23Sn for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:51:26 +0000 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4280ee5f1e3so12220125e9.0 for ; Fri, 16 Aug 2024 00:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723794684; x=1724399484; 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=0IunwWJytaRslMINJvXl7msOQ8aykw8LsNbHsg4ezH8=; b=eAwp32FJ5yfmFRXAAdQzy6IHxOsehDE/Mf26kHye57ZtJTr0ZI0dg/Z8Ew40DvO6bC O3JqcSvQM38efFHOUNdw6N4rY1FId9ZXMvI2aXnRsrSbJZDCRvKKiCe50k2HqRHfC4+i fpv6LeMa5dpjgSbEk400WWe7L7ACyFGNAnSZtbQ9Wc4sjhu+Y9Uq2HEEvjnBa1j0HyRg 0u/C0FIbS5py16bFSV1Dtc7x5gr5S5Mfo/O44qIeFQQIyZtCRs3emrMYG9rcqdwUj5iJ fFGb3dnkTl1YgxX5H4Xs6tryKZyouGCjX3AiJQlOm1kc40C2LXLee4z2tLd+o9Lixrc8 sAgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723794684; x=1724399484; 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=0IunwWJytaRslMINJvXl7msOQ8aykw8LsNbHsg4ezH8=; b=rTOZQwWuBblq6Bg043jwJxxqMO+UlYeC+zp2uEpI+6lh485VkdABjMa2/Ag9vsQJCJ bfFxk/DZ8gnD2uL+JBNdgPCrFk43r03gttgBTwm3FivaiOEPLQk/x8cvVbSuq5FGfDi0 Ow51fHA9/cZ6Z90SuKiFS+x5r6fCwK2gUFZL7myY782lsHRVk6PlBQW694HKV+Nv/D7g JY/cxKodLokcJhqpKueVPvsGuIFQAiorOjAVfdP4J9pIWrUbF9/OKLQkckCqR66VKwiq U+aqnty8V3kcSKPeKsai5F7LiJvZASGFzmB1oMGR8b1Kn9YCt/c171bLtAvp2K28vfb3 Ja5w== X-Forwarded-Encrypted: i=1; AJvYcCVSQrmZBbIQuCR4P7GSH+iZgMy0CO9gVutSIuNjYQmhZllryvLDuEWgkCu7u6xaV0oSZvmFfcrl5TkbOdn2V8cTCnPmQLUwoLBDZwESPUSj37/0jG4= X-Gm-Message-State: AOJu0YwiqsGX4hdHHZYsxCVu7yoT9eAZqtkzDid4VDoRPPFhvGzsz71j 5wx6jkl7SHizijIrgOnUNbGCj+4sTDlDYy5kFMs8Old9VuzikENf X-Google-Smtp-Source: AGHT+IFjJcBN8/J5T8cHGhkx4qB2p/SDnSyKTH/7y/grx4LnP0iZCz3tAB8h7joAk8VUOp5hIQY2WA== X-Received: by 2002:adf:ef4a:0:b0:368:334e:2d2a with SMTP id ffacd0b85a97d-37194328c2fmr1341141f8f.18.1723794683545; Fri, 16 Aug 2024 00:51:23 -0700 (PDT) Received: from tablet.my.domain ([37.30.8.221]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6c4sm3026201f8f.52.2024.08.16.00.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:51:23 -0700 (PDT) From: Artur Weber Date: Fri, 16 Aug 2024 09:51:02 +0200 Subject: [PATCH RESEND v2 5/6] ARM: dts: samsung: exynos4212-tab3: Drop interrupt from WM1811 codec MIME-Version: 1.0 Message-Id: <20240816-midas-audio-tab3-v2-5-48ee7f2293b3@gmail.com> References: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> In-Reply-To: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1008; i=aweber.kernel@gmail.com; h=from:subject:message-id; bh=9n2dRgGAl4hw4l3oRLChRSV149jqa2jkry4HCt2pAsU=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmvwTnsIb3lMya1KfWhEvX91x8+K3ZlKkQ/VdTv KR2QObrgx2JAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZr8E5wAKCRCzu/ihE6BR aHd3EACKOh9GVcx0vKejDCZjgQua9HsLWSdDU1fGRJNTAWYUZboiNdAkclvcOqXdTMADaB6hdvx tWKctAQRPME21ATpB64rnJokrMyxvgIwVCf+8srbSwIwScyI7xMt8YsTk3mwm5WAVj1zUub+zUJ dtds9TolUntDTtFFTv2O/xTndHtUiQ5FYVzwiuGEQWhLfLeKvHQyZXdnx7gr7cbSUYh6sV4ze9l Quy4CQbTLLaA8FetQV2Y1HrTSVx2Jv37S/u7DHCT+CYpxEDd0+sNcCLPImy3SGfYxJyjUfDhhaj bIFVuN6xRRis75GtxQhH9ohpYM4htbX1eIBSUoh6KCT7sG/vIva0vTedMGxxq2qCYOo65gntCL1 FmUL2lKWRPMjRg4D9+pkChyzmfTF30DPtT2ibzIQN47hl0mJSXkHpQXbs4qeTkwABW+F714Rtvf aybIiBZpASKkiq/QXx8CMupVYUOmEJz81Yz3U+coLbio3p5YX6NpmvXdssjxvtOPpZxTWLV0NyW ZDCUJk8SeY3YRo1FZanxqnDJT45uVIySe/AHN6/msJCjF6W5UaEvCXxEr3EgVZLcwrkxyMVHCSg Lz2aCLcrs2EaCdr+KDU6bwW3y6TbTVsV9xTtDFRAoWHK2Vwof8unfShxbi2UOUfSrbBmR4l6EPl 2k9kG4oFeditjYQ== X-Developer-Key: i=aweber.kernel@gmail.com; a=openpgp; fpr=E663000EAC1DECCD6AD2890DB3BBF8A113A05168 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_005125_597515_D5F96D59 X-CRM114-Status: GOOD ( 12.48 ) 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 This was initially copied from the Midas DTSI, but there is no proof that the same interrupt is also used on the Tab 3. The pin listed as the interrupt here is GPIO_HDMI_CEC on the Midas, but for the Tab 3 it is the headset button GPIO - GPIO_EAR_SEND_END. Drop the interrupt, since there is no proof that it is used. Signed-off-by: Artur Weber --- arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index 5106bb752b7d..70e3091062f9 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -540,8 +540,6 @@ wm1811: audio-codec@1a { clock-names = "MCLK1", "MCLK2"; interrupt-controller; #interrupt-cells = <2>; - interrupt-parent = <&gpx3>; - interrupts = <6 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; #gpio-cells = <2>; From patchwork Fri Aug 16 07:51:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13765653 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 A7652C3DA4A for ; Fri, 16 Aug 2024 07:56:25 +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=ftpauJHvJu+xnhEvp7WCn3mWm6mJ6dwVq2EMLSHYt5k=; b=vXQHAvkkKmwOdi/MaJxMiJJeF5 DYj3Slxw+0t0j+hI42Bq16iLUvtY3iWqpd8joy58FX1zf4sB8zx1vGO0fwXDKC4t24shzTy+YFC4d rMS3662h3EPeVqjL3hPMjME9cIh8e4muZ2nTguQHO++3CESdUZdtYo8JTwi3j3DO7QQnEisKOC7E6 oDK++tbjGC4AlV5gyAC70JiA1e7wRGyjXUlXVS1kpKUDZYRrW/1gQ74GmeM1CzH59YS9pBsoQMDfJ A/rYuXh8oxHcoQzrHIHxCjPCUzvD6xsA1fKXf5bmIWmIRmQFmodJoMElSAbB7wVEOIf1gibwiB0dS 51g6Gsnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seroc-0000000CBuG-4AZT; Fri, 16 Aug 2024 07:56:07 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1serk7-0000000CAcn-0A9m for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:51:28 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4280bbdad3dso11477495e9.0 for ; Fri, 16 Aug 2024 00:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723794685; x=1724399485; 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=ftpauJHvJu+xnhEvp7WCn3mWm6mJ6dwVq2EMLSHYt5k=; b=f8eTAsrvirDyp5eo26jw0KTK5juR4RQrDduE4XwBFSjLMtpjxJPEkCym5bcHrH69Dz 1nhJaoFJUMIcHxlcDdGZ3jAtdg2wqiTavxdKwpkxJPWC6fc/eXwoINDS1uiWjXCYmgAk rlePWbe6pEJYGNY4ncMBS/zxWetd81xLbkrQXfYu72lGYly6wCo1xJM+EXZYUhRY2OHl 4TaBHlqgl4j3b8sK0um2xm21vRTw6EcSQhDTLhpstdE78A4tn4LVvz8+oWxJXMGJeP7j 6yIs40NdoeDhUIJNeWWOmFS7SSfaAS8OeiF+ntMW7grUPXEzf4qUfIkR8tOImGw+Sjau +7dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723794685; x=1724399485; 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=ftpauJHvJu+xnhEvp7WCn3mWm6mJ6dwVq2EMLSHYt5k=; b=nv8u0axVhZ92ToZm/V60WShZxZEjw7tcDVZb8ea/m37oCqzCs+Jm2zQSJx/IEaESaG grsMjcnlHDaCImN6+7CRShIw+Ptb1fq9j44LUyISA4i3rZR+L3ekZ47rhgjWUjsoayi9 DdrXlVm+0UmUUegryrf3WuZlO9B7YWIOApmqKLF9NPTPQ03sLvn4CQQkQnTysX2gJVvD gfWkVoR1Y6nkW8WQ0ZORV91TeFXM+r51iDrFpwMPhzEV/2E5rkXyg0IKxm+IYPLYXxbY V+p/IzPElZinJ3CC31CCidhFF5RKcgPTcyvfPJWu7J5zle1484qiTQwFW47i56INTzPx L87Q== X-Forwarded-Encrypted: i=1; AJvYcCXFtsnTGbe3Vq1aHPDb/bl+ovBueAaN1T4+1aoEx3pPAUsRfQYNZSgvHCGU4lm7QEhJyZAQ6istT7dQF5N+g71rt1OgqNkLN17FBQ1t5GEKINqqcWU= X-Gm-Message-State: AOJu0YxS8x7SxfmRphrRAdUW1EvhjWOS9DBOW9ctftehlOE58gcJBGRC xCp88cXCnMjzY0ZGm7oky0tzxXs+FJBuBcOZdn8o3eL/TYUzWfTv X-Google-Smtp-Source: AGHT+IFcWSg7R6ZOrgOTbSp4WTq9l/KTHzuMWJwWrtjUMZDFfV6LDRMvpsDKBTTz+8GRTCWba44Jpg== X-Received: by 2002:adf:fa50:0:b0:367:9881:7d5e with SMTP id ffacd0b85a97d-3719431e648mr969068f8f.8.1723794685161; Fri, 16 Aug 2024 00:51:25 -0700 (PDT) Received: from tablet.my.domain ([37.30.8.221]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6c4sm3026201f8f.52.2024.08.16.00.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:51:24 -0700 (PDT) From: Artur Weber Date: Fri, 16 Aug 2024 09:51:03 +0200 Subject: [PATCH RESEND v2 6/6] ARM: dts: samsung: exynos4212-tab3: Drop dummy mic bias regulators MIME-Version: 1.0 Message-Id: <20240816-midas-audio-tab3-v2-6-48ee7f2293b3@gmail.com> References: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> In-Reply-To: <20240816-midas-audio-tab3-v2-0-48ee7f2293b3@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1778; i=aweber.kernel@gmail.com; h=from:subject:message-id; bh=QbDGTrOuqa+9JhAPdZB7MbiB7g0LqwVmKKAqqQeXAR8=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmvwTnloZNW8WuZLkNUngAi1UB8gAHT75XHcj2c tku/+yxd1GJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZr8E5wAKCRCzu/ihE6BR aEYfD/0X5RW1LxXFB1Mj5dXgnFZv0jcjZjmJMmmqXCSEU5pWFlL3B9cgA1TTpj/Uc8goGZE4niC oZXdJJWsLU8pmJ21p5ntE7KeN9cPCezRa2Pvh+Rwaimx1SYyZS4Pv7SVuYcyRq/u8daN7Cyay2y vbVqEzuwd7Vnjq7PjL7hVSRO2uqm55Nhxd2MW/HLVCDH7m6Kkxwcf+9bLuUPtlEgU4G2XNHmWlw 9A3yNFd8Al3As+WBAxkegsxgAzIWeec0J+QZ59lUHipaqx3mcwyINrWXCWqoMe+4XsCKmdqN39h IS2MyC/FDZF7cZq/s18BkOf7rb0CUuA9yfkkqhgiaajxpRftKSWoQgEnIc7SXQ5UfWd9Awni1iX zCoThh47d5DwlLuvqCn6hNin+x10y/ZxPmjl+hab10Hwm5ZyxupCGzgGTfcenFtsCoUVd3Rj7Q8 k6QEjCrzVPgTv+eIv0JqDnMOW8SU96UimCL5C4fnLHEEJ3y4VXY54szWAXWM/2fwvEH4n+WJ9Pz ae8fM3CQKDC+W1S/BrfrIDVON3AduYhpHtjdBGxt8bdYqr3HegtZfMGreIkpTjCogFX7NTtWt5l F66ewVkEvh4O5SU3KHMu4CzwXQ0ZBJMC6x/x832hBc8kJOsEPZeYL/YQ078cMPqFOuAvDiImaKd heg8dTSdgvuuS1Q== X-Developer-Key: i=aweber.kernel@gmail.com; a=openpgp; fpr=E663000EAC1DECCD6AD2890DB3BBF8A113A05168 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_005127_130620_CA4A4A90 X-CRM114-Status: GOOD ( 10.63 ) 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 samsung,tab3-audio compatible that makes mic bias regulators non-required, and drop the dummy main/sub mic bias regulators that don't exist in hardware. Signed-off-by: Artur Weber --- Changes in v2: - Rename earmic bias reg node to voltage-regulator-4 --- arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index 70e3091062f9..553ddc3d42da 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -286,21 +286,7 @@ display_3v3_supply: voltage-regulator-3 { enable-active-high; }; - mic_bias_reg: voltage-regulator-4 { - compatible = "regulator-fixed"; - regulator-name = "MICBIAS_LDO_2.8V"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - }; - - submic_bias_reg: voltage-regulator-5 { - compatible = "regulator-fixed"; - regulator-name = "SUB_MICBIAS_LDO_2.8V"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - }; - - earmic_bias_reg: voltage-regulator-6 { + earmic_bias_reg: voltage-regulator-4 { compatible = "regulator-fixed"; regulator-name = "EAR_MICBIAS_LDO_2.8V"; regulator-min-microvolt = <2800000>; @@ -310,10 +296,8 @@ earmic_bias_reg: voltage-regulator-6 { }; sound: sound { - compatible = "samsung,midas-audio"; + compatible = "samsung,tab3-audio", "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>;