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@somainline.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
Subject: [PATCH 20/23] ARM: dts: qcom: msm8660: move pm8058 LED devices to the main DT file
Date: Fri, 30 Sep 2022 21:52:33 +0300	[thread overview]
Message-ID: <20220930185236.867655-21-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20220930185236.867655-1-dmitry.baryshkov@linaro.org>

Declare PM8058 LED devices in the main msm8660 DT file to allow them to
be used by other devices.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../arm/boot/dts/qcom-apq8060-dragonboard.dts | 12 +++------
 arch/arm/boot/dts/qcom-msm8660.dtsi           | 26 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
index 573e4dc66bb0..dd409ff31e21 100644
--- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
@@ -436,39 +436,35 @@ led@48 {
 					 * ambient light and proximity sensor
 					 * Capella Microsystems CM3605.
 					 */
-					compatible = "qcom,pm8058-keypad-led";
-					reg = <0x48>;
 					label = "pm8058:infrared:proximitysensor";
 					default-state = "off";
 					linux,default-trigger = "cm3605";
+					status = "okay";
 				};
 				led@131 {
-					compatible = "qcom,pm8058-led";
-					reg = <0x131>;
 					label = "pm8058:red";
 					color = <LED_COLOR_ID_RED>;
 					default-state = "off";
+					status = "okay";
 				};
 				led@132 {
 					/*
 					 * This is actually green too on my
 					 * board, but documented as yellow.
 					 */
-					compatible = "qcom,pm8058-led";
-					reg = <0x132>;
 					label = "pm8058:yellow";
 					color = <LED_COLOR_ID_YELLOW>;
 					default-state = "off";
 					linux,default-trigger = "mmc0";
+					status = "okay";
 				};
 				led@133 {
-					compatible = "qcom,pm8058-led";
-					reg = <0x133>;
 					label = "pm8058:green";
 					function = LED_FUNCTION_HEARTBEAT;
 					color = <LED_COLOR_ID_GREEN>;
 					default-state = "on";
 					linux,default-trigger = "heartbeat";
+					status = "okay";
 				};
 			};
 		};
diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index ddce7d64ba99..35e90d188e05 100644
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -359,6 +359,12 @@ pm8058_gpio: gpio@150 {
 
 				};
 
+				pm8058_led48: led@48 {
+					compatible = "qcom,pm8058-keypad-led";
+					reg = <0x48>;
+					status = "disabled";
+				};
+
 				pm8058_mpps: mpps@50 {
 					compatible = "qcom,pm8058-mpp",
 						     "qcom,ssbi-mpp";
@@ -379,7 +385,25 @@ pwrkey@1c {
 					pull-up;
 				};
 
-				keypad@148 {
+				pm8058_led131: led@131 {
+					compatible = "qcom,pm8058-led";
+					reg = <0x131>;
+					status = "disabled";
+				};
+
+				pm8058_led132: led@132 {
+					compatible = "qcom,pm8058-led";
+					reg = <0x132>;
+					status = "disabled";
+				};
+
+				pm8058_led133: led@133 {
+					compatible = "qcom,pm8058-led";
+					reg = <0x133>;
+					status = "disabled";
+				};
+
+				pm8058_keypad: keypad@148 {
 					compatible = "qcom,pm8058-keypad";
 					reg = <0x148>;
 					interrupt-parent = <&pm8058>;
-- 
2.35.1


  parent reply	other threads:[~2022-09-30 18:53 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-30 18:52 [PATCH 00/23] ARM: dts: qcom: rework DT for apq8064, msm8960 and msm8660 Dmitry Baryshkov
2022-09-30 18:52 ` [PATCH 01/23] ARM: dts: qcom: apq8064: disable HDMI nodes by default Dmitry Baryshkov
2022-10-03 16:14   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 02/23] ARM: dts: qcom: apq8064-ifc6410: use labels to patch device tree Dmitry Baryshkov
2022-10-03 16:29   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 03/23] ARM: dts: qcom: apq8064-ifc6410: pull ext-3p3v regulator from soc node Dmitry Baryshkov
2022-10-03 16:14   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 04/23] ARM: dts: qcom: apq8064-ifc6410: fix user1 LED node name Dmitry Baryshkov
2022-10-03 16:33   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 05/23] ARM: dts: qcom: apq8064-ifc6410: pull SDCC pwrseq node up one level Dmitry Baryshkov
2022-10-03 16:34   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 06/23] ARM: dts: qcom: apq8064-flo: use labels to patch device tree Dmitry Baryshkov
2022-10-03 16:30   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 07/23] ARM: dts: qcom: apq8064-nexus7-flo: fix node name for ext 3p3v regulator Dmitry Baryshkov
2022-10-03 16:16   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 08/23] ARM: dts: qcom: apq8064-cm-qs600: use labels to patch device tree Dmitry Baryshkov
2022-10-03 16:33   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 09/23] ARM: dts: qcom: apq8064-cm-qs600: pull 3p3v regulator from soc node Dmitry Baryshkov
2022-10-03 16:16   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 10/23] ARM: dts: qcom: apq8064-cm-qs600: pull SDCC pwrseq node up one level Dmitry Baryshkov
2022-10-03 16:20   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 11/23] ARM: dts: qcom: apq8064-sony-xperia-lagan-yuga: use labels to patch device tree Dmitry Baryshkov
2022-10-03 16:35   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 12/23] ARM: dts: qcom: apq8064: drop amba device node Dmitry Baryshkov
2022-10-03 16:22   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 13/23] ARM: dts: qcom: apq8064: drop unit ids from PMIC nodes Dmitry Baryshkov
2022-10-03 16:22   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 14/23] ARM: dts: qcom: apq8064: drop qcom, prefix from SSBI node name Dmitry Baryshkov
2022-10-03 16:24   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 15/23] ARM: dts: qcom: apq8064: fix the riva-pil node id Dmitry Baryshkov
2022-10-03 16:24   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 16/23] ARM: dts: qcom: msm8960: drop unit ids from PMIC nodes Dmitry Baryshkov
2022-10-03 16:24   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 17/23] ARM: dts: qcom: msm8960: drop qcom, prefix from SSBI node name Dmitry Baryshkov
2022-10-03 16:25   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 18/23] ARM: dts: qcom: msm8960-cdp: drop unit ids from regulator node Dmitry Baryshkov
2022-10-03 16:25   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 19/23] ARM: dts: qcom: msm8960: drop amba device node Dmitry Baryshkov
2022-10-03 16:26   ` Neil Armstrong
2022-09-30 18:52 ` Dmitry Baryshkov [this message]
2022-10-03 16:35   ` [PATCH 20/23] ARM: dts: qcom: msm8660: move pm8058 LED devices to the main DT file Neil Armstrong
2022-09-30 18:52 ` [PATCH 21/23] ARM: dts: qcom: apq8060-dragonboard: use labels to patch device tree Dmitry Baryshkov
2022-10-03 16:36   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 22/23] ARM: dts: qcom: msm8660: drop unit ids from PMIC nodes Dmitry Baryshkov
2022-10-03 16:27   ` Neil Armstrong
2022-09-30 18:52 ` [PATCH 23/23] ARM: dts: qcom: msm8660: drop qcom, prefix from SSBI node name Dmitry Baryshkov
2022-10-03 16:27   ` Neil Armstrong
2022-10-18  3:05 ` [PATCH 00/23] ARM: dts: qcom: rework DT for apq8064, msm8960 and msm8660 Bjorn Andersson

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=20220930185236.867655-21-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@somainline.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-msm@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).