From patchwork Fri Oct 27 14:42:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 158979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp656309vqb; Fri, 27 Oct 2023 07:44:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHa7a3bMA38661IlOAqCX1WuLDlGR2TyK/xyFrOCM6ZYVtibwN7YxgKkzcwONBrOLvu9CLk X-Received: by 2002:a81:4153:0:b0:58a:83cd:115d with SMTP id f19-20020a814153000000b0058a83cd115dmr2468068ywk.50.1698417860943; Fri, 27 Oct 2023 07:44:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698417860; cv=none; d=google.com; s=arc-20160816; b=Eaaus1FySMm/XmVD5KUrIhJtO00jRUipS6va+7CyTklxDzDcTYBDggQqRqOA7HdNkv eKn+/BYbfuyG/Reij8GHta0NayEQq7xXAikQwbKBW358hzlGvCC3kvpv1UgaRR0CXm6B fqZk3BcCrnUdbm5Xq2cNkoemKlnD8i7KPo4WVVlt77rs0Vs4+WCGd2d8yDFadY7lQuUa ShdoQtiUYyUCgjXCfxArhtkg7pzBJeHaSQt+PrfLpuYOaZ8vToThYcJfP71A6wNOixJf SBqZ+bFXxHoLrDGnaSSLKzsVVlnhoCeZ3ZOPdsW5Za5IwnrlNH8ej5IZyY6M7P5V57ha 8xfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=X5UThObnU9g7pNxsMGmIt91UwuGqjpTylnz96zBTAuQ=; fh=DWQ2Wn++nCPTn9t2adbobvcLGK04hHpyc6wXSNOnLbM=; b=F6nb6sb6RiSGkgHHBCmGDyGGw2jGsyyvsjTJMArwOz2XO8QvPWqz4tqYBfgvYfzfsz D0JicaaNSEntLjTp3TrmWKQz141JsvpU7TCPcll43zvGbLbS/y3siFk9vATVJwVe7ZgW LxmUknjb7XHL4zhLRDoasdYqpV35D7RepePYS/mPqM+qtZhAEM4eWFQGr0uylorvi2fF ZrP5gXhxJETka8hlHcplhVyb/TIW4Zf7m34wga4aIPe5ngSN5yLgmlazD2mK5e1qJBtH 3LgxvPMWmGVoHZy2I0IA9ISBSKCCN1P+6GII53zg7IbU+jl0fNmR0i5PJw7gpO3DB8zI 8jMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=0TKezU14; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id r7-20020a815d07000000b005a7a78f4ff0si2707598ywb.364.2023.10.27.07.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:44:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=0TKezU14; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 44AC983D9B4E; Fri, 27 Oct 2023 07:44:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345966AbjJ0Onl (ORCPT + 25 others); Fri, 27 Oct 2023 10:43:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231585AbjJ0Oni (ORCPT ); Fri, 27 Oct 2023 10:43:38 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE5A9C4; Fri, 27 Oct 2023 07:43:35 -0700 (PDT) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id 8279B40553; Fri, 27 Oct 2023 19:42:48 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1698417769; bh=/wvspNZ6UnwHBJSoNffLyGijS/yc+9Bx1gjik/P77pE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=0TKezU14dvQYvmZVCGhrOkT0XMcQVoePyWFa1I3rRm6mX4nIMDQkDiluXU7Jy+xjo 5b/L/FgM0buo9gOBYyYQcJ9diV0i55P2iwvM2ByaMHUZj5uudoONCyJUSKUbC7KuCN PAyHpkQ+WUrDvkVYgCreFW4JCU8XFe0KCrycBlJZaw4toIVjZi7IFsoKCwfaao5DIr sbvcDPg1Tm/+LDEEMTmIsv7Yf0yOWj9uygWUSsmWPQd+IpxHQuZFL+sf1IE6dsEfoq RS/KkKO1QhFH1HHNm4hnCPfOV31Nh7GIWcKuP62bg+OpO+HGwb60otqk7xY2YcmUOh HWS2tuk+XdVIA== From: Nikita Travkin Date: Fri, 27 Oct 2023 19:42:21 +0500 Subject: [PATCH 1/3] arm64: dts: qcom: acer-aspire1: Enable RTC MIME-Version: 1.0 Message-Id: <20231027-aspire1-sound-v1-1-5ff3cf8b5701@trvn.ru> References: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@trvn.ru> In-Reply-To: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@trvn.ru> To: cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin X-Developer-Signature: v=1; a=openpgp-sha256; l=693; i=nikita@trvn.ru; h=from:subject:message-id; bh=/wvspNZ6UnwHBJSoNffLyGijS/yc+9Bx1gjik/P77pE=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBlO8xbT/dr4P0OR1A/Mcg7Izk15NCEbz2Ss101B ClTp7VwQNaJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZTvMWwAKCRBDHOzuKBm/ de0FD/sGSQp699iOGnsKkb4UdbmDIxMt8Iwx4iwbvxX3zqcano/O6E8lu9tmB+ZXUMRR874ni3Q ZaysymuK1cCXW02SL2Kq14OzUj/o+hw9kYpHstfGS5dZjxErMPMcHwhn3xl+63C9yEdi61cElBY 9hZ69fmLwbGzUYxcu/2Ed3janX1ee42nYa49iTA2TklbczxFY/RFCrEOzBBL5yckqFcYD/z4Ry/ l0/lRlcmiypWpNX+rVDO3l0VwbmuOvXGm6cmk8qzWOtDH86/lIPtFb17IAo1pgdgPmdLxCbMAyN Zomz6AbKBmVDtFiLbBnqNAVRp72VF1jbjQaNX/J7fE1bjg2qq60Intb9LshPCXYklW0wm/illaa cCXREzzvHgTO+7oZ9tzgPT4K+FRqnGFxeMlfhb9CfWpIW2t+R0+AZXo4amdPJrpowe0RPddm0W2 ScZbpYQGxYMiUR3/t81JH2fV9ynRL8VtqqiGvbGafMyN3lOauIy5ws4d3BLheCjZcGnuP8czll1 nSQENoP1olh46Hiut5DZbji7iGN+l/gF7W3G23u2LI6sqXuyqleO2qdtDpTNsxz1o2mofXsSUZ+ x26pEBIus5bkFChiV8q4YpDUwUSX/vAdFs6dJmwTJs3R7NP/Zp0LT4I4BPOMQcAPskO06JNGalH Y5jXKc9ZqA3o72Q== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 27 Oct 2023 07:44:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780920206618947909 X-GMAIL-MSGID: 1780920206618947909 pm6150 has a read-only RTC that can be used to keep the time with some extra userspace tools. Enable it. Signed-off-by: Nikita Travkin Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts index dbb48934d499..cfde8cd47107 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -351,6 +351,10 @@ &pm6150_pon { status = "disabled"; }; +&pm6150_rtc { + status = "okay"; +}; + &qupv3_id_0 { status = "okay"; }; From patchwork Fri Oct 27 14:42:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 158978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp656241vqb; Fri, 27 Oct 2023 07:44:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWrYkvOv+HBfFBjmKkI27TIiAJTpm9KzInZfOnpkZcxRkEIAdgPorx+JHne6QZ0F8meTgJ X-Received: by 2002:a25:41d0:0:b0:da0:f622:8466 with SMTP id o199-20020a2541d0000000b00da0f6228466mr4854570yba.22.1698417852249; Fri, 27 Oct 2023 07:44:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698417852; cv=none; d=google.com; s=arc-20160816; b=JvbrEa3pz4O84TGwsdH9L/lWkCCQo4ohyZaDXv+P18ME9lmSJwdfOcqrgX0gf94PNk fT6B0k8aUCoWYCg87rsyBxF3PrUkl+M7sA5Y9MyFbFhNoQxfSIcgmVKXOLFXEJhgLjb7 th05SU/b/IkUrl3lega/4KtS8ZbR85ovT4OILGJ7rFcGXvhXSizi+bYN/RfllT4yh12X FVf0b0Sa8cSrx5oRkLeMNGb62S098zD7jukghYa6NSQDWcyL5lEi+Poq9J8OzxhBgXrn r4zYXVlX1UONs9IGk/d7uOwM8krgDkLOCYA9AUeGcxa8AXEnBOZEJ1xKPqCbhvvXx2sf 0cIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=HTMPZ07ilrxgBPBC68WOSFMaNPW9i2YaF7t+xpSNcp8=; fh=DWQ2Wn++nCPTn9t2adbobvcLGK04hHpyc6wXSNOnLbM=; b=TtLHike1Kxkad2t5oslN2j/UgQw6q+0sQ8DotnSLTVL3LOvtEgIYNn9oXaB1PoBnp0 B2YoS0bSkupMT1BAAaefWbjWxSY/gppnKJFnhCuUietyv01pUe5eiYI+H9xHaFq2sGwR sB9SBGrkC1IJpbM2krAHPJtb4vAMxWaLV1+j8SVIkdLNOJKCFPTzpSM7bigBw61KYOcy munDWLV1RKt40qCzKe4TQ7dCrw5VdaRHi13MxTo7dJxU7ji3C/Yc1Oa5m0a+tpWRRP/d cVlimPcMjsO9jw+2lZofhnctKOJYlKWevq44C7Ln/VHgv0HL2YjfcHNOCHPXSQAIpnq5 7sQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=l9Byw6iu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id z1-20020a056902054100b00d9a525838f5si2807934ybs.611.2023.10.27.07.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:44:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=l9Byw6iu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5979B81A5DC1; Fri, 27 Oct 2023 07:44:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345868AbjJ0Onj (ORCPT + 25 others); Fri, 27 Oct 2023 10:43:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231627AbjJ0Oni (ORCPT ); Fri, 27 Oct 2023 10:43:38 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEE62DE; Fri, 27 Oct 2023 07:43:35 -0700 (PDT) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id 8156640554; Fri, 27 Oct 2023 19:42:49 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1698417769; bh=eqmIkkJoEX4wLBmCVriM0QlbehXiI4/GaHNwKQsh75Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=l9Byw6iupejRMmwhEuuQ+u91/S+6UohNmC0/Mmt5FjV/RqZaioBBWCMJYR0sGLjVe lV8NgyAtXfXTknoJPUOOoP7fAukroF/8gwBmuB+CPk3NTmbE5Il/bVVWRZ6lmvdCgJ pl9jYSW9SdRbKCU47GbGqHGcAKJw0MQL7bR9AVBHwpqZ4CpevBua+13lXUzEPGADjN YPua+mecjMhTNhx+fgVrX350lU0+4Om/zfNBc6kB7v6cDcYu8jCVw1bKwfalQnz9Ih uGyHKlye0LSv8HRpj5BJKaFIdA62DgTCNyLUawSI54UQbTrK10zrhV5029mV72EUGb GuE2lvhKGXchA== From: Nikita Travkin Date: Fri, 27 Oct 2023 19:42:22 +0500 Subject: [PATCH 2/3] arm64: dts: qcom: acer-aspire1: Correct audio codec definition MIME-Version: 1.0 Message-Id: <20231027-aspire1-sound-v1-2-5ff3cf8b5701@trvn.ru> References: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@trvn.ru> In-Reply-To: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@trvn.ru> To: cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin X-Developer-Signature: v=1; a=openpgp-sha256; l=1892; i=nikita@trvn.ru; h=from:subject:message-id; bh=eqmIkkJoEX4wLBmCVriM0QlbehXiI4/GaHNwKQsh75Q=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBlO8xbnO705dHZXG80e25iSYMqO/brPSmEW7Yce CG/57QRmiSJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZTvMWwAKCRBDHOzuKBm/ dWGiEACoEd3tGoQuYmuisQ+9VXeRW4qCM3ITZGPmnxCX51TBFacSFh40cjqsMtFDSE3Unbcr4Tt /p88GxcD0xm2NBNNKgd5Xc7NHf+uQ+fjmkXXE/ZF2lKmknwG/Ifk3BxnoomAA6p7SaltffqYzxI cBz1DTGiqPmTWtqsFrUFoPZ5B1gU0IhLKpc0ukfm/iFPruyGIkMGsIoKaLrsC09+S7FzhdW8tcQ 7FsklhElnboV7fvH29NW2D1oQU/SzIB4N+EbFJE7Zn+Bu8OU+Hl+2tPKh3hsjZ4K8sKKK7GOSAO 4ghnMcCM14nQap02k2HP5JDG6TonB1RadIPVbop3+lDb5DWbk06bW4uUuUPQt5mC7Ng/gxasm7g ZYg5ScczRUXhSeXTo3x4D85j4ffL7LPbk9ZLebrvwo2/NhEfaGWhdTM747SqylZklRYC4aRiyJ0 9m+4oKbt0Y+RxcLV5MRn11ajDZ2c+FwOD4FRSx3kK4pe52gdXLTQd0gHtY5Q/JQCnRNYiEoA6q8 1qJNAjxhGbKXkTK0jqcvSNnEx8+oDZHu0JjGH+MUu53wAol3WI8Vbt4k2IfNdg7oux7+p/wLhrD ghB4GsjirzMxbRfz3so2SGvchK4ZN4AGMoTX/hbCIGSICbGfkJKyglo/HVIxc0q3xj7liKpII+/ Bk1BRxCXRIJXMjw== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 27 Oct 2023 07:44:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780920197858344237 X-GMAIL-MSGID: 1780920197858344237 When initially added, a mistake was made in the definition of the codec. Despite the fact that the DMIC line is connected on the side of the codec chip, and relevant passive components, including 0-ohm resistors connecting the dmics, are present, the dmic line is still cut in another place on the board, which was overlooked. Correct this by replacing the dmic configuration with a comment describing this hardware detail. While at it, also add missing regulators definitions. This is not a functional change as all the relevant regulators were already added via the other rail supplies. Fixes: 4a9f8f8f2ada ("arm64: dts: qcom: Add Acer Aspire 1") Signed-off-by: Nikita Travkin --- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts index cfde8cd47107..00b442696618 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -209,9 +209,22 @@ alc5682: codec@1a { AVDD-supply = <&vreg_l15a_1p8>; MICVDD-supply = <®_codec_3p3>; VBAT-supply = <®_codec_3p3>; + DBVDD-supply = <&vreg_l15a_1p8>; + LDO1-IN-supply = <&vreg_l15a_1p8>; + + /* + * NOTE: The board has a path from this codec to the + * DMIC microphones in the lid, however some of the option + * resistors are absent and the microphones are connected + * to the SoC instead. + * + * If the resistors were to be changed by the user to + * connect the codec, the following could be used: + * + * realtek,dmic1-data-pin = <1>; + * realtek,dmic1-clk-pin = <1>; + */ - realtek,dmic1-data-pin = <1>; - realtek,dmic1-clk-pin = <1>; realtek,jd-src = <1>; }; }; From patchwork Fri Oct 27 14:42:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 158977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp656224vqb; Fri, 27 Oct 2023 07:44:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEfkQUxtKbdxQTAVBJYEhLliM4pI6JmnpCjkZZzrkNG/87D7u4RPk0jINfSE3AmkdMtpqHA X-Received: by 2002:aca:1204:0:b0:3b2:ecab:900e with SMTP id 4-20020aca1204000000b003b2ecab900emr2616005ois.15.1698417850993; Fri, 27 Oct 2023 07:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698417850; cv=none; d=google.com; s=arc-20160816; b=knjDTlG08QsMlJ2yR4SJgCGiw0A2hECSFBtf4J/iBJtyL5xI1c7rzwWy69zC2VXCS7 Oeq2/+SV11EfbAPTiESH1QBVC2Jo9jlKu/4ICi/jJVB7Q1sYDiX8i1gUmDJBEiPCZw11 RNuMnzkzLNsxLF5Zgcm/dZzurnBy5zsUt+5IHk4Ne1BTX7abGDZqPyRZNf/hHUbKsz3B bMal4RtOZ6AyTklkCnUNTz8bk3b9d4ascNFlskXkaFM6N7oG6fn+yzzAOR5VpoagYzk+ JsbpRc8kN/zWEM21zqSEvwUFSfGTQved9WM5bsGcTYLlZCvdO8SpA1XuScdl9ndk6k9r acYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=9/fZh5UdJD8/BeLWNPYTG6i1dcG4ikcMzlBcvluHN2o=; fh=DWQ2Wn++nCPTn9t2adbobvcLGK04hHpyc6wXSNOnLbM=; b=RhNlfJW1ztZlbI/obt32xoZAOVHWjUptnTRypN9miThOyiHFsXCT+lnpZKnc+2iKti NgYOqR0vQYbEbyVKHONGvO3Gwq/6yuZN3QCPO6g7L/4RRdNULmhMPaVwh8BxJkoaepCd 5Y5ctrYmzGn7xqiItXPxVn5Hg/KURDAZ5LSv2tPzZSH/Xi3IQodjbIeKqmJqR9c+97xY 52oYBaOMVzGFtsLRdf9CMacMT1gFv8LTOrxVin0ZXoHVn/RQyflybbAnyyfv5FYKVBHa UFoYvKO1u49+dW06YsYDzN/d17Ke8aLromziie8riQvaI953BvBD9/JoXb6X0Qs3txoJ Pl4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=vjhEzfNB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 72-20020a25024b000000b00da0cbb01ee5si2621236ybc.657.2023.10.27.07.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:44:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=vjhEzfNB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 4A6D883896C5; Fri, 27 Oct 2023 07:44:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346102AbjJ0Onr (ORCPT + 25 others); Fri, 27 Oct 2023 10:43:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231678AbjJ0Oni (ORCPT ); Fri, 27 Oct 2023 10:43:38 -0400 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EB33E3; Fri, 27 Oct 2023 07:43:36 -0700 (PDT) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id 4343240557; Fri, 27 Oct 2023 19:42:50 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1698417770; bh=OHLRJC/diPfVFt8XwpnQvHWosIsHUiivbV6zXKO3qc0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=vjhEzfNBqX2jogZExWJu9smjWlNjalqWufxvt6mPBlLmiofTQKr+n1gW/qZ2fmxX9 ibhUnclb0yuzOXkbupuJw4kfzorN8n/8R6udUv9vc1jZPVksm+k/9QNXR9RVv6Yyki TdoGbRHCtmdy9aqDBx7aufN+Es/Y3lIIWrBelFJhD25vXt9jvpUtzZ1wqhEXPonTFD +sYtXon6jSnNy1JZ6zbQ5wgQM1qn9Fo45MaHapNjKrJkLbX5kIxXNJQdxNQSeB4Jhs 2lGOaXfrCAEk5+Nm5kzcoeb8+K89RCgd6Ww9p30nCtrLJbZYddWCJwUVDGBqz/PMjD GPMFDOJJZR1bg== From: Nikita Travkin Date: Fri, 27 Oct 2023 19:42:23 +0500 Subject: [PATCH 3/3] arm64: dts: qcom: acer-aspire1: Add sound MIME-Version: 1.0 Message-Id: <20231027-aspire1-sound-v1-3-5ff3cf8b5701@trvn.ru> References: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@trvn.ru> In-Reply-To: <20231027-aspire1-sound-v1-0-5ff3cf8b5701@trvn.ru> To: cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin X-Developer-Signature: v=1; a=openpgp-sha256; l=4201; i=nikita@trvn.ru; h=from:subject:message-id; bh=OHLRJC/diPfVFt8XwpnQvHWosIsHUiivbV6zXKO3qc0=; b=owEBbQKS/ZANAwAIAUMc7O4oGb91AcsmYgBlO8xc30z+MrENqgfLgqVSE+q+ra7RoCnWdyiz1 6GhE6uWXmGJAjMEAAEIAB0WIQTAhK9UUj+qg34uxUdDHOzuKBm/dQUCZTvMXAAKCRBDHOzuKBm/ dd67D/4pT2ycHdMwd/6ryVt9JVDg9rTTP+IYgpuMiDCjwy/JQbSkqPqigfGqMOwdFhI9L4h6fqt gYa6wqXhCXxADwSfKrvXLSJsszBm5Btrm71ZnhWp+E5gDGYCoO4hjfH3L4Nv9FWJ4rkJe5WQL7Z 3Ya+y6IW5jrKlAQhkr+zdTFhc3cgPKdbvB45jvxncQ5zEXPVQv5rDZ6m+orp42Pft9QWajLr5E5 EOrN61xy36EwCz0zEj5irEOPUQXicR08uheUN/DlJIPppxOVnmfLku0/fO5SIjIQOEe0D20pSf0 IA+VWyXrcE/+dAieOEBT+jN9f2IE25r5urMUMLv9jSjfcUvBufLRya6kRJ97bLOMu1sSW2OWnA4 ZWu27d+nhxE+ux11DeQAvl+9Hs4iKT5cibvCieGVX0OLLjRWl1sFgVRAgc7lFMEyC89YYzTBmOt kaBR56+mNmr+MVA46wlhySWo5phGSniQA9iK6g/XqYREephKV64kJfDK2VysZrf4yfDyJXPS//3 sB7h6sL81NHZkJR1MJ5vlGDWFaDbQ33V2N2rBn6VfcPaoMYCVYA2n/QGo/yWlsrey5E/G42nQ5P UMKEqwzUDkw+V/t66xTROfIN2I/UmtMPnRl1P1VNe9FVihLxSIyeZnIwM0SLCOC7RW4aCu2sA1U z0aJPfUusk+QCPw== X-Developer-Key: i=nikita@trvn.ru; a=openpgp; fpr=C084AF54523FAA837E2EC547431CECEE2819BF75 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 27 Oct 2023 07:44:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780920196519718946 X-GMAIL-MSGID: 1780920196519718946 This laptop has two i2s speakers; an i2s audio codec for the headset jack; two DMIC microphones in the lid and the displayport audio channel. This commit adds the audio node that describes all of the above with the exception of the DMICs that require in-SoC digital codec to be brought up, which will be done later. Note that the displayport channel is connected here for completeness, but the displayport can't be used yet since the HPD signal is created by the embedded controller, which will be added later. Signed-off-by: Nikita Travkin Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 153 +++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts index 00b442696618..5afcb8212f49 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -3,6 +3,7 @@ /dts-v1/; #include +#include #include #include "sc7180.dtsi" @@ -129,6 +130,113 @@ reg_lcm_3p3: panel-regulator { pinctrl-names = "default"; }; + sound: sound { + compatible = "qcom,sc7180-qdsp6-sndcard"; + pinctrl-0 = <&pri_mi2s_active>, <&pri_mi2s_mclk_active>, <&ter_mi2s_active>; + pinctrl-names = "default"; + model = "Acer-Aspire-1"; + + audio-routing = + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + multimedia1-dai-link { + link-name = "MultiMedia1"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + multimedia2-dai-link { + link-name = "MultiMedia2"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; + }; + }; + + multimedia3-dai-link { + link-name = "MultiMedia3"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + multimedia4-dai-link { + link-name = "MultiMedia4"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA4>; + }; + }; + + primary-rx-dai-link { + link-name = "Primary MI2S Playback"; + + cpu { + sound-dai = <&q6afedai PRIMARY_MI2S_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&alc5682 0>; + }; + }; + + primary-tx-dai-link { + link-name = "Primary MI2S Capture"; + + cpu { + sound-dai = <&q6afedai PRIMARY_MI2S_TX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&alc5682 0>; + }; + }; + + tertiary-rx-dai-link { + link-name = "Tertiary MI2S Playback"; + + cpu { + sound-dai = <&q6afedai TERTIARY_MI2S_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&max98357a>; + }; + }; + + displayport-rx-dai-link { + link-name = "DisplayPort Playback"; + + cpu { + sound-dai = <&q6afedai DISPLAY_PORT_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&mdss_dp>; + }; + }; + }; + reg_tp_3p3: touchpad-regulator { compatible = "regulator-fixed"; regulator-name = "tp_3p3"; @@ -368,6 +476,45 @@ &pm6150_rtc { status = "okay"; }; +&q6afedai { + dai@16 { + reg = ; + qcom,sd-lines = <1>; + }; + + dai@17 { + reg = ; + qcom,sd-lines = <0>; + }; + + dai@20 { + reg = ; + qcom,sd-lines = <0>; + }; + + dai@104 { + reg = ; + }; +}; + +&q6asmdai { + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; + + dai@2 { + reg = <2>; + }; + + dai@3 { + reg = <3>; + }; +}; + &qupv3_id_0 { status = "okay"; }; @@ -376,6 +523,12 @@ &qupv3_id_1 { status = "okay"; }; +&remoteproc_adsp { + memory-region = <&adsp_mem>; + firmware-name = "qcom/sc7180/acer/aspire1/qcadsp7180.mbn"; + status = "okay"; +}; + &remoteproc_mpss { firmware-name = "qcom/sc7180/acer/aspire1/qcmpss7180_nm.mbn"; status = "okay";