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,
Johan Hovold <johan+linaro@kernel.org>,
devicetree@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
linux-iio@vger.kernel.org
Subject: [PATCH 6/6] arm64: dts: qcom: sc8280xp*: use pm8350c.dtsi and pmr735a.dtsi
Date: Wed, 29 Mar 2023 03:08:33 +0300 [thread overview]
Message-ID: <20230329000833.2507594-7-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230329000833.2507594-1-dmitry.baryshkov@linaro.org>
Stop duplicating declarations of pm8350c and pmr735a PMICs, use existing
files to prevent possible future issues.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 +--
.../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 +--
arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 51 ++-----------------
3 files changed, 11 insertions(+), 52 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 58a14c39633b..aabdacc15aab 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 = <&pm8350c_pwm 3 1000000>;
enable-gpios = <&pm8350_1_gpios 8 GPIO_ACTIVE_HIGH>;
power-supply = <&vreg_edp_bl>;
@@ -555,7 +555,7 @@ &pcie4_phy {
status = "okay";
};
-&pmc8280c_lpg {
+&pm8350c_pwm {
status = "okay";
};
@@ -710,7 +710,7 @@ wwan_sw_en: wwan-sw-en-state {
};
};
-&pmc8280c_gpios {
+&pm8350c_gpios {
edp_bl_pwm: edp-bl-pwm-state {
pins = "gpio8";
function = "func1";
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 023ccb7725ef..7e589e5f6a2e 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 = <&pm8350c_pwm 3 1000000>;
enable-gpios = <&pm8350_1_gpios 8 GPIO_ACTIVE_HIGH>;
power-supply = <&vreg_edp_bl>;
@@ -725,7 +725,7 @@ &pcie4_phy {
status = "okay";
};
-&pmc8280c_lpg {
+&pm8350c_pwm {
status = "okay";
};
@@ -1172,7 +1172,7 @@ wwan_sw_en: wwan-sw-en-state {
};
};
-&pmc8280c_gpios {
+&pm8350c_gpios {
edp_bl_pwm: edp-bl-pwm-state {
pins = "gpio8";
function = "func1";
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
index 505bb8f9a13c..a37fe4b1458c 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
@@ -15,53 +15,12 @@
#include "pm8350.dtsi"
#undef PM8350_SID
+/* SID 2 */
+#include "pm8350c.dtsi"
+
#define PM8350_SID 3
#include "pm8350.dtsi"
#undef PM8350_SID
-&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>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pmr735a_gpios: gpio@8800 {
- compatible = "qcom,pmr735a-gpio", "qcom,spmi-gpio";
- reg = <0x8800>;
- gpio-controller;
- gpio-ranges = <&pmr735a_gpios 0 0 4>;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-};
+/* SID 4 */
+#include "pmr735a.dtsi"
--
2.30.2
prev parent reply other threads:[~2023-03-29 0:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 0:08 [PATCH 0/6] arm64: dts: qcom: sc8280xp: remove duplication in PMIC declarations Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 1/6] dt-bindings: iio: qcom,spmi-adc7-pmk8350.h: include sid into defines Dmitry Baryshkov
2023-03-29 0:21 ` Konrad Dybcio
2023-03-30 7:49 ` Krzysztof Kozlowski
2023-04-01 14:48 ` Jonathan Cameron
2023-04-01 14:59 ` Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 2/6] arm64: dts: qcom: pmk8350: rename pon label Dmitry Baryshkov
2023-03-29 0:22 ` Konrad Dybcio
2023-03-29 0:08 ` [PATCH 3/6] arm64: dts: qcom: use main pmk8350.dtsi for sc8280xp platform Dmitry Baryshkov
2023-03-29 0:27 ` Konrad Dybcio
2023-03-29 0:29 ` Konrad Dybcio
2023-03-29 0:35 ` Konrad Dybcio
2023-03-29 11:54 ` Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 4/6] arm64: dts: qcom: pm8350: include SID into labels Dmitry Baryshkov
2023-03-29 0:33 ` Konrad Dybcio
2023-03-29 10:51 ` Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 5/6] arm64: dts: qcom: sc8280xp*: use pm8350.dtsi Dmitry Baryshkov
2023-03-29 0:08 ` Dmitry Baryshkov [this message]
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=20230329000833.2507594-7-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).