提交 0642badf 编写于 作者: A Alexandre Torgue 提交者: Zheng Zengkai

ARM: dts: stm32: fix stpmic node for stm32mp1 boards

stable inclusion
from stable-5.10.53
commit f40a7c9b8ee19843cb1473f9de822733d21e73c5
bugzilla: 175574 https://gitee.com/openeuler/kernel/issues/I4DTUX

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f40a7c9b8ee19843cb1473f9de822733d21e73c5

--------------------------------

[ Upstream commit 4bf4abe1 ]

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: NAlexandre Torgue <alexandre.torgue@foss.st.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 4aeb8c8e
...@@ -184,8 +184,6 @@ ...@@ -184,8 +184,6 @@
vdd_usb: ldo4 { vdd_usb: ldo4 {
regulator-name = "vdd_usb"; regulator-name = "vdd_usb";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
interrupts = <IT_CURLIM_LDO4 0>; interrupts = <IT_CURLIM_LDO4 0>;
}; };
...@@ -208,7 +206,6 @@ ...@@ -208,7 +206,6 @@
vref_ddr: vref_ddr { vref_ddr: vref_ddr {
regulator-name = "vref_ddr"; regulator-name = "vref_ddr";
regulator-always-on; regulator-always-on;
regulator-over-current-protection;
}; };
bst_out: boost { bst_out: boost {
...@@ -219,13 +216,13 @@ ...@@ -219,13 +216,13 @@
vbus_otg: pwr_sw1 { vbus_otg: pwr_sw1 {
regulator-name = "vbus_otg"; regulator-name = "vbus_otg";
interrupts = <IT_OCP_OTG 0>; interrupts = <IT_OCP_OTG 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
vbus_sw: pwr_sw2 { vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw"; regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>; interrupts = <IT_OCP_SWOUT 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
}; };
......
...@@ -173,8 +173,6 @@ ...@@ -173,8 +173,6 @@
vdd_usb: ldo4 { vdd_usb: ldo4 {
regulator-name = "vdd_usb"; regulator-name = "vdd_usb";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
interrupts = <IT_CURLIM_LDO4 0>; interrupts = <IT_CURLIM_LDO4 0>;
}; };
...@@ -197,7 +195,6 @@ ...@@ -197,7 +195,6 @@
vref_ddr: vref_ddr { vref_ddr: vref_ddr {
regulator-name = "vref_ddr"; regulator-name = "vref_ddr";
regulator-always-on; regulator-always-on;
regulator-over-current-protection;
}; };
bst_out: boost { bst_out: boost {
...@@ -213,7 +210,7 @@ ...@@ -213,7 +210,7 @@
vbus_sw: pwr_sw2 { vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw"; regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>; interrupts = <IT_OCP_SWOUT 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
}; };
......
...@@ -234,8 +234,6 @@ ...@@ -234,8 +234,6 @@
vdd_usb: ldo4 { vdd_usb: ldo4 {
regulator-name = "vdd_usb"; regulator-name = "vdd_usb";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
interrupts = <IT_CURLIM_LDO4 0>; interrupts = <IT_CURLIM_LDO4 0>;
}; };
...@@ -257,7 +255,6 @@ ...@@ -257,7 +255,6 @@
vref_ddr: vref_ddr { vref_ddr: vref_ddr {
regulator-name = "vref_ddr"; regulator-name = "vref_ddr";
regulator-always-on; regulator-always-on;
regulator-over-current-protection;
}; };
bst_out: boost { bst_out: boost {
...@@ -273,7 +270,7 @@ ...@@ -273,7 +270,7 @@
vbus_sw: pwr_sw2 { vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw"; regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>; interrupts = <IT_OCP_SWOUT 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
}; };
......
...@@ -146,8 +146,6 @@ ...@@ -146,8 +146,6 @@
vdd_usb: ldo4 { vdd_usb: ldo4 {
regulator-name = "vdd_usb"; regulator-name = "vdd_usb";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
interrupts = <IT_CURLIM_LDO4 0>; interrupts = <IT_CURLIM_LDO4 0>;
}; };
...@@ -171,7 +169,6 @@ ...@@ -171,7 +169,6 @@
vref_ddr: vref_ddr { vref_ddr: vref_ddr {
regulator-name = "vref_ddr"; regulator-name = "vref_ddr";
regulator-always-on; regulator-always-on;
regulator-over-current-protection;
}; };
bst_out: boost { bst_out: boost {
...@@ -182,13 +179,13 @@ ...@@ -182,13 +179,13 @@
vbus_otg: pwr_sw1 { vbus_otg: pwr_sw1 {
regulator-name = "vbus_otg"; regulator-name = "vbus_otg";
interrupts = <IT_OCP_OTG 0>; interrupts = <IT_OCP_OTG 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
vbus_sw: pwr_sw2 { vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw"; regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>; interrupts = <IT_OCP_SWOUT 0>;
regulator-active-discharge; regulator-active-discharge = <1>;
}; };
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册