diff mbox series

[20/23] ARM: dts: qcom: msm8660: move pm8058 LED devices to the main DT file

Message ID 20220930185236.867655-21-dmitry.baryshkov@linaro.org
State Accepted
Commit cdaf1f11809257b8c5c1fe417c6e0764721b0cf3
Headers show
Series ARM: dts: qcom: rework DT for apq8064, msm8960 and msm8660 | expand

Commit Message

Dmitry Baryshkov Sept. 30, 2022, 6:52 p.m. UTC 
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(-)

Comments

Neil Armstrong Oct. 3, 2022, 4:35 p.m. UTC | #1 
On 30/09/2022 20:52, Dmitry Baryshkov wrote:
> 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(-)
> 

<snip>

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff mbox series

Patch

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>;