summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2023-03-02 11:36:28 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2023-03-02 11:55:03 +0100
commit7acf561ac72246ae4d50e7deac99c080e999b3d1 (patch)
tree6bf65d4d80b7c439fa0960edb50cf8a3cb860e17 /arch/arm/dts
parent425cc3a47418e203914a5b76f2f534e040cb6fcb (diff)
downloadbarebox-7acf561ac72246ae4d50e7deac99c080e999b3d1.tar.gz
barebox-7acf561ac72246ae4d50e7deac99c080e999b3d1.tar.xz
ARM: dts: imx6ull-jozacp: Move regulators out of subnode
regulators shall no longer be collected in an extra subnode. Move them up one level. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/dts')
-rw-r--r--arch/arm/dts/imx6ull-jozacp.dtsi72
1 files changed, 33 insertions, 39 deletions
diff --git a/arch/arm/dts/imx6ull-jozacp.dtsi b/arch/arm/dts/imx6ull-jozacp.dtsi
index f7d35684f8..53f617d4f8 100644
--- a/arch/arm/dts/imx6ull-jozacp.dtsi
+++ b/arch/arm/dts/imx6ull-jozacp.dtsi
@@ -30,48 +30,42 @@
reg = <0x80000000 0x10000000>;
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- reg_5v: 5v-regulator {
- compatible = "regulator-fixed";
- regulator-name = "regulator-5V";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- regulator-always-on;
- };
+ reg_5v: 5v-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "regulator-5V";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-always-on;
+ };
- reg_3p3v: 3p3-regulator {
- compatible = "regulator-fixed";
- regulator-name = "regulator-3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <&reg_5v>;
- regulator-always-on;
- };
+ reg_3p3v: 3p3-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "regulator-3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&reg_5v>;
+ regulator-always-on;
+ };
- reg_1p4v: 1p4-regulator {
- compatible = "regulator-fixed";
- regulator-name = "regulator-1P4V";
- regulator-min-microvolt = <1400000>;
- regulator-max-microvolt = <1400000>;
- vin-supply = <&reg_5v>;
- regulator-always-on;
- };
+ reg_1p4v: 1p4-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "regulator-1P4V";
+ regulator-min-microvolt = <1400000>;
+ regulator-max-microvolt = <1400000>;
+ vin-supply = <&reg_5v>;
+ regulator-always-on;
+ };
- reg_vbus: vbus-regulator {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_vbus>;
- compatible = "regulator-fixed";
- regulator-name = "regulator-vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <&reg_5v>;
- gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
+ reg_vbus: vbus-regulator {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_vbus>;
+ compatible = "regulator-fixed";
+ regulator-name = "regulator-vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&reg_5v>;
+ gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
};
usdhc2_pwrseq: usdhc2-pwrseq {