CVS commit: src/sys/arch/arm/dts

[Christoph Badura]

Module Name:    src
Committed By:   bad
Date:           Tue Oct  8 23:00:36 UTC 2019

Modified Files:
        src/sys/arch/arm/dts: sun8i-h3-nanopi-r1.dts

Log Message:
Cherry pick a few changes from the armbian u-boot patch.

Makes my NanoPi R1 boot reliably.
>From 
>https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nano+pi-r1-and-duo2.patch


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts
diff -u src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts:1.1 src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts:1.2
--- src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts:1.1	Tue Oct  8 22:55:58 2019
+++ src/sys/arch/arm/dts/sun8i-h3-nanopi-r1.dts	Tue Oct  8 23:00:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i-h3-nanopi-r1.dts,v 1.1 2019/10/08 22:55:58 bad Exp $ */
+/* $NetBSD: sun8i-h3-nanopi-r1.dts,v 1.2 2019/10/08 23:00:36 bad Exp $ */
 
 /*
  * Copyright (C) 2019 Igor Pecovnik <i...@armbian.com>
@@ -63,6 +63,7 @@
 
 	reg_gmac_3v3: gmac-3v3 {
 		compatible = "regulator-fixed";
+		pinctrl-names = "default";
 		regulator-name = "gmac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -129,6 +130,15 @@
 	};
 };
 
+#if 0 /* XXX u-boot dts for NanoPi R1 has this but not needed? */
+&pio {
+	gmac_power_pin_nanopi: gmac_power_pin@0 {
+		pins = "PD6";
+		function = "gpio_out";
+	};
+};
+#endif
+
 &emac {
 	pinctrl-names = "default";
 	pinctrl-0 = <&emac_rgmii_pins>;
@@ -170,6 +180,11 @@
 	vqmmc-supply = <&reg_vcc3v3>;
 	bus-width = <8>;
 	non-removable;
+	cap-mmc-hw-reset;
+	status = "okay";
+};
+
+&ehci0 {
 	status = "okay";
 };