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>;