* [PATCH 1/2] ARM: dts: marvell: armada: drop incorrect reg in fixed regulators
@ 2023-07-26 7:02 Krzysztof Kozlowski
2023-07-26 7:02 ` [PATCH 2/2] ARM: dts: marvell: dove: " Krzysztof Kozlowski
2023-08-12 15:05 ` [PATCH 1/2] ARM: dts: marvell: armada: " Gregory CLEMENT
0 siblings, 2 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2023-07-26 7:02 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree,
linux-kernel
Cc: Krzysztof Kozlowski
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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../dts/marvell/armada-370-dlink-dns327l.dts | 83 ++++++--------
.../marvell/armada-370-seagate-nas-4bay.dts | 43 ++++---
.../marvell/armada-370-seagate-nas-xbay.dtsi | 46 ++++----
...armada-370-seagate-personal-cloud-2bay.dts | 21 ++--
.../armada-370-seagate-personal-cloud.dtsi | 43 +++----
.../marvell/armada-370-synology-ds213j.dts | 54 ++++-----
.../dts/marvell/armada-xp-synology-ds414.dts | 105 +++++++++---------
7 files changed, 177 insertions(+), 218 deletions(-)
diff --git a/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
index 561195b749eb..d4c4efabd254 100644
--- a/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
@@ -105,54 +105,45 @@ led-backup {
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
+ usb_power: regulator-1 {
+ compatible = "regulator-fixed";
+ pinctrl-0 = <&xhci_pwr_pin>;
+ pinctrl-names = "default";
+ regulator-name = "USB3.0 Port Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-boot-on;
+ regulator-always-on;
+ gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+ };
- usb_power: regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- pinctrl-0 = <&xhci_pwr_pin>;
- pinctrl-names = "default";
- regulator-name = "USB3.0 Port Power";
- 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 {
+ compatible = "regulator-fixed";
+ pinctrl-0 = <&sata_r_pwr_pin>;
+ pinctrl-names = "default";
+ regulator-name = "SATA-R Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ startup-delay-us = <2000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+ };
- sata_r_power: regulator@2 {
- compatible = "regulator-fixed";
- reg = <2>;
- pinctrl-0 = <&sata_r_pwr_pin>;
- pinctrl-names = "default";
- regulator-name = "SATA-R Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- startup-delay-us = <2000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
- };
-
- sata_l_power: regulator@3 {
- compatible = "regulator-fixed";
- reg = <3>;
- pinctrl-0 = <&sata_l_pwr_pin>;
- pinctrl-names = "default";
- regulator-name = "SATA-L Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- startup-delay-us = <4000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
- };
+ sata_l_power: regulator-3 {
+ compatible = "regulator-fixed";
+ pinctrl-0 = <&sata_l_pwr_pin>;
+ pinctrl-names = "default";
+ regulator-name = "SATA-L Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ startup-delay-us = <4000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
};
};
diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
index 9cb69999b1db..370ca9c43247 100644
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
@@ -46,29 +46,26 @@ pca9554: pca9554@21 {
};
};
- regulators {
- regulator@3 {
- compatible = "regulator-fixed";
- reg = <3>;
- regulator-name = "SATA2 power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
- };
- regulator@4 {
- compatible = "regulator-fixed";
- reg = <4>;
- regulator-name = "SATA3 power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
- };
+ regulator-3 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA2 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
+ };
+
+ regulator-4 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA3 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
};
gpio-leds {
diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
index 822f10734946..ffb3179033e7 100644
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
@@ -70,34 +70,26 @@ rtc@6f {
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
- pinctrl-names = "default";
+ regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA0 power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+ };
- regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "SATA0 power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
- };
- regulator@2 {
- compatible = "regulator-fixed";
- reg = <2>;
- 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>;
- };
+ regulator-2 {
+ compatible = "regulator-fixed";
+ 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 {
diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
index 5ee572dc9242..45d8ec5dfeb7 100644
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
@@ -32,17 +32,14 @@ sata@a0000 {
};
};
- regulators {
- regulator@2 {
- compatible = "regulator-fixed";
- reg = <2>;
- 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>;
- };
+ regulator-2 {
+ compatible = "regulator-fixed";
+ 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>;
};
};
diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
index 124a8ba279e3..054124857235 100644
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
@@ -53,32 +53,25 @@ usb@50000 {
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
+ regulator-0 {
+ compatible = "regulator-fixed";
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
+ };
- regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- regulator-name = "USB Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
- };
- regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "SATA0 power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
- };
+ regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA0 power";
+ 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 {
diff --git a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
index f0893cc06607..b07d11d1f124 100644
--- a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
@@ -142,38 +142,32 @@ disk2-led-amber {
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
- pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>;
+ sata1_regulator: sata1-regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA1 Power";
+ regulator-min-microvolt = <5000000>;
+ 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";
+ };
- sata1_regulator: sata1-regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "SATA1 Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- startup-delay-us = <2000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
- };
-
- 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>;
- };
+ sata2_regulator: sata2-regulator-2 {
+ compatible = "regulator-fixed";
+ 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>;
+ pinctrl-0 = <&sata2_pwr_pin>;
+ pinctrl-names = "default";
};
};
diff --git a/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
index 5551bac1962c..1b65059794bf 100644
--- a/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
@@ -109,65 +109,60 @@ ethernet@74000 {
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
- pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin
- &sata3_pwr_pin &sata4_pwr_pin>;
+ sata1_regulator: sata1-regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA1 Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ 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";
+ };
- sata1_regulator: sata1-regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "SATA1 Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- startup-delay-us = <2000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- };
+ sata2_regulator: sata2-regulator-2 {
+ compatible = "regulator-fixed";
+ 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>;
+ 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 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA3 Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ startup-delay-us = <6000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+ pinctrl-0 = <&sata3_pwr_pin>;
+ pinctrl-names = "default";
+ };
- sata3_regulator: sata3-regulator@3 {
- compatible = "regulator-fixed";
- reg = <3>;
- regulator-name = "SATA3 Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- startup-delay-us = <6000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
- };
-
- sata4_regulator: sata4-regulator@4 {
- compatible = "regulator-fixed";
- reg = <4>;
- regulator-name = "SATA4 Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- startup-delay-us = <8000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
- };
+ sata4_regulator: sata4-regulator-4 {
+ compatible = "regulator-fixed";
+ regulator-name = "SATA4 Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ startup-delay-us = <8000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+ pinctrl-0 = <&sata4_pwr_pin>;
+ pinctrl-names = "default";
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: dts: marvell: dove: drop incorrect reg in fixed regulators
2023-07-26 7:02 [PATCH 1/2] ARM: dts: marvell: armada: drop incorrect reg in fixed regulators Krzysztof Kozlowski
@ 2023-07-26 7:02 ` Krzysztof Kozlowski
2023-08-12 15:06 ` Gregory CLEMENT
2023-08-12 15:05 ` [PATCH 1/2] ARM: dts: marvell: armada: " Gregory CLEMENT
1 sibling, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2023-07-26 7:02 UTC (permalink / raw)
To: Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel, devicetree,
linux-kernel
Cc: Krzysztof Kozlowski
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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm/boot/dts/marvell/dove-cm-a510.dtsi | 18 +++++--------
arch/arm/boot/dts/marvell/dove-cubox.dts | 29 ++++++++-------------
arch/arm/boot/dts/marvell/dove-d3plug.dts | 29 ++++++++-------------
arch/arm/boot/dts/marvell/dove-sbc-a510.dts | 28 +++++++++-----------
4 files changed, 41 insertions(+), 63 deletions(-)
diff --git a/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi b/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
index 1082fdfbfe60..621cb145a8f6 100644
--- a/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
+++ b/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
@@ -108,18 +108,12 @@ led-system {
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- wifi_power: regulator@1 {
- compatible = "regulator-fixed";
- regulator-name = "WiFi Power";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
- };
+ wifi_power: regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "WiFi Power";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
};
};
diff --git a/arch/arm/boot/dts/marvell/dove-cubox.dts b/arch/arm/boot/dts/marvell/dove-cubox.dts
index dbba0c8cdab1..bfde99486a87 100644
--- a/arch/arm/boot/dts/marvell/dove-cubox.dts
+++ b/arch/arm/boot/dts/marvell/dove-cubox.dts
@@ -28,24 +28,17 @@ led-power {
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- usb_power: regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "USB Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio0 1 0>;
- pinctrl-0 = <&pmx_gpio_1>;
- pinctrl-names = "default";
- };
+ usb_power: regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 1 0>;
+ pinctrl-0 = <&pmx_gpio_1>;
+ pinctrl-names = "default";
};
clocks {
diff --git a/arch/arm/boot/dts/marvell/dove-d3plug.dts b/arch/arm/boot/dts/marvell/dove-d3plug.dts
index 5aa5d4a7d51d..a451fd576990 100644
--- a/arch/arm/boot/dts/marvell/dove-d3plug.dts
+++ b/arch/arm/boot/dts/marvell/dove-d3plug.dts
@@ -37,24 +37,17 @@ led-status {
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- usb_power: regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "USB Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio0 8 0>;
- pinctrl-0 = <&pmx_gpio_8>;
- pinctrl-names = "default";
- };
+ usb_power: regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ gpio = <&gpio0 8 0>;
+ pinctrl-0 = <&pmx_gpio_8>;
+ pinctrl-names = "default";
};
};
diff --git a/arch/arm/boot/dts/marvell/dove-sbc-a510.dts b/arch/arm/boot/dts/marvell/dove-sbc-a510.dts
index df021f9b0117..8585ee5533bf 100644
--- a/arch/arm/boot/dts/marvell/dove-sbc-a510.dts
+++ b/arch/arm/boot/dts/marvell/dove-sbc-a510.dts
@@ -76,22 +76,20 @@ chosen {
stdout-path = &uart0;
};
- regulators {
- usb0_power: regulator@2 {
- compatible = "regulator-fixed";
- regulator-name = "USB Power";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
- };
+ usb0_power: regulator-2 {
+ compatible = "regulator-fixed";
+ regulator-name = "USB Power";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
+ };
- mmc_power: regulator@3 {
- compatible = "regulator-fixed";
- regulator-name = "MMC Power";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
- };
+ mmc_power: regulator-3 {
+ compatible = "regulator-fixed";
+ regulator-name = "MMC Power";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] ARM: dts: marvell: dove: drop incorrect reg in fixed regulators
2023-07-26 7:02 ` [PATCH 2/2] ARM: dts: marvell: dove: " Krzysztof Kozlowski
@ 2023-08-12 15:06 ` Gregory CLEMENT
0 siblings, 0 replies; 4+ messages in thread
From: Gregory CLEMENT @ 2023-08-12 15:06 UTC (permalink / raw)
To: Krzysztof Kozlowski, Andrew Lunn, Sebastian Hesselbarth,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> writes:
> 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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Applied on mvebu/dt
Thanks,
Gregory
> ---
> arch/arm/boot/dts/marvell/dove-cm-a510.dtsi | 18 +++++--------
> arch/arm/boot/dts/marvell/dove-cubox.dts | 29 ++++++++-------------
> arch/arm/boot/dts/marvell/dove-d3plug.dts | 29 ++++++++-------------
> arch/arm/boot/dts/marvell/dove-sbc-a510.dts | 28 +++++++++-----------
> 4 files changed, 41 insertions(+), 63 deletions(-)
>
> diff --git a/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi b/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
> index 1082fdfbfe60..621cb145a8f6 100644
> --- a/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
> +++ b/arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
> @@ -108,18 +108,12 @@ led-system {
> };
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - wifi_power: regulator@1 {
> - compatible = "regulator-fixed";
> - regulator-name = "WiFi Power";
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
> - };
> + wifi_power: regulator-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "WiFi Power";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
> };
> };
>
> diff --git a/arch/arm/boot/dts/marvell/dove-cubox.dts b/arch/arm/boot/dts/marvell/dove-cubox.dts
> index dbba0c8cdab1..bfde99486a87 100644
> --- a/arch/arm/boot/dts/marvell/dove-cubox.dts
> +++ b/arch/arm/boot/dts/marvell/dove-cubox.dts
> @@ -28,24 +28,17 @@ led-power {
> };
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - usb_power: regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - regulator-name = "USB Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio0 1 0>;
> - pinctrl-0 = <&pmx_gpio_1>;
> - pinctrl-names = "default";
> - };
> + usb_power: regulator-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "USB Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio0 1 0>;
> + pinctrl-0 = <&pmx_gpio_1>;
> + pinctrl-names = "default";
> };
>
> clocks {
> diff --git a/arch/arm/boot/dts/marvell/dove-d3plug.dts b/arch/arm/boot/dts/marvell/dove-d3plug.dts
> index 5aa5d4a7d51d..a451fd576990 100644
> --- a/arch/arm/boot/dts/marvell/dove-d3plug.dts
> +++ b/arch/arm/boot/dts/marvell/dove-d3plug.dts
> @@ -37,24 +37,17 @@ led-status {
> };
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - usb_power: regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - regulator-name = "USB Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio0 8 0>;
> - pinctrl-0 = <&pmx_gpio_8>;
> - pinctrl-names = "default";
> - };
> + usb_power: regulator-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "USB Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio0 8 0>;
> + pinctrl-0 = <&pmx_gpio_8>;
> + pinctrl-names = "default";
> };
> };
>
> diff --git a/arch/arm/boot/dts/marvell/dove-sbc-a510.dts b/arch/arm/boot/dts/marvell/dove-sbc-a510.dts
> index df021f9b0117..8585ee5533bf 100644
> --- a/arch/arm/boot/dts/marvell/dove-sbc-a510.dts
> +++ b/arch/arm/boot/dts/marvell/dove-sbc-a510.dts
> @@ -76,22 +76,20 @@ chosen {
> stdout-path = &uart0;
> };
>
> - regulators {
> - usb0_power: regulator@2 {
> - compatible = "regulator-fixed";
> - regulator-name = "USB Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
> - };
> + usb0_power: regulator-2 {
> + compatible = "regulator-fixed";
> + regulator-name = "USB Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
> + };
>
> - mmc_power: regulator@3 {
> - compatible = "regulator-fixed";
> - regulator-name = "MMC Power";
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
> - };
> + mmc_power: regulator-3 {
> + compatible = "regulator-fixed";
> + regulator-name = "MMC Power";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
> };
> };
>
> --
> 2.34.1
>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ARM: dts: marvell: armada: drop incorrect reg in fixed regulators
2023-07-26 7:02 [PATCH 1/2] ARM: dts: marvell: armada: drop incorrect reg in fixed regulators Krzysztof Kozlowski
2023-07-26 7:02 ` [PATCH 2/2] ARM: dts: marvell: dove: " Krzysztof Kozlowski
@ 2023-08-12 15:05 ` Gregory CLEMENT
1 sibling, 0 replies; 4+ messages in thread
From: Gregory CLEMENT @ 2023-08-12 15:05 UTC (permalink / raw)
To: Krzysztof Kozlowski, Andrew Lunn, Sebastian Hesselbarth,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-arm-kernel,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> writes:
> 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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Applied on mvebu/dt
Thanks,
Gregory
> ---
> .../dts/marvell/armada-370-dlink-dns327l.dts | 83 ++++++--------
> .../marvell/armada-370-seagate-nas-4bay.dts | 43 ++++---
> .../marvell/armada-370-seagate-nas-xbay.dtsi | 46 ++++----
> ...armada-370-seagate-personal-cloud-2bay.dts | 21 ++--
> .../armada-370-seagate-personal-cloud.dtsi | 43 +++----
> .../marvell/armada-370-synology-ds213j.dts | 54 ++++-----
> .../dts/marvell/armada-xp-synology-ds414.dts | 105 +++++++++---------
> 7 files changed, 177 insertions(+), 218 deletions(-)
>
> diff --git a/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
> index 561195b749eb..d4c4efabd254 100644
> --- a/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
> +++ b/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
> @@ -105,54 +105,45 @@ led-backup {
> };
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> + usb_power: regulator-1 {
> + compatible = "regulator-fixed";
> + pinctrl-0 = <&xhci_pwr_pin>;
> + pinctrl-names = "default";
> + regulator-name = "USB3.0 Port Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-boot-on;
> + regulator-always-on;
> + gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
> + };
>
> - usb_power: regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - pinctrl-0 = <&xhci_pwr_pin>;
> - pinctrl-names = "default";
> - regulator-name = "USB3.0 Port Power";
> - 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 {
> + compatible = "regulator-fixed";
> + pinctrl-0 = <&sata_r_pwr_pin>;
> + pinctrl-names = "default";
> + regulator-name = "SATA-R Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + startup-delay-us = <2000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
> + };
>
> - sata_r_power: regulator@2 {
> - compatible = "regulator-fixed";
> - reg = <2>;
> - pinctrl-0 = <&sata_r_pwr_pin>;
> - pinctrl-names = "default";
> - regulator-name = "SATA-R Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - startup-delay-us = <2000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
> - };
> -
> - sata_l_power: regulator@3 {
> - compatible = "regulator-fixed";
> - reg = <3>;
> - pinctrl-0 = <&sata_l_pwr_pin>;
> - pinctrl-names = "default";
> - regulator-name = "SATA-L Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - startup-delay-us = <4000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
> - };
> + sata_l_power: regulator-3 {
> + compatible = "regulator-fixed";
> + pinctrl-0 = <&sata_l_pwr_pin>;
> + pinctrl-names = "default";
> + regulator-name = "SATA-L Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + startup-delay-us = <4000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
> };
> };
>
> diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
> index 9cb69999b1db..370ca9c43247 100644
> --- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
> +++ b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
> @@ -46,29 +46,26 @@ pca9554: pca9554@21 {
> };
> };
>
> - regulators {
> - regulator@3 {
> - compatible = "regulator-fixed";
> - reg = <3>;
> - regulator-name = "SATA2 power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
> - };
> - regulator@4 {
> - compatible = "regulator-fixed";
> - reg = <4>;
> - regulator-name = "SATA3 power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
> - };
> + regulator-3 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA2 power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
> + };
> +
> + regulator-4 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA3 power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
> };
>
> gpio-leds {
> diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
> index 822f10734946..ffb3179033e7 100644
> --- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
> +++ b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
> @@ -70,34 +70,26 @@ rtc@6f {
>
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> - pinctrl-names = "default";
> + regulator-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA0 power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
> + };
>
> - regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - regulator-name = "SATA0 power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
> - };
> - regulator@2 {
> - compatible = "regulator-fixed";
> - reg = <2>;
> - 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>;
> - };
> + regulator-2 {
> + compatible = "regulator-fixed";
> + 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 {
> diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
> index 5ee572dc9242..45d8ec5dfeb7 100644
> --- a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
> +++ b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
> @@ -32,17 +32,14 @@ sata@a0000 {
> };
> };
>
> - regulators {
> - regulator@2 {
> - compatible = "regulator-fixed";
> - reg = <2>;
> - 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>;
> - };
> + regulator-2 {
> + compatible = "regulator-fixed";
> + 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>;
> };
> };
> diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
> index 124a8ba279e3..054124857235 100644
> --- a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
> +++ b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
> @@ -53,32 +53,25 @@ usb@50000 {
> };
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> + regulator-0 {
> + compatible = "regulator-fixed";
> + regulator-name = "USB Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
> + };
>
> - regulator@0 {
> - compatible = "regulator-fixed";
> - reg = <0>;
> - regulator-name = "USB Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
> - };
> - regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - regulator-name = "SATA0 power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
> - };
> + regulator-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA0 power";
> + 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 {
> diff --git a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
> index f0893cc06607..b07d11d1f124 100644
> --- a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
> +++ b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
> @@ -142,38 +142,32 @@ disk2-led-amber {
> };
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> - pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>;
> + sata1_regulator: sata1-regulator-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA1 Power";
> + regulator-min-microvolt = <5000000>;
> + 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";
> + };
>
> - sata1_regulator: sata1-regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - regulator-name = "SATA1 Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - startup-delay-us = <2000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
> - };
> -
> - 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>;
> - };
> + sata2_regulator: sata2-regulator-2 {
> + compatible = "regulator-fixed";
> + 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>;
> + pinctrl-0 = <&sata2_pwr_pin>;
> + pinctrl-names = "default";
> };
> };
>
> diff --git a/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
> index 5551bac1962c..1b65059794bf 100644
> --- a/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
> +++ b/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
> @@ -109,65 +109,60 @@ ethernet@74000 {
> };
> };
>
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> - pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin
> - &sata3_pwr_pin &sata4_pwr_pin>;
> + sata1_regulator: sata1-regulator-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA1 Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + 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";
> + };
>
> - sata1_regulator: sata1-regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - regulator-name = "SATA1 Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - startup-delay-us = <2000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
> - };
> + sata2_regulator: sata2-regulator-2 {
> + compatible = "regulator-fixed";
> + 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>;
> + 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 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA3 Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + startup-delay-us = <6000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
> + pinctrl-0 = <&sata3_pwr_pin>;
> + pinctrl-names = "default";
> + };
>
> - sata3_regulator: sata3-regulator@3 {
> - compatible = "regulator-fixed";
> - reg = <3>;
> - regulator-name = "SATA3 Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - startup-delay-us = <6000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
> - };
> -
> - sata4_regulator: sata4-regulator@4 {
> - compatible = "regulator-fixed";
> - reg = <4>;
> - regulator-name = "SATA4 Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - startup-delay-us = <8000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
> - };
> + sata4_regulator: sata4-regulator-4 {
> + compatible = "regulator-fixed";
> + regulator-name = "SATA4 Power";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + startup-delay-us = <8000000>;
> + enable-active-high;
> + regulator-always-on;
> + regulator-boot-on;
> + gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
> + pinctrl-0 = <&sata4_pwr_pin>;
> + pinctrl-names = "default";
> };
> };
>
> --
> 2.34.1
>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-12 15:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-26 7:02 [PATCH 1/2] ARM: dts: marvell: armada: drop incorrect reg in fixed regulators Krzysztof Kozlowski
2023-07-26 7:02 ` [PATCH 2/2] ARM: dts: marvell: dove: " Krzysztof Kozlowski
2023-08-12 15:06 ` Gregory CLEMENT
2023-08-12 15:05 ` [PATCH 1/2] ARM: dts: marvell: armada: " Gregory CLEMENT
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).