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: 45185 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2284742wrn; Wed, 18 Jan 2023 03:34:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXtfnNISrjo7CkkreMyRiuQSimFU+lMrui81fMhDcVsjEz5gi2Ux+KRg7Mya5UaaCm6tFsjW X-Received: by 2002:a17:907:1dcd:b0:877:6288:eff2 with SMTP id og13-20020a1709071dcd00b008776288eff2mr769020ejc.75.1674041645018; Wed, 18 Jan 2023 03:34:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674041645; cv=none; d=google.com; s=arc-20160816; b=wh5ySySg5vkz8CxQJ5BXvJ3mxdIZQwr1kt+dwasvkhlmxIXS5gasau/r6rH1tMIkuE p9r2lbjRdXOwrAzJD7uHLPBGFIl08Cn/ApsbzAUoH/Fbi3/Swfmtq9Fx4hfjY5FJV5XK UDBeIby8ga6ukt+ISF9e4xd18ZMa3TN2WawGUhDNlQ6PqDVOXx58P2VgOfjEB4ZjcEZT sj242OTKMmhEoodg29MZ8dzPpXjzVut06sXhtI/4jxqKN3kgXqxwMu435Bo7Cqprfo0h OehwH93RhVnd0d6VSa9o7zmd4ZS9jIMN3JXRO1AcYJ/Xw083yZpgahxRL7oyFuAqMC6d jnEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=B4h4mwj02VQM2QT5Jhg78WSnTdol3IH9qvJRJtozX8o=; b=Fv2tMz7BcyMqSXVfyrRarMSmapRW0BJ3SPYouAQcz/8yzmUpzBROVe9Yt/UxmLAVKP R+dsYgMvDl8UWSUrQ8DjaTEKiTtam/Cczzk0xUNyAi0Am5C9THJKPqaLr3oTs6yzP1bH BhTnmbeCDQvcL0cgdwDpAhyUBjK/lncXvLHFU7PML8PGFIklogitga9KyW6fmEuww7GX IqibtIbAcLV0lWB8tfNRpfsA6DqjCExGQK8hzMsL2iD/U/SkgaJSKpO63OMLfsv5myw7 uix7YLUwBUmkQMSglIgs+40mxIMLYBmKF6hu7orfr1Ndnm86x8hr7YCL3k3qI4Ih7Cur ynTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vomJyRUr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xh9-20020a170906da8900b0084d3036d59bsi35254140ejb.152.2023.01.18.03.33.41; Wed, 18 Jan 2023 03:34:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vomJyRUr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229666AbjARLUV (ORCPT + 99 others); Wed, 18 Jan 2023 06:20:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229776AbjARLTR (ORCPT ); Wed, 18 Jan 2023 06:19:17 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21894676F3 for ; Wed, 18 Jan 2023 02:35:03 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id t5so29035149wrq.1 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=Z48MhJL7VfwuFAWXZq09WVaj4Mbyl6wGaxBSmmcyMqqVJ0gSOB3dEWBmkm2WGNHEzv JBQ8vqmNCGuX03liKF+nfx5KDnRkTQ/VKyDq+uPi0WE81gK6CeDeO12Mg0uydEUqqynj 76bFqVGdgNdL9uFp/LCEvqgx1biJdg9EcJ9QzVZfZ28iyxLDY8b7GQ7SoKU/F/NPuOAF 7ZmdOHH9NDsRjAL9q79Pod8sl0Bc3LKlDz3DpHttrErKvEv5K0CORWI6xVdjwj8U/DZL BgeuLu1P/p0SLh9ltPlIat7ZucvizGPCsgBvzqZX6JD9R7LWFaULueu/ULPYDYsXpRQH DMYQ== X-Gm-Message-State: AFqh2kpDmUxoCK6ct+yYecKUCnnbg5zxJTiDG9TuA+tNkLhHYOx38CSx FE8OjFuj8Xa//SEm266UHfAXglpuywwmOkbI 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755359891985786875?= X-GMAIL-MSGID: =?utf-8?q?1755359891985786875?= 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: 45186 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2285481wrn; Wed, 18 Jan 2023 03:35:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXtt2PbqxHhuBSj4pHnIJXBRDVE1RZ3LZiqGlPXOdmQ2Jcpz9vbU80hGvKiI9+PR5fktgZnf X-Received: by 2002:a17:907:9885:b0:870:7340:b770 with SMTP id ja5-20020a170907988500b008707340b770mr6610609ejc.54.1674041750504; Wed, 18 Jan 2023 03:35:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674041750; cv=none; d=google.com; s=arc-20160816; b=Ps9XVRmq0hpuoshRL+1vrVmzjLEZ7HU6dLUsRCgow8Rvw8M+FnK+CZ8NhVouGhFP0Z 1fwCaytj2wu3hBnkA8Lpb8omBrV0wJrCQomlRadinJLV0zeuuyiIDH74zwuoDz/SuZ1h rUmrlT0HwTJTHhbDY6hsaKy5zgFWaXcNdQFFpKI1qDaS4BnMBKjlZvzaofeDPXFMYTXY 5mK1elQvDAHcqOZ6LeCA5VdHy+zLcQtcX9D3TjgwNz77EfCpxfO8/FeuH2gA5dEut+o1 3ybFv5vSYma5NJki33pUPCpt6+g+0GDMs5dNsgo2UUsBaBIIv1mxNULooTzjlKXxFh7V M1nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FneBkYyQ6xaqzMShBmUzlBY2+Gx/oH+DvIS8onnxBTM=; b=ckHiTsFXc2C1/pgxHArFJd7ejJituefaNzsEWQaPYMSEXCtsX98BFSGkA6bWnNa73M pPfWiHwBVALVimp93TCXP8OqBskk08Vubw/VHXx4XjebPM4cj831Epzq6249kT+N+T9k Fv2o5IS9jSEDGtWRS1AgPzZQrQnuJxqY82INL6JNnoTbwOtFkg01DaEopDsyhqBZlYwh IrRZvkb7iJVb0p8btBgTa5N6Ig9A0DvZjeZO2V7IRKfBHAxKAoRVXyfYT5UY0yQXjs40 qI3sBRhtML4979quJaGrnRotlv/cooGBPFZlIAwDj5ewyYepMycsuT/+m3iQ5J2SskNf D1nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WzPbpXjf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sa23-20020a1709076d1700b00876de60e8b0si2721164ejc.696.2023.01.18.03.35.25; Wed, 18 Jan 2023 03:35:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WzPbpXjf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbjARLU1 (ORCPT + 99 others); Wed, 18 Jan 2023 06:20:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229799AbjARLTR (ORCPT ); Wed, 18 Jan 2023 06:19:17 -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 3DFEF654CE for ; Wed, 18 Jan 2023 02:35:05 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id b7so7455550wrt.3 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=qLjgIxkpaHT77oy73V6XUA5NIeXHortHe02s5kP797stKNKkBIIjjyP0bL1oVGqNWg cP+sO4dSqT+PTGfPn0MUXctPDdif6h77iJdZO/wf6JeUNsXe7DPjFqLVsMx2Gc76Q5q9 WyRGC1qtAqoEsW/w73BiemfdkWwkA0E9S9qDC6FgfI0xVcsU1m1In4XV70wvsfF4/inH dyioXRiUPS7rLnPfUZln2wYhUhvhI+onyj0MdGUjAA1YH9OllILD2jGoxIo1wLwYS0T1 /vHp/w2R1G9g7rBuSnVHPLFgUgP01XtAvNPzdB3UR5FSSAkkywoqDix7Ynyj1VyrMUgn KxjQ== X-Gm-Message-State: AFqh2kpYU/1mYzx815V3ZFYAEShyxp9H2VJDFG9JLmaaXiCAJlXRrkRn s+kNb1Bh/mh12Ue0+9lwzOYNRQ== 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755360002295979204?= X-GMAIL-MSGID: =?utf-8?q?1755360002295979204?= 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: 45181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2283641wrn; Wed, 18 Jan 2023 03:31:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXvgNNwSRMQfHHQJncggCjqTnK0QiP/VMx531OwGFK6XwKjgo81ZAXQ3fzSc1h4gMYCCWlk5 X-Received: by 2002:a17:90a:b108:b0:229:7d9c:fd6d with SMTP id z8-20020a17090ab10800b002297d9cfd6dmr6868960pjq.48.1674041490128; Wed, 18 Jan 2023 03:31:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674041490; cv=none; d=google.com; s=arc-20160816; b=rJi17no3KoPDOB/w4+EofnthLCbllC8nQ2c+NkKLeOrUTX/zgCBVWLsdVfjATkdUsM 24n7bzKOx7Qu9FSwTpFwLjMEJTqFKFPi25Xn4VoOfEe0+xyc/gfSElyQAFwUzyI9kvXt uyuelUrt61KGPzBPHn6Gatxc3zbbgFNK6uBOj3qCM3Ph3Xw5e8aAokKNTmb649StqRbz l8E1rHnb51NS9t2fW00dg99834wOxn/ovg2cGP5YAzXq1mkoM3KEDFB+8MxyJ/dG4syN JC5Wzoq2gQOeqJFRtreY9gxIn7Kstj2Wxub5yc7REhXWh5jjyXICeNpRn0vo8J1ub3gw 3L4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lx2/zPduR9kyydYgB7n51yrhAvGD9FHDkQln9sB/Ijs=; b=JKj3+nJG8Ho58duYBW1mwE8eouHooIx6t+CgEIehseMy0OYn0aZMDMjisZLFq0uBoZ TByc4Jzs5mkoWLD9wQYHr74ddMr8K4fGzdFgPpFCEbQZ730kZyLryaP13K/w6F8NPymu LGMRBZ7rOYIaP7ESM2qsx7KDkFETWS0CdVbb5Ag91RR7sTzU4AuV25O1EropG8NzXmVi jsMfkYk3OHpPOC/TGfSHtt5i+ztvidLos8FI5HQS8j47V8HozOCwbghMJ+jFF0KcaaFo jsJYy4rn93PT5efHgZvPSpeq0DFzOtUH7DCCCsxxXeNooT9aOFdcYPBkiqDpiDZemm1E vu9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YkynYi4w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a11-20020a17090a480b00b00229c7de0072si1813319pjh.147.2023.01.18.03.31.17; Wed, 18 Jan 2023 03:31:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YkynYi4w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229593AbjARLV2 (ORCPT + 99 others); Wed, 18 Jan 2023 06:21:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbjARLTV (ORCPT ); Wed, 18 Jan 2023 06:19:21 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E927169B3B for ; Wed, 18 Jan 2023 02:35:06 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id t5so29035297wrq.1 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=6VTmzzoFAw9zz1miLEmQLgzOv4zBV3sX+5i9hUNagWehUdMoRG7TBTm5MfiqhVlYT6 bAwKVkNo6mcFbIgE8lf+2XJIuAkM3cv+0GD/WYaKXSNa8j6t7hDGxLcq6+0niikyUrro kJfgGAJNInkgB9jlKjrIkJNu1OWtmmiz/FXqeFy+V2iZT8fdDVj4YqliOnosPWg4CGkx RHbsq4aMtSOPuQvKPcaY+ZVIdVeCpCbzB8iTjYtUzMcSMT2iHiDlI1wBbkuZXH41JNU3 Viwxa/pLGAmaQEUB3L4vN9a4F7dGtbTcej4M1sbu+P490TrosYuLWUA9TeJ5wreOMRVO WHFA== X-Gm-Message-State: AFqh2koR+77LxTKqSYIn7os9Uow61Ep4CTBeQjzO1CkJaAeIEIgCQNdY ssWSTM1bleeCdSdtCyndDwPaTQ== 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755359729355104986?= X-GMAIL-MSGID: =?utf-8?q?1755359729355104986?= 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: 45187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2285495wrn; Wed, 18 Jan 2023 03:35:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXstAq/pO7kji0gExSZ1PGRjr5itKEi1LQGWLr8/JJAXNbWjaq/kefmWc1tjOJEjT49FfOyM X-Received: by 2002:a17:907:2159:b0:849:e96f:521b with SMTP id rk25-20020a170907215900b00849e96f521bmr2850596ejb.32.1674041751961; Wed, 18 Jan 2023 03:35:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674041751; cv=none; d=google.com; s=arc-20160816; b=JPhGRNvhoJ6lFMOfezQKuP2rnbyiBhPO69LnyFmp/kDY7Z+OtiQBu2zYZ1u4Rs/0kS MvYhGF+vZ3XeTlCaJ9x2fJGVWbwXGObxhSsiR4to6TDPYfpBdWhG38SlDlYc2LbHardH xDSW4L6dWVBhxxf1HQs0mZIJJLZe+AMyMV6LqofXSbcnh+zD0Qx/lG2MVfcvuzeZo1vD Rnfv/J/as/4tx53JEnWTViurn051m+73cb3Rj7Vnq/7AO+5A205emKHc3K3i2CGOX8wt ieHMT0PxNwoutJpUfDxED6mietKaTIPI8IUPsyJLdUuU26XCbAmbqga8ItkD95W46p9D WNoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=frM+OJIW8+YWIIMkRCM2WWed4kr4d1TRkS3GV593Yj0=; b=bTkAijgLP85zJ8O3ouCRCaQg0iYoOiRz+j1XyvDK4C0EiSXTBxRJJM1KRsOLFQfn+C 602WGa/JriKcsJYGGDhCatQ8PwFUH0Ajj+OFpknfeNyCEiijvqajnVueuiIm3AdxgOA4 DLxzr82uXEZ/wHZpbfPY+0AWOzz37Qz4Uddr2KP2ltGFiemXJ/xlfYNpL0Po//su+k9Q i8/bIRJyYm6fa0dhYRC6s6z0Sp9hZKlvQPFJ7CdAYfzqQfWuizc1FzKRnl8JiAwDJ6hB k58CZYeHPh9+YA9i5PzdS/A7FadnX7BwftwosOEIjXr4Uwg/5jEepxEK3/L6Ny6m765x ml6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xQRUgdqA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id du11-20020a17090772cb00b00870e204d41fsi9243115ejc.564.2023.01.18.03.35.27; Wed, 18 Jan 2023 03:35:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xQRUgdqA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229573AbjARLU4 (ORCPT + 99 others); Wed, 18 Jan 2023 06:20:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229995AbjARLTw (ORCPT ); Wed, 18 Jan 2023 06:19:52 -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 7242D6CCED for ; Wed, 18 Jan 2023 02:35:08 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id n7so7381591wrx.5 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=C15o2YEXWaDnVv9lLrWMCKawYOrY/YWnEZeNno/nnRMzQP4B+ST8vGCwb8sCW0rlXu ZsCc/LQce0sX05VxtVGRZK+Rcr80wx8L2GbsX1gRGM10THaI57sPv8mOVa1kcwoReCGG lbQEWYXYtzLK8bN0GhgUqNaeEGagQgjbssKrNR4xGGErMHK0qFeqVb69EuOrfjmbz10R sT4WNmX49hqGf2hWSX2YLF2OYWYaBr8nasD/TstH3fwDATTnMnHS8Njo4A9Qm8gT9QQa SZBqJL0AYLxbMGGfb4/R38+wPSGFJg60agx1/Gf4iNoJzJfN32WEC22mfpkBKBnmP6J4 2mtA== X-Gm-Message-State: AFqh2koaSwj0ElYMdmqdL/Hs5uuUeMKvexmb9UdRhJiclSeytTfCUgQj sEDb4lEqtRsdJPS4/FXf/f0oPg== 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755360003957148856?= X-GMAIL-MSGID: =?utf-8?q?1755360003957148856?= 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: 45188 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2286871wrn; Wed, 18 Jan 2023 03:39:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXva0AHxGBTM5+t4vQHW9ipc06iAEqvTWxNasrRjB7TlHUim7cXYp40RBZLXV8flLSrDgmFv X-Received: by 2002:a05:6402:1009:b0:479:8313:3008 with SMTP id c9-20020a056402100900b0047983133008mr6171924edu.0.1674041949809; Wed, 18 Jan 2023 03:39:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674041949; cv=none; d=google.com; s=arc-20160816; b=xD0ZSg3n7Df7mHo0cQJDgDRss8Em6WF+GsPdqii4tcqCi2GjxSvceKfcgkdK2fDupU H6x1+fUFOGWF13IsEGcw4epku75h4BtFLiY0uQjH2SmeEp4ISE9ab01EX5yjp5kwB/AP CQ/2dSLKIYoNjLTL6DogJbs3X4npOYlcms/pSzAiWcnv7WwGfUedeeKRpNgPfmVufYE8 NgMBSztdDzDysGIvmZlUJQSRr4o1XeJsMVjX2pwmF2UtyG1y+lsE/eZ9UtElWYEbZKqI pB4tASPzK8Az4opX3F++hlQPv7+n+Bj/EjgKAYpIxF8fh6XOujZPzGUxPDWEEHxFftFe pUkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iIDXkdPXxIGn0ZNYUmZnXVxjwZTStPEoPMuwp198lp8=; b=isyYLGOAJBh3Uc7TSULICHnrEm5ZTCc4Go33s7cexia0eE3xhmVbIbPiY4AhkVWljP AUnhKcWlKRCw16LyECHSWlbfoWqz8uefoePYlTsOiNeDt2JUQ03QxuKK8+Db2w3fJQ/G voqiq6XVvwA3nY3mT/mwi15YFBhaWNfcFEJ1dTEk629HkAj8c5eVKbvREaXvbaK4NHzH le4lLR1WI9eLSbTPfdoAqcSLjSB3bF4yrktnHRYRTsPAskV7tmtW+pKoq46xZpzdhosM 72bj3TIxVxsRM7BiMFLrY/qVcmioyQYl2q2DfHRt14n3r9zQ5MdFZOnphGIHIbc09shI XYkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="RH/qet4X"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg20-20020a170907971400b0086e054bfd10si15944558ejc.173.2023.01.18.03.38.45; Wed, 18 Jan 2023 03:39:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="RH/qet4X"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230057AbjARLUd (ORCPT + 99 others); Wed, 18 Jan 2023 06:20:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbjARLTw (ORCPT ); Wed, 18 Jan 2023 06:19:52 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 352486CCF5 for ; Wed, 18 Jan 2023 02:35:10 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id j17so5792370wms.0 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=Egqp4LEy9WTJTbyAPjn7q3ArggX/HRs2m54eWTrqQ5ZgcP2kmp3L3o7Wa8tm+KFTml BAhhfkPhSWe1Q+xsv6+9dievqbfMF8DEYQTiOMyj6cOCULv4+q0HLFpNi5z/8L+UAsqK nVOmUf7wZ/V7uZOem5sKjPtCW9NZpmFNZ7nJxer32Ir0VmmwT1IarUvcV4DWWVcEmtNY 8+lIGENIkuVIuxFkE1/ia+Zv0jYpEoDeiMjghE7qadsY+tZoPyGP3b/rEn4+GS4KZvOl ZkQbQrM7uJ26vjgotLxPGK6SuARR6psu5UR82MJ+bBG2LUiHYdtHNiQISMg9JRWHQDo7 JIMA== X-Gm-Message-State: AFqh2krFJe9Kh4GBk/wlFIA04/lOD+q6AbCRvTYtjtg9OIScGs4zQ4Aq trnTuFvTiUp2StDm1eGsS0hMUA== 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755360211729502046?= X-GMAIL-MSGID: =?utf-8?q?1755360211729502046?= 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: 45184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2284210wrn; Wed, 18 Jan 2023 03:32:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXvEEGKTx/2jrq9xego0j+XCpQgA7VOr1KdRd3YLOL0QoEeiySAoenQscIVLfl4P2ugm4YjJ X-Received: by 2002:a05:6402:27cf:b0:49e:2e15:3984 with SMTP id c15-20020a05640227cf00b0049e2e153984mr9709898ede.36.1674041569421; Wed, 18 Jan 2023 03:32:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674041569; cv=none; d=google.com; s=arc-20160816; b=YRotJLjXSxQikVaATlBuGzTlw37nfOFFDwIKeVWyX00nj92jx69MwKPyJMIH5KnIOa cnS8ttBI0reFPkT2LnsHsIF6fBvDEJfj5EGTfkPIukQF6IGTemDZEYKq8dLKPwXggPfV fmFhQGZH+dAdZ4oDS/o54Uej1pPagtZuUXa7nt0GaZjUgsY3IECz7K7RD5tDSjM/yt7K eOYEpjqioruMAcoRylpx6mZjvY6NFxgaARcDuczWiIzwnnwTwsgX99CE36H8qoMW/WgR SGp07poBtV5c2CRY0KpGA/MOuDl0BypEEFwX7KTsC/bFVTteYsMNOR0jjlAkayECwxKd bUOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lu9NeKrCPTgPXNywztLAN6YS+xgp77uKV6p8fRsddmw=; b=BRmCHu4VuEY/y6BfOLHAlrX3cQa7jRmXhcEia+p5XNspv6N9twCyRfTzVjAZvtXiqK RL3U3qHkV57rGyxXoV1n4IcoP0Mr6OLs09Wz9KPP3HAzA4rj/wHL7xEWk/npzBYjmduJ +uFvAJEMEmx2WGpoKdzzDEPtf6jFvY+B+d2HXfnAfGcvqeEryvHksevo0F2ANJu+mcYV dX+PkPbHNQhuUvb3R3r+so4NBE/2hIyp6dkJDZ2D5fpOJx4uMrxlNzSNUQiV6lFdFpsc ix/N/y0oKABd7XBcVVCgcGPmiMH0BA8oA2bLeUyL6eKJYo5JqJcIryR1q5r3I2tl/nOX i8pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NklBNzdH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wu1-20020a170906eec100b0081a9c3ca498si39016220ejb.314.2023.01.18.03.32.25; Wed, 18 Jan 2023 03:32:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NklBNzdH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjARLVi (ORCPT + 99 others); Wed, 18 Jan 2023 06:21:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230152AbjARLTx (ORCPT ); Wed, 18 Jan 2023 06:19:53 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 573766D343 for ; Wed, 18 Jan 2023 02:35:14 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id h16so33436049wrz.12 for ; Wed, 18 Jan 2023 02:35:14 -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=uQRcOQ7cOlxw8dEeAQ6tAiOFl0fgd6bWnHk/+X2ysSuvTGDjq0su+W35hq1+t+gGZs XG6KrNbskp8N1+DyVJhNXLudsRBqKf9Tl6lN5tUtm2uTqkv18vh8AkrNWKWFTrGGyeze pgvtrQVSePvDAnQA8DZBP+S/fYEfqpgohbWZU96mk6JkXW2mC+eDEljkiFg4xkJ6QrNd qPLhzF/hjnMuDtH2arXQL4Dy/yYr1eMmSXdJ2ZIYEp17PnwhVfMtFDYuR8JaraGoAUR2 KAajOPkF/ie1Og/OOHNKw4uu9S7IC7Z91bF60KJ+qjmjECFS+76AW2dhX4U0b6v0dIUO TZJA== X-Gm-Message-State: AFqh2kqj+eOTQY/O4lgGQdUWuoB+rVapOuYw82nq8cYjcuGxUJwnjz9w oH//PxscerArI4yL0GGtEkVT6Q== 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755359813006139512?= X-GMAIL-MSGID: =?utf-8?q?1755359813006139512?= 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>;