[PATCH v2 4/5] ARM: dts: stm32: move fixe regulators reg11 & reg18

[Yannick FERTRE]

Hi Alexandre,

this patch can be abandoned.

BR

-- 
Yannick Fertré | TINA: 166 7152 | Tel: +33 244027152 | Mobile: +33 620600270
Microcontrollers and Digital ICs Group | Microcontrolleurs Division

On 5/10/19 4:20 PM, Yannick Fertré wrote:
> Move regulators reg11 & reg18 from device-tree files stm32mp157c-ed1.dts
> & stm32mp157c-dk2.dts to file stm32mp157c.dtsi.
>
> Signed-off-by: Yannick Fertré <yannick.fertre at st.com>
> ---
>   arch/arm/boot/dts/stm32mp157c-dk2.dts |  8 --------
>   arch/arm/boot/dts/stm32mp157c-ed1.dts | 16 ----------------
>   arch/arm/boot/dts/stm32mp157c.dtsi    | 16 ++++++++++++++++
>   3 files changed, 16 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32mp157c-dk2.dts b/arch/arm/boot/dts/stm32mp157c-dk2.dts
> index 20ea601..020ea0f 100644
> --- a/arch/arm/boot/dts/stm32mp157c-dk2.dts
> +++ b/arch/arm/boot/dts/stm32mp157c-dk2.dts
> @@ -11,14 +11,6 @@
>   / {
>   	model = "STMicroelectronics STM32MP157C-DK2 Discovery Board";
>   	compatible = "st,stm32mp157c-dk2", "st,stm32mp157";
> -
> -	reg18: reg18 {
> -		compatible = "regulator-fixed";
> -		regulator-name = "reg18";
> -		regulator-min-microvolt = <1800000>;
> -		regulator-max-microvolt = <1800000>;
> -		regulator-always-on;
> -	};
>   };
>   
>   &dsi {
> diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
> index 62a8c78..f41189c 100644
> --- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
> +++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
> @@ -27,22 +27,6 @@
>   		serial0 = &uart4;
>   	};
>   
> -	reg11: reg11 {
> -		compatible = "regulator-fixed";
> -		regulator-name = "reg11";
> -		regulator-min-microvolt = <1100000>;
> -		regulator-max-microvolt = <1100000>;
> -		regulator-always-on;
> -	};
> -
> -	reg18: reg18 {
> -		compatible = "regulator-fixed";
> -		regulator-name = "reg18";
> -		regulator-min-microvolt = <1800000>;
> -		regulator-max-microvolt = <1800000>;
> -		regulator-always-on;
> -	};
> -
>   	sd_switch: regulator-sd_switch {
>   		compatible = "regulator-gpio";
>   		regulator-name = "sd_switch";
> diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
> index 6b14f1e..aaac51cd 100644
> --- a/arch/arm/boot/dts/stm32mp157c.dtsi
> +++ b/arch/arm/boot/dts/stm32mp157c.dtsi
> @@ -11,6 +11,22 @@
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>   
> +	reg11: reg11 {
> +		compatible = "regulator-fixed";
> +		regulator-name = "reg11";
> +		regulator-min-microvolt = <1100000>;
> +		regulator-max-microvolt = <1100000>;
> +		regulator-always-on;
> +	};
> +
> +	reg18: reg18 {
> +		compatible = "regulator-fixed";
> +		regulator-name = "reg18";
> +		regulator-min-microvolt = <1800000>;
> +		regulator-max-microvolt = <1800000>;
> +		regulator-always-on;
> +	};
> +
>   	cpus {
>   		#address-cells = <1>;
>   		#size-cells = <0>;