Commit afc19882 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Gregory CLEMENT

ARM: dts: marvell: dove: drop incorrect reg in fixed regulators

Fixed regulators are not in some bus and bindings do not allow a "reg"
property.  Move them out of "regulators" node to top-level.

  dove-cubox.dtb: regulator@1: Unevaluated properties are not allowed ('reg' was unexpected)
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent afa6b4f3
...@@ -108,18 +108,12 @@ led-system { ...@@ -108,18 +108,12 @@ led-system {
}; };
}; };
regulators { wifi_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "WiFi Power";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
wifi_power: regulator@1 { gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
compatible = "regulator-fixed";
regulator-name = "WiFi Power";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
...@@ -28,24 +28,17 @@ led-power { ...@@ -28,24 +28,17 @@ led-power {
}; };
}; };
regulators { usb_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "USB Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
usb_power: regulator@1 { enable-active-high;
compatible = "regulator-fixed"; regulator-always-on;
reg = <1>; regulator-boot-on;
regulator-name = "USB Power"; gpio = <&gpio0 1 0>;
regulator-min-microvolt = <5000000>; pinctrl-0 = <&pmx_gpio_1>;
regulator-max-microvolt = <5000000>; pinctrl-names = "default";
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 1 0>;
pinctrl-0 = <&pmx_gpio_1>;
pinctrl-names = "default";
};
}; };
clocks { clocks {
......
...@@ -37,24 +37,17 @@ led-status { ...@@ -37,24 +37,17 @@ led-status {
}; };
}; };
regulators { usb_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "USB Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
usb_power: regulator@1 { enable-active-high;
compatible = "regulator-fixed"; regulator-always-on;
reg = <1>; regulator-boot-on;
regulator-name = "USB Power"; gpio = <&gpio0 8 0>;
regulator-min-microvolt = <5000000>; pinctrl-0 = <&pmx_gpio_8>;
regulator-max-microvolt = <5000000>; pinctrl-names = "default";
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 8 0>;
pinctrl-0 = <&pmx_gpio_8>;
pinctrl-names = "default";
};
}; };
}; };
......
...@@ -76,22 +76,20 @@ chosen { ...@@ -76,22 +76,20 @@ chosen {
stdout-path = &uart0; stdout-path = &uart0;
}; };
regulators { usb0_power: regulator-2 {
usb0_power: regulator@2 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "USB Power";
regulator-name = "USB Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>; };
};
mmc_power: regulator-3 {
mmc_power: regulator@3 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "MMC Power";
regulator-name = "MMC Power"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment