ARM: dts: qcom: msm8660: move pm8058 LED devices to the main DT file

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>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220930185236.867655-21-dmitry.baryshkov@linaro.org

diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
index 573e4dc66bb0274b839995bb3285e398ca393ed1..dd409ff31e21e5bdf265aa889dbd448f25308b56 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
@@ -436,39 +436,35 @@
                                         * 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 ddce7d64ba9911c5ecdd2c71b8945648ef192a21..35e90d188e0582bb923b7d0d4c9d6dbe6c976533 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -359,6 +359,12 @@
 
                                };
 
+                               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 @@
                                        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>;