From patchwork Mon Apr 10 20:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 13206711 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 617C1C77B75 for ; Mon, 10 Apr 2023 20:29:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229777AbjDJU3e (ORCPT ); Mon, 10 Apr 2023 16:29:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbjDJU3d (ORCPT ); Mon, 10 Apr 2023 16:29:33 -0400 Received: from relay05.th.seeweb.it (relay05.th.seeweb.it [IPv6:2001:4b7a:2000:18::166]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A596173C; Mon, 10 Apr 2023 13:29:31 -0700 (PDT) Received: from localhost.localdomain (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r2.th.seeweb.it (Postfix) with ESMTPSA id EBB9A3FA35; Mon, 10 Apr 2023 22:29:26 +0200 (CEST) From: Marijn Suijten To: phone-devel@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Manivannan Sadhasivam , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 0/5] dts: qcom: Use labels with generic node names for ADC channels Date: Mon, 10 Apr 2023 22:29:12 +0200 Message-Id: <20230410202917.247666-1-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org As discussed in [1] it is more convenient to use a generic `channel` node name for ADC channels while storing a friendly - board-specific instead of PMIC-specific - name in the label, if/when desired to overwrite the channel description already contained (but previously unused) in the driver [2]. The same `channel` node name pattern has also been set in iio/adc/adc.yaml, but this generic binding is not inherited as base for qcom,spmi-vadc bindings due to not having any other generic elements in common, besides the node name rule and reg property. Replace the .* name pattern with the `channel` literal, but leave the label property optional for bindings to choose to fall back a channel label hardcoded in the driver [2] instead. [1]: https://lore.kernel.org/linux-arm-msm/20221106193018.270106-1-marijn.suijten@somainline.org/T/#u [2]: https://lore.kernel.org/linux-arm-msm/20230116220909.196926-4-marijn.suijten@somainline.org/ Changes since v3: - Switch generic node name to `channel`, matching iio/adc/adc.yaml; - Besides switching arbitrary names to `channel`, now also rename all existing `adc-chan` names to `channel`, including ARM tree; - Rebase on next-20230406 and apply rename to newer PMIC files. v3: https://lore.kernel.org/linux-arm-msm/20230201204447.542385-1-marijn.suijten@somainline.org/T/#u Changes since v2: - Reorder DT changes before dt-bindings changes; - Update adc-chan generic node name in tm5 example bindings. v2: https://lore.kernel.org/linux-arm-msm/20230119212632.185881-1-marijn.suijten@somainline.org/T/#u Changes since v1: - Require adc-chan name in dt-bindings; - Replace more node names with adc-chan and a descriptive label, that were found by running dtbs_check on adjusted bindings; - sm8250-mtp.dts: Fix accidental adc-chan2 node name with pa_therm label, which should have been adc-chan with pa_therm2 label. v1: https://lore.kernel.org/linux-arm-msm/20221209215308.1781047-1-marijn.suijten@somainline.org/ Marijn Suijten (5): ARM: dts: qcom: Use labels with generic node names for ADC channels arm64: dts: qcom: Use labels with generic node names for ADC channels dt-bindings: thermal: Use generic ADC node name in examples dt-bindings: mfd: qcom,spmi-pmic: Use generic ADC node name in examples dt-bindings: iio: adc: Require generic `channel` name for channel nodes .../bindings/iio/adc/qcom,spmi-vadc.yaml | 26 +++++++------ .../bindings/mfd/qcom,spmi-pmic.yaml | 4 +- .../bindings/thermal/qcom-spmi-adc-tm-hc.yaml | 4 +- .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 9 +++-- arch/arm/boot/dts/qcom-pm8226.dtsi | 12 +++--- arch/arm/boot/dts/qcom-pm8941.dtsi | 14 +++---- arch/arm/boot/dts/qcom-pma8084.dtsi | 12 +++--- arch/arm/boot/dts/qcom-pmx55.dtsi | 8 ++-- arch/arm64/boot/dts/qcom/pm6125.dtsi | 18 ++++++--- arch/arm64/boot/dts/qcom/pm6150.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm6150l.dtsi | 8 ++-- arch/arm64/boot/dts/qcom/pm660.dtsi | 33 ++++++++++------ arch/arm64/boot/dts/qcom/pm7250b.dtsi | 24 ++++++------ arch/arm64/boot/dts/qcom/pm8150.dtsi | 6 +-- arch/arm64/boot/dts/qcom/pm8150b.dtsi | 8 ++-- arch/arm64/boot/dts/qcom/pm8150l.dtsi | 6 +-- arch/arm64/boot/dts/qcom/pm8916.dtsi | 14 +++---- arch/arm64/boot/dts/qcom/pm8950.dtsi | 39 ++++++++++++------- arch/arm64/boot/dts/qcom/pm8953.dtsi | 12 +++--- arch/arm64/boot/dts/qcom/pm8994.dtsi | 12 +++--- arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmi8950.dtsi | 12 +++--- arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 6 +-- arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 6 +-- arch/arm64/boot/dts/qcom/pmp8074.dtsi | 27 ++++++++----- arch/arm64/boot/dts/qcom/pms405.dtsi | 21 ++++++---- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 15 ++++--- .../dts/qcom/sc7180-trogdor-coachz-r1.dts | 4 +- .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 3 +- .../dts/qcom/sc7180-trogdor-homestar.dtsi | 3 +- .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 +- .../dts/qcom/sc7180-trogdor-pompom-r1.dts | 2 +- .../dts/qcom/sc7180-trogdor-pompom-r2.dts | 2 +- .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 3 +- .../dts/qcom/sc7180-trogdor-wormdingler.dtsi | 3 +- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 3 +- arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 4 +- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 26 ++++++------- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 10 ++--- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 12 +++--- .../qcom/sm6125-sony-xperia-seine-pdx201.dts | 15 ++++--- .../boot/dts/qcom/sm7225-fairphone-fp4.dts | 6 +-- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 21 ++++++---- 45 files changed, 278 insertions(+), 205 deletions(-) --- 2.40.0