Hi! > From: Michael Klein <michael@xxxxxxxxxxxx> > > [ Upstream commit 23e85be1ec81647374055f731488cc9a7c013a5c ] > > Add regulator nodes vcc-dram and vcc1v2 to the devicetree. These > regulators correspond to U4 and U5 in the schematics: > > http://forum.banana-pi.org/t/bpi-m2-zero-schematic-diagram-public/4111 > > Signed-off-by: Michael Klein <michael@xxxxxxxxxxxx> > Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx> > Link: https://lore.kernel.org/r/20201130183841.136708-1-michael@xxxxxxxxxxxx > Stable-dep-of: 4a0e7f2decbf ("netfilter: nf_tables: do not compare > internal table flags on updates") Iti s hard to believe dts update is dependency of netfilter core change. Please investigate and drop. Best regards, Pavel > --- > .../dts/sun8i-h2-plus-bananapi-m2-zero.dts | 24 +++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts > index 4c6704e4c57ec..74d5732c412ba 100644 > --- a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts > +++ b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts > @@ -62,6 +62,30 @@ reg_vdd_cpux: vdd-cpux-regulator { > states = <1100000 0>, <1300000 1>; > }; > > + reg_vcc_dram: vcc-dram { > + compatible = "regulator-fixed"; > + regulator-name = "vcc-dram"; > + regulator-min-microvolt = <1500000>; > + regulator-max-microvolt = <1500000>; > + regulator-always-on; > + regulator-boot-on; > + enable-active-high; > + gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>; /* PL9 */ > + vin-supply = <®_vcc5v0>; > + }; > + > + reg_vcc1v2: vcc1v2 { > + compatible = "regulator-fixed"; > + regulator-name = "vcc1v2"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-always-on; > + regulator-boot-on; > + enable-active-high; > + gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */ > + vin-supply = <®_vcc5v0>; > + }; > + > wifi_pwrseq: wifi_pwrseq { > compatible = "mmc-pwrseq-simple"; > reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Attachment:
signature.asc
Description: PGP signature