From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82BC0C43219 for ; Wed, 12 Oct 2022 18:41:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229899AbiJLSlF (ORCPT ); Wed, 12 Oct 2022 14:41:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229786AbiJLSlC (ORCPT ); Wed, 12 Oct 2022 14:41:02 -0400 Received: from relay02.th.seeweb.it (relay02.th.seeweb.it [IPv6:2001:4b7a:2000:18::163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B2899E6B8; Wed, 12 Oct 2022 11:40:59 -0700 (PDT) Received: from cp.tophost.it (vm1054.cs12.seeweb.it [217.64.195.253]) by m-r1.th.seeweb.it (Postfix) with ESMTPA id 5B1F320645; Wed, 12 Oct 2022 20:40:55 +0200 (CEST) MIME-Version: 1.0 Date: Wed, 12 Oct 2022 20:27:15 +0200 From: konrad.dybcio@somainline.org To: Krzysztof Kozlowski Cc: Bjorn Andersson , Andy Gross , Konrad Dybcio , Linus Walleij , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] arm64: dts: qcom: msm8994: Align TLMM pin configuration with DT schema In-Reply-To: <20221012165712.93053-2-krzysztof.kozlowski@linaro.org> References: <20221012165712.93053-1-krzysztof.kozlowski@linaro.org> <20221012165712.93053-2-krzysztof.kozlowski@linaro.org> User-Agent: Roundcube Webmail/1.4.6 Message-ID: <908877458e34e83b90b799a7018c094d@somainline.org> X-Sender: konrad.dybcio@somainline.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022-10-12 18:57, Krzysztof Kozlowski wrote: > DT schema expects TLMM pin configuration nodes to be named with > '-state' suffix and their optional children with '-pins' suffix. > > Order the "function" and "pins" property to match other DTS. > > Signed-off-by: Krzysztof Kozlowski > --- Reviewed-by: Konrad Dybcio Konrad > .../dts/qcom/msm8994-msft-lumia-octagon.dtsi | 8 +- > .../qcom/msm8994-sony-xperia-kitakami.dtsi | 6 +- > arch/arm64/boot/dts/qcom/msm8994.dtsi | 130 +++++++++--------- > 3 files changed, 74 insertions(+), 70 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi > b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi > index f9d8bd09e074..63568f73e9d3 100644 > --- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi > @@ -881,28 +881,28 @@ &sdhc2 { > }; > > &tlmm { > - grip_default: grip-default { > + grip_default: grip-default-state { > pins = "gpio39"; > function = "gpio"; > drive-strength = <6>; > bias-pull-down; > }; > > - grip_sleep: grip-sleep { > + grip_sleep: grip-sleep-state { > pins = "gpio39"; > function = "gpio"; > drive-strength = <2>; > bias-pull-down; > }; > > - hall_front_default: hall-front-default { > + hall_front_default: hall-front-default-state { > pins = "gpio42"; > function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - hall_back_default: hall-back-default { > + hall_back_default: hall-back-default-state { > pins = "gpio75"; > function = "gpio"; > drive-strength = <2>; > diff --git > a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi > b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi > index ff60b7004d26..a390af54c715 100644 > --- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi > @@ -477,15 +477,17 @@ &sdhc2 { > }; > > &tlmm { > - ts_int_active: ts-int-active { > + ts_int_active: ts-int-active-state { > pins = "gpio42"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > input-enable; > }; > > - ts_reset_active: ts-reset-active { > + ts_reset_active: ts-reset-active-state { > pins = "gpio109"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > output-low; > diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi > b/arch/arm64/boot/dts/qcom/msm8994.dtsi > index 7a582a5fe3a8..ba687e64ba3c 100644 > --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi > @@ -773,254 +773,256 @@ tlmm: pinctrl@fd510000 { > interrupt-controller; > #interrupt-cells = <2>; > > - blsp1_uart2_default: blsp1-uart2-default { > - function = "blsp_uart2"; > + blsp1_uart2_default: blsp1-uart2-default-state { > pins = "gpio4", "gpio5"; > + function = "blsp_uart2"; > drive-strength = <16>; > bias-disable; > }; > > - blsp1_uart2_sleep: blsp1-uart2-sleep { > - function = "gpio"; > + blsp1_uart2_sleep: blsp1-uart2-sleep-state { > pins = "gpio4", "gpio5"; > + function = "gpio"; > drive-strength = <2>; > bias-pull-down; > }; > > - blsp2_uart2_default: blsp2-uart2-default { > + blsp2_uart2_default: blsp2-uart2-default-state { > + pins = "gpio45", "gpio46", "gpio47", "gpio48"; > function = "blsp_uart8"; > - pins = "gpio45", "gpio46", > - "gpio47", "gpio48"; > drive-strength = <16>; > bias-disable; > }; > > - blsp2_uart2_sleep: blsp2-uart2-sleep { > + blsp2_uart2_sleep: blsp2-uart2-sleep-state { > + pins = "gpio45", "gpio46", "gpio47", "gpio48"; > function = "gpio"; > - pins = "gpio45", "gpio46", > - "gpio47", "gpio48"; > drive-strength = <2>; > bias-disable; > }; > > - i2c1_default: i2c1-default { > - function = "blsp_i2c1"; > + i2c1_default: i2c1-default-state { > pins = "gpio2", "gpio3"; > + function = "blsp_i2c1"; > drive-strength = <2>; > bias-disable; > }; > > - i2c1_sleep: i2c1-sleep { > - function = "gpio"; > + i2c1_sleep: i2c1-sleep-state { > pins = "gpio2", "gpio3"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - i2c2_default: i2c2-default { > - function = "blsp_i2c2"; > + i2c2_default: i2c2-default-state { > pins = "gpio6", "gpio7"; > + function = "blsp_i2c2"; > drive-strength = <2>; > bias-disable; > }; > > - i2c2_sleep: i2c2-sleep { > - function = "gpio"; > + i2c2_sleep: i2c2-sleep-state { > pins = "gpio6", "gpio7"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - i2c4_default: i2c4-default { > - function = "blsp_i2c4"; > + i2c4_default: i2c4-default-state { > pins = "gpio19", "gpio20"; > + function = "blsp_i2c4"; > drive-strength = <2>; > bias-disable; > }; > > - i2c4_sleep: i2c4-sleep { > - function = "gpio"; > + i2c4_sleep: i2c4-sleep-state { > pins = "gpio19", "gpio20"; > + function = "gpio"; > drive-strength = <2>; > bias-pull-down; > input-enable; > }; > > - i2c5_default: i2c5-default { > - function = "blsp_i2c5"; > + i2c5_default: i2c5-default-state { > pins = "gpio23", "gpio24"; > + function = "blsp_i2c5"; > drive-strength = <2>; > bias-disable; > }; > > - i2c5_sleep: i2c5-sleep { > - function = "gpio"; > + i2c5_sleep: i2c5-sleep-state { > pins = "gpio23", "gpio24"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - i2c6_default: i2c6-default { > - function = "blsp_i2c6"; > + i2c6_default: i2c6-default-state { > pins = "gpio28", "gpio27"; > + function = "blsp_i2c6"; > drive-strength = <2>; > bias-disable; > }; > > - i2c6_sleep: i2c6-sleep { > - function = "gpio"; > + i2c6_sleep: i2c6-sleep-state { > pins = "gpio28", "gpio27"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - i2c7_default: i2c7-default { > - function = "blsp_i2c7"; > + i2c7_default: i2c7-default-state { > pins = "gpio44", "gpio43"; > + function = "blsp_i2c7"; > drive-strength = <2>; > bias-disable; > }; > > - i2c7_sleep: i2c7-sleep { > - function = "gpio"; > + i2c7_sleep: i2c7-sleep-state { > pins = "gpio44", "gpio43"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - blsp2_spi10_default: blsp2-spi10-default { > - default { > - function = "blsp_spi10"; > + blsp2_spi10_default: blsp2-spi10-default-state { > + default-pins { > pins = "gpio53", "gpio54", "gpio55"; > + function = "blsp_spi10"; > drive-strength = <10>; > bias-pull-down; > }; > - cs { > - function = "gpio"; > + > + cs-pins { > pins = "gpio67"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > }; > > - blsp2_spi10_sleep: blsp2-spi10-sleep { > + blsp2_spi10_sleep: blsp2-spi10-sleep-state { > pins = "gpio53", "gpio54", "gpio55"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - i2c11_default: i2c11-default { > - function = "blsp_i2c11"; > + i2c11_default: i2c11-default-state { > pins = "gpio83", "gpio84"; > + function = "blsp_i2c11"; > drive-strength = <2>; > bias-disable; > }; > > - i2c11_sleep: i2c11-sleep { > - function = "gpio"; > + i2c11_sleep: i2c11-sleep-state { > pins = "gpio83", "gpio84"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - blsp1_spi1_default: blsp1-spi1-default { > - default { > - function = "blsp_spi1"; > + blsp1_spi1_default: blsp1-spi1-default-state { > + default-pins { > pins = "gpio0", "gpio1", "gpio3"; > + function = "blsp_spi1"; > drive-strength = <10>; > bias-pull-down; > }; > - cs { > - function = "gpio"; > + > + cs-pins { > pins = "gpio8"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > }; > > - blsp1_spi1_sleep: blsp1-spi1-sleep { > + blsp1_spi1_sleep: blsp1-spi1-sleep-state { > pins = "gpio0", "gpio1", "gpio3"; > + function = "gpio"; > drive-strength = <2>; > bias-disable; > }; > > - sdc1_clk_on: clk-on { > + sdc1_clk_on: clk-on-state { > pins = "sdc1_clk"; > bias-disable; > drive-strength = <16>; > }; > > - sdc1_clk_off: clk-off { > + sdc1_clk_off: clk-off-state { > pins = "sdc1_clk"; > bias-disable; > drive-strength = <2>; > }; > > - sdc1_cmd_on: cmd-on { > + sdc1_cmd_on: cmd-on-state { > pins = "sdc1_cmd"; > bias-pull-up; > drive-strength = <8>; > }; > > - sdc1_cmd_off: cmd-off { > + sdc1_cmd_off: cmd-off-state { > pins = "sdc1_cmd"; > bias-pull-up; > drive-strength = <2>; > }; > > - sdc1_data_on: data-on { > + sdc1_data_on: data-on-state { > pins = "sdc1_data"; > bias-pull-up; > drive-strength = <8>; > }; > > - sdc1_data_off: data-off { > + sdc1_data_off: data-off-state { > pins = "sdc1_data"; > bias-pull-up; > drive-strength = <2>; > }; > > - sdc1_rclk_on: rclk-on { > + sdc1_rclk_on: rclk-on-state { > pins = "sdc1_rclk"; > bias-pull-down; > }; > > - sdc1_rclk_off: rclk-off { > + sdc1_rclk_off: rclk-off-state { > pins = "sdc1_rclk"; > bias-pull-down; > }; > > - sdc2_clk_on: sdc2-clk-on { > + sdc2_clk_on: sdc2-clk-on-state { > pins = "sdc2_clk"; > bias-disable; > drive-strength = <10>; > }; > > - sdc2_clk_off: sdc2-clk-off { > + sdc2_clk_off: sdc2-clk-off-state { > pins = "sdc2_clk"; > bias-disable; > drive-strength = <2>; > }; > > - sdc2_cmd_on: sdc2-cmd-on { > + sdc2_cmd_on: sdc2-cmd-on-state { > pins = "sdc2_cmd"; > bias-pull-up; > drive-strength = <10>; > }; > > - sdc2_cmd_off: sdc2-cmd-off { > + sdc2_cmd_off: sdc2-cmd-off-state { > pins = "sdc2_cmd"; > bias-pull-up; > drive-strength = <2>; > }; > > - sdc2_data_on: sdc2-data-on { > + sdc2_data_on: sdc2-data-on-state { > pins = "sdc2_data"; > bias-pull-up; > drive-strength = <10>; > }; > > - sdc2_data_off: sdc2-data-off { > + sdc2_data_off: sdc2-data-off-state { > pins = "sdc2_data"; > bias-pull-up; > drive-strength = <2>;