linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: devicetree@vger.kernel.org, Lee Jones <lee@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@linaro.org>,
	linux-arm-msm@vger.kernel.org,
	Jonathan Cameron <jic23@kernel.org>,
	Lars-Peter Clausen <lars@metafoo.de>,
	linux-iio@vger.kernel.org,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	linux-input@vger.kernel.org, Pavel Machek <pavel@ucw.cz>,
	linux-leds@vger.kernel.org
Subject: [PATCH v4 10/38] ARM: dts: qcom: apq8064: fix PMIC node labels
Date: Sun, 27 Aug 2023 03:58:52 +0300	[thread overview]
Message-ID: <20230827005920.898719-11-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230827005920.898719-1-dmitry.baryshkov@linaro.org>

Change PM8921 node labels to start with pm8921_ prefix, following other
Qualcomm PMIC device nodes.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
index 950adb63af70..6514d728b1ec 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
@@ -292,13 +292,13 @@ scm {
 	 */
 	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>; /* Charger temperature */
+		io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */
+			      <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */
+			      <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */
+			      <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */
+			      <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
+			      <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
+			      <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */
 	};
 
 	soc: soc {
@@ -686,7 +686,7 @@ ssbi@500000 {
 			reg = <0x00500000 0x1000>;
 			qcom,controller-type = "pmic-arbiter";
 
-			pmicintc: pmic {
+			pm8921: pmic {
 				compatible = "qcom,pm8921";
 				interrupt-parent = <&tlmm_pinmux>;
 				interrupts = <74 8>;
@@ -721,7 +721,7 @@ pm8921_mpps: mpps@50 {
 
 				rtc@11d {
 					compatible = "qcom,pm8921-rtc";
-					interrupt-parent = <&pmicintc>;
+					interrupt-parent = <&pm8921>;
 					interrupts = <39 1>;
 					reg = <0x11d>;
 					allow-set-time;
@@ -730,16 +730,16 @@ rtc@11d {
 				pwrkey@1c {
 					compatible = "qcom,pm8921-pwrkey";
 					reg = <0x1c>;
-					interrupt-parent = <&pmicintc>;
+					interrupt-parent = <&pm8921>;
 					interrupts = <50 1>, <51 1>;
 					debounce = <15625>;
 					pull-up;
 				};
 
-				xoadc: xoadc@197 {
+				pm8921_xoadc: xoadc@197 {
 					compatible = "qcom,pm8921-adc";
 					reg = <0x197>;
-					interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
+					interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>;
 					#address-cells = <2>;
 					#size-cells = <0>;
 					#io-channel-cells = <2>;
-- 
2.39.2


  parent reply	other threads:[~2023-08-27  1:00 UTC|newest]

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

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=20230827005920.898719-11-dmitry.baryshkov@linaro.org \
    --to=dmitry.baryshkov@linaro.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jic23@kernel.org \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lars@metafoo.de \
    --cc=lee@kernel.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-leds@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --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).