On 1/28/20 10:10 AM, Patrick Delaunay wrote:
> Update the driver to use the latest binding from kernel v5.5-rc1:
> no more use syscon or regmap to access to pwr register and
> only one pwr_regulators node with the compatibility "st,stm32mp1,pwr-reg"
> is available.
>
> Signed-off-by: Patrick Delaunay
> ---
>
> arch/arm/dts/stm32mp157-u-boot.dtsi| 2 +-
> arch/arm/dts/stm32mp157a-avenger96.dts | 8 ++--
> arch/arm/dts/stm32mp157a-dk1.dts | 8 ++--
> arch/arm/dts/stm32mp157c-ed1.dts | 8 ++--
> arch/arm/dts/stm32mp157c.dtsi | 46 +-
> arch/arm/dts/stm32mp15xx-dhcom.dtsi| 8 ++--
> arch/arm/mach-stm32mp/include/mach/stm32.h | 1 -
> arch/arm/mach-stm32mp/pwr_regulator.c | 23 ++-
> arch/arm/mach-stm32mp/syscon.c | 1 -
> 9 files changed, 42 insertions(+), 63 deletions(-)
>
> diff --git a/arch/arm/dts/stm32mp157-u-boot.dtsi
> b/arch/arm/dts/stm32mp157-u-boot.dtsi
> index 0d1d387e54..cb8d60e33d 100644
> --- a/arch/arm/dts/stm32mp157-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp157-u-boot.dtsi
> @@ -128,7 +128,7 @@
> u-boot,dm-pre-reloc;
> };
>
> -&pwr {
> +&pwr_regulators {
> u-boot,dm-pre-reloc;
> };
>
> diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts
> b/arch/arm/dts/stm32mp157a-avenger96.dts
> index 5b15a4a915..232fe70905 100644
> --- a/arch/arm/dts/stm32mp157a-avenger96.dts
> +++ b/arch/arm/dts/stm32mp157a-avenger96.dts
> @@ -282,11 +282,9 @@
> status = "okay";
> };
>
> -&pwr {
> - pwr-regulators {
> - vdd-supply = <&vdd>;
> - vdd_3v3_usbfs-supply = <&vdd_usb>;
> - };
> +&pwr_regulators {
> + vdd-supply = <&vdd>;
> + vdd_3v3_usbfs-supply = <&vdd_usb>;
> };
>
> &rng1 {
> diff --git a/arch/arm/dts/stm32mp157a-dk1.dts
> b/arch/arm/dts/stm32mp157a-dk1.dts
> index 4652253012..dc61bfc3d5 100644
> --- a/arch/arm/dts/stm32mp157a-dk1.dts
> +++ b/arch/arm/dts/stm32mp157a-dk1.dts
> @@ -397,11 +397,9 @@
> status = "okay";
> };
>
> -&pwr {
> - pwr-regulators {
> - vdd-supply = <&vdd>;
> - vdd_3v3_usbfs-supply = <&vdd_usb>;
> - };
> +&pwr_regulators {
> + vdd-supply = <&vdd>;
> + vdd_3v3_usbfs-supply = <&vdd_usb>;
> };
>
> &rng1 {
> diff --git a/arch/arm/dts/stm32mp157c-ed1.dts
> b/arch/arm/dts/stm32mp157c-ed1.dts
> index bc4d7e1ab5..acb59f24cc 100644
> --- a/arch/arm/dts/stm32mp157c-ed1.dts
> +++ b/arch/arm/dts/stm32mp157c-ed1.dts
> @@ -263,11 +263,9 @@
> status = "okay";
> };
>
> -&pwr {
> - pwr-regulators {
> - vdd-supply = <&vdd>;
> - vdd_3v3_usbfs-supply = <&vdd_usb>;
> - };
> +&pwr_regulators {
> + vdd-supply = <&vdd>;
> + vdd_3v3_usbfs-supply = <&vdd_usb>;
> };
>
> &rng1 {
> diff --git a/arch/arm/dts/stm32mp157c.dtsi b/arch/arm/dts/stm32mp157c.dtsi
> index 28a7e4c08a..22a9386248 100644
> --- a/arch/arm/dts/stm32mp157c.dtsi
> +++ b/arch/arm/dts/stm32mp157c.dtsi
> @@ -1110,36 +1110,26 @@
> #reset-cells = <1>;
> };
>
> - pwr: pwr@50001000 {
> - compatible = "st,stm32mp1-pwr", "st,stm32-pwr",
> "syscon", "simple-mfd";
> - reg = <0x50001000 0x400>;
> - system-power-controller;
> - interrupts = ;
> - st,sysrcc = <&rcc>;
> - clocks = <&rcc PLL2_R>;
> - clock-names = "phyclk";
> -
> - pwr-regulators {
> - compatible = "st,stm32mp1,pwr-reg";
> - st,tzcr = <&rcc 0x0 0x1>;
> -
> - reg11: reg11 {
> - regulator-name = "reg11";
> - regulator-min-microvolt = <110>;
> - regulator-max-microvolt = <110>;
> - };
> + pwr_regulators: pwr@50001000 {
> + compatible = "st,stm32mp1,pwr-reg";
> + reg = <0x50001000 0x10>;
> +
> + reg11: reg11 {
> + regulator-name = "reg11";
> + regulator-min-microvolt = <110>;
> + regulator-max-microvolt = <110>;
> + };
>
> - reg18: reg18 {
> - regulator-name = "reg18";
> - regulator-min-microvolt = <180>;
> - regulator-max-microvolt = <180>;
> - };
> + reg18: reg18 {
> + regulator-name = "reg18";
> + regulator-min-microvolt = <180>;
> + regulator-max-microvolt = <180>;
> + };
>
> - u
