Skip to content

Commit

Permalink
Merge tag 'sunxi-dt-for-6.12-2' of https://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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/ZuKmwD8VQrvNx8ir@wens.tw
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
arndb committed Sep 12, 2024
2 parents af0103e + 605f564 commit 168c3e0
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,40 @@
startup-delay-us = <100000>;
enable-active-high;
gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
vin-supply = <&reg_vcc3v3>;
};

reg_gmac_2v5: gmac-2v5 {
/* 2V5 supply for GMAC PHY IO */
compatible = "regulator-fixed";
regulator-name = "gmac-2v5";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
vin-supply = <&reg_vcc3v3>;
};

reg_vcc5v: regulator-vcc5v {
/* board 5V supply from micro USB or pin headers */
compatible = "regulator-fixed";
regulator-name = "vcc-5v";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};

reg_vcc3v3: vcc3v3 {
/* board 3V3 supply by SY8089A */
compatible = "regulator-fixed";
regulator-name = "vcc3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
vin-supply = <&reg_vcc5v>;
};

vdd_cpux: gpio-regulator {
/* cpu voltage regulator MP2143DJ */
compatible = "regulator-gpio";
regulator-name = "vdd-cpux";
regulator-type = "voltage";
Expand All @@ -66,6 +90,7 @@
gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;
gpios-states = <0x1>;
states = <1100000 0>, <1300000 1>;
vin-supply = <&reg_vcc5v>;
};

wifi_pwrseq: pwrseq {
Expand Down Expand Up @@ -146,6 +171,18 @@
status = "okay";
};

&pio {
vcc-pa-supply = <&reg_vcc3v3>;
vcc-pc-supply = <&reg_vcc3v3>;
vcc-pd-supply = <&reg_gmac_2v5>;
vcc-pf-supply = <&reg_vcc3v3>;
vcc-pg-supply = <&reg_vcc3v3>;
};

&r_pio {
vcc-pl-supply = <&reg_vcc3v3>;
};

&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pa_pins>;
Expand Down

0 comments on commit 168c3e0

Please sign in to comment.