| Message ID | 20210415101037.1465-10-alexandre.torgue@foss.st.com |
|---|---|
| State | Accepted |
| Commit | 4bf4abe19089245b7b12f35e5cafb5477b3e2c48 |
| Headers | show |
| Series | ARM: dts: stm32: fix "make dtbs_check W=1" round1 | expand |
On 4/15/21 12:10 PM, Alexandre Torgue wrote: > 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> Applied on stm32-next. Thanks. Alex > > diff --git a/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi b/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi > index 113c48b2ef93..a4b14ef3caee 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 6cf49a0a9e69..0c0b66788ea1 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 272a1a67a9ad..769fcf74685a 100644 > --- a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi > +++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi > @@ -327,8 +327,6 @@ > > vdd_usb: ldo4 { > regulator-name = "vdd_usb"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > interrupts = <IT_CURLIM_LDO4 0>; > }; > > @@ -350,7 +348,6 @@ > vref_ddr: vref_ddr { > regulator-name = "vref_ddr"; > regulator-always-on; > - regulator-over-current-protection; > }; > > bst_out: boost { > @@ -366,7 +363,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>; > }; > }; > >
diff --git a/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi b/arch/arm/boot/dts/stm32mp157a-stinger96.dtsi index 113c48b2ef93..a4b14ef3caee 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 6cf49a0a9e69..0c0b66788ea1 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 272a1a67a9ad..769fcf74685a 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi @@ -327,8 +327,6 @@ vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; }; @@ -350,7 +348,6 @@ vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost { @@ -366,7 +363,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>; }; };
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>