Skip to content

L
linux
Commit afa6b4f3 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Gregory CLEMENT
Browse files
Options

ARM: dts: marvell: armada: 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.

  armada-370-dlink-dns327l.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 c44fdf86
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 220 deletions
arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
View file @ afa6b4f3
...@@ -105,54 +105,45 @@ led-backup { ...@@ -105,54 +105,45 @@ led-backup {
}; };
}; };
regulators { usb_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-0 = <&xhci_pwr_pin>;
#size-cells = <0>; pinctrl-names = "default";
regulator-name = "USB3.0 Port Power";
usb_power: regulator@1 { regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <5000000>;
reg = <1>; enable-active-high;
pinctrl-0 = <&xhci_pwr_pin>; regulator-boot-on;
pinctrl-names = "default"; regulator-always-on;
regulator-name = "USB3.0 Port Power"; gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
regulator-min-microvolt = <5000000>; };
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-boot-on;
regulator-always-on;
gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};
sata_r_power: regulator@2 { sata_r_power: regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; pinctrl-0 = <&sata_r_pwr_pin>;
pinctrl-0 = <&sata_r_pwr_pin>; pinctrl-names = "default";
pinctrl-names = "default"; regulator-name = "SATA-R Power";
regulator-name = "SATA-R Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <2000000>;
startup-delay-us = <2000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; };
};
sata_l_power: regulator@3 { sata_l_power: regulator-3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; pinctrl-0 = <&sata_l_pwr_pin>;
pinctrl-0 = <&sata_l_pwr_pin>; pinctrl-names = "default";
pinctrl-names = "default"; regulator-name = "SATA-L Power";
regulator-name = "SATA-L Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <4000000>;
startup-delay-us = <4000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
View file @ afa6b4f3
...@@ -46,29 +46,26 @@ pca9554: pca9554@21 { ...@@ -46,29 +46,26 @@ pca9554: pca9554@21 {
}; };
}; };
regulators { regulator-3 {
regulator@3 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "SATA2 power";
reg = <3>; regulator-min-microvolt = <5000000>;
regulator-name = "SATA2 power"; regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; regulator-always-on;
enable-active-high; regulator-boot-on;
regulator-always-on; gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
regulator-boot-on; };
gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
}; regulator-4 {
regulator@4 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "SATA3 power";
reg = <4>; regulator-min-microvolt = <5000000>;
regulator-name = "SATA3 power"; regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; regulator-always-on;
enable-active-high; regulator-boot-on;
regulator-always-on; gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
regulator-boot-on;
gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
};
}; };
gpio-leds { gpio-leds {
......
arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
View file @ afa6b4f3
...@@ -70,34 +70,26 @@ rtc@6f { ...@@ -70,34 +70,26 @@ rtc@6f {
}; };
regulators { regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "SATA0 power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
pinctrl-names = "default"; regulator-max-microvolt = <5000000>;
enable-active-high;
regulator@1 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <1>; gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
regulator-name = "SATA0 power"; };
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-2 {
enable-active-high; compatible = "regulator-fixed";
regulator-always-on; regulator-name = "SATA1 power";
regulator-boot-on; regulator-min-microvolt = <5000000>;
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>; regulator-max-microvolt = <5000000>;
}; enable-active-high;
regulator@2 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <2>; gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
regulator-name = "SATA1 power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
};
}; };
gpio-fan { gpio-fan {
......
arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
View file @ afa6b4f3
...@@ -32,17 +32,14 @@ sata@a0000 { ...@@ -32,17 +32,14 @@ sata@a0000 {
}; };
}; };
regulators { regulator-2 {
regulator@2 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "SATA1 power";
reg = <2>; regulator-min-microvolt = <5000000>;
regulator-name = "SATA1 power"; regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; regulator-always-on;
enable-active-high; regulator-boot-on;
regulator-always-on; gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
regulator-boot-on;
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
View file @ afa6b4f3
...@@ -53,32 +53,25 @@ usb@50000 { ...@@ -53,32 +53,25 @@ usb@50000 {
}; };
}; };
regulators { regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "USB Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <0>; gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
regulator-name = "USB Power"; };
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-1 {
regulator-always-on; compatible = "regulator-fixed";
regulator-boot-on; regulator-name = "SATA0 power";
gpio = <&gpio1 27 GPIO_ACTIVE_LOW>; regulator-min-microvolt = <5000000>;
}; regulator-max-microvolt = <5000000>;
regulator@1 { enable-active-high;
compatible = "regulator-fixed"; regulator-always-on;
reg = <1>; regulator-boot-on;
regulator-name = "SATA0 power"; gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
};
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
View file @ afa6b4f3
...@@ -142,38 +142,32 @@ disk2-led-amber { ...@@ -142,38 +142,32 @@ disk2-led-amber {
}; };
}; };
regulators { sata1_regulator: sata1-regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "SATA1 Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>; regulator-max-microvolt = <5000000>;
startup-delay-us = <2000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&sata1_pwr_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
};
sata1_regulator: sata1-regulator@1 { sata2_regulator: sata2-regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "SATA2 Power";
regulator-name = "SATA1 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <4000000>;
startup-delay-us = <2000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata2_pwr_pin>;
}; pinctrl-names = "default";
sata2_regulator: sata2-regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "SATA2 Power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
startup-delay-us = <4000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
View file @ afa6b4f3
...@@ -109,65 +109,60 @@ ethernet@74000 { ...@@ -109,65 +109,60 @@ ethernet@74000 {
}; };
}; };
regulators { sata1_regulator: sata1-regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "SATA1 Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin regulator-max-microvolt = <5000000>;
&sata3_pwr_pin &sata4_pwr_pin>; startup-delay-us = <2000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&sata1_pwr_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
};
sata1_regulator: sata1-regulator@1 { sata2_regulator: sata2-regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "SATA2 Power";
regulator-name = "SATA1 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <4000000>;
startup-delay-us = <2000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata2_pwr_pin>;
}; pinctrl-names = "default";
};
sata2_regulator: sata2-regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "SATA2 Power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
startup-delay-us = <4000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
};
sata3_regulator: sata3-regulator@3 { sata3_regulator: sata3-regulator-3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "SATA3 Power";
regulator-name = "SATA3 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <6000000>;
startup-delay-us = <6000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata3_pwr_pin>;
}; pinctrl-names = "default";
};
sata4_regulator: sata4-regulator@4 { sata4_regulator: sata4-regulator-4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "SATA4 Power";
regulator-name = "SATA4 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <8000000>;
startup-delay-us = <8000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata4_pwr_pin>;
}; pinctrl-names = "default";
}; };
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7