devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	linux-input@vger.kernel.org
Subject: [PATCH v3 12/32] ARM: dts: qcom: msm8660: fix PMIC node labels
Date: Tue, 22 Aug 2023 03:13:29 +0300	[thread overview]
Message-ID: <20230822001349.899298-13-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230822001349.899298-1-dmitry.baryshkov@linaro.org>

Change PM8058 node labels to start with pm8058_ prefix, following other
Qualcomm PMIC device nodes.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../boot/dts/qcom/qcom-apq8060-dragonboard.dts   |  4 ++--
 arch/arm/boot/dts/qcom/qcom-msm8660.dtsi         | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
index db4c791b2e2f..48fd1a1feea3 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
@@ -72,7 +72,7 @@ cm3605 {
 		/* Trig on both edges - getting close or far away */
 		interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>;
 		/* MPP05 analog input to the XOADC */
-		io-channels = <&xoadc 0x00 0x05>;
+		io-channels = <&pm8058_xoadc 0x00 0x05>;
 		io-channel-names = "aout";
 		pinctrl-names = "default";
 		pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>;
@@ -945,7 +945,7 @@ irq-pins {
 	};
 };
 
-&xoadc {
+&pm8058_xoadc {
 	/* Reference voltage 2.2 V */
 	xoadc-ref-supply = <&pm8058_l18>;
 
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
index 78023ed2fdf7..9217ced108c4 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
@@ -80,13 +80,13 @@ sleep-clk {
 	 */
 	iio-hwmon {
 		compatible = "iio-hwmon";
-		io-channels = <&xoadc 0x00 0x01>, /* Battery */
-			    <&xoadc 0x00 0x02>, /* DC in (charger) */
-			    <&xoadc 0x00 0x04>, /* VPH the main system voltage */
-			    <&xoadc 0x00 0x0b>, /* Die temperature */
-			    <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
-			    <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
-			    <&xoadc 0x00 0x0e>; /* Reference voltage 0.325V */
+		io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */
+			      <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */
+			      <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */
+			      <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */
+			      <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
+			      <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
+			      <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */
 	};
 
 	soc: soc {
@@ -390,7 +390,7 @@ pm8058_keypad: keypad@148 {
 					row-hold = <91500>;
 				};
 
-				xoadc: xoadc@197 {
+				pm8058_xoadc: xoadc@197 {
 					compatible = "qcom,pm8058-adc";
 					reg = <0x197>;
 					interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;
-- 
2.39.2


  parent reply	other threads:[~2023-08-22  0:14 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-22  0:13 [PATCH v3 00/32] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 01/32] dt-bindings: input: qcom,pm8921-keypad: convert to YAML format Dmitry Baryshkov
2023-08-22  6:29   ` Krzysztof Kozlowski
2023-08-22  0:13 ` [PATCH v3 02/32] dt-bindings: mfd: qcom-pm8xxx: add missing child nodes Dmitry Baryshkov
2023-08-22  6:29   ` Krzysztof Kozlowski
2023-08-22  0:13 ` [PATCH v3 03/32] dt-bindings: bus: convert qcom,ssbi schema to YAML format Dmitry Baryshkov
2023-08-22  6:30   ` Krzysztof Kozlowski
2023-08-22 20:24   ` Rob Herring
2023-08-22  0:13 ` [PATCH v3 04/32] ARM: dts: qcom: apq8064: correct XOADC register address Dmitry Baryshkov
2023-08-22  6:31   ` Krzysztof Kozlowski
2023-08-22  0:13 ` [PATCH v3 05/32] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 06/32] ARM: dts: qcom: msm8660-surf: use keypad label directly Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 07/32] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 08/32] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 09/32] ARM: dts: qcom: strip prefix from PMIC files Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 10/32] ARM: dts: qcom: apq8064: fix PMIC node labels Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 11/32] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
2023-08-22  0:13 ` Dmitry Baryshkov [this message]
2023-08-22  0:13 ` [PATCH v3 13/32] ARM: dts: qcom: msm8960: " Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 14/32] ARM: dts: qcom: msm8960: split PMIC to separate dtsi files Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 15/32] ARM: dts: qcom: apq8064: split PMICs " Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 16/32] ARM: dts: qcom: mdm9615: split PMIC " Dmitry Baryshkov
2023-08-26 12:08   ` Konrad Dybcio
2023-08-26 13:43     ` Dmitry Baryshkov
2023-08-26 13:48       ` Konrad Dybcio
2023-08-26 14:03         ` Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 17/32] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-08-26 12:08   ` Konrad Dybcio
2023-08-26 13:49   ` Konrad Dybcio
2023-08-22  0:13 ` [PATCH v3 18/32] ARM: dts: qcom: pm8058: reorder nodes Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 19/32] ARM: dts: qcom: pm8921: " Dmitry Baryshkov
2023-08-26 10:28   ` Konrad Dybcio
2023-08-22  0:13 ` [PATCH v3 20/32] ARM: dts: qcom: pm8018: move reg property Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 21/32] ARM: dts: qcom: pm8921: " Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 22/32] ARM: dts: qcom: pm8058: use defined IRQ flags Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 23/32] ARM: dts: qcom: pm8921: switch to interrupts-extended Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 24/32] ARM: dts: qcom: pm8018: " Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 25/32] ARM: dts: qcom: pm8058: " Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 26/32] ARM: dts: qcom: apq8064: move RPM regulators to board files Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 27/32] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 28/32] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 29/32] ARM: dts: qcom: msm8960: drop useless rpm regulators node Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 30/32] ARM: dts: qcom: msm8974: move regulators to board files Dmitry Baryshkov
2023-08-22  0:13 ` [PATCH v3 31/32] ARM: dts: qcom: pm8921: Disable keypad by default Dmitry Baryshkov
2023-08-26 10:27   ` Konrad Dybcio
2023-08-22  0:13 ` [PATCH v3 32/32] ARM: dts: qcom: apq8060-dragonboard: rename mpp ADC channels to adc-channel Dmitry Baryshkov
2023-08-26 10:25   ` Konrad Dybcio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230822001349.899298-13-dmitry.baryshkov@linaro.org \
    --to=dmitry.baryshkov@linaro.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).