Skip to content

Commit 168c3e0

Browse files
committed
Merge tag 'sunxi-dt-for-6.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
Allwinner SoC device tree changes for 6.12 part 2 ARM64 device tree and binding-only changes - Add system and pin voltage regulator supplies for NanoPi NEO Plus2 * tag 'sunxi-dt-for-6.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: h5: NanoPi NEO Plus2: Use regulators for pio arm64: dts: allwinner: h5: NanoPi Neo Plus2: Fix regulators Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents af0103e + 605f564 commit 168c3e0

File tree

1 file changed

+37
-0
lines changed

1 file changed

+37
-0
lines changed

arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,40 @@
4545
startup-delay-us = <100000>;
4646
enable-active-high;
4747
gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
48+
vin-supply = <&reg_vcc3v3>;
49+
};
50+
51+
reg_gmac_2v5: gmac-2v5 {
52+
/* 2V5 supply for GMAC PHY IO */
53+
compatible = "regulator-fixed";
54+
regulator-name = "gmac-2v5";
55+
regulator-min-microvolt = <2500000>;
56+
regulator-max-microvolt = <2500000>;
57+
regulator-always-on;
58+
vin-supply = <&reg_vcc3v3>;
59+
};
60+
61+
reg_vcc5v: regulator-vcc5v {
62+
/* board 5V supply from micro USB or pin headers */
63+
compatible = "regulator-fixed";
64+
regulator-name = "vcc-5v";
65+
regulator-min-microvolt = <5000000>;
66+
regulator-max-microvolt = <5000000>;
67+
regulator-always-on;
4868
};
4969

5070
reg_vcc3v3: vcc3v3 {
71+
/* board 3V3 supply by SY8089A */
5172
compatible = "regulator-fixed";
5273
regulator-name = "vcc3v3";
5374
regulator-min-microvolt = <3300000>;
5475
regulator-max-microvolt = <3300000>;
76+
regulator-always-on;
77+
vin-supply = <&reg_vcc5v>;
5578
};
5679

5780
vdd_cpux: gpio-regulator {
81+
/* cpu voltage regulator MP2143DJ */
5882
compatible = "regulator-gpio";
5983
regulator-name = "vdd-cpux";
6084
regulator-type = "voltage";
@@ -66,6 +90,7 @@
6690
gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;
6791
gpios-states = <0x1>;
6892
states = <1100000 0>, <1300000 1>;
93+
vin-supply = <&reg_vcc5v>;
6994
};
7095

7196
wifi_pwrseq: pwrseq {
@@ -146,6 +171,18 @@
146171
status = "okay";
147172
};
148173

174+
&pio {
175+
vcc-pa-supply = <&reg_vcc3v3>;
176+
vcc-pc-supply = <&reg_vcc3v3>;
177+
vcc-pd-supply = <&reg_gmac_2v5>;
178+
vcc-pf-supply = <&reg_vcc3v3>;
179+
vcc-pg-supply = <&reg_vcc3v3>;
180+
};
181+
182+
&r_pio {
183+
vcc-pl-supply = <&reg_vcc3v3>;
184+
};
185+
149186
&uart0 {
150187
pinctrl-names = "default";
151188
pinctrl-0 = <&uart0_pa_pins>;

0 commit comments

Comments
 (0)