arm: dts: mt6323: move node mt6323 leds to mt6323.dtsi

Since those LEDs are parts of PMIC MT6323, it is reasonable to merge
those LEDs node definition back into mt6323.dtsi. This way can improve
the reusability of those nodes among different boards with the same PMIC.

And LED is very much board specific and thus the mt6323.dtsi only includes
the parent node here and leave these child nodes in the board specific
dts file.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/arch/arm/boot/dts/mt6323.dtsi b/arch/arm/boot/dts/mt6323.dtsi
index 958980cb718d9694d46c191c66b5a8d8d8205bb9..ba397407c1dd0f4ce6bdf36bf61714ea4fc12cbf 100644 (file)
--- a/arch/arm/boot/dts/mt6323.dtsi
+++ b/arch/arm/boot/dts/mt6323.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2017 MediaTek Inc.
+ * Copyright (c) 2017-2018 MediaTek Inc.
  * Author: John Crispin <john@phrozen.org>
  *        Sean Wang <sean.wang@mediatek.com>
  *
@@ -14,6 +14,13 @@ pmic: mt6323 {
                interrupt-controller;
                #interrupt-cells = <2>;
 
+               mt6323_leds: leds {
+                       compatible = "mediatek,mt6323-led";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
                mt6323regulator: mt6323regulator{
                        compatible = "mediatek,mt6323-regulator";
 

diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index 1fd6f559e06dba8a369bf148f7dd5dcdf862e530..395912ec2e5057d104f380cb16a9569b4e1e4447 100644 (file)
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -237,6 +237,28 @@ &mmc1 {
        vqmmc-supply = <&reg_3p3v>;
 };
 
+&mt6323_leds {
+       status = "okay";
+
+       led@0 {
+               reg = <0>;
+               label = "bpi-r2:isink:green";
+               default-state = "off";
+       };
+
+       led@1 {
+               reg = <1>;
+               label = "bpi-r2:isink:red";
+               default-state = "off";
+       };
+
+       led@2 {
+               reg = <2>;
+               label = "bpi-r2:isink:blue";
+               default-state = "off";
+       };
+};
+
 &pcie {
        pinctrl-names = "default";
        pinctrl-0 = <&pcie_default>;
@@ -482,34 +504,6 @@ &pwm {
        status = "okay";
 };
 
-&pwrap {
-       mt6323 {
-               mt6323led: led {
-                       compatible = "mediatek,mt6323-led";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       led@0 {
-                               reg = <0>;
-                               label = "bpi-r2:isink:green";
-                               default-state = "off";
-                       };
-
-                       led@1 {
-                               reg = <1>;
-                               label = "bpi-r2:isink:red";
-                               default-state = "off";
-                       };
-
-                       led@2 {
-                               reg = <2>;
-                               label = "bpi-r2:isink:blue";
-                               default-state = "off";
-                       };
-               };
-       };
-};
-
 &spi0 {
        pinctrl-names = "default";
        pinctrl-0 = <&spi0_pins_a>;