From 2353f805fff1316faaf6722da59c41b15825e09b Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Sun, 9 Jul 2017 13:56:34 +0000
Subject: [PATCH] dts: arm: Fix our local patches for H3

sun4i-a10.h is not included anymore, define directly the drive strengh
of the pins.
---
 sys/boot/fdt/dts/arm/h3.dtsi              | 6 ++----
 sys/boot/fdt/dts/arm/orangepi-plus-2e.dts | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys/boot/fdt/dts/arm/h3.dtsi b/sys/boot/fdt/dts/arm/h3.dtsi
index 08e9f292b57d..078b802c0669 100644
--- a/sys/boot/fdt/dts/arm/h3.dtsi
+++ b/sys/boot/fdt/dts/arm/h3.dtsi
@@ -96,14 +96,12 @@
 				 "PD7", "PD8", "PD9", "PD10", "PD12", "PD13",
 				 "PD15", "PD16", "PD17";
 		allwinner,function = "emac";
-		allwinner,drive = <SUN4I_PINCTRL_40_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+		allwinner,drive = <40>;
 	};
 
 	emac_phy_reset_pin: emac_phy_reset_pin@0 {
 		allwinner,pins = "PD6";
 		allwinner,function = "gpio_out";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+		allwinner,drive = <10>;
 	};
 };
diff --git a/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts b/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts
index 9a6a562eb243..28298cac50e5 100644
--- a/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts
+++ b/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts
@@ -50,15 +50,13 @@
 	emac_phy_reset_pin: emac_phy_reset_pin@0 {
 		allwinner,pins = "PD6";
 		allwinner,function = "gpio_out";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+		allwinner,drive = <10>;
 	};
 
 	codec_pa_pin: codec_pa_pin@0 {
 		allwinner,pins = "PA16";
 		allwinner,function = "gpio_out";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+		allwinner,drive = <10>;
 	};
 };