summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
diff options
context:
space:
mode:
authorAlexander Kurz <akurz@blala.de>2018-05-29 06:20:18 +0000
committerShawn Guo <shawnguo@kernel.org>2018-06-17 15:30:10 +0800
commit9d1b8418b4773add2ec6ae29cfbd953cf07cc042 (patch)
treead8a658193573ef9a74df4eb297070c2225f672a /arch/arm/boot/dts/imx6qdl-wandboard.dtsi
parentbcf1477468143170ab98638a09162a3cac221367 (diff)
ARM: dts: imx6qdl-wandboard: remove regulators bus node
To match the convention, move all regulator-fixed nodes directly into the root node. Signed-off-by: Alexander Kurz <akurz@blala.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-wandboard.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-wandboard.dtsi40
1 files changed, 16 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
index e1afa54404d0..52baf6d1a956 100644
--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -8,30 +8,6 @@
#include <dt-bindings/gpio/gpio.h>
/ {
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- reg_2p5v: regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- regulator-name = "2P5V";
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <2500000>;
- regulator-always-on;
- };
-
- reg_3p3v: regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
- };
-
sound {
compatible = "fsl,imx6-wandboard-sgtl5000",
"fsl,imx-audio-sgtl5000";
@@ -52,6 +28,22 @@
spdif-controller = <&spdif>;
spdif-out;
};
+
+ reg_2p5v: regulator-2p5v {
+ compatible = "regulator-fixed";
+ regulator-name = "2P5V";
+ regulator-min-microvolt = <2500000>;
+ regulator-max-microvolt = <2500000>;
+ regulator-always-on;
+ };
+
+ reg_3p3v: regulator-3p3v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
};
&audmux {