From mboxrd@z Thu Jan 1 00:00:00 1970 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 BC06FC46CD4 for ; Fri, 22 Dec 2023 16:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kqL2X60La3CbJ/PTQhzxpAF7BrtsNewlbuea/MPURb4=; b=gLJkxOqXfESrzj7IeY9RrtttRJ xyHq8DinWk2MpZyCUjt5+3v/fzHL7arN/sAj1Yv6YPZESnsHvn9OTVqc5ZxO9goSqcrdes5N4Vab+ tIo/UQ2u8VSnS4f1CcdGlvOGlq/49VGRCFyK1m380qEdwahL2wUeiT1/rODX74QFJ+vgMBHm+tSQa l/eyOiv+jVKwdmvgKlMdf8pbThH1pDqq+vdqaAcXMdmTw40sOjHXne1G0jnwXoT9g/mOk9SS00VCg s5vMQE9F8v8FIIznoSqvUkOf0sEi6NAxfRkFAaT9zlHJSR3OWWnKuW1gGRjOZ1tp7jM11lSqaav76 CJUSqAUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rGiig-006Rfd-2A; Fri, 22 Dec 2023 16:49:54 +0000 Received: from out-186.mta0.migadu.com ([2001:41d0:1004:224b::ba]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rGiib-006Rew-2m; Fri, 22 Dec 2023 16:49:52 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cknow.org; s=key1; t=1703263785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ErvDQcJbtNazTvA7ofzMhh10seib29pmsETLyke7Hfw=; b=Ua+1kP0ovBMWSseoDN2nCgNB6Xg5KSPml2pLS0rxSOZ+TzRhKdlhDS0DT6ABauzZsa8wyL klV9HRZbQlts2+LWIVIMmy/HfXY1IO+qfINb/FzpjFlEP1BIDPJVvNprzyBRy30CGXVzlM n9piVAn0te1I5QfLciGL84utA9Qc3uwfHyGysCASnI7BAe5kBllMdJiowqHImjDHZ4Ozzr t6nnazNjF8TvexAI8PRTvsrrcJEpjOLLJ9l5th8Rsv6neNM4gEm7eX77cKr/3kMyrHtgr+ bC+d/yNutAxY9TzkF6xvVqDBKe0EW5W2hm0GaT8vFM8+waAPObIEDLTFQzwNLA== From: Diederik de Haas To: Neil Armstrong , Jessica Zhang , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sandy Huang , Mark Yao , Segfault , Arnaud Ferraris , Manuel Traut , Danct12 Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Manuel Traut Subject: Re: [PATCH 4/6] arm64: dts: rockchip: Add devicetree for Pine64 Pinetab2 Date: Fri, 22 Dec 2023 17:49:35 +0100 Message-ID: <2250271.fI8GBZLEnK@bagend> Organization: Connecting Knowledge In-Reply-To: <20231222-pinetab2-v1-4-e148a7f61bd1@mecka.net> References: <20231222-pinetab2-v1-0-e148a7f61bd1@mecka.net> <20231222-pinetab2-v1-4-e148a7f61bd1@mecka.net> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231222_084950_326218_380186EC X-CRM114-Status: GOOD ( 21.04 ) 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: , Content-Type: multipart/mixed; boundary="===============2868169770025752906==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============2868169770025752906== Content-Type: multipart/signed; boundary="nextPart1735942.3G8mRxy5iN"; micalg="pgp-sha256"; protocol="application/pgp-signature" --nextPart1735942.3G8mRxy5iN Content-Type: multipart/mixed; boundary="nextPart2189696.cEvZYOimPK"; protected-headers="v1" Content-Transfer-Encoding: 7Bit X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Diederik de Haas Date: Fri, 22 Dec 2023 17:49:35 +0100 Message-ID: <2250271.fI8GBZLEnK@bagend> Organization: Connecting Knowledge In-Reply-To: <20231222-pinetab2-v1-4-e148a7f61bd1@mecka.net> MIME-Version: 1.0 This is a multi-part message in MIME format. --nextPart2189696.cEvZYOimPK Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" On Friday, 22 December 2023 12:05:44 CET Manuel Traut wrote: > + rk817-sound { > + compatible = "simple-audio-card"; > + pinctrl-names = "default"; > + pinctrl-0 = <&hp_det_l>; > + simple-audio-card,format = "i2s"; > + simple-audio-card,name = "PineTab2"; > + simple-audio-card,mclk-fs = <256>; > + > + simple-audio-card,widgets = > + "Microphone", "Mic Jack", > + "Headphone", "Headphones", > + "Microphone", "Microphone", > + "Speaker", "Speakers"; > + > + simple-audio-card,routing = > + "MICL", "Microphone", > + "MICR", "Mic Jack", > + "Headphones", "HPOL", > + "Headphones", "HPOR", > + "Speaker Amplifier INL", "HPOL", > + "Speaker Amplifier INR", "HPOR", > + "Speakers", "Speaker Amplifier OUTL", > + "Speakers", "Speaker Amplifier OUTR"; > + > + simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 > GPIO_ACTIVE_HIGH>; + simple-audio-card,aux-devs = > <&speaker_amp>; > + simple-audio-card,pin-switches = "Speakers", "Microphone"; > + > + simple-audio-card,cpu { > + sound-dai = <&i2s1_8ch>; > + }; > + > + simple-audio-card,codec { > + sound-dai = <&rk817>; > + }; > + }; Not sure if it's right (or allowed) to post a different patch as attachment, but I have been using a different audio configuration (see attachment). I haven't yet tried if/how it works via HDMI yet, but the speakers and headphones work fine. This patch is based on the following commit: https://github.com/TuxThePenguin0/linux/commit/ 872b829a3511cfa853bd3af3bd4f30be1cb3d1ab I've added 'Danct12' to the To list as they are the maintainer of the primary PT2 image and we worked together to get to this audio config. I don't if they still use it. (I've been using my own kernel/image for a while now). Cheers, Diederik --nextPart2189696.cEvZYOimPK Content-Disposition: attachment; filename="0003-arm64-dts-rk3566-pinetab2-Fix-audio-configuration.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="x-UTF_8J"; name="0003-arm64-dts-rk3566-pinetab2-Fix-audio-configuration.patch" >From 17efeb0ae766886345ff0574c534079742539b56 Mon Sep 17 00:00:00 2001 From: Scott Santucci Date: Mon, 17 Jul 2023 13:06:20 +0200 Subject: [PATCH 3/8] arm64: dts: rk3566-pinetab2: Fix audio configuration The audio configuration of the PineTab2 matches the `rk817_ext` alsa ucm2 profile, so switch the configuration to that. Use `rk817_ext` and not `rk817_int` as the PineTab2 uses an external amplifier. Also the headphones plugged/unplugged detection is backwards, so apply the fix provided by Danct12 . Signed-off-by: Diederik de Haas Link: https://github.com/dreemurrs-embedded/Pine64-Arch/pull/555 --- arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi index a766f21bd6f8..59e4bf2f77c7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi @@ -116,14 +116,14 @@ rk817-sound { pinctrl-names = "default"; pinctrl-0 = <&hp_det_l>; simple-audio-card,format = "i2s"; - simple-audio-card,name = "PineTab2"; + simple-audio-card,name = "rk817_ext"; simple-audio-card,mclk-fs = <256>; simple-audio-card,widgets = "Microphone", "Mic Jack", "Headphone", "Headphones", "Microphone", "Microphone", - "Speaker", "Speakers"; + "Speaker", "Internal Speakers"; simple-audio-card,routing = "MICL", "Microphone", @@ -132,12 +132,12 @@ rk817-sound { "Headphones", "HPOR", "Speaker Amplifier INL", "HPOL", "Speaker Amplifier INR", "HPOR", - "Speakers", "Speaker Amplifier OUTL", - "Speakers", "Speaker Amplifier OUTR"; + "Internal Speakers", "Speaker Amplifier OUTL", + "Internal Speakers", "Speaker Amplifier OUTR"; - simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>; simple-audio-card,aux-devs = <&speaker_amp>; - simple-audio-card,pin-switches = "Speakers", "Microphone"; + simple-audio-card,pin-switches = "Internal Speakers", "Microphone"; simple-audio-card,cpu { sound-dai = <&i2s1_8ch>; -- 2.42.0 --nextPart2189696.cEvZYOimPK-- --nextPart1735942.3G8mRxy5iN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQT1sUPBYsyGmi4usy/XblvOeH7bbgUCZYW+HwAKCRDXblvOeH7b bk8YAP9l/Ynyc1NgUzHaJH+8pqpPvbqfRat1qp4Tm/CX1vZjiQEAi+d8vAIDfJs2 ytBGxf56fdtLqnUcH11NRRCnHeSFMA0= =znXm -----END PGP SIGNATURE----- --nextPart1735942.3G8mRxy5iN-- --===============2868169770025752906== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============2868169770025752906==--