Fix broken bananapi m2 devicetree/regulators
Subsystems (2)
v2 cover Fix broken bananapi m2 devicetree/regulators
This patchseries fixes the bananapi m1 devicetree, to be able to boot again. The first two patches update/improve the devicetree and the last patch adds all missing regulators.
Regards,
Philipp
Changes since v1:
* squashed commit 1 and 3
* fix wrong mmc regulator
Philipp Rossak (2):
arm: dts: sun6i: a31s: bpi-m2: improve pmic properties
arm: dts: sun6i: a31s: fix: bpi-m2: add missing regulators
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 63 ++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/2 arm: dts: sun6i: a31s: bpi-m2: improve pmic properties
The eldoin is supplied from the dcdc1 regulator. The N_VBUSEN pin is connected to an external power regulator (SY6280AAC). With this commit we update the pmic binding properties to support those features.
BPI-M2")
--- arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +2 -0
@@ -163,6 +163,8 @@ reg = <0x68>; interrupt-parent = <&nmi_intc>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + eldoin-supply = <®_dcdc1>; + x-powers,drive-vbus-en; }; };
Signature · 1 line
2.11.0
PATCH v2 2/2 arm: dts: sun6i: a31s: fix: bpi-m2: add missing regulators
In reply to Philipp RossakThis patch fixes a bootproblem with the Bananapi M2 board. Since there are some regulators missing we add them right now. Those values come from the schematic, below you can find a small overview:
* reg_aldo1: 3,3V, powers the wifi * reg_aldo2: 2,5V, powers the IO of the RTL8211E * reg_aldo3: 3,3V, powers the audio
* reg_dldo1: 3,0V, powers the RTL8211E * reg_dldo2: 2,8V, powers the analog part of the csi * reg_dldo3: 3,3V, powers misc * reg_eldo1: 1,8V, powers the csi
* reg_ldo_io1:1,8V, powers the gpio
* reg_dc5ldo: needs to be always on
This patch updates also the vmmc-supply properties on the mmc0 and mmc2 node to use the allready existent regulators.
We can now remove the sunxi-common-regulators.dtsi include since we don't need it anymore.
BPI-M2")
--- arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 61 ++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +58 -3
@@ -42,7 +42,6 @@ /dts-v1/; #include "sun6i-a31s.dtsi" -#include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> / {
@@ -99,6 +98,7 @@ pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>; phy = <&phy1>; phy-mode = "rgmii"; + phy-supply = <®_dldo1>; snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; /* PA21 */ snps,reset-active-low; snps,reset-delays-us = <0 10000 30000>;
@@ -118,7 +118,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>; - vmmc-supply = <®_vcc3v0>; + vmmc-supply = <®_dcdc1>; bus-width = <4>; cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */ cd-inverted;
@@ -132,7 +132,7 @@ &mmc2 { pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins_a>; - vmmc-supply = <®_vcc3v0>; + vmmc-supply = <®_aldo1>; mmc-pwrseq = <&mmc2_pwrseq>; bus-width = <4>; non-removable;
@@ -195,7 +195,28 @@ #include "axp22x.dtsi" +®_aldo1 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi"; +}; + +®_aldo2 { + regulator-always-on; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-name = "vcc-gmac"; +}; + +®_aldo3 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "avcc"; +}; + ®_dc5ldo { + regulator-always-on; regulator-min-microvolt = <700000>; regulator-max-microvolt = <1320000>; regulator-name = "vdd-cpus";
@@ -235,6 +256,40 @@ regulator-name = "vcc-dram"; }; +®_dldo1 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc-mac"; +}; + +®_dldo2 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-name = "avdd-csi"; +}; + +®_dldo3 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-pb"; +}; + +®_eldo1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vdd-csi"; + status = "okay"; +}; + +®_ldo_io1 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc-pm-cpus"; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>;
Signature · 1 line
2.11.0
Quoted 7 lines · Philipp Rossak
This patchseries fixes the bananapi m1 devicetree, to be able to boot again. The first two patches update/improve the devicetree and the last patch adds all missing regulators.
Regards,
Philipp
Quoted 7 lines
Changes since v1:
* squashed commit 1 and 3
* fix wrong mmc regulatorPhilipp Rossak (2):
arm: dts: sun6i: a31s: bpi-m2: improve pmic properties
arm: dts: sun6i: a31s: fix: bpi-m2: add missing regulators
Applied both.
I had to make a couple of changes though, in the commit title arm should be uppercase, and the fix isn't needed.
I also added stable in Cc, since these patches have been there for quite some time.
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180215/6bebb158/attachment.sig>
Quoted 18 lines · Maxime Ripard
Quoted 7 lines · Philipp Rossak
This patchseries fixes the bananapi m1 devicetree, to be able to boot again. The first two patches update/improve the devicetree and the last patch adds all missing regulators.
Regards,
PhilippQuoted 7 lines
Changes since v1:
* squashed commit 1 and 3
* fix wrong mmc regulatorPhilipp Rossak (2):
arm: dts: sun6i: a31s: bpi-m2: improve pmic properties
arm: dts: sun6i: a31s: fix: bpi-m2: add missing regulatorsApplied both.
Quoted 8 lines
I had to make a couple of changes though, in the commit title arm should be uppercase, and the fix isn't needed.
I also added stable in Cc, since these patches have been there for quite some time.
Maxime
Thanks!
Philipp