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,
	Johan Hovold <johan+linaro@kernel.org>,
	Jonathan Cameron <jic23@kernel.org>,
	Lars-Peter Clausen <lars@metafoo.de>,
	linux-iio@vger.kernel.org
Subject: [PATCH v2 18/22] arm64: dts: qcom: sc8280xp*: use pm8350c.dtsi
Date: Sun,  2 Apr 2023 01:08:06 +0300	[thread overview]
Message-ID: <20230401220810.3563708-19-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230401220810.3563708-1-dmitry.baryshkov@linaro.org>

Employ PMIC_SID/_LABEL and switch sc8280xp-pmics to use pm8350c.dtsi in
order to reduce duplication and possible discrepancies.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     |  4 +--
 .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  4 +--
 arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi  | 32 +++----------------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index d7b537284990..18f821d99434 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -24,7 +24,7 @@ aliases {
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pmc8280c_lpg 3 1000000>;
+		pwms = <&pmc8280c_pwm 3 1000000>;
 		enable-gpios = <&pmc8280_1_gpios 8 GPIO_ACTIVE_HIGH>;
 		power-supply = <&vreg_edp_bl>;
 
@@ -555,7 +555,7 @@ &pcie4_phy {
 	status = "okay";
 };
 
-&pmc8280c_lpg {
+&pmc8280c_pwm {
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 590400985055..c74d32f7931e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -54,7 +54,7 @@ wcd938x: audio-codec {
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pmc8280c_lpg 3 1000000>;
+		pwms = <&pmc8280c_pwm 3 1000000>;
 		enable-gpios = <&pmc8280_1_gpios 8 GPIO_ACTIVE_HIGH>;
 		power-supply = <&vreg_edp_bl>;
 
@@ -725,7 +725,7 @@ &pcie4_phy {
 	status = "okay";
 };
 
-&pmc8280c_lpg {
+&pmc8280c_pwm {
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
index 69f79ed87f62..3d2914d13fd2 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
@@ -16,40 +16,16 @@
 #define PMIC_NODE pmc82801
 #include "pm8350.dtsi"
 
+#define PMIC_SID 2
+#define PMIC_LABEL pmc8280c
+#include "pm8350c.dtsi"
+
 #define PMIC_SID 3
 #define PMIC_LABEL pmc8280_2
 #define PMIC_NODE pmc82802
 #include "pm8350.dtsi"
 
 &spmi_bus {
-	pmc8280c: pmic@2 {
-		compatible = "qcom,pm8350c", "qcom,spmi-pmic";
-		reg = <0x2 SPMI_USID>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		pmc8280c_gpios: gpio@8800 {
-			compatible = "qcom,pm8350c-gpio", "qcom,spmi-gpio";
-			reg = <0x8800>;
-			gpio-controller;
-			gpio-ranges = <&pmc8280c_gpios 0 0 9>;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <2>;
-		};
-
-		pmc8280c_lpg: pwm {
-			compatible = "qcom,pm8350c-pwm";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			#pwm-cells = <2>;
-
-			status = "disabled";
-		};
-	};
-
 	pmr735a: pmic@4 {
 		compatible = "qcom,pmr735a", "qcom,spmi-pmic";
 		reg = <0x4 SPMI_USID>;
-- 
2.30.2


  parent reply	other threads:[~2023-04-01 22:08 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-01 22:07 [PATCH v2 00/22] arm64: dts: qcom: remove duplication in PMIC declarations Dmitry Baryshkov
2023-04-01 22:07 ` [PATCH v2 01/22] arm64: dts: qcom: pm8350: fix thermal zone node name Dmitry Baryshkov
2023-04-03  9:55   ` Konrad Dybcio
2023-04-01 22:07 ` [PATCH v2 02/22] arm64: dts: qcom: pm8350b: " Dmitry Baryshkov
2023-04-02 10:34   ` Krzysztof Kozlowski
2023-04-02 11:02     ` Dmitry Baryshkov
2023-04-03  9:09       ` Krzysztof Kozlowski
2023-04-03  9:50         ` Dmitry Baryshkov
2023-04-03 10:00           ` Konrad Dybcio
2023-04-03 10:06             ` Krzysztof Kozlowski
2023-04-01 22:07 ` [PATCH v2 03/22] arm64: dts: qcom: sc8280xp-pmics: use pmk8350 specifics for pon device Dmitry Baryshkov
2023-04-02  9:42   ` Krzysztof Kozlowski
2023-04-02 10:25     ` Dmitry Baryshkov
2023-04-02 10:32       ` Krzysztof Kozlowski
2023-04-02 11:03         ` Dmitry Baryshkov
2023-04-02 11:12           ` Krzysztof Kozlowski
2023-04-03 10:06             ` Konrad Dybcio
2023-04-03  6:32   ` Johan Hovold
2023-04-01 22:07 ` [PATCH v2 04/22] arm64: dts: qcom: sc8280xp-pmics: correct interrupt routing for pm8280_2_temp_alarm Dmitry Baryshkov
2023-04-03 10:07   ` Konrad Dybcio
2023-04-01 22:07 ` [PATCH v2 05/22] dt-bindings: iio: qcom,spmi-adc7-pmk8350.h: include sid into defines Dmitry Baryshkov
2023-04-01 22:07 ` [PATCH v2 06/22] arm64: dts: qcom: pmk8350: rename pon label Dmitry Baryshkov
2023-04-01 22:07 ` [PATCH v2 07/22] arm64: dts: qcom: pmk8350: port sdam_6 device from sc8280xp-pmics Dmitry Baryshkov
2023-04-03 10:09   ` Konrad Dybcio
2023-04-01 22:07 ` [PATCH v2 08/22] arm64: dts: qcom: pmk8350: rename PMK8350_SID to PMIC_SID Dmitry Baryshkov
2023-04-03 10:11   ` Konrad Dybcio
2023-04-01 22:07 ` [PATCH v2 09/22] arm64: dts: qcom: pmk8350: allow overriding the label Dmitry Baryshkov
2023-04-02  9:44   ` Krzysztof Kozlowski
2023-04-02 11:54     ` Dmitry Baryshkov
2023-04-03 10:14   ` Konrad Dybcio
2023-04-03 11:06     ` Dmitry Baryshkov
2023-04-01 22:07 ` [PATCH v2 10/22] arm64: dts: qcom: pmk8350: use interrupts-extended for IRQ specification Dmitry Baryshkov
2023-04-03 10:16   ` Konrad Dybcio
2023-04-01 22:07 ` [PATCH v2 11/22] arm64: dts: qcom: sc8280xp*: use pmk8350.dtsi Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 12/22] arm64: dts: qcom: pm8350: allow overriding SID and label Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 13/22] arm64: dts: qcom: pm8350: use interrupts-extended for IRQ specification Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 14/22] arm64: dts: qcom: sc8280xp*: use pm8350.dtsi Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 15/22] arm64: dts: qcom: pm8350c: move thermal zone declaration to the top Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 16/22] arm64: dts: qcom: pm8350c: allow overriding SID and label Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 17/22] arm64: dts: qcom: pm8350c: use interrupts-extended for IRQ specification Dmitry Baryshkov
2023-04-01 22:08 ` Dmitry Baryshkov [this message]
2023-04-01 22:08 ` [PATCH v2 19/22] arm64: dts: qcom: sc8280xp*: use pmr735a.dtsi Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 20/22] arm64: dts: qcom: pm8150: convert to use dynamic SID/LABEL Dmitry Baryshkov
2023-04-02  9:47   ` Krzysztof Kozlowski
2023-04-01 22:08 ` [PATCH v2 21/22] arch: arm64: dts: qcom: pm8150: support SID greater that 9 Dmitry Baryshkov
2023-04-02  9:51   ` Krzysztof Kozlowski
2023-04-03 10:35     ` Konrad Dybcio
2023-04-03 11:45       ` Dmitry Baryshkov
2023-04-03 12:56         ` Krzysztof Kozlowski
2023-04-03 13:56           ` Dmitry Baryshkov
2023-04-01 22:08 ` [PATCH v2 22/22] arm64: dts: qcom sa8540p-pmics: switch to pm8150.dtsi Dmitry Baryshkov
2023-04-02  9:55 ` [PATCH v2 00/22] arm64: dts: qcom: remove duplication in PMIC declarations Krzysztof Kozlowski
2023-04-03 10:44   ` Konrad Dybcio
2023-04-03 11:37     ` Dmitry Baryshkov
2023-04-03 13:00     ` Krzysztof Kozlowski

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=20230401220810.3563708-19-dmitry.baryshkov@linaro.org \
    --to=dmitry.baryshkov@linaro.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jic23@kernel.org \
    --cc=johan+linaro@kernel.org \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lars@metafoo.de \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-iio@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).