From patchwork Thu Jul 25 10:40:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13741756 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 53A65C3DA49 for ; Thu, 25 Jul 2024 10:41:42 +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=6dxd18IEPPCN0mdlU0anYLSOukmaQJ1jfiipuPAXFgc=; b=FNJbWJd5mNBTjb6xAevD/pl+zP KY6pxgX9q2wBfr2+jJZMa8swKrV5Z3Pfh4xPRRfovzS0GTt1E+lvnb2Hk5LcHCCDvRJYPp4z1liw1 JrYIkOWjSMP9FcAiUpTl/hd0OpdSy+13pmdQU+LVi7rxXSQoXnuBwyyFfkGWqYJbRPkFtEf7HWIbB 46lk1F7D7W8X8QAugBIjBN8OY2BajfkLOmMzRmykVfwGGGGK4epo5CiVIvsieX5QOkV0dPt5faKCN AhBLIjLjvzKEpg8WygQnwZ/pDYjtdz7aYMYag+a4XKDouOmH2GFMj56QZxLd9+B3DDEOaf6Xxu+NQ kZ5r7+Fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvue-00000000ehN-0BrW; Thu, 25 Jul 2024 10:41:32 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvtt-00000000eT1-3WJO for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 10:40:47 +0000 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5a3458bf989so922092a12.0 for ; Thu, 25 Jul 2024 03:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721904044; x=1722508844; 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=6dxd18IEPPCN0mdlU0anYLSOukmaQJ1jfiipuPAXFgc=; b=K3YWrlr2+KNoQ7pz/vLWFH0rYtobxkwCpG44QbpvwOIA+gy8xqZoBV/HUcu02Q0ukV VmaZ71eus2YtoOqBtR11HyBqb1kC8w5AV1BScdVZxYWP+CnHQdua/kxLpfHkCm6pVWLl BjNhwQ4nlhEy2Yze9Q1qmWoG03y8pueLWJ317th4fYWoBugqRzndPD54umZYbslWcKeH SkN5ru4U2tYgOSUj6SZkdMk7IAA65rrgsri4dZjtzgmjLAa8YamPvJNYdr4chwMaWXb3 3OPSIPmlJEzysebW9EoAHB1dSPBrZUNFTHxsRsiX4Z06XO6PS3sA707Vuypc7Ohv8foQ gvkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721904044; x=1722508844; 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=6dxd18IEPPCN0mdlU0anYLSOukmaQJ1jfiipuPAXFgc=; b=FOPLatbAt0JHKJFOm3rTFEi/EyIo7kps8/Ax4r8reKQS60vLcz1zjgSP1ofFCLdKdr KaBYYpJCuKTGGkzKUApy+Z0k+V8HJfhZVzU26hLnmSUoBbhyyKkc47i3ODk3QtC9LxJE fezTPnWycXsMGuz6jJsNkl1vzpIZEZQMwPmJ2Oje2NbAHK+jP4QjAlGkgv8B07GFHjTa vOk9QOfFR5yPZBQCdExcg8TKXITyXvphFxJHTrQejArUjsoj6RIU+OJ50IAUZVRlA021 8Eq3dQlxPHsmiZ7AiXvEzWF+ws/llfJv8xgRRZKa3ZGIACTWwsifXGYFDRly23iz01t2 i5Og== X-Forwarded-Encrypted: i=1; AJvYcCXMPr0DlcL9HLm8QTaS1EonlJI1urSbPjUgFCnPo/n95wapcvyYnbetFskFeu94m/PYNPaoomSVuM2Dr53LE6oWDgym6hxDA4SY2OD4MzUemza1h2w= X-Gm-Message-State: AOJu0YxXpI6I2yjLe4OwiKTHY0hS8WgiIHW8L8g0b3Tlo2LPHNB5rhHD 5K6yoiqmzDH+KKMDlLRkw83Mh4lGmdtJiKkzbaaW1wohWOKDiSAx X-Google-Smtp-Source: AGHT+IF/mZbfu+qwl21CGnof/UHOhOM/AoVBM2J5sHP5zzGk+ZLCeJEelKisWC/ixRmMZRuh2PLccA== X-Received: by 2002:a17:907:7296:b0:a77:db36:1ccf with SMTP id a640c23a62f3a-a7ac5049d22mr170757266b.42.1721904043764; Thu, 25 Jul 2024 03:40:43 -0700 (PDT) Received: from tablet.my.domain (83.25.114.69.ipv4.supernova.orange.pl. [83.25.114.69]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab23d56sm58342066b.38.2024.07.25.03.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 03:40:43 -0700 (PDT) From: Artur Weber Date: Thu, 25 Jul 2024 12:40:35 +0200 Subject: [PATCH v2 1/6] ASoC: dt-bindings: midas-audio: Declare required properties for GPIO jack det MIME-Version: 1.0 Message-Id: <20240725-midas-audio-tab3-v2-1-dbc055c27879@gmail.com> References: <20240725-midas-audio-tab3-v2-0-dbc055c27879@gmail.com> In-Reply-To: <20240725-midas-audio-tab3-v2-0-dbc055c27879@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=KTkZsY91b0iIJMvb4V4gIHRHYTVzSRya4eCPvKugz6w=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmoiunWLve7myaMeuIovS4h1pW8U8xbvx9acrN/ qVuhsjSsLKJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZqIrpwAKCRCzu/ihE6BR aC6gD/4uXF/Wqdaq+E/UKPCSJtW5sD0MMI5hJO/AEi2YsUdRTkvMTiq+QlBZ8U0qIfFGmoMwgtV dkaMh/H9I2AM2+WaDGzsujfyw3z32V3RleZ5khHTmpvkY5PS3rRqSFGKOe97986MDlXSuP3gO9u lnc787HkF2gGZNm0ncYQKwB5hIUZrwf+0vvMKifZoPwwfG2DvJzNCiUEOx65QCmETCU9ErNsc69 WMyX3Y+K8HipJUl2gliPQBWKib7mDIJygI7vxeb/sTTzxbas+s60U4cnSYZDOsN/ie0MzDNIgx1 IU+wzT9+ylJDLAdbaaVTroKlTcA+dF4rT4FQMwWXRcBQvkCrgmE1PdqRmp9gpgx1Hs6CPE+agAB g+a0Om2tQggxrB2RaSoP+GpFM+xFYy6D/uyN1bpV4I8ksDkstOOvZPnRpDL9BOz76bFlY+HhsEp WK149c2UYZ5HFaA9wCCfSxG/esHCpsQVe/uAhCwD2Is6zNz13wW42WcOWz+5lecDTmJ83wnFC8E TZNDboutQGxmO3aBrkNwhaM3eC/wmBEgISMYRGtHPjsPpC7qQhDatmMyqDr37xW9bwaRP/04D5X jIjOF+Ym1msRJRZnDFAEniXwzGUSWHbwERZiAG0hmWoYsGK3go5YsT1SaVQPeOs4BruOuJl5uRd UhcmDdCN+asxSvw== 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-20240725_034045_913056_CCD4EF53 X-CRM114-Status: GOOD ( 10.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 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 Thu Jul 25 10:40:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13741757 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 3E3EFC3DA49 for ; Thu, 25 Jul 2024 10:42: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=/BT1ETjGdxc1ofYe6xfqubr4qkHhr85Rz6D2FNj+D4g=; b=n/7K+r5X4ZNWnHiAhuNYt8RtkY DRteMeg1RYDxgeH+vGAserAYlFddJxG+mBzRrP2Y76vuztTWVbD3T7r+QFnI6WdyGQcwge4QzBCrq E3pqTxTJjB4sRpmHjmzGwgQl0ykcpz+H6TXWHW5THDAFXx35n3SLesBJ1f3qBiKzDC2GxuceN6nLy jdRAlCWiDOZ0ucsL0ajK4K6aYk96dcZocz/HsuqGgDyWVRP59XAmejhvKcZeMjeWhImE3G1Aajex5 QYGtt12BpsXe1k2FB4sh5k+XHbUYPQcufXV2FbteHcizi0ZoZm6heaKnIYia4Fmbw/xN2mjcwubOX mEkBfoUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvuz-00000000eo2-18tY; Thu, 25 Jul 2024 10:41:53 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvtu-00000000eTM-3NOk for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 10:40:48 +0000 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a7aa086b077so36132666b.0 for ; Thu, 25 Jul 2024 03:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721904045; x=1722508845; 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=/BT1ETjGdxc1ofYe6xfqubr4qkHhr85Rz6D2FNj+D4g=; b=aqNsBAHQO3qxf8wBDa8tRRNKdWkxzIDHbSlk8hywDrux3SyYV5ABLL4sUEqavE9rOp 5XyAqsL1eyFbBaqJVJRbb40OxNIK9I/VbsFaIIlrHwbqCxfSyEs4DjoCMFQnR0rEi7Hp wVodIL1+4dHNJV06pbiOUPCBQNz+WNcxAUj9xoQxHfXeiur90SGI5jlMlKlBmxMJqbFS Ey44KvqNkyddxwl85omHtK5tafv/dN7dty7KomIjljbcXIC6XBAXoZkHdkaRQSxodM1G 8kqtWIjhB4TSGyF4K+XGNdJJQvnL2sSHe53xLClbYMpuAde7OIO4uZEq3UC/0yfVqsTp P1rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721904045; x=1722508845; 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=/BT1ETjGdxc1ofYe6xfqubr4qkHhr85Rz6D2FNj+D4g=; b=aFNLfpUGbcbD0VrFjaOFAJTX88mogd51o8gjl3sCTCP+u9prduTwSBH1Km/k7Vq3am +3+V8ALsVVQmHeZ/j0bWIzjT7tKoo/TMafgpcG4HDv7BI6Xf0MJvkZ5WEabokGaU5Lg3 9elMDkYOeVzzg7hEcD4lsQcapXWRBf9lnWIV9jBYGQnGWiVhpRZFJTokCkarVAtFMuH8 P2HGF+hRxVDlPBvlkI37x1AL1P5ZT5DacdvIefNm53BiNK1OeICY88q9qmcb1A1VBeYs u0eURGc/pH6cmvz8Psz0yA5INd8TIaRVH0erMmp5RVLPmkUTObQ8IA2KHDavEafRPiR6 WyZA== X-Forwarded-Encrypted: i=1; AJvYcCViZiYbpYYrQAEY9gNM/1kO2WaA6rJiok8lAmayMq/WVhqt0r+dLuzC2D8LZUljJNhKLZzNL1/NbPQIR18GAVCilnwJFktN1doewAox7IpemEPyCcM= X-Gm-Message-State: AOJu0YyFG33kyHDbSrISZQWG2iykqDFpZAH0azHlSjn5G/wpoV2yXQsT PWHXFEnkimzG7wU5grgCOShsPssp3jkjvR8mzGY4H5UD3VpDVXig X-Google-Smtp-Source: AGHT+IGV5STZLw87HTmp51t5/YRKLVMWBZVnchanMigxTA6+DYmh2GOpfpud+QG6bDPjnYECDGQPhw== X-Received: by 2002:a17:907:3fa4:b0:a7a:9144:e256 with SMTP id a640c23a62f3a-a7ac4d7bf13mr189732966b.6.1721904044993; Thu, 25 Jul 2024 03:40:44 -0700 (PDT) Received: from tablet.my.domain (83.25.114.69.ipv4.supernova.orange.pl. [83.25.114.69]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab23d56sm58342066b.38.2024.07.25.03.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 03:40:44 -0700 (PDT) From: Artur Weber Date: Thu, 25 Jul 2024 12:40:36 +0200 Subject: [PATCH v2 2/6] ASoC: dt-bindings: midas-audio: Add separate compatible for tab3 audio MIME-Version: 1.0 Message-Id: <20240725-midas-audio-tab3-v2-2-dbc055c27879@gmail.com> References: <20240725-midas-audio-tab3-v2-0-dbc055c27879@gmail.com> In-Reply-To: <20240725-midas-audio-tab3-v2-0-dbc055c27879@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=/IfLGEvhoqbrXs/mPhWyyuqb+s7Bk3eCuOnYTVRjQvM=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmoiuoO0ZE2wk3i+nYkt8Ex24aMWi3VFBpdFQCH A9vUABb0DeJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZqIrqAAKCRCzu/ihE6BR aPM3D/9DuGk/DVvmkKZFs7V6thby1GbdhHaTN4tv22CBr/GctAXE5hXXS4sc9yxw7OIcIwgmTEB yKHS5JGvJ1ie3vKM2ATVt0J9RKyJLeoPc0lftseWw958rmbpKHbOa+Vec6bWIOOS31bQ244fTrj Xo4qY1Q2cuFJEzta6dILYzdcs66/jU3hafxGNWLfBkp6flE+BsSwgiPK8X/MJqPLvdRRmpRDxi5 j0gLZieogu48aRVKlxIRBXiHzSXCaCb68q/4iY0i9BVN+QimdKkJlUxjF2kRhlmr4eyzEYKucnb BvjIKjSr3Q+TeCV0bw+37EPiyrxGshzRLCKj/NQDa+dFVq2rwo574RcL2S/mZQidVVg3D8/U/P7 LImrSvFMCG+ZrKxAc+VyD+UJSjYAXEHGPK9Y3w2Sb8/R0ZetrtE+tck3ai2NP8WZVjNS13+DMPa qUI6bSu3Vo0EyrrjTVYykgvxXXVYq9N3T7c1eb81Ua/ziGamV4o7J3jvbyHsrYvmnqId8tL5o/5 77n0K9uvx9z/vGq2QoiMgYqJrKxRmtXeQ6KtqrFOGcltePtKnQcWOHvoP5yR8ZF0vcJnuILm7wF WPeRf5rDc0PUK67nj8l6PeC/wvsnGoPlxUbqH3wuKWp2t4FFBYq/UmriyehsjGcFmbG1+7zC9hV tdHhEHpieUYWpLw== 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-20240725_034047_097336_4FCA8C11 X-CRM114-Status: GOOD ( 11.15 ) 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 Thu Jul 25 10:40:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13741758 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 DC35EC3DA49 for ; Thu, 25 Jul 2024 10:42: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=6jgZAm73Hf/bhFqyp8PoWdCzqWnz2LzHMQrAjO6S6u8=; b=kUKPgWBIgJFFWXRj2OYGmKfL/G jBz+wWXNVr3RihtAOvuoXFNpVfJK0eLNBWb3NabPeKdHSvIOh+4SJqfkkVZHs3Iwbr+hBGSisdNz6 pXNxsd8oQTJRc7lKWhawbnCiCfwASD4F/FbpSLSr/jiDp8kaASI8EdQhrtBNqlD5E1taiJnFvhU4J H2cJofcZnMIfs/vQ5l9gXWXRTZ3IIAnV95P91l8qIy1aeCXms36Bmx7BVwhxs4ADfqlYa+fy1I6NT px6NsM901S8Bh2CCpoOTj9YX/rVBrEilqajK+0tmgtokklKflu6WOH2Tve12Tii07Q/dWnGl9QfQE UJWpXa6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvvL-00000000ewX-2idu; Thu, 25 Jul 2024 10:42:15 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvtw-00000000eU1-2Zom for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 10:40:50 +0000 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a7a9a7af0d0so51227566b.3 for ; Thu, 25 Jul 2024 03:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721904046; x=1722508846; 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=6jgZAm73Hf/bhFqyp8PoWdCzqWnz2LzHMQrAjO6S6u8=; b=m92JZGonQ1+rYenkn+hglOvjq7eh9m9U7Ynvt/DIT6Tjkx8jDi+ikaep1ocwQG7ZDQ DDW7AiLEyabqOhOxjSAcavK92BQsajIPm8RmM4DAiKlxN1nhJGQFtXRmQCE+7kalKke1 th7Dk3CAVheLO8RMdBprLQTmwZhORBg+djK3C10fZnuWDpEAdMsBiYxcAJUAig7uJSrR C0r+nAXiiNYXudwk4XJvp7GdhMjWc7BJSQuY0oqCKZcMqUq7zNLHcw5TAJLlyAS19OMs O5qUW2/zxgITksoSBC13Qy0IPI6EG16cTumliW+t+egXVvILZLNnf3am56X5ir9r1O1h 5i+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721904046; x=1722508846; 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=6jgZAm73Hf/bhFqyp8PoWdCzqWnz2LzHMQrAjO6S6u8=; b=QZGBIb9LXWGt19emtp/mG8tMIY+rxh+Sk04q2xOyvxOhlEIfkM0vUc9iom1jfpSrvv curVlMENbKCiUEcT49eWc+rhwr7971Byk3clkIMLeLuk0RHKpCBLLRXUrpxa/NkvClaP X4rmtbJtMCR9kmiIAr0YA8+JIs+/NuqC3IHiItO39a8Zu5As2K1Babb4Z/t3VBvKKNFC Vsi0KeRHEJ88xYDFVBqKea6UJRsfQTNjwdlAKe1T/eXJijVPYr1fkvhotjnmb9Op4Z5g Lg0x9mLNAE4Qrlwph2F52IBbMBRv5XAiFVpJ9IZ3ryvSsqOdnhFSJKM3BWs3r2s8NQse 8l3Q== X-Forwarded-Encrypted: i=1; AJvYcCVsVvNWpBO/1xlgMCDdKI1xNZl+6PEzy12U9G2sb+l2tFXJPeJemWid8C61PS1Uh1c/7X9hemokKHwkknPKaCCyWJjqlgCFD3ag9NBBR2Sm3+Ks3UA= X-Gm-Message-State: AOJu0YxorGaqkp6V2LCPspVjSkLXWuZMWDLSmZ2V/2RQ5dn8LG8MKE2V CYMOgBZOoQhesuYVAZIgE2izJeWpQZaY9KKeZsZUbGhf7WQuFEJl X-Google-Smtp-Source: AGHT+IGovJSsZSFuA3Rq17j+OMkIEqicFAzp2LhAj97sWOxPvJ5mqgOjmYbaykRF1W4HiOM0VjAsiA== X-Received: by 2002:a17:907:318a:b0:a7a:a33e:47b5 with SMTP id a640c23a62f3a-a7acb9b7230mr120125566b.69.1721904046538; Thu, 25 Jul 2024 03:40:46 -0700 (PDT) Received: from tablet.my.domain (83.25.114.69.ipv4.supernova.orange.pl. [83.25.114.69]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab23d56sm58342066b.38.2024.07.25.03.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 03:40:46 -0700 (PDT) From: Artur Weber Date: Thu, 25 Jul 2024 12:40:37 +0200 Subject: [PATCH v2 3/6] ARM: dts: samsung: exynos4212-tab3: Fix headset mic, add jack detection MIME-Version: 1.0 Message-Id: <20240725-midas-audio-tab3-v2-3-dbc055c27879@gmail.com> References: <20240725-midas-audio-tab3-v2-0-dbc055c27879@gmail.com> In-Reply-To: <20240725-midas-audio-tab3-v2-0-dbc055c27879@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=GMcA/CSZ2AnnqzHK3pWs0min7yshm+f3JahQWfU+ihQ=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmoiuoa1y6zAZghDGX5n5/kjHDjOkdleE4d6VW9 MNmqhpGxGmJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZqIrqAAKCRCzu/ihE6BR aOxRD/9hAoKjY6o689I2hWMx51UiaLiHANSV1D4QZtTyRJEgFD3qpVpxqD3AcUx/801XjwvsIXq 00/9B/gR3i3SiSwK+hduFutC2wb0bdxodLGGcMWIfnNzjGFTN/KCuSe+sZoe25Rh/cFvsWNLWX1 +gv4KezzrPiIDvI3R4AwXIHnwkZ+gpNxQQyMuJNP6wNjh8H1Hs9ew0778etASf2itDcj8eME2VQ jmHoDRs21JiN4YrihRB55REl8QlLqK3FqJ/LbtZmKFoW33QcUY7FPID08AGGV4Q+BIjmclQAw1E /S7tqFGiZ7gI3JGjEs3USUCZwzBtA8cRSMFq+H3pZU2W5IFagHV9q9nwWJCB9TDxIk9AKgNv8qx wBmMqnEgK+8I42k/KdjbIz0CU5QNzbVEb6szGD6UCKl0LzP6iKcVPMTUYVAI9q/itAEAaxwFNEj WC1fA7FWvqJJe5VJ2B1NHO+9kMS1LfwK1gAcXDjru8InSBWqEMuu8cyexm66GWpVrli3pVrwyfk 5L/MZv0FT+fH3/8PuR6I0HhDS9X7WiZFJczmCV4vEwbu7DvIO1ejuqx08dZ0AsJZJVnZJmWaWJe G4dtFJAU2IJtZrYf7cMQdjr05HeZYeGlASY9BDVgD5NHn7MkrJaiRNCtFM9/86aHJCKPBhu7njI CyMvpywuh5Iiw2Q== 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-20240725_034048_695961_21BA5C2A X-CRM114-Status: GOOD ( 10.86 ) 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 Thu Jul 25 10:40:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13741759 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 07E21C3DA49 for ; Thu, 25 Jul 2024 10:42:50 +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=Hbfg5uXazW+nwwPtfcNespnqKTYu9/iLCCEpTXlI5LU=; b=CR6ocfWIb998Xd6M4syXWoQBFt wjev5gPawMc3cJftW9p5iZNEVahIWYtnirBq9w0gV1PSKrYME0g8pxejyc0nV1dsyPrGAiZ9nYZ01 gRuudLBddV/CvGQecQCQ/x6Uj6OQbV5irQOukMnEZmCmjubNB+p3CBPYp35mGWVknZ80/HshLNCXw fQvhFG90Rlfln801ZeTV2y3yA8YIuezwIyCtuINfW49VY2VbBZZM+12OM0RG+nanSEnlmRCGMV9ib pFFiYV5e7nxlHKj+ovzS9902osijgVJJy/bot2zw0xBtm9hqgmNDN623x4/5DQiIF4oTyOuyrYsCi dap/7Ngw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvvi-00000000f55-0KFM; Thu, 25 Jul 2024 10:42:38 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvtx-00000000eUL-41L5 for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 10:40:51 +0000 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a7ad02501c3so38297766b.2 for ; Thu, 25 Jul 2024 03:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721904048; x=1722508848; 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=Hbfg5uXazW+nwwPtfcNespnqKTYu9/iLCCEpTXlI5LU=; b=F7wHHGET8K/AcPVJm7XysmmQ1jWor2dX6R5QoaXTDcvonVlmysE0QfzhJtYBT1XDn3 a2ztLMa30ZjpMr2kzJnaNV5Ki+Lch6oC1Oexqm3/Z50nFkM0HpaBP7UYNIl/nm0axkyR 0N9OiPEFCTwCeeUa113PVrNaeoWL/k4R4bVimGISitS0cXuc8NsQSwLnkLqrvNJmVN1N NurqgJSAXbgXO8zUlcwYJ9e8bM9PVLt4j/gruYUMuTZWzxJvGTFvJVrvx9WRU8TniBDN b8pU+YC8G65RJtjyOp9Jdoqk5M9HlpMf5RbUA1fxwlioGz447KYz3oIglZ7U2SA/R4Ie MokA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721904048; x=1722508848; 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=Hbfg5uXazW+nwwPtfcNespnqKTYu9/iLCCEpTXlI5LU=; b=l8ho8yhkHtY/LyqCuW0b7/pOvXbwkjSP699ss8h+pzoKWtkXwKMMJTgRScY6R4HlHd MO4MYP7wSNyrgavPRU0Aefs7nDtkn0hZLozeO7yRQrHDwVb754gIwNpGc7Hljpk42/2S I2kEgSdggINk1RMrRIjv3YdO9BJ36THw3Xt9fYu1jmTQVJSJHXQ/pLpG8RwQvCPMEMRe 6H9BamDvRtLDcawhJp7vZiGW2J0alOrjiasbbIPUkYklTZ3L/M0DIHKqFwporHuR0fYy Bzvu37ZGN94M37j9iWRCy0LjRhSpKk4o95dfaRnIuTJHRwzIe3+fNvaphZ/0Lc/hbI0I vv8A== X-Forwarded-Encrypted: i=1; AJvYcCUfK4IYs0on8AZSW/MSlEEkea1R5nkrnv73SCHiHMKCFwXRUNULygm9NVmOX2AnYPOZcoTFUQY8K/rcH39JCwO+uD9qRGuUELPS3n1e4K7ViXbsSDE= X-Gm-Message-State: AOJu0Ywhju7gKmMZmVYoLImOR/0LNEcKuEjk7LFK9wyTiAq/iXv9KsmV 4ADJRfcVuPEdrNiOGtsIZMT8LOCV8VYQgYX8ZPGJNuACXIYoxYm6 X-Google-Smtp-Source: AGHT+IGnP6YKcnhjuaGkkjpm8excP6NxkP2lXBsisKbDvXzA+qzUyviZNMfKXDl7Qml3TfN17X3VQg== X-Received: by 2002:a17:907:3d9e:b0:a7a:a892:8e05 with SMTP id a640c23a62f3a-a7acb498255mr126320166b.33.1721904048162; Thu, 25 Jul 2024 03:40:48 -0700 (PDT) Received: from tablet.my.domain (83.25.114.69.ipv4.supernova.orange.pl. [83.25.114.69]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab23d56sm58342066b.38.2024.07.25.03.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 03:40:47 -0700 (PDT) From: Artur Weber Date: Thu, 25 Jul 2024 12:40:38 +0200 Subject: [PATCH v2 4/6] ARM: dts: samsung: exynos4212-tab3: Add MCLK2 clock to WM1811 codec config MIME-Version: 1.0 Message-Id: <20240725-midas-audio-tab3-v2-4-dbc055c27879@gmail.com> References: <20240725-midas-audio-tab3-v2-0-dbc055c27879@gmail.com> In-Reply-To: <20240725-midas-audio-tab3-v2-0-dbc055c27879@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=jHWT0Fa+xhOf6Fte2P6lvkJ4mgTfM/iqD1caxnjhtGk=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmoiuo/j+1OWobQ2BFtLgRwLTmCNNfv8vZtkvJq eWwbWcRkhWJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZqIrqAAKCRCzu/ihE6BR aHJiEACOfWoLCfrTTHzQfVC3ppsNF4bl/G0huge1xId4KARL7Pl6fDS/9LsgEP2BZ/nRv+lCzpH TYb/bcPcAEsxLV0VfJBGf1Kh0Ql9Zy0k6qgOv4Ody+XdxV8JFL9EDw/cH3q/1Jo34oaFF2X4nm/ PfDvK//aK6sGVYvLc5Fan0tt2fhRFnfzvKt+4SGHoyQC7q1Mym30YSF2kfHNQa4og7jNQOl8OaA 3eR7To3EdzZvjOGOSJaIcUYdyOgsUXZAjOBuRHlP8SeHsnBynmpvqBTSkkBsgHxh17rgkZZaWe/ HL+Uyzuxi8M9XfMc6DnJYB9LMtFS0Bszhkpob0z8zaqrRssEV+Zl3kherkqk3V0uHkUU7Xf/XYX WdJv097bim0r5mKdon/UQLYvXnsIPukB/opj9ld6JX7vTLEuugtML/Vp+t19EUgC1dycBhJU2Gs Qo2J4oUXWx1/9i5VAkqJ0WYjFjjiA6403criZcbK68QEmwzv1WdCP0+HfSD4kTS67mwZm3YVulX +oH3g6i3EXv+owUSaHCjoPK3EwOor6gia4U13ZZC8FUqGj4XlQYlLYFQ2t6rbCvKY8RyJXoMJ+3 DjYJ/5T6umwtK9jnWtG8NidAjNDR84BKQkuC6YJ1+C1W5NiJkyY1/vhOOsV03b6fUY0SbW4AHK5 MWTK3+xkVk4sRhg== 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-20240725_034050_040748_E2AB4006 X-CRM114-Status: GOOD ( 12.66 ) 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 Thu Jul 25 10:40:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13741779 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 359E0C3DA49 for ; Thu, 25 Jul 2024 10:43:14 +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=SJECV00aSZJvcUel7cdkOHAoSvIhtNZxcjf7hQkKcCw=; b=EzN+jVuMS4WMQ5iZy+wrD4bTrW JoW7aOqPCzIpss9Ua+RQ0wfGZ2YHEkq/dyVt2zX+cHoQm+X4LQmys9lTYfyJRMcVfUnVboHRNiVyK LT1vG60o5vlIo0VplEnB4laLPci9rnqGxm9wHu6na84hDG1HzuYWBgdhcyHes3QL068pwWW1taj3A JMefXTHpmYrE8nLrlt335mPlNhCiFTaPtnnedUqn8lpiaQrRDnYO4T7HnBBjhPY/pCHBHgwYI3tyl wrgOdBjAYV+Yb8deOG2SnyGFoQue4lLF8CjBTGWTA4e6cWaHJOjcPzkZZiNrgku29ZLWtQZ10DqCv 9KJnUx3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvw8-00000000fH2-0GvY; Thu, 25 Jul 2024 10:43:04 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvtz-00000000eUr-0ij9 for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 10:40:52 +0000 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a7a9185e1c0so33124066b.1 for ; Thu, 25 Jul 2024 03:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721904050; x=1722508850; 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=SJECV00aSZJvcUel7cdkOHAoSvIhtNZxcjf7hQkKcCw=; b=GPG5Z9J+R9OxdBl1/PlG/7CwF41T1A/555o/1XSddfiMNLJBg5vXLhblzQt9d8+7R5 5BW6vWIxbCjdAP7Q6m320SbydV5Dt+oqZl+i7i+UmPJvcSET9L21mnf4bhPR3eWm0EWP u5KU2U3l+lriEXKpKgWJgpk3nE3jAU6k30AV73uQJRwh6OfZgHfGBmxlkZQqVOpqWFhG vUhEhKgTHZX+ZtoYW2OknaLtazaZDuvHKDR14/NQV0nE7cWEV/1zNYRtKBnPNp3KrN3Q IKt3rQFu26CNYSiGv7MyIm/zh8DcvgdcqQHIrj92FxP4GLBvSgql3uWvq/up+AQT2tyE OpiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721904050; x=1722508850; 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=SJECV00aSZJvcUel7cdkOHAoSvIhtNZxcjf7hQkKcCw=; b=jjbYcCqW67PAJxExeUxyr3qnh7s9NRBwplIYOOLPWzvXxvSygKkei4uqw9ATsLz7oD BN/USRrVoWUTdNYX84d07Pib+Q3Ilkcpq7VnuOz7K/3Kb4/km7nhQtBJFuc7DH25Od4V RK9G6Iq8k4u9nHFIdEJKFRttSvi17gDYzoB0lbHIC1DtVM+A0SMyn8j9jjFBHZcYNWgu iiReu+92n1XJebJNFNN63Ry+jbtlHXu6DgBie+jir00C9p4yFXtmOWzgvwMnj3EimR6s AlfVdBP5vQxxWuVFxJirQWZW+uAybTNhnKweRUFRA7XewBkxvy73AFbS8VmZNzqFkQnS tmHQ== X-Forwarded-Encrypted: i=1; AJvYcCX2IB5e47whFUNLq92dXuKcgJU0d7GQ5ECZBjflH7s+Zc/u+hZXkHmM8kZ+BJJQJHJFv8jPBxZYxqg7T9mx5RroPa9zc0wLKScgr9uCU/vnRTxM+Vg= X-Gm-Message-State: AOJu0YwJY2ILWcMM2HCrNjrUl9xL2dA+X5h6oWV7luC6du8EcA16tBkC krmu3b/AK9HqZCCZ2+idV+ebWoIBseugYiTSz1v6YZKpteKlaxaN X-Google-Smtp-Source: AGHT+IEikXKg04ARhssW/AiIZZ8R+Aawhsoiu6JlzbB2M604sKuPaZz7gj0BaIJjX9DPfSg/iy3gQg== X-Received: by 2002:a17:907:2da0:b0:a7a:b43e:86cf with SMTP id a640c23a62f3a-a7ac4f2ab39mr183502066b.27.1721904049824; Thu, 25 Jul 2024 03:40:49 -0700 (PDT) Received: from tablet.my.domain (83.25.114.69.ipv4.supernova.orange.pl. [83.25.114.69]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab23d56sm58342066b.38.2024.07.25.03.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 03:40:49 -0700 (PDT) From: Artur Weber Date: Thu, 25 Jul 2024 12:40:39 +0200 Subject: [PATCH v2 5/6] ARM: dts: samsung: exynos4212-tab3: Drop interrupt from WM1811 codec MIME-Version: 1.0 Message-Id: <20240725-midas-audio-tab3-v2-5-dbc055c27879@gmail.com> References: <20240725-midas-audio-tab3-v2-0-dbc055c27879@gmail.com> In-Reply-To: <20240725-midas-audio-tab3-v2-0-dbc055c27879@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=roUKo7CFEIQkN7A/oDyigzzuh8PFW77vS/znRSNpqcY=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmoiuoBrt7EUoGhEmOO8WCtfUWJBFniV6o+8yE6 vbj8W7rcDmJAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZqIrqAAKCRCzu/ihE6BR aBRfEACHwk02sNzZBwZL27qnehvZU1Yr3TFZM3stZBQtbXYCvaZOQcanMkSbrEXmhE2UqoewjjL mt7agvyDUS5t4vKOkBebEYId0cwbRjxAGyUedp3W6Gr20KcKj9aLu0RY4MhwTIWjGWB4hCS8fzG dqW6VI1UbjknCPN8Jewz23CvEzfPNCX1zn4nSbn8SVnlFJMSskcHz483SayDq1bMXewIwezVVOn 6TnIbQ3QHhvQO3sYLTzx9yq343Fw65KIID4TQ4v8DQ9wNpTE+f1paYrmtMdgAwl6iTMr3+mnyiF lGO0qyVuaxsfH+yk4jqDM0LeOJJmPd7NRVKuJeIDzDxe8EgznXNmSQmX5mMwTa11X9nctd6Sfvs hZFniRjJXTkGWFct22DAGwQs5D6imFAESRSzgCYLXZQlVnb/68OwBPeQpTLSjxD/FrMnyYjPcry T+Z3g8dqOIJ4VXkZs25RNUjioKEv/LlBasIbtzjH9LECs7s64uhuZTwISccP9jRSRpkCbiB5v6a OSSZ1eR+LjRVUznq/kFpAMG+3Di1ugIlj/1br8t8fNd1gDQN9PeS2B0mHKkXx/SSl1pVa8z82Xl Q+5b5Ia1IHl3AhxVLLMYr1v5dnxih6uwXbVkTCMk3mty2Ax8JKuk4TnPQvM3gIrntdLhraH/0h9 w6jy4bw3fPm9gew== 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-20240725_034051_250406_3D0064EC X-CRM114-Status: GOOD ( 12.92 ) 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 Thu Jul 25 10:40:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13741780 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 1319DC3DA5D for ; Thu, 25 Jul 2024 10:43:41 +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=nf6VPiGgpzV4Bh7OdZ3UQlM8J+Hh+6fmABD4788z7Ds=; b=chnck9fDIbAWjWScmtEUdfzx8i du+grzn/qqii7uNbvZzkExnwaQnnkh+QAdffuEO95FUR/o6J1xtPIBLkEtoZzi93wmi23UW86wdPN ofYHfFxJHJoAPNJ324XpJ6rY4fmpWiRj6oCDRTASsQkvgLm2vra9aQWGedK0tvsHvEeJz30dPODLS VEmeeAl7bogy+Ox8m+9yHZ26dK03z2aUahau4p6qF64/CE89QAiGh0MikxbcHe18sJb2aJhW3Hm+C D0S9tzGfvbCdiXrDD9k1HRnxBQR/1e0urZsHgL9xRhJb06AraFLYN7GpVk6z4Ubza1y4+tPvu5802 GTiJhOuw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvwU-00000000fNk-2S4b; Thu, 25 Jul 2024 10:43:26 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWvu0-00000000eVE-2EQt for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 10:40:53 +0000 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a7aa086b077so36139866b.0 for ; Thu, 25 Jul 2024 03:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721904051; x=1722508851; 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=nf6VPiGgpzV4Bh7OdZ3UQlM8J+Hh+6fmABD4788z7Ds=; b=f2MuE0+4zW5O7SlElHT3j4OVj38QISdodKT8rRmJPJgYEFQYBB81e1MvhOUIt3PvHC d6yDntLTj1OJ9OLoavlS+j46JJjyApUBc/fbsAaDw+GSZsPLaMer6/dDLCxgwkypXMVM 9Fs5VaBBbPZ9syTLPV0Fj4kNay+GlsIrIZ1O5+w5/vIGqtRDAF4yIMjkMQk4aYPYWFM8 lcov+TqpZ7BdLG7/pj47GROFsL0mH+u82E6rmLUABnOZxmNLw0TSJLFG3CeCpe1tx5R9 O7lEe7zXzcqyPCigOfhygl2txlvXY1Apd7rWsjUxS3BHNzKv1m9swYbl830VEN2RILZK ENog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721904051; x=1722508851; 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=nf6VPiGgpzV4Bh7OdZ3UQlM8J+Hh+6fmABD4788z7Ds=; b=OawPMhV7OJpEYfuocwGOIiixzvtEGb9N/ktcNa+NKkACDb2l/UiwOBT4MXw1wUXzXM 49C/4Te0cckLOgrNkS46/lK7xbKOsK3kHkh7l2Jp7/ds9mYQUPHkQJ1ZrbvCa3+g62TT tS/gGJT32Bb1EgDKeRUaMiPMrG3qgibyfTnTl9+djiLp3Nqv9UROtWx8285wNgIhmpPn 84RJF+S9DBa0PlzO1/wSZ7wwSP1InPO13EvCn48S3CW5SZSgd8EH+4Dhr989YGorf311 6F3uQ2PXi5+i1jKPAi/nDWltrAypyZbyfWYk1gjQo/LvPy36xQBGPFKXgiqQDGpgN1eV FlUw== X-Forwarded-Encrypted: i=1; AJvYcCUnNULYYORrbuwUHqxRCubRr4l5FRUyotKk5rnZhCHugvSfZHM4gZ3P9AmR4GWHGecu/Uy0HCbdTctUq7blBvxnMfH7HPYF/FOcc25+djv2+WBcvM8= X-Gm-Message-State: AOJu0Yw7Wb9/vw0dNTE6gaNT98CDjyCUSYPSo+b3Rv5quj3033RJwTdh +VqdPlcXNtt8RchOU01zx1oimgH/Gz69nF5SLkR5Kj26ZBL6/i7i X-Google-Smtp-Source: AGHT+IHFHN1eSuVeoNBYHF2aEjmsl6zUvRBRtaleADXs7+Y8AS7m0pQ7TJ12ZESC7WgwBTmMXOPAkw== X-Received: by 2002:a17:906:7d7:b0:a77:e55a:9e87 with SMTP id a640c23a62f3a-a7ac503afd5mr124692966b.48.1721904051139; Thu, 25 Jul 2024 03:40:51 -0700 (PDT) Received: from tablet.my.domain (83.25.114.69.ipv4.supernova.orange.pl. [83.25.114.69]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab23d56sm58342066b.38.2024.07.25.03.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 03:40:50 -0700 (PDT) From: Artur Weber Date: Thu, 25 Jul 2024 12:40:40 +0200 Subject: [PATCH v2 6/6] ARM: dts: samsung: exynos4212-tab3: Drop dummy mic bias regulators MIME-Version: 1.0 Message-Id: <20240725-midas-audio-tab3-v2-6-dbc055c27879@gmail.com> References: <20240725-midas-audio-tab3-v2-0-dbc055c27879@gmail.com> In-Reply-To: <20240725-midas-audio-tab3-v2-0-dbc055c27879@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=KWNNuFqNb/S25IX+uh0qv+bi86RJdKP7RJ0/PuyXSXs=; b=owEBbQKS/ZANAwAKAbO7+KEToFFoAcsmYgBmoiuo73T/jCYrP6aHYU23aYR987wIqfIeBMOOC hJQMnOR0w+JAjMEAAEKAB0WIQTmYwAOrB3szWrSiQ2zu/ihE6BRaAUCZqIrqAAKCRCzu/ihE6BR aK5rD/9YmUzevnGSNsQKWo7b6UYIap/vF5Ks+XvjbkRyABXZjCQqmDJNf4tZ1hk8z5HG2CJlAsp 4wqetvaNMjlckh1dvtY/5ow7vQ4t0l/FhPQomwabSjSQJ2zoHldeMcI5bpIr+B4yQUkpeh0QgeR f1R+ZvcV3OFkBcFz4UQQ7h18yvW7LATZfxfi2LhNQVx9tl9M3fV1smoaJs1mOijiuMxu5X4TVYs ulA3Hnuc4bNPzpKk/Kt0FrgG8+Cd8qL+Vb3mPK0E5I+zkMdTzj8YsknziktUnXA57w/pvfLEELY sxTIQj6o2SptMltnODm54rcL3pGE/vhFmczWypdGORSSd6wMFBULknd15yqWC1jsf6Mj10czEfk WTjGLe0F2cR4JRIsv9461y6ELZf4D++V8Gii7zggeGdYjp2Av2Mu95QZjwlyhDFoRylmR5HofuF sTGBN24AiXzxR711sm3AeBXaA3gQwmsMBMIUXXtN4u0FtBbiaupV7Cljsm6Iq+Br/duy5fzG02s 2gHszWlqzdzqV3rF5+hHLIr6kgNVS8TIu2OyKQ93sS4pzotT32zA8aQ8BTocD4QvbknTnjDYsUr V+1DVS5TxV7Yr44a4XW+ZU12UBnVWefTyhzc24V9SvPuGo+/zWmIMJEWwo+a7IhDwovRyHhAi6R 0Kn8Id6ffUiAvPw== 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-20240725_034052_616032_C339DC06 X-CRM114-Status: GOOD ( 11.07 ) 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>;