lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 058/125] ARM: dts: stm32: fix stpmic node for stm32mp1 boards
    Date
    From: Alexandre Torgue <alexandre.torgue@foss.st.com>

    [ Upstream commit 4bf4abe19089245b7b12f35e5cafb5477b3e2c48 ]

    On some STM32 MP15 boards, stpmic node is not correct which generates
    warnings running "make dtbs_check W=1" command. Issues are:

    -"regulator-active-discharge" is not a boolean but an uint32.
    -"regulator-over-current-protection" is not a valid entry for vref_ddr.
    -LDO4 has a fixed voltage (3v3) so min/max entries are not allowed.

    Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 7 ++-----
    arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 5 +----
    arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 5 +----
    arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 7 ++-----
    4 files changed, 6 insertions(+), 18 deletions(-)

    diff --git a/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi b/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi
    index 58275bcf9e26..4dd138d691c7 100644
    --- a/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi
    +++ b/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi
    @@ -184,8 +184,6 @@

    vdd_usb: ldo4 {
    regulator-name = "vdd_usb";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    interrupts = <IT_CURLIM_LDO4 0>;
    };

    @@ -208,7 +206,6 @@
    vref_ddr: vref_ddr {
    regulator-name = "vref_ddr";
    regulator-always-on;
    - regulator-over-current-protection;
    };

    bst_out: boost {
    @@ -219,13 +216,13 @@
    vbus_otg: pwr_sw1 {
    regulator-name = "vbus_otg";
    interrupts = <IT_OCP_OTG 0>;
    - regulator-active-discharge;
    + regulator-active-discharge = <1>;
    };

    vbus_sw: pwr_sw2 {
    regulator-name = "vbus_sw";
    interrupts = <IT_OCP_SWOUT 0>;
    - regulator-active-discharge;
    + regulator-active-discharge = <1>;
    };
    };

    diff --git a/arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi b/arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi
    index b5601d270c8f..2d9461006810 100644
    --- a/arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi
    +++ b/arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi
    @@ -173,8 +173,6 @@

    vdd_usb: ldo4 {
    regulator-name = "vdd_usb";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    interrupts = <IT_CURLIM_LDO4 0>;
    };

    @@ -197,7 +195,6 @@
    vref_ddr: vref_ddr {
    regulator-name = "vref_ddr";
    regulator-always-on;
    - regulator-over-current-protection;
    };

    bst_out: boost {
    @@ -213,7 +210,7 @@
    vbus_sw: pwr_sw2 {
    regulator-name = "vbus_sw";
    interrupts = <IT_OCP_SWOUT 0>;
    - regulator-active-discharge;
    + regulator-active-discharge = <1>;
    };
    };

    diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
    index c43c5c93f8eb..8221bf69fefe 100644
    --- a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
    +++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
    @@ -234,8 +234,6 @@

    vdd_usb: ldo4 {
    regulator-name = "vdd_usb";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    interrupts = <IT_CURLIM_LDO4 0>;
    };

    @@ -257,7 +255,6 @@
    vref_ddr: vref_ddr {
    regulator-name = "vref_ddr";
    regulator-always-on;
    - regulator-over-current-protection;
    };

    bst_out: boost {
    @@ -273,7 +270,7 @@
    vbus_sw: pwr_sw2 {
    regulator-name = "vbus_sw";
    interrupts = <IT_OCP_SWOUT 0>;
    - regulator-active-discharge;
    + regulator-active-discharge = <1>;
    };
    };

    diff --git a/arch/arm/boot/dts/stm32mp15xx-osd32.dtsi b/arch/arm/boot/dts/stm32mp15xx-osd32.dtsi
    index 713485a95795..6706d8311a66 100644
    --- a/arch/arm/boot/dts/stm32mp15xx-osd32.dtsi
    +++ b/arch/arm/boot/dts/stm32mp15xx-osd32.dtsi
    @@ -146,8 +146,6 @@

    vdd_usb: ldo4 {
    regulator-name = "vdd_usb";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    interrupts = <IT_CURLIM_LDO4 0>;
    };

    @@ -171,7 +169,6 @@
    vref_ddr: vref_ddr {
    regulator-name = "vref_ddr";
    regulator-always-on;
    - regulator-over-current-protection;
    };

    bst_out: boost {
    @@ -182,13 +179,13 @@
    vbus_otg: pwr_sw1 {
    regulator-name = "vbus_otg";
    interrupts = <IT_OCP_OTG 0>;
    - regulator-active-discharge;
    + regulator-active-discharge = <1>;
    };

    vbus_sw: pwr_sw2 {
    regulator-name = "vbus_sw";
    interrupts = <IT_OCP_SWOUT 0>;
    - regulator-active-discharge;
    + regulator-active-discharge = <1>;
    };
    };

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-22 19:36    [W:4.410 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site