[PATCH] Revert "ARM: dts: sunxi: Add regulators for Sinovoip BPI-M2"
Icenowy Zheng
icenowy at aosc.io
Sat Feb 3 03:23:53 PST 2018
This reverts commit 7daa213700758b5b08fc0daab09bb139dd334165.
The original commit has several problems:
- vdd-cpus and aldo3 (AVCC of the SoC) are not set to always-on, which
leads to system hang when disabling unused regulators.
- GMAC (which uses dldo1 and aldo2) and Wi-Fi (which uses aldo1) are not
considered, and will fail to work after adding this commit.
This indicates that this patch should be not tested at all.
Signed-off-by: Icenowy Zheng <icenowy at aosc.io>
---
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 57 ------------------------
1 file changed, 57 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index 51e6f1d21c32..a565316eb340 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -86,10 +86,6 @@
};
};
-&cpu0 {
- cpu-supply = <®_dcdc3>;
-};
-
&ehci0 {
status = "okay";
};
@@ -155,17 +151,6 @@
status = "okay";
};
-&p2wi {
- status = "okay";
-
- axp22x: pmic at 68 {
- compatible = "x-powers,axp221";
- reg = <0x68>;
- interrupt-parent = <&nmi_intc>;
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
- };
-};
-
&pio {
gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin at 0 {
pins = "PA21";
@@ -191,48 +176,6 @@
};
};
-#include "axp22x.dtsi"
-
-®_dc5ldo {
- regulator-min-microvolt = <700000>;
- regulator-max-microvolt = <1320000>;
- regulator-name = "vdd-cpus";
-};
-
-®_dcdc1 {
- regulator-always-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-name = "vdd-3v0";
-};
-
-®_dcdc2 {
- regulator-min-microvolt = <700000>;
- regulator-max-microvolt = <1320000>;
- regulator-name = "vdd-gpu";
-};
-
-®_dcdc3 {
- regulator-always-on;
- regulator-min-microvolt = <700000>;
- regulator-max-microvolt = <1320000>;
- regulator-name = "vdd-cpu";
-};
-
-®_dcdc4 {
- regulator-always-on;
- regulator-min-microvolt = <700000>;
- regulator-max-microvolt = <1320000>;
- regulator-name = "vdd-sys-dll";
-};
-
-®_dcdc5 {
- regulator-always-on;
- regulator-min-microvolt = <1500000>;
- regulator-max-microvolt = <1500000>;
- regulator-name = "vcc-dram";
-};
-
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
--
2.15.1
More information about the linux-arm-kernel
mailing list