2023-07-26 07:08:59

by Krzysztof Kozlowski

Subject: [PATCH 2/2] 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: Krzysztof Kozlowski <[email protected]>
---
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

2023-08-12 16:36:58

by Gregory CLEMENT

Subject: Re: [PATCH 2/2] ARM: dts: marvell: dove: drop incorrect reg in fixed regulators

Krzysztof Kozlowski <[email protected]> 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 <[email protected]>

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