From patchwork Mon Jan 23 08:42: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: 47065 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496219wrn; Mon, 23 Jan 2023 00:43:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXvDLPzks++a2xtXjoQHDP+w9Nv92J+/I3BV14WLVDlicn2MVai4hX6GPPux8bki/E+2r932 X-Received: by 2002:a62:6410:0:b0:58b:c873:54e9 with SMTP id y16-20020a626410000000b0058bc87354e9mr22885806pfb.4.1674463426235; Mon, 23 Jan 2023 00:43:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674463426; cv=none; d=google.com; s=arc-20160816; b=sf54ycuxW/2MQPIZrL+cBDdfx+GAaXUJvbeFLMqyw5/jNZG2G/4mlsb4jWk0ebIdOU lrNngugSRBmhvCT/jUH2heC451iHu4CnJHCp2aX9CzDXa2Gen2Lta/o/zrB+SSKePgmu Fkv79TtUp4lAdQbdJFGE+OoNqeEqOd8v/VUErALuAM4U8DXk513eWDVr6reYKEE0PsnO 2gBc0/BlJtlWRiq3+5bJU5msbrtmLhmJXm2cXs1vafkW38Brs896IfI17xLpt19oxKG4 jN591djWynUkHOmagvProRT9sJtynzu5fZl8rR9Sgq3GshrB9wT7rY5QBBvHw0DJFDc4 b3bQ== 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=i62Sv7Z9pyLgKE8iTn5bJ35rfwFqLP3uw4DYsz1kYmw=; b=YW2uoxMRl+S0P3tV10FygFjfVygVIPKHd8Rbi/qB576/+/IWBsAaA3zUirdE57Hksn XA3CsHvckg553JK5KJj+t1ouZZ/YDYXp3w1E22QWafeR7+NA5bXJKZQgH39hlfikL1O+ DogbM9yDTntMMvMKThc9FOV2unu2YO9JqlNWFT/FeM7BBA0m3dgtvN8wU4WAHNnDf5f3 4sSKWGAA9OQfEjo3f7C2P07HaeHMIDIAO6SKo0mpG5dz15QfnrTlYynTUp4DXpgt/6/a 98x3CV4hefSROXYE8BwZyLv4hVrKVsIk1f/uG2htmpMBIIcnXe/JYpjn2q5EvqJxLi8y 6q+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OKiDMSTw; 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 f14-20020a056a0022ce00b0058de5bb613csi17056969pfj.29.2023.01.23.00.43.34; Mon, 23 Jan 2023 00:43:46 -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=OKiDMSTw; 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 S231691AbjAWInL (ORCPT + 99 others); Mon, 23 Jan 2023 03:43:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231564AbjAWInK (ORCPT ); Mon, 23 Jan 2023 03:43:10 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FD0C18AB6 for ; Mon, 23 Jan 2023 00:43:08 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id l8so8366718wms.3 for ; Mon, 23 Jan 2023 00:43:08 -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=i62Sv7Z9pyLgKE8iTn5bJ35rfwFqLP3uw4DYsz1kYmw=; b=OKiDMSTw8KbxzjIbLtJQ64WHWuvfvKhnoEHI44pe6iL5nQLWWlW9utB6k2dIpPUn7M JydRitF9xELcpVMMVt3C8T+9kjEvG0VWNlK7eVdUK84+xaxQTsn83aqKBBIbbQzeBjgA 2v8I8Pn8iLNyGzNPhHte5D9V6wFdd2iUghrLs7+1G9RqRylUueYecEQS7MTK9DMkMXID axZ020kT/tjgn6OfUTcx5fJBT6U/Ni0s3AcjkYoBdYoMpjqPm7uygZXPGfRWLM7s+mo/ 7Ku47KjAOdp9fUMUIJZe6w6gNrPvpJbk94wSkxnGdw215mm4Nk/tuCRq12EktmH8M9K6 VvoA== 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=i62Sv7Z9pyLgKE8iTn5bJ35rfwFqLP3uw4DYsz1kYmw=; b=yWCvSJqILBASFK7YOWqJRcX2qWGJoID6h0e+3kk3n7N3g656tMkDKZorXe7D0Fmqra GPa6UCih9Aj4Lkn8zzzJsapREoHJSRMuMzC0FfsW4bp5t7XL7JW6W01ygmPgdsLMwhDY ouwF/C9d3mMtDRSQQ85uVsZXnrJPnLlSydCLxz3F6Go6w/GPyUMnagIGy78T2TDYq5vq e2/mdwyEHnb8av52fkfPQauYk7TPUS8rhCjIoCN2s7YIFFH8EunRLoGKoH4XpCaeSdBV q5vl+RiaTA4O7xFYHl73VbNBZ0N/mgB8ASCWWeMFragxarOGHqzzhiubTdx6su3DQv1K s5lA== X-Gm-Message-State: AFqh2ko6eQaIPJ3PP07mf4K2JcxxI16hrd9gGcu1rkqj9vSHwrdofkJw W5BkbRr+cUPr6y/urK8wPCCc/A== X-Received: by 2002:a05:600c:3514:b0:3db:80c:8ed9 with SMTP id h20-20020a05600c351400b003db080c8ed9mr21484635wmq.22.1674463387029; Mon, 23 Jan 2023 00:43:07 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id l30-20020a05600c1d1e00b003c6b70a4d69sm10974120wms.42.2023.01.23.00.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 00:43: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 v3 1/6] arm64: dts: qcom: sdm845-db845c: add generic sound compatible Date: Mon, 23 Jan 2023 09:42:55 +0100 Message-Id: <20230123084300.22353-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?1755802161861922563?= X-GMAIL-MSGID: =?utf-8?q?1755802161861922563?= Use generic sound card fallback compatible, because the device is actually fully compatible with the generic one. Signed-off-by: Krzysztof Kozlowski --- Changes since v2: 1. None 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 Mon Jan 23 08:42: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: 47066 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496294wrn; Mon, 23 Jan 2023 00:43:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXumM5zIL7aTUK01Y9Pgv3zuzaAC5q3QOiQdG/UfKtXBkQ4rs0UfmNbe0GWdvjCHFwoh9vlG X-Received: by 2002:a17:902:da91:b0:188:760f:d831 with SMTP id j17-20020a170902da9100b00188760fd831mr33602764plx.7.1674463439320; Mon, 23 Jan 2023 00:43:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674463439; cv=none; d=google.com; s=arc-20160816; b=DxSoR4VrrzywJeEpjQt3Vd5jjPbpggdF2BC/pYhz+aasvrqYvpWtz6JP7N429Lf44R ICGi8PCbWXob6PU1GE46cHW3bXqxulkz8/hmZpuYEs8QKnSVr8gPX3Az0/eWqvCT3FR5 Z6iKmhe63fSlFO+SUmJ2jbsR6UUUf9N2xJPx2LhI1CHXczZoZxpc98aNj8E9EkKlsCYy KWe/4itaQLd8n5D0o38pUa2eQiEOtacpR93GhOOnUY45oTgIzGdSFF9UJauB2GQEI8je UkvNAOPvJ2zSjoZVnsLMQNFqGSlarbpDfMCPopgvnXQL1QX8TwS7YtMKgr8auDj0dPOB 80kg== 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=aBYXU7BYe++OQvW58cNbRlLqJuMd3YZekY4rCqXq5Xg=; b=lt+yiPe817GEEtnpqVwaye4eWOvnTWRrFZ21hQ8wHNy3ZsDGo3ysxs/EMfVVGUiDkc yS25Vf59VBUzavu+jOjyO36WPoPNChoO8QKAVsIPRKCESlJdJAhYmOZ/9sDby48+5xBJ m5vJEQGBEnkyEyjkut0OUTPs3so9+sampNp6uA+J/3GcsRTFAEIOaOQWB2Py9rz5wsAF g84Q5G7FYuf2MZVtcMzgtEiplajeAqPNSLDXW4eWCmuTue/nhwMdlNYrZ9rtoqLJxxMY kOF7EUQMidnqBzw9MkfsNC9/yN5NOJXBwu5+NHqcWFsZfAIy4lArix3Of2JPPHohIA+p 1Y3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CZeldiGm; 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 n13-20020a170902e54d00b001929dfd3fd7si44417600plf.578.2023.01.23.00.43.47; Mon, 23 Jan 2023 00:43:59 -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=CZeldiGm; 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 S231705AbjAWInO (ORCPT + 99 others); Mon, 23 Jan 2023 03:43:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231693AbjAWInL (ORCPT ); Mon, 23 Jan 2023 03:43:11 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4D9E1CF40 for ; Mon, 23 Jan 2023 00:43:09 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id q8so8355757wmo.5 for ; Mon, 23 Jan 2023 00:43:09 -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=aBYXU7BYe++OQvW58cNbRlLqJuMd3YZekY4rCqXq5Xg=; b=CZeldiGmAMoh9AyX++Cc9wiONG6AqYVq56JEOGws0sp5Id1XgurC2NY9QIpac3/jfC k3niGMyQQMEqQo1ENdkZHjVX9yGytIYmvfKirapkNnwFacXlBNxeZGr873cRFR4Wthmf vUiAFUEyW+aRIgtet10u8LxFtl6jaE1qFa6jBdqBjRQOuyDikyTpk9C8z2vDLpJUEaou JuROCiau9K7g/yyoVIh5xmCvOs24Otm9z1DXIqmRgYM6RjiStfT45TPIUCwzFCV3bTzC r/x6L4I1cQAZmQPIba6zqTHKd2s6o2+OG5ueJaVWpcHCiTMI1adOAXupbUmSj3gBIsQE 4uZw== 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=aBYXU7BYe++OQvW58cNbRlLqJuMd3YZekY4rCqXq5Xg=; b=b9vMa+EuWu1ubKH/N+ry+oQ1gKlzStF5XLr8qYN2aCKEmaACt6Bvb2CBKxY+xM3c3p Qj53CmeqrCbLgwHmaunQpzv+6PpEIVU4YIDxzKWfRXzTBx2AnCybSqyeug/lxHJXVsSh TJF1tM1ySqUXGsONRmYESiwDfDi+rzuXDase3vvJvkXx2B3V2569ccwPUG5paOD4P3ay v7VRrk9oSpauU12eu1CCstXnAMWxCw5fJOa2t328wpBLo89uuiFJmc6wrR5cxtcBBJFq d0YQzyFB5P7HXcY/eWU0c0hIFkbz0y/Dbk4QDHxkFbXfYaEOsKL8DLaUQKB0hXTEqPyg nZPA== X-Gm-Message-State: AFqh2kotOXIpvZMsbQMb8fEcnN6GGZQCw8TxELV0mHfyWwtxOWJgVAxC PrRWZ5fDUBtGPliwNcbKVh4HmO4MKqt415CI X-Received: by 2002:a05:600c:c8d:b0:3da:fcee:2ef1 with SMTP id fj13-20020a05600c0c8d00b003dafcee2ef1mr22989216wmb.32.1674463388405; Mon, 23 Jan 2023 00:43:08 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id l30-20020a05600c1d1e00b003c6b70a4d69sm10974120wms.42.2023.01.23.00.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 00:43: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 v3 2/6] arm64: dts: qcom: sdm845-xiaomi-beryllium: add generic sound compatible Date: Mon, 23 Jan 2023 09:42:56 +0100 Message-Id: <20230123084300.22353-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123084300.22353-1-krzysztof.kozlowski@linaro.org> References: <20230123084300.22353-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?1755802175064222438?= X-GMAIL-MSGID: =?utf-8?q?1755802175064222438?= Use generic sound card fallback compatible, because the device is actually fully compatible with the generic one. Signed-off-by: Krzysztof Kozlowski --- Changes since v2: 1. None 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 Mon Jan 23 08:42: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: 47067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496332wrn; Mon, 23 Jan 2023 00:44:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXtQDvgBYNaJGWBIO2vMjP+HFEHg1+A9pQqUWo2aPONSBgB62+xWulvSvrSHpYF9aAN6+BSP X-Received: by 2002:a17:90a:ea86:b0:229:9369:e13 with SMTP id h6-20020a17090aea8600b0022993690e13mr24796570pjz.36.1674463445412; Mon, 23 Jan 2023 00:44:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674463445; cv=none; d=google.com; s=arc-20160816; b=GMVrlHtkEvvCahlaLUV5zx7j9jMoXWLmzSRDieVjNmf3GysgFHaju/HGDvRUfWhaRe oNCsDW8i6EDGENu8PXNVW6oZmBheGp4PUgKtoYG2nG/AA4uJvjp4SVv0ZlfwGdcDrIhH S7CBoJaJsRMQ7qOIpvXbvSvysxmeKCeeLAAXYUW3qCSfGXIgyMGkDruROyi7te6ZR3QP 6DqZA+fWJi3sIGr9NvYszMvN64cq7+pEeN+gn+XVEwTXrZLtQRv3xdjPjbeFbvrGkraK EGRb5FXnmjjnfhMjocdhHbSSbdL+vu3mvfy7QKDmbg2x++0/OZht80zmecQYykQ91D7m /Fqg== 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=Y5Yz4ZDu0mhl5KPN2z6Y4aarA8Bhnf1jEGoG09a//y8=; b=pCU/TIxvzSz/lBzD12e9NPxZ29QOPLfiXuEpA8zTk0rM+gyyHGMiDzIPx17SmFDJdm nmUllpxlAKyXzOBAMd5tF9S2Twe/+Uhph1EopDUfZqOVRcD8Xm4s1JDY+Te50716yfOu JBVXaoEbN27M0Jq5goXctnKnbOmaSn5Ra2foLbsoJuQHPoBU6ZPO+hM7Oh9wc7m+q9WH ZM1BMweQBbIE3oVpqBCTxjq9+nAX0LGdfhtpOzyQPXP57nR0gJGJaHabUuI3piMzdq19 gknBYYBEmffXhD7YYmcqVCbE9MKGzZuWNSjTND0dsCCA4N5KFv/gG2EteQmdMbKa7i9t 3R2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jGCU5Z5/"; 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 w17-20020a634751000000b004780221f08bsi48924915pgk.853.2023.01.23.00.43.53; Mon, 23 Jan 2023 00:44:05 -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="jGCU5Z5/"; 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 S231713AbjAWInS (ORCPT + 99 others); Mon, 23 Jan 2023 03:43:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231478AbjAWInM (ORCPT ); Mon, 23 Jan 2023 03:43:12 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 771D9193E1 for ; Mon, 23 Jan 2023 00:43:11 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so10028834wma.1 for ; Mon, 23 Jan 2023 00:43:11 -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=Y5Yz4ZDu0mhl5KPN2z6Y4aarA8Bhnf1jEGoG09a//y8=; b=jGCU5Z5/vXpjPSDf60ve9bcSmYJtrvrKZJBERfFcOrKEtlRpPItjU4E6SCT1m9FelE plFxbMdJ/3YzfCaUza/6ZIi/yxXGrHjol0TUqMgXDGlHxCUdAY1ymfwiuhNiozISMxGy 7Q062gR8mKXB17O7QQFw8IrD6glb6TsEDHga+KVFbNp0nfsR3vX2JrrKr6ZtzQkF3l1d cYgB1EFuyVO09R65dqRIsd8DNnT063rX2e1sGva4xNEdqr3HXkoBI2ptz1cazg6iyIFE ieGHB8NBMwAoyMEmHKC4+p7TsLfypeA5lLc3Q8ixS09uZNlB4zCGGBr9BLeOjSgEq/d1 fy+A== 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=Y5Yz4ZDu0mhl5KPN2z6Y4aarA8Bhnf1jEGoG09a//y8=; b=atM7Hax6cNLhVcTKJlxx8+dLxE8K157AKAYEaIEWtQmdlosIVCnt10gWtIXV5xBP+X WZTJL+xriHWBrvT+V0zDi6I1yr0+idF2+ZmfW/TiQYPEMX2s4KAuUWPxfrxbQpeoKqST +9yzj8Uq5V12YD3auln43oRSXFPGgCz4NCg5Hgkm1Qp52QpuI+iW6MBDN99yjZtEfaLn Ubi0SVs6AWi2O1AkyHiH9LZQogDXgSj5LV9A9uQku4vfDP4Kf/ZCukturN5VrwRKBQ8+ pXxm6PYwIbGJEPQQZEkddSNdCAhIpVv2vM/oMCIKzStYh6r87ax6D3OT/GJe6ssDlPj+ uwBA== X-Gm-Message-State: AFqh2kqIXoucBig6xYHwV53N2/PO+DI+mV6JV1SYYR66Nlvcf/NokDjK Lys8723srnxbd9Ft7lidBG6Mow== X-Received: by 2002:a05:600c:1c8e:b0:3d9:e5f9:984c with SMTP id k14-20020a05600c1c8e00b003d9e5f9984cmr23439461wms.2.1674463390029; Mon, 23 Jan 2023 00:43:10 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id l30-20020a05600c1d1e00b003c6b70a4d69sm10974120wms.42.2023.01.23.00.43.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 00:43:09 -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 v3 3/6] arm64: dts: qcom: sdm850-lenovo-yoga: correct sound compatible Date: Mon, 23 Jan 2023 09:42:57 +0100 Message-Id: <20230123084300.22353-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123084300.22353-1-krzysztof.kozlowski@linaro.org> References: <20230123084300.22353-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?1755802181322199315?= X-GMAIL-MSGID: =?utf-8?q?1755802181322199315?= 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 v2: 1. None 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 Mon Jan 23 08:42: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: 47068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496343wrn; Mon, 23 Jan 2023 00:44:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXvURlmXZExsFMv38ryyPQnHbGLWRBS6SQ5S8rBAL3CwxnDm7rmvE/SWTdneytTOb17hGviJ X-Received: by 2002:a17:902:b691:b0:194:9288:dc19 with SMTP id c17-20020a170902b69100b001949288dc19mr25410718pls.68.1674463448028; Mon, 23 Jan 2023 00:44:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674463448; cv=none; d=google.com; s=arc-20160816; b=SDJygAu9GHnt8W3lSl6SmlAZ1lYQV/6gw3GV48IaCcwh1VTKrzWKNDjjyMzQ9uUspa R60OXcRWbxBtuIIfUm4I1Zu8oMxB3uNNcM3XoLx9eel4iLzYbsENfgD1aKHslHRHQL7A GNjkWWcLDwOztyyLLHNulmNN/R8F3YjE6379Yn+IlHTZw1pOPWY6ml3fn/rEFDHJ872f mgoPoFntKzgUu7lrOqZjC4m17DPNHHMiljwxJ2qO8bamYVxdxGlqmotLgxeq4s95FRkd e4BwwSMjj5Q24PQeGR7dloGjEFEH4YMQQdgAyd7TjPuYTOuC2XXSBw4MEpXvyHd2j2/H gMag== 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=z9If+JSkFzojuFUTOP8x6BCS0M/klfUAgvUIkh+Y7QU=; b=oWWvOz7yCJxvNMHWj8FEDlGAW5DpETBlSvrSrd7eY1tVMmzuVFtHjPlFMj8NJVn9uH jZUfP4zBiGMp77OR5cPUMhQ3EWpI2u3DNPBEIfymjh0xMxkppQ/uiI1M1ZtLbfCcF5QQ fzbADdNJsq+PSbXZe6VQm8GOSHdgrLeQglStGHexlWSXVFbpXptB119P1DuYbLG7Zn8P NulL3bW7sEu9VBZY9pbA7eeO4JdBtL2XzqONwEJI3p3T/Y82JrLLiJeD5J6Vi0DfGxYH EFtYvXB9Xfw8SGTo46DxcdKckRBuiTYfOhmcbUadhZglTQ84cg3+gWtiyocUgbSpKnDc 3/Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FW859MoF; 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 y21-20020a1709027c9500b00175449cf6f8si4602639pll.606.2023.01.23.00.43.56; Mon, 23 Jan 2023 00:44:08 -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=FW859MoF; 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 S231734AbjAWInW (ORCPT + 99 others); Mon, 23 Jan 2023 03:43:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231710AbjAWInP (ORCPT ); Mon, 23 Jan 2023 03:43:15 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 216611E2B1 for ; Mon, 23 Jan 2023 00:43:12 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id iv8-20020a05600c548800b003db04a0a46bso4151666wmb.0 for ; Mon, 23 Jan 2023 00:43:12 -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=z9If+JSkFzojuFUTOP8x6BCS0M/klfUAgvUIkh+Y7QU=; b=FW859MoFegTf9Ta3DQs4WgGwR4+mE6lILGJuL5EL3/wlXpjX6WIgoEl83uByhWkzdl sOR3FXONMrC6yoBiCONBUkcGDjQ4OY6bN38706D+aAlpSkJj7CdCun9sJg3XPQbPS3ae 28uJHduUjAWlqBUnkW2fIny2+KwME4prdx+eZ/r+OEuKT1NYLeOWCkh9MeqZjl3NQZTl akSLCklkxpdGUWUgorwsJSdgPAHFkek6H8vNMrp5S2rTf6jqC1vnAebNmA1arUNq70wj ESM8n807U9Y+7QDHxlQgfUnAibdY/Mr2fQmfY2I9nnnD8spk0ZvJd2PhsVvFBtL88U08 lHVg== 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=z9If+JSkFzojuFUTOP8x6BCS0M/klfUAgvUIkh+Y7QU=; b=IfKonQFU9E+dsENvrXZ8Ad0+mUR5L0Zjklrhk8RQDL7qxVHgFU+F4WTeUFzazuC0ch LrBYidf3ryvU9Q62Z4bmRNc3NVaeXriUhko/AtBORs65YBXsf4Ijl2Yl7UzEoycuDe0X EafoiNVmYXlhpCLs8vw8DC8jK1UIbG/VUVuBTsRJ+EXjSaMLtoQyjncg/leSZnOtH9Ge oIH9KjYRKLk2LKCSPTg4h2RTxXtqXo5+vHDk3L14263K306ndijcndnMIEG/GWfqjcKk hcf23g8VtznyL2eHLHKklUjuSjBrHwsB78n0m+UT5QesKfvDl5TdWwSIHIoCrogsQ9nL wL1w== X-Gm-Message-State: AFqh2koSidQFbLeRHvcF4G9qWSjTzQJozHmTLPJrdY3k9W9uP+Lxam0U 6ske5naJx4TgzODTZ4+WJv3vQQ== X-Received: by 2002:a05:600c:224a:b0:3da:fa15:8658 with SMTP id a10-20020a05600c224a00b003dafa158658mr26764786wmm.32.1674463391538; Mon, 23 Jan 2023 00:43:11 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id l30-20020a05600c1d1e00b003c6b70a4d69sm10974120wms.42.2023.01.23.00.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 00:43:11 -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 v3 4/6] arm64: dts: qcom: sdm845: move codec to separate file Date: Mon, 23 Jan 2023 09:42:58 +0100 Message-Id: <20230123084300.22353-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123084300.22353-1-krzysztof.kozlowski@linaro.org> References: <20230123084300.22353-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?1755802184121194871?= X-GMAIL-MSGID: =?utf-8?q?1755802184121194871?= Re-organize SDM845 audio codec into separate, audio DTSI which should be included and customized by the SDM845 boards wanting audio. The codec node is anyway not a property of the SoC, but the boards. On all others boards not using audio, keep the Slimbus node disabled as it is empty. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Caleb Connolly --- Changes since v2: 1. Drop sound node in DTSI - affects devices. 2. Drop "audio" from DTSI file name. Changes since v1: 1. Move also sound node. 2. Rewrite commit msg. RFC - please kindly test the boards. --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 1 + arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi | 69 +++++++++++++++++++ .../qcom/sdm845-xiaomi-beryllium-common.dtsi | 1 + .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 60 +--------------- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 1 + .../boot/dts/qcom/sdm850-samsung-w737.dts | 1 + 7 files changed, 75 insertions(+), 59 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 4833e89affc2..118cc50ce49b 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-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi new file mode 100644 index 000000000000..5bcce7d0d709 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi @@ -0,0 +1,69 @@ +// 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>; + }; + }; + }; +}; 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..a472c716f966 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-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index a80c3dd9a2da..ea2a1a9fb3ff 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-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..6d253fbe0267 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-wcd9340.dtsi" #include "pm8998.dtsi" /* diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index 6730804f4e3e..6758b0698acc 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-wcd9340.dtsi" #include "pm8998.dtsi" /* From patchwork Mon Jan 23 08:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 47069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496417wrn; Mon, 23 Jan 2023 00:44:20 -0800 (PST) X-Google-Smtp-Source: AMrXdXvV2/IwtJB+VU1iyM6reYO5dVwBJm4r10k97EZc4cNe4MTWWA6FuacvtF5Ra/V3KZxkk1pK X-Received: by 2002:a05:6a20:bf20:b0:a4:64c7:a7f1 with SMTP id gc32-20020a056a20bf2000b000a464c7a7f1mr23789378pzb.14.1674463460374; Mon, 23 Jan 2023 00:44:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674463460; cv=none; d=google.com; s=arc-20160816; b=dRgOVgcPuOZ5YQk+QHW0uej8gfQI3FgbdfpbgvU7CMYyXAXvchNwiOfwIGqlZT9jDh MJePmrzDqOB2gTSnw8zY1cSLh42sFi64BUiYJiS7Im+ozKyankIVx911ltAGy/1D2Q2U MMkYOI5T/wEerJ3ycdB41qu1ifp7z3VQP8T2FcX1WrOyZ3uLE1icgjeTBdkgx7zUySlH Xu74gUiRrrc0nLjf+4pMQ7Rs+IeM01+GownrYOXp09hCYTKMNxUMcFKIkGmUyskfEIKX 11BZj/ey+xpiqHLbsq/+5+GH6CxFxrqr7pmHq1YWRXPba+SGCcIiYHDYp4JQ0wfIRo7K JdrA== 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=U9ZYwRA2fIhXBOI9yCXs02WUBD5VW4Olt97ohAsC1bg=; b=Q8LWSz+LSG9TNKHQUwRjYqsRG15aoaFTdhZUY0oe3QZWDv7ikfzO8Yytk+NKumZpWa ingRaboguYVccnHh4Av90s9NQE6MBNbILSEYU932eynawFdAicSxvjuHW7Mdj7PicCFr q8GKz3AxVlID/cFFcX7duGqj477uQnvOrNXiMy5fl7lbG8tuMyYH+863YBa2dFmvfa3N Gt7sFprs2nnrbCOu5qzKTKj4CHA5K9D6nTQ23QzQS3GWW2rxtqcosiSSrj2PDO7jbdFb Vybs1yqeURZnGmwiLRxiDQrFxlEU5RUjkvcDD2MBgponGGpID702tcrq7Q2YyrXwFIcG /Zqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SlCxRF6O; 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 33-20020a631461000000b0046f5808167asi51677250pgu.812.2023.01.23.00.44.08; Mon, 23 Jan 2023 00:44:20 -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=SlCxRF6O; 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 S231722AbjAWInZ (ORCPT + 99 others); Mon, 23 Jan 2023 03:43:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231719AbjAWInQ (ORCPT ); Mon, 23 Jan 2023 03:43:16 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 966691E9E1 for ; Mon, 23 Jan 2023 00:43:14 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id o17-20020a05600c511100b003db021ef437so7921780wms.4 for ; Mon, 23 Jan 2023 00:43: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=U9ZYwRA2fIhXBOI9yCXs02WUBD5VW4Olt97ohAsC1bg=; b=SlCxRF6O622HxsHHm4eVc7IFrPpV9pM5X7mEPPIBWP00Mu7XQH0Rm/hSs409p3yY3i YMbuQc0rHV7hL9zw41shyFjyXya5xxCWuNJ4hZXPDageUvx7xwtpSU7E62RbgZvWkBQC CrGb8/r8OkV3DQ4RvIM3Eew/3A7usMXQ84P6ZADEwnLPNmDWrXgi0eu5tXkK4XMZlM53 RRg5Kv3AyajNKo/7fZXMAjGo7UHVqDu5Dxb6dpHfTi+fl6fbT4KmxhCr6its+lSPazPo IOEuHSYVeMu02pFM7J2DLX2R4s9tnneI3Vt1SJJ1YUX3MrDAVWHY8KkTClHHVSoG/d3S NpMQ== 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=U9ZYwRA2fIhXBOI9yCXs02WUBD5VW4Olt97ohAsC1bg=; b=lCkBaPPUeGsPTuEl5YsCA2nZE329eI+1H9JnjA8V0g5FBQ7NjZXQbFHFho9zij9+9h dA4ihzkFacEpGnMgcl+tTNHKv9kLEdo4jrF4oMmeoJ7906qsdCZAmEfzPl+ANhyKvw/l di/gsGHMZwRTdNwZ+Bzit4MiWyv8ZtEnIPu8FtMvCAoFobrr/efrlcX69yGUE+DDycFH 48aOdN4/N1v6nbGgwbaHj9ypSmcs8IEbdwAmMDEdxZXrHvjvVo5Q45jPMJu8DxyY8+N6 t36vR8Cw3X2JEzZ3MlTEXqBBIB9SmeT25icKgbZNA0TfpUam8/94Z9RCZN4PT22s/sZh 0/Sg== X-Gm-Message-State: AFqh2krJ2ZHpWABNYQ1hTOqyTU0zg8oE3yOzXLx+zay+3fzTt4HHMvQZ ytE0zosSzlvy6tTCZ/gtqlMjsw== X-Received: by 2002:a05:600c:1f0e:b0:3db:2098:17c0 with SMTP id bd14-20020a05600c1f0e00b003db209817c0mr14882305wmb.29.1674463393081; Mon, 23 Jan 2023 00:43:13 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id l30-20020a05600c1d1e00b003c6b70a4d69sm10974120wms.42.2023.01.23.00.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 00:43:12 -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 v3 5/6] arm64: dts: qcom: sdm845-audio-wcd9340: commonize pinctrl Date: Mon, 23 Jan 2023 09:42:59 +0100 Message-Id: <20230123084300.22353-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123084300.22353-1-krzysztof.kozlowski@linaro.org> References: <20230123084300.22353-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?1755802197356731808?= X-GMAIL-MSGID: =?utf-8?q?1755802197356731808?= 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 v2: 1. None Changes since v1: 1. Add Rb tag. 2. Split from previous patchset. --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 11 ----------- arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi | 15 +++++++++++++++ .../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-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 118cc50ce49b..c7a12257ac75 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -973,15 +973,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 { @@ -1087,8 +1078,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-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi index 5bcce7d0d709..33718cb95c83 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-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>; @@ -67,3 +71,14 @@ swm: swm@c85 { }; }; }; + +&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-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index a472c716f966..57f1c5925cb0 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -466,15 +466,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 { @@ -543,8 +534,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 ea2a1a9fb3ff..468867363f18 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 6d253fbe0267..a461cb7f6bd2 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -628,15 +628,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"; @@ -747,8 +738,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 6758b0698acc..d4ae2788bada 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -552,15 +552,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 { @@ -656,8 +647,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 Mon Jan 23 08:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 47070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496722wrn; Mon, 23 Jan 2023 00:45:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXvqXLJTB/h7my8cfBpS53u4HOeVqslhGTiee9RoC3cxBkpLXWzzSTI1wk5P+sd3adqJHT9u X-Received: by 2002:a17:90b:1907:b0:227:1e67:d588 with SMTP id mp7-20020a17090b190700b002271e67d588mr25168378pjb.23.1674463518464; Mon, 23 Jan 2023 00:45:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674463518; cv=none; d=google.com; s=arc-20160816; b=P3GqZWFKJnKpAm9YlTlO0TuvripQp6RmbPGYDxPrNOuGQiTFWgIe3cE3SMeplNTPIQ G/CFQ5T8C4htispWp8FHBe3iqD/L/pvAdrlRcY4jNbLT67VIvIvIlr7+UrA6eoe8lOTP jSksmyp82X+R6mnGYkWEBz0IciM+3k6Yi0CV4G4PYMdFsHwsi3EN3lvtivjo0w+HWLHb MjD5B9mytFTEMKt1YZ5YbP1XT3m1gsG+BAAhOJ6dUD7aZlHDwgw2xjgFcUv88Aee/bTm EoOD3epQ+gQgOw2OzzQ7ty9xMP34ve/cfXIuZsRkdm6vW2R3SW4B5Sr8AyqqYBLGkGNt 7NLw== 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=+50E74LIwt2qnQP5k9lnFoKkan1KmgeAjiTYyPnB5qY=; b=nJHE2GZSzcHKhTRgcr8ZHeotq6RmQT+r6kcQFQz0/6kJyF+nJ8NiCGD3zoTp9Wv5WS 2+jz+yOlYk4zGwiQYP7IAO6qkeIXHA4NWXZatSi0m3gBnFGs22i6210hSpc1kXs/5Q0u b6L1TZQHRH3srpNNLrKuY58c2CEieThimBQRthQWdY0nko8suAPeF8H55AVugqvZnFm2 1g4r+jNtq5G0KFbiE2IQDJi936UWZN6FXOME+nrNyxWMH88UuLeqi9PuBpFQo7oy6eyd Sb/TjW//vY5XjYdEe4cvy9va7sDdCXRltN1Nm09vVE2Zj0xPBrZOpDb+pt2ghzD5ThKt AxyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JsZBpBut; 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 l10-20020a17090a850a00b0022952aba5bcsi10585408pjn.176.2023.01.23.00.45.06; Mon, 23 Jan 2023 00:45:18 -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=JsZBpBut; 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 S231765AbjAWIn1 (ORCPT + 99 others); Mon, 23 Jan 2023 03:43:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231721AbjAWInQ (ORCPT ); Mon, 23 Jan 2023 03:43:16 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D181C1E9E6 for ; Mon, 23 Jan 2023 00:43:14 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id k16so8369256wms.2 for ; Mon, 23 Jan 2023 00:43: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=+50E74LIwt2qnQP5k9lnFoKkan1KmgeAjiTYyPnB5qY=; b=JsZBpButlSUwVfHf7fEWZdB9s6KlsWPz9sJibHjsO3RCLOUluoxx0g3ptbN7RlBPn+ pIe2TM9FFz7Ei+ssqv//eg5fQf0QY12vh52mgOLbu7eeoeTv4IeHccFPYlkhqlR2EoC+ dL1rItZru80U9fH7q7zKlZ0Rdi6h0b7Cc57L6jxHHuXzJjYxUEZY2jfmB+96ekvsw44O R5Dar3oy9tM9HxUZGxuZZ+aUQtlyqG+gOoYGY/upv0/PhHGP3Mji99P8e12gWyr0DxdL yp2Y3RY4cE9t3+kqniiUKUvrYiKmzuWxVxKF6d3GvHpHXhupIlYcH4mEB2h9HftYcTsT bfzQ== 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=+50E74LIwt2qnQP5k9lnFoKkan1KmgeAjiTYyPnB5qY=; b=aWJ6Kzv/CFeqrde5ppoyHwy2hbsRmMzUcTzWihX7+VfXBR5r6uj5ASXGtK1OoauE47 eo+rAzxmOObPg4XHugkS6qkdhRv/JebJgEZUHWoN1pFpsrNghrlGM7mrWzMQHHvVcqW2 f2kahk4AA7uyF/MHfiNzwAB5e7kRfGIB/QOaFVkUcCC57PlBxynuhqbGcq1pB5MMk6HB oiw376ikY/SvAIxjoMVlODQi9NCcMt/WrykirjfyzKhOUFtaIOxw9XYXFSRzYeIHOcnZ KIqnrMRyzmAfY+BBcMn1TPNrj/OZiakqqR+MEu7MHtfDTkm+7C/ydewOX/Hxc0GwP6cL 3oXA== X-Gm-Message-State: AFqh2krktyMMcL3UZ6qJfpuPdFFqdDA9ZGHMXYCSbog031VmXGbd3p5m ag0F/Ec4AV7kPxymhP5Zjh/T0g== X-Received: by 2002:a05:600c:1695:b0:3da:f502:83b5 with SMTP id k21-20020a05600c169500b003daf50283b5mr23316158wmn.2.1674463394438; Mon, 23 Jan 2023 00:43:14 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id l30-20020a05600c1d1e00b003c6b70a4d69sm10974120wms.42.2023.01.23.00.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 00:43:14 -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 v3 6/6] arm64: dts: qcom: sdm845-audio-wcd9340: commonize clocks Date: Mon, 23 Jan 2023 09:43:00 +0100 Message-Id: <20230123084300.22353-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123084300.22353-1-krzysztof.kozlowski@linaro.org> References: <20230123084300.22353-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?1755802258283419858?= X-GMAIL-MSGID: =?utf-8?q?1755802258283419858?= 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 v2: 1. None Changes since v1: 1. Add Rb tag. 2. Split from previous patchset. --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 -- arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi | 3 +++ 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-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index c7a12257ac75..90c981bccc14 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -1078,8 +1078,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-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi index 33718cb95c83..0d7c37f39176 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-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-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 57f1c5925cb0..d9ad762c8d01 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -534,8 +534,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 468867363f18..3dadcfc40341 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 a461cb7f6bd2..5380ccf976f9 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -738,8 +738,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 d4ae2788bada..23af707741df 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -647,8 +647,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>;