From patchwork Wed Jan 18 10:34:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 643756 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2BEDC46467 for ; Wed, 18 Jan 2023 11:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbjARLU2 (ORCPT ); Wed, 18 Jan 2023 06:20:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbjARLTP (ORCPT ); Wed, 18 Jan 2023 06:19:15 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 217ED676E2 for ; Wed, 18 Jan 2023 02:35:03 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id z5so32396583wrt.6 for ; Wed, 18 Jan 2023 02:35:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=B4h4mwj02VQM2QT5Jhg78WSnTdol3IH9qvJRJtozX8o=; b=vomJyRUrJLvNlMY1ZQgbdsDsx1UU/LL7olxLzA2w4RLVywXnCCg/92FUgIavvuXfjt 9oMN0k3XEBFMy9YrfjdqxXgkkTy7a6sLydgl7leNPQsQD7ZiMlJFGH0+1FtyPXcmvXDz 9QwC/cnGZYhjX7603YpzwrOIdvPxYFlGtHXfm3xnNfcz+g6TcisX5XMpI8Z2N21VfGjw lF528LzWQVfwixsuAxclvnhWFPd3A3/sePXYKVfOvVX6SwjuNtTsBNCUvsdXwvFYIvka rCBt9SBy9W9U4nTgy5DQ/jAHKFIRSVtRYL1K0BxuMLh3G3RarfWM4Qz/ZVFi3nzuWRfW QXuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=B4h4mwj02VQM2QT5Jhg78WSnTdol3IH9qvJRJtozX8o=; b=ZpXUs6hB3kXYdWRJFhnAZ/92Ut21ovZsPwoq/uLy6Vslkfl9CkoREt2FNrMyuIq/2t P+IyyiQwLWZVcQzXW3to88Rso8BnkMBbgSCS1MhlBYIOyLgBMlfnAyPEUcX3hDDjxJ6H uVUtrGdtccZ2hCCfxexGb8LDQLOPYBZte6q8iH2rMbOCxxDYKH3yGRjhlmzV8pYlGy2y 8VPBwJZqw/xx/vCPViVfewtkHwVa8ml5rrMuTirUwLWs/4E+bl/cJk3WdA+ZdQ9x6wZb sXArux1EZUmy3CJeVabETeUSTefSQSlZSBKvzKfhlVedfqWb6wzXEjJWhFJ/u9mNZFh0 3nVg== X-Gm-Message-State: AFqh2kp9/Z/ZXp6qmRp1jf23MN3/gNnelnJZnLhLKUe8XRAt2sZwV+EO prXLpy9jK/UsPwKTB7rBB+IpKA== X-Google-Smtp-Source: AMrXdXt1w/LVgSXfDkHFXZl/xC1VdkFrMTumyZOJOrOWd728r2/b0gEtPJC3NQXZhQ0t8Pb2OVyiOg== X-Received: by 2002:a5d:5a85:0:b0:2bd:f5df:2689 with SMTP id bp5-20020a5d5a85000000b002bdf5df2689mr5906564wrb.47.1674038102235; Wed, 18 Jan 2023 02:35:02 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id ba29-20020a0560001c1d00b002b065272da2sm10076731wrb.13.2023.01.18.02.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 02:35:01 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v2 1/6] arm64: dts: qcom: sdm845-db845c: add generic sound compatible Date: Wed, 18 Jan 2023 11:34:53 +0100 Message-Id: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use generic sound card fallback compatible, because the device is actually fully compatible with the generic one. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. New patch Bindings: https://lore.kernel.org/alsa-devel/20230118101542.96705-1-krzysztof.kozlowski@linaro.org/T/#t --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 0d935c928148..4833e89affc2 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -704,7 +704,7 @@ &sdhc_2 { }; &sound { - compatible = "qcom,db845c-sndcard"; + compatible = "qcom,db845c-sndcard", "qcom,sdm845-sndcard"; pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active &quat_mi2s_sd1_active From patchwork Wed Jan 18 10:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 644246 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93BEDC32793 for ; Wed, 18 Jan 2023 11:20:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229966AbjARLU2 (ORCPT ); Wed, 18 Jan 2023 06:20:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbjARLTR (ORCPT ); Wed, 18 Jan 2023 06:19:17 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4013D6843D for ; Wed, 18 Jan 2023 02:35:05 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id e3so24224283wru.13 for ; Wed, 18 Jan 2023 02:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FneBkYyQ6xaqzMShBmUzlBY2+Gx/oH+DvIS8onnxBTM=; b=WzPbpXjfP/50g4douBX2JiZIhuFwpktydGweh0Bp+Ub86OVoiKnpD/3Ee0GJm1Rqfh USMtN+pmCtfvqzWzeHzaOWoTxT8WhNrSPSF5LBjIg1nz1MET5vCiHs7i4cl9rKIbRikm Sq6WO+IiLtkIsY0tx8S8fvk6e8x3twYAvYFldwDd0entrLkX3rLVL+x3WkXkTxk2WoV8 rgaVd/uuNu274/igmP+nZNOzHpZ6bmCG2pgfWPCRRZb9PqwF5xwjUv8ShJphrj8p2uME 5fHfgVecUsjGjsBIYFXNvRLPGlvVMKSiUFn7o0HU6OqZiRNH/r0yugJ//Oivh5+YXmGd 36Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FneBkYyQ6xaqzMShBmUzlBY2+Gx/oH+DvIS8onnxBTM=; b=1ImTOZnYSR/TyxyQccE+VN8hr80bMvaerM1PwEF61yGrNqLpfLPXklI2qkvyFeqFOe tkvMjIs9OXU+fDvQW5zk1zBKbXJUUdHaVK/m+Tb7K7T8Uy7cw2IIHPTyjuZNKKf5BpJm NtPPNOF0QAOI7ynlueGVP8IGdaNgZesp5lwTBsDuiJJKM44toYDmbkwRrnHqOGgx8Dga tnwk+CyNWhZk61pImYukyYi8ZEY9vZ2CeSN6his+QJLF492kcJbqlRpgEbnNTBdHy03s 8IjHSrI2aBGwR7OL82Uekxe7oTwOAdFiyn8nxKYyuC8NiBJsMIA1aYxF8LmQjo38HSwR Pdlg== X-Gm-Message-State: AFqh2kqcurMFe98TcajzYq38jl4gKf6q1AV/YCbdbttyml/q+pIg/uUA eRzirgkHt88TV+UwxORmYe/8wQ== X-Google-Smtp-Source: AMrXdXvsu9ri6SzVvmegPxf2Hi0Dil/3/MKkHw7o/CJzj9kIaCRYndOuIMzP0rA1U/3XuLQobgC1Ow== X-Received: by 2002:adf:f74f:0:b0:2be:d02:1bde with SMTP id z15-20020adff74f000000b002be0d021bdemr5741157wrp.46.1674038103790; Wed, 18 Jan 2023 02:35:03 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id ba29-20020a0560001c1d00b002b065272da2sm10076731wrb.13.2023.01.18.02.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 02:35:03 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v2 2/6] arm64: dts: qcom: sdm845-xiaomi-beryllium: add generic sound compatible Date: Wed, 18 Jan 2023 11:34:54 +0100 Message-Id: <20230118103458.107434-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> References: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use generic sound card fallback compatible, because the device is actually fully compatible with the generic one. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. New patch Bindings: https://lore.kernel.org/alsa-devel/20230118101542.96705-1-krzysztof.kozlowski@linaro.org/T/#t --- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 64de4ed9b0c8..5de8b4c372fc 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -374,7 +374,7 @@ &sdhc_2 { }; &sound { - compatible = "qcom,db845c-sndcard"; + compatible = "qcom,db845c-sndcard", "qcom,sdm845-sndcard"; pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>; pinctrl-names = "default"; From patchwork Wed Jan 18 10:34:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 643758 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08E51C38159 for ; Wed, 18 Jan 2023 11:20:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229736AbjARLUX (ORCPT ); Wed, 18 Jan 2023 06:20:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229847AbjARLTu (ORCPT ); Wed, 18 Jan 2023 06:19:50 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E89CC689EA for ; Wed, 18 Jan 2023 02:35:06 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id q10so14130898wrs.2 for ; Wed, 18 Jan 2023 02:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lx2/zPduR9kyydYgB7n51yrhAvGD9FHDkQln9sB/Ijs=; b=YkynYi4wp/W5U2kj7v3/YAg8OKGKrA9QD7xlZ6nuoEWMOG78rbLDLgIJz2NU1WnI4s 2TlXWW+1TyIzqcuUdnfo2+fjh+u1vgKdfV1kR0riw+XmfwxlRlEdp9xTIq7G3aKYojcr agBbBxYznwMSQDBHlWT3rp2DMST5cfCaIRdNihZpIH18TJsQ5iyBHeLkZg8Xu5pcskMb BWjK+KRMK05C2OGeAoXnRMtSNi/aDwX8Wp5K56EhJ0pHkgSQvWGXlO6VOsEa7DliV0VB o5DfjMEkzzp2x2hMPzlcuFvTbex/oczAXlDS9XnwcoglwsE+uBdIBMopxcef45bWYEmY zjOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lx2/zPduR9kyydYgB7n51yrhAvGD9FHDkQln9sB/Ijs=; b=yNaAug0/yjNBm6xg2u7tqk7figqcqkFP2WT5ZpIdJ0VmyiFi6dhM6EivtCS7JyVpVP TJSFkNpuTr6/hYFUUn3462cH6Ti3Gn7OPdXFw/G7mRJieBCmrtWB5qcPKUYI6DiDUpRb SOXCVbK5pv74kAI3d6HU//q+/aL//C6ObEbapUwSj1vY443QU/l0mw8ndtr3YPfKhNbS eKvpb+R8WmQ8OoNaAgxtH8oLSFHdcNybdkkaKK5WRCHjWZcRpAoDQAS+R1mZE7VVRNhL JacgGV0PU3wz+CYnDjWVTEWcuYbVb/WF5Ioh07u6pZ+O8OzSSPXyDJ3+kyo8/o3WSXDC GlpQ== X-Gm-Message-State: AFqh2koTx12jlXRh8DxMsBL1H/6G03eOFR8x6AuYx7/xAVhhfrCibU0h fmZZ2dlfPsgLfmsZ425E43id2g== X-Google-Smtp-Source: AMrXdXvslf3z1cVuDVN1383bkZcjnwwOVW03en/Xkj6ZCKWVzbgTKVKbjqSLWQEFD8GAN+UzdxcWzQ== X-Received: by 2002:a05:6000:1f95:b0:2bc:371a:8a2 with SMTP id bw21-20020a0560001f9500b002bc371a08a2mr5990033wrb.37.1674038105466; Wed, 18 Jan 2023 02:35:05 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id ba29-20020a0560001c1d00b002b065272da2sm10076731wrb.13.2023.01.18.02.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 02:35:05 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v2 3/6] arm64: dts: qcom: sdm850-lenovo-yoga: correct sound compatible Date: Wed, 18 Jan 2023 11:34:55 +0100 Message-Id: <20230118103458.107434-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> References: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There is dedicated compatible for Lenovo Yoga C630 sound card (documented in bindings and used by Linux driver), so use it along with a generic sound card fallback. The device is actually fully compatible with the generic one. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. New patch Bindings: https://lore.kernel.org/alsa-devel/20230118101542.96705-1-krzysztof.kozlowski@linaro.org/T/#t --- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index d9581f4440b3..d55ffd69155e 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -511,7 +511,7 @@ dai@2 { }; &sound { - compatible = "qcom,db845c-sndcard"; + compatible = "lenovo,yoga-c630-sndcard", "qcom,sdm845-sndcard"; model = "Lenovo-YOGA-C630-13Q50"; audio-routing = From patchwork Wed Jan 18 10:34:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 643757 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9ED2C46467 for ; Wed, 18 Jan 2023 11:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229771AbjARLU0 (ORCPT ); Wed, 18 Jan 2023 06:20:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229868AbjARLTv (ORCPT ); Wed, 18 Jan 2023 06:19:51 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E8B56CCD6 for ; Wed, 18 Jan 2023 02:35:08 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id r30so9026975wrr.10 for ; Wed, 18 Jan 2023 02:35:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=frM+OJIW8+YWIIMkRCM2WWed4kr4d1TRkS3GV593Yj0=; b=xQRUgdqAtDsyd8GEVNxAU3OGb5rFMqxezTC4M/aakqKpXIvbFut2AOFNORVe4kKiei ac26dqi76/W4lotcNZUF/9nbjKCZiDC/XYAuOx7DR9IFG3/YBa1boJ4zfHOIqZihvz2d fADSL4vVTp8p1IMH96dE5xSskYSZ7ixPNxCOy7WrPkkCp3m5OtV1R01QQMyQ3qQG4L0Q JOCS2evy6xMojVq+Tw5gx49UuayBu6lQAX29moMKgzG+UyDkd6ihohjaVugaitR9RFBY n+OPaDq+76pHW8nkb0VdDAYHl5k+8dBl+uAyYD/x9JYRNvfh+pyHhXpYaDdqf/A9XQlL 2a7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=frM+OJIW8+YWIIMkRCM2WWed4kr4d1TRkS3GV593Yj0=; b=HeizvIKr3jvi9vvkty6hSUIY50TfSEFH6JZHaGPdkeUX90nyUFSliORWD7vAmrEGen qPxZJCF4HhndrbF05SUgJ/aDaCmimcp3wyCgTaCl3ExAs0TDhwaLskA+VzmpuDBDfiWv YfD9bx8JusqeKaNY5+vbMTwmEYyV28zUnQ5dvJVooBmobxqoAFlI6jLDvv+EyfMe9rv+ sK+7kIO2MZWtXeNTQt/yHQP/eAl/zILKbDG4KxVbTvHR3NMXLXbxr5fKYGopF/rqQcj9 RlCbW0VpZpSgRNsy2hWaw2RAYca1g7AUOM7KvjwbSkKBIB0ER83DkB3D601TK7HAChkD +dgA== X-Gm-Message-State: AFqh2kopkoXx73zvOv/Sn5U9jL1FDnJEq3eCZcPS2OcRuoPpWbxXvJlK lXTjCHJVHpT3JHsKJXcSezS9Mg== X-Google-Smtp-Source: AMrXdXuG05WWhM2byRAtJGgMaWWbMw89Qh6aCbjge8kSKDZ4c7X4qbGuZCPrUe5D5gFQJ0Ttre3+sg== X-Received: by 2002:a5d:5608:0:b0:2b6:daf8:52ad with SMTP id l8-20020a5d5608000000b002b6daf852admr1622631wrv.52.1674038106988; Wed, 18 Jan 2023 02:35:06 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id ba29-20020a0560001c1d00b002b065272da2sm10076731wrb.13.2023.01.18.02.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 02:35:06 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v2 4/6] arm64: dts: qcom: sdm845: move audio to separate file Date: Wed, 18 Jan 2023 11:34:56 +0100 Message-Id: <20230118103458.107434-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> References: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Re-organize SDM845 sound components into separate, audio DTSI which should be included and customized by the SDM845 boards wanting audio. The DTSI includes: 1. WCD9340 codec node because it is not a property of the SoC, but board. 2. Common sound DAI links, shared with all sound cards. The Xiaomi Polaris, although includes WCD9340 codec, it lacks sound node, so it stays disabled. On all others boards not using audio, keep the Slimbus node disabled as it is empty. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. Move also sound node. 2. Rewrite commit msg. RFC - please kindly test the boards. --- .../boot/dts/qcom/sdm845-audio-wcd9340.dtsi | 125 ++++++++++++++++++ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 55 +------- .../qcom/sdm845-xiaomi-beryllium-common.dtsi | 53 +------- .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 60 +-------- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 59 ++------- .../boot/dts/qcom/sdm850-samsung-w737.dts | 60 ++------- 7 files changed, 151 insertions(+), 262 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi new file mode 100644 index 000000000000..0a94fde6741d --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi @@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * SDM845 SoC device tree source + * + * Copyright (c) 2018, The Linux Foundation. All rights reserved. + */ + +&slim { + status = "okay"; + + slim@1 { + reg = <1>; + #address-cells = <2>; + #size-cells = <0>; + + wcd9340_ifd: ifd@0,0 { + compatible = "slim217,250"; + reg = <0 0>; + }; + + wcd9340: codec@1,0 { + compatible = "slim217,250"; + reg = <1 0>; + slim-ifc-dev = <&wcd9340_ifd>; + + #sound-dai-cells = <1>; + + interrupts-extended = <&tlmm 54 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + + #clock-cells = <0>; + clock-frequency = <9600000>; + clock-output-names = "mclk"; + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + + #address-cells = <1>; + #size-cells = <1>; + + wcdgpio: gpio-controller@42 { + compatible = "qcom,wcd9340-gpio"; + gpio-controller; + #gpio-cells = <2>; + reg = <0x42 0x2>; + }; + + swm: swm@c85 { + compatible = "qcom,soundwire-v1.3.0"; + reg = <0xc85 0x40>; + interrupts-extended = <&wcd9340 20>; + + qcom,dout-ports = <6>; + qcom,din-ports = <2>; + qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1f 0x3f 0x7 0x1f 0x3f 0x0f 0x0f>; + qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0c 0x6 0x12 0x0d 0x07 0x0a>; + qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x1f 0x00 0x00 0x1f 0x00 0x00>; + + #sound-dai-cells = <1>; + clocks = <&wcd9340>; + clock-names = "iface"; + #address-cells = <2>; + #size-cells = <0>; + }; + }; + }; +}; + +&sound { + compatible = "qcom,sdm845-sndcard"; + status = "disabled"; + + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + mm2-dai-link { + link-name = "MultiMedia2"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; + }; + }; + + mm3-dai-link { + link-name = "MultiMedia3"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + sound_slim_dai_link: slim-dai-link { + link-name = "SLIM Playback"; + cpu { + sound-dai = <&q6afedai SLIMBUS_0_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&wcd9340 0>; + }; + }; + + slimcap-dai-link { + link-name = "SLIM Capture"; + cpu { + sound-dai = <&q6afedai SLIMBUS_0_TX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&wcd9340 1>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 4833e89affc2..11b0554a6aea 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -11,6 +11,7 @@ #include #include #include "sdm845.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" @@ -726,27 +727,7 @@ &quat_mi2s_sd2_active "MM_DL2", "MultiMedia2 Playback", "MM_DL4", "MultiMedia4 Playback", "MultiMedia3 Capture", "MM_UL3"; - - mm1-dai-link { - link-name = "MultiMedia1"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; - }; - }; - - mm2-dai-link { - link-name = "MultiMedia2"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; - }; - }; - - mm3-dai-link { - link-name = "MultiMedia3"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; - }; - }; + status = "okay"; mm4-dai-link { link-name = "MultiMedia4"; @@ -769,35 +750,11 @@ codec { sound-dai = <<9611_codec 0>; }; }; +}; - slim-dai-link { - link-name = "SLIM Playback"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_RX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; - }; - }; - - slimcap-dai-link { - link-name = "SLIM Capture"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_TX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&wcd9340 1>; - }; +&sound_slim_dai_link { + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 5de8b4c372fc..54eabacdc031 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -7,6 +7,7 @@ #include #include #include "sdm845.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" @@ -384,57 +385,7 @@ &sound { "AMIC1", "MIC BIAS1", "AMIC2", "MIC BIAS2", "AMIC3", "MIC BIAS3"; - - mm1-dai-link { - link-name = "MultiMedia1"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; - }; - }; - - mm2-dai-link { - link-name = "MultiMedia2"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; - }; - }; - - mm3-dai-link { - link-name = "MultiMedia3"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; - }; - }; - - slim-dai-link { - link-name = "SLIM Playback"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_RX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&wcd9340 0>; - }; - }; - - slimcap-dai-link { - link-name = "SLIM Capture"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_TX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&wcd9340 1>; - }; - }; + status = "okay"; }; &tlmm { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index a80c3dd9a2da..f81619c8a3ba 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -13,6 +13,7 @@ #include #include #include "sdm845.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" #include "pm8005.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 0f1cb2c8addd..27d1917f5358 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -3831,65 +3831,7 @@ slim: slim-ngd@171c0000 { iommus = <&apps_smmu 0x1806 0x0>; #address-cells = <1>; #size-cells = <0>; - - slim@1 { - reg = <1>; - #address-cells = <2>; - #size-cells = <0>; - - wcd9340_ifd: ifd@0,0 { - compatible = "slim217,250"; - reg = <0 0>; - }; - - wcd9340: codec@1,0 { - compatible = "slim217,250"; - reg = <1 0>; - slim-ifc-dev = <&wcd9340_ifd>; - - #sound-dai-cells = <1>; - - interrupts-extended = <&tlmm 54 IRQ_TYPE_LEVEL_HIGH>; - interrupt-controller; - #interrupt-cells = <1>; - - #clock-cells = <0>; - clock-frequency = <9600000>; - clock-output-names = "mclk"; - qcom,micbias1-microvolt = <1800000>; - qcom,micbias2-microvolt = <1800000>; - qcom,micbias3-microvolt = <1800000>; - qcom,micbias4-microvolt = <1800000>; - - #address-cells = <1>; - #size-cells = <1>; - - wcdgpio: gpio-controller@42 { - compatible = "qcom,wcd9340-gpio"; - gpio-controller; - #gpio-cells = <2>; - reg = <0x42 0x2>; - }; - - swm: swm@c85 { - compatible = "qcom,soundwire-v1.3.0"; - reg = <0xc85 0x40>; - interrupts-extended = <&wcd9340 20>; - - qcom,dout-ports = <6>; - qcom,din-ports = <2>; - qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1f 0x3f 0x7 0x1f 0x3f 0x0f 0x0f>; - qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0c 0x6 0x12 0x0d 0x07 0x0a>; - qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x1f 0x00 0x00 0x1f 0x00 0x00>; - - #sound-dai-cells = <1>; - clocks = <&wcd9340>; - clock-names = "iface"; - #address-cells = <2>; - #size-cells = <0>; - }; - }; - }; + status = "disabled"; }; lmh_cluster1: lmh@17d70800 { diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index d55ffd69155e..b979d8ae8698 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -13,6 +13,7 @@ #include #include #include "sdm850.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" /* @@ -522,57 +523,7 @@ &sound { "MM_DL1", "MultiMedia1 Playback", "MM_DL3", "MultiMedia3 Playback", "MultiMedia2 Capture", "MM_UL2"; - - mm1-dai-link { - link-name = "MultiMedia1"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; - }; - }; - - mm2-dai-link { - link-name = "MultiMedia2"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; - }; - }; - - mm3-dai-link { - link-name = "MultiMedia3"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; - }; - }; - - slim-dai-link { - link-name = "SLIM Playback"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_RX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; - }; - }; - - slimcap-dai-link { - link-name = "SLIM Capture"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_TX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&wcd9340 1>; - }; - }; + status = "okay"; slim-wcd-dai-link { link-name = "SLIM WCD Playback"; @@ -590,6 +541,12 @@ codec { }; }; +&sound_slim_dai_link { + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; + }; +}; + &tlmm { gpio-reserved-ranges = <0 4>, <81 4>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index 6730804f4e3e..75773b06701b 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -14,6 +14,7 @@ #include #include #include "sdm850.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" /* @@ -436,7 +437,6 @@ dai@2 { }; &sound { - compatible = "qcom,sdm845-sndcard"; model = "Samsung-W737"; audio-routing = @@ -447,57 +447,7 @@ &sound { "MM_DL1", "MultiMedia1 Playback", "MM_DL3", "MultiMedia3 Playback", "MultiMedia2 Capture", "MM_UL2"; - - mm1-dai-link { - link-name = "MultiMedia1"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; - }; - }; - - mm2-dai-link { - link-name = "MultiMedia2"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; - }; - }; - - mm3-dai-link { - link-name = "MultiMedia3"; - cpu { - sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; - }; - }; - - slim-dai-link { - link-name = "SLIM Playback"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_RX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; - }; - }; - - slimcap-dai-link { - link-name = "SLIM Capture"; - cpu { - sound-dai = <&q6afedai SLIMBUS_0_TX>; - }; - - platform { - sound-dai = <&q6routing>; - }; - - codec { - sound-dai = <&wcd9340 1>; - }; - }; + status = "okay"; slim-wcd-dai-link { link-name = "SLIM WCD Playback"; @@ -515,6 +465,12 @@ codec { }; }; +&sound_slim_dai_link { + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swm 0>, <&wcd9340 0>; + }; +}; + &tlmm { gpio-reserved-ranges = <0 6>, <85 4>; From patchwork Wed Jan 18 10:34:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 644248 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71E09C46467 for ; Wed, 18 Jan 2023 11:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229651AbjARLUV (ORCPT ); Wed, 18 Jan 2023 06:20:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbjARLTw (ORCPT ); Wed, 18 Jan 2023 06:19:52 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 397E56CCF8 for ; Wed, 18 Jan 2023 02:35:10 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id m15so3127238wms.4 for ; Wed, 18 Jan 2023 02:35:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iIDXkdPXxIGn0ZNYUmZnXVxjwZTStPEoPMuwp198lp8=; b=RH/qet4XNhU52ZWTvIyivLWn+3ztIVzNZu0xoCsse1b8KUAuIssqWY6lVgLSomCM0M 8ryTI7nbqWVgJiOUNXB1D0ZWoeLXpMKPofo+9qdhdPgSjBQ5DyM7RHzSPc+eTjs3jEhb Xevkftdr/bspV3MY26tRsQihSbtZ96BAu5Qk0AuN73S9ZRJWnZ5JxcJlqKbRxWmYDBE0 VTTflC61im7P4fKcbs+PcWjOEb61irZjzKvPiHdRVxmw3wBSFU21Y/ZzqwJPe2rCAi9T ZusVHUzRcQD1TnWDrl/4dJLjCXltfVFZc36Zu6MHOQnQQcu1PZRlmJwb9VwdPHKXSMkI PeGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iIDXkdPXxIGn0ZNYUmZnXVxjwZTStPEoPMuwp198lp8=; b=PegJK+daNBJDMcHcYmpa2WEPUEFNcoYCUDeiDQTsy/eT8U+rHUxbQiIwlgys039W1o k8aIDNPEiSESp5Xp6PsuF6C3vNijQJZZ+TmtKIR9AmL3r34egq58HxVweV92560dwFXx MmNOdOHvSe6WJRjvfhjYZtGMAC287me3C9FQGqfcC64i1OE5D6T0KRZRA09pxIF6ee7Q bFqRoQwCFtc21Kl/dolKA+Q8Ss7e/vKG3VWdkKwVn961i31fXcu2qjMYFP2RtG2zaknO W+m17pqcS/1vAWka7fu1pwh/lmg0ockm5aHDVYjLSV7cJdMMsJOuH2sqOUu9lPR0jPk2 dY8w== X-Gm-Message-State: AFqh2kqWTM5Lul2RcMq/YR8Bm545A9ezMxnAS8YckyeT7jXsndKs1crj ZFdvfX31FNXRicdYuJ4lOWNrPg== X-Google-Smtp-Source: AMrXdXtx/YYLRzeSDvijXD69XalTZ3p6xPEchA6Fznk7hRIofwQLK3kT8rL+8ucAXpZPU49W+NXo5A== X-Received: by 2002:a05:600c:1f09:b0:3d3:5506:1bac with SMTP id bd9-20020a05600c1f0900b003d355061bacmr2128201wmb.30.1674038108722; Wed, 18 Jan 2023 02:35:08 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id ba29-20020a0560001c1d00b002b065272da2sm10076731wrb.13.2023.01.18.02.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 02:35:08 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v2 5/6] arm64: dts: qcom: sdm845-audio-wcd9340: commonize pinctrl Date: Wed, 18 Jan 2023 11:34:57 +0100 Message-Id: <20230118103458.107434-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> References: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Pin configuration fow WCD9340 is the same in all users, so move it to common file to reduce the code duplication (which still allows further customizations per board). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- Changes since v1: 1. Add Rb tag. 2. Split from previous patchset. --- .../arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi | 15 +++++++++++++++ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 11 ----------- .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 11 ----------- .../arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 10 ---------- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 11 ----------- arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 11 ----------- 6 files changed, 15 insertions(+), 54 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi index 0a94fde6741d..d0c77a8c1985 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi @@ -32,6 +32,10 @@ wcd9340: codec@1,0 { #clock-cells = <0>; clock-frequency = <9600000>; clock-output-names = "mclk"; + + pinctrl-0 = <&wcd_intr_default>; + pinctrl-names = "default"; + qcom,micbias1-microvolt = <1800000>; qcom,micbias2-microvolt = <1800000>; qcom,micbias3-microvolt = <1800000>; @@ -123,3 +127,14 @@ codec { }; }; }; + +&tlmm { + wcd_intr_default: wcd-intr-default-state { + pins = "gpio54"; + function = "gpio"; + + input-enable; + bias-pull-down; + drive-strength = <2>; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 11b0554a6aea..e0289973d3e4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -929,15 +929,6 @@ sdc2_card_det_n: sd-card-det-n-state { function = "gpio"; bias-pull-up; }; - - wcd_intr_default: wcd-intr-default-state { - pins = "gpio54"; - function = "gpio"; - - input-enable; - bias-pull-down; - drive-strength = <2>; - }; }; &uart3 { @@ -1043,8 +1034,6 @@ &venus { }; &wcd9340 { - pinctrl-0 = <&wcd_intr_default>; - pinctrl-names = "default"; clock-names = "extclk"; clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 54eabacdc031..5aca280b3994 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -416,15 +416,6 @@ sdc2_card_det_n: sd-card-det-n-state { function = "gpio"; bias-pull-up; }; - - wcd_intr_default: wcd-intr-default-state { - pins = "gpio54"; - function = "gpio"; - - input-enable; - bias-pull-down; - drive-strength = <2>; - }; }; &uart6 { @@ -493,8 +484,6 @@ &venus { }; &wcd9340 { - pinctrl-0 = <&wcd_intr_default>; - pinctrl-names = "default"; clock-names = "extclk"; clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index f81619c8a3ba..1ceeea0885b9 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -616,14 +616,6 @@ sde_dsi_suspend: sde-dsi-suspend-state { drive-strength = <2>; bias-pull-down; }; - - wcd_intr_default: wcd-intr-default-state { - pins = "gpio54"; - function = "gpio"; - input-enable; - bias-pull-down; - drive-strength = <2>; - }; }; &uart6 { @@ -700,8 +692,6 @@ &venus { }; &wcd9340 { - pinctrl-0 = <&wcd_intr_default>; - pinctrl-names = "default"; clock-names = "extclk"; clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index b979d8ae8698..db868af1f399 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -584,15 +584,6 @@ i2c11_hid_active: i2c11-hid-active-state { drive-strength = <2>; }; - wcd_intr_default: wcd-intr-default-state { - pins = "gpio54"; - function = "gpio"; - - input-enable; - bias-pull-down; - drive-strength = <2>; - }; - lid_pin_active: lid-pin-state { pins = "gpio124"; function = "gpio"; @@ -703,8 +694,6 @@ &venus { }; &wcd9340 { - pinctrl-0 = <&wcd_intr_default>; - pinctrl-names = "default"; clock-names = "extclk"; clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index 75773b06701b..6a9ced334f19 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -507,15 +507,6 @@ pen_rst_l: pen-rst-l-state { */ output-high; }; - - wcd_intr_default: wcd-intr-default-state { - pins = "gpio54"; - function = "gpio"; - - input-enable; - bias-pull-down; - drive-strength = <2>; - }; }; &uart6 { @@ -611,8 +602,6 @@ &venus { }; &wcd9340 { - pinctrl-0 = <&wcd_intr_default>; - pinctrl-names = "default"; clock-names = "extclk"; clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; From patchwork Wed Jan 18 10:34:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 644247 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98FF1C678DB for ; Wed, 18 Jan 2023 11:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229847AbjARLUY (ORCPT ); Wed, 18 Jan 2023 06:20:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230149AbjARLTx (ORCPT ); Wed, 18 Jan 2023 06:19:53 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52EEA6CCFC for ; Wed, 18 Jan 2023 02:35:13 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id r2so33447096wrv.7 for ; Wed, 18 Jan 2023 02:35:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lu9NeKrCPTgPXNywztLAN6YS+xgp77uKV6p8fRsddmw=; b=NklBNzdHxym8hhVOWn75ZpV/v0klHWGimQbSivaGHxeh4WmoqwWI4muR9Rpd6273F3 ywsFfhV3Rx1Dqdb9L7bklr9jci8wcHarRTKbdp4mUUHxySllUtCfQumHW9qEW9W0XTCt HOHffaB6rQfy/j/4HJEfU1q4HQDxnB0xF6AlD16h+VcjQwvi6SR387iyRsSKshwmefp3 RN52LAMZ7P5HlBBMjYknXHM+gNvPJj+F70PMOiRJKEU8fc8CP5JN3PTztq1b6pZB4HD9 cp8MP+f5NNLlbrQQg+l6ViOTa+pieOHwGzpk6+xtiZr1CfXFR+wwJv69fgbIQz4fwpdh NHlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lu9NeKrCPTgPXNywztLAN6YS+xgp77uKV6p8fRsddmw=; b=ntiCeMxGWry41axVmmSRv25BumGxVnH4dugdvJHuCW4ErLPUljGEzSqp1IdB8Z6Dk7 g7KdmF5xHDvmJlWBkeXHoaqN47CDpZRY467fWy174WfdShCSQhcLUiMKPQPsW86ynD2c sl7RHQRhxMecSzYjQj+4EazVAjtrXqQ3V9ZIhnmP6/f0MinqkLO3mOFPXCeBD1Zye1no qfQfN47XySCMdrzWNBCkj4bHXAr5KDWDCWi7wLBIEr6Fcwy5LUkbp5rGx4qcvIfCuQu8 Ki0vtBoHDHAa6vUWknIrxQw84iB5v/9lfYZEWlK8tY/b2ir5WKux/KMbviGlDDWbVLMu Hv5Q== X-Gm-Message-State: AFqh2kqniM1lrbxADGagHU/skszoIQOV1GPMOVfarCiPoP3iT3ZgfWy9 G8WYaZbW6sqIfyYLSXtTu0I+Og== X-Google-Smtp-Source: AMrXdXuioPX3CcOJ7PqYvQD4+aEm5IPY4MEt5v4JJcsEMuPl9hiGn+yVSIB9gvNaUNgqdw1BwAjPBg== X-Received: by 2002:adf:e5ce:0:b0:2bd:dd95:4cad with SMTP id a14-20020adfe5ce000000b002bddd954cadmr14575194wrn.40.1674038112906; Wed, 18 Jan 2023 02:35:12 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id ba29-20020a0560001c1d00b002b065272da2sm10076731wrb.13.2023.01.18.02.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 02:35:10 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v2 6/6] arm64: dts: qcom: sdm845-audio-wcd9340: commonize clocks Date: Wed, 18 Jan 2023 11:34:58 +0100 Message-Id: <20230118103458.107434-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> References: <20230118103458.107434-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Clock for WCD9340 is coming from the SoC and is the same in all users, so move it to common file to reduce the code duplication (which still allows further customizations per board). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- Changes since v1: 1. Add Rb tag. 2. Split from previous patchset. --- arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi | 3 +++ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 -- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 -- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 -- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 -- arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 -- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi index d0c77a8c1985..c82a8f21cbdc 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi @@ -29,6 +29,9 @@ wcd9340: codec@1,0 { interrupt-controller; #interrupt-cells = <1>; + clock-names = "extclk"; + clocks = <&rpmhcc RPMH_LN_BB_CLK2>; + #clock-cells = <0>; clock-frequency = <9600000>; clock-output-names = "mclk"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index e0289973d3e4..d9dd0136ff62 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -1034,8 +1034,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 5aca280b3994..fb41ac8707f0 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -484,8 +484,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 1ceeea0885b9..d9c4af06ab63 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -692,8 +692,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; vdd-buck-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index db868af1f399..aeee716a1f9a 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -694,8 +694,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index 6a9ced334f19..7ff6ac6f820e 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -602,8 +602,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>;