Skip to content

Commit

Permalink
nanopineo2black: fix hanging boot and Ethernet in U-Boot
Browse files Browse the repository at this point in the history
MichaIng/DietPi#7367

Signed-off-by: MichaIng <[email protected]>
  • Loading branch information
MichaIng committed Jan 27, 2025
1 parent 9e48c39 commit 03b248f
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ new file mode 100644
index 000000000000..57283cc16ad9
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-core2.dts
@@ -0,0 +1,210 @@
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2017 Antony Antony <[email protected]>
+ * Copyright (C) 2016 ARM Ltd.
Expand Down Expand Up @@ -172,6 +172,7 @@ index 000000000000..57283cc16ad9
+ vmmc-supply = <&reg_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+ disable-wp;
+ status = "okay";
+};
+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ new file mode 100644
index 0000000..dd25549
--- /dev/null
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-core2.dts
@@ -0,0 +1,113 @@
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2017 Antony Antony <[email protected]>
+ * Copyright (c) 2016 ARM Ltd.
Expand Down Expand Up @@ -70,6 +70,7 @@ index 0000000..dd25549
+ compatible = "friendlyarm,nanopi-neo-core2", "allwinner,sun50i-h5";
+
+ aliases {
+ ethernet0 = &emac;
+ serial0 = &uart0;
+ };
+
Expand All @@ -81,6 +82,16 @@ index 0000000..dd25549
+ reg = <0x40000000 0x40000000>;
+ };
+
+ reg_gmac_3v3: gmac-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "gmac-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <100000>;
+ enable-active-high;
+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
+ };
+
+ reg_vcc3v3: vcc3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3";
Expand All @@ -93,6 +104,22 @@ index 0000000..dd25549
+ status = "okay";
+};
+
+&emac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&emac_rgmii_pins>;
+ phy-supply = <&reg_gmac_3v3>;
+ phy-handle = <&ext_rgmii_phy>;
+ phy-mode = "rgmii-id";
+ status = "okay";
+};
+
+&external_mdio {
+ ext_rgmii_phy: ethernet-phy@7 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <7>;
+ };
+};
+
+&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc",
Expand Down

0 comments on commit 03b248f

Please sign in to comment.