Module Name: src
Committed By: jmcneill
Date: Thu Nov 30 21:36:45 UTC 2017
Modified Files:
src/sys/arch/arm/dts: sun50i-a64.dtsi sun8i-h3-nanopi-neo.dts
sun8i-h3-orangepi-plus2e.dts sun8i-h3.dtsi
Removed Files:
src/sys/arch/arm/dts: sun8i-h3-orangepi-one.dts
Log Message:
Switch to new emac bindings for H3 boards
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/dts/sun50i-a64.dtsi
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts \
src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/dts/sun8i-h3.dtsi
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/sun50i-a64.dtsi
diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.3 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.4
--- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.3 Sat Sep 9 12:05:28 2017
+++ src/sys/arch/arm/dts/sun50i-a64.dtsi Thu Nov 30 21:36:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64.dtsi,v 1.3 2017/09/09 12:05:28 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64.dtsi,v 1.4 2017/11/30 21:36:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -75,33 +75,3 @@
drive-strength = <40>;
};
};
-
-/ {
- soc {
- ehci0: usb@01c1a000 {
- compatible = "allwinner,sun50i-a64-ehci", "generic-ehci";
- reg = <0x01c1a000 0x100>;
- interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ccu CLK_BUS_OHCI0>,
- <&ccu CLK_BUS_EHCI0>,
- <&ccu CLK_USB_OHCI0>;
- resets = <&ccu RST_BUS_OHCI0>,
- <&ccu RST_BUS_EHCI0>;
- phys = <&usbphy 0>;
- phy-names = "usb";
- status = "disabled";
- };
-
- ohci0: usb@01c1a400 {
- compatible = "allwinner,sun50i-a64-ohci", "generic-ohci";
- reg = <0x01c1a400 0x100>;
- interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ccu CLK_BUS_OHCI0>,
- <&ccu CLK_USB_OHCI0>;
- resets = <&ccu RST_BUS_OHCI0>;
- phys = <&usbphy 0>;
- phy-names = "usb";
- status = "disabled";
- };
- };
-};
Index: src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts
diff -u src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.2 src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.3
--- src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts:1.2 Thu Oct 5 13:25:33 2017
+++ src/sys/arch/arm/dts/sun8i-h3-nanopi-neo.dts Thu Nov 30 21:36:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i-h3-nanopi-neo.dts,v 1.2 2017/10/05 13:25:33 jmcneill Exp $ */
+/* $NetBSD: sun8i-h3-nanopi-neo.dts,v 1.3 2017/11/30 21:36:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -57,16 +57,3 @@
enable-active-high;
};
};
-
-&emac {
- phy-mode = "mii";
- phy = <&phy1>;
-
- allwinner,use-internal-phy;
- allwinner,leds-active-low;
- status = "okay";
-
- phy1: ethernet-phy@1 {
- reg = <1>;
- };
-};
Index: src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
diff -u src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.2 src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.3
--- src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.2 Mon Oct 2 22:51:15 2017
+++ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts Thu Nov 30 21:36:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.2 2017/10/02 22:51:15 jmcneill Exp $ */
+/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.3 2017/11/30 21:36:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -30,18 +30,6 @@
#include "sun8i-h3.dtsi"
/ {
- reg_gmac_3v3: gmac-3v3 {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&emac_phy_reset_pin>;
- 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>;
- };
-
cpus {
cpu@0 {
cpu-supply = <&vdd_cpu>;
@@ -57,21 +45,6 @@
};
};
-&emac {
- pinctrl-names = "default";
- pinctrl-0 = <&emac_pins_rgmii_a>;
- phy-supply = <®_gmac_3v3>;
- phy-mode = "rgmii";
- phy = <&phy1>;
-
- allwinner,leds-active-low;
- status = "okay";
-
- phy1: ethernet-phy@1 {
- reg = <1>;
- };
-};
-
&r_i2c {
status = "okay";
Index: src/sys/arch/arm/dts/sun8i-h3.dtsi
diff -u src/sys/arch/arm/dts/sun8i-h3.dtsi:1.5 src/sys/arch/arm/dts/sun8i-h3.dtsi:1.6
--- src/sys/arch/arm/dts/sun8i-h3.dtsi:1.5 Thu Oct 5 01:32:46 2017
+++ src/sys/arch/arm/dts/sun8i-h3.dtsi Thu Nov 30 21:36:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i-h3.dtsi,v 1.5 2017/10/05 01:32:46 jmcneill Exp $ */
+/* $NetBSD: sun8i-h3.dtsi,v 1.6 2017/11/30 21:36:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -48,20 +48,6 @@
};
soc {
- emac: ethernet@1c30000 {
- compatible = "allwinner,sun8i-h3-emac";
- reg = <0x01c30000 0x104>, <0x01c00030 0x4>;
- reg-names = "emac", "syscon";
- interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
- resets = <&ccu RST_BUS_EMAC>, <&ccu RST_BUS_EPHY>;
- reset-names = "ahb", "ephy";
- clocks = <&ccu CLK_BUS_EMAC>, <&ccu CLK_BUS_EPHY>;
- clock-names = "ahb", "ephy";
- #address-cells = <1>;
- #size-cells = <0>;
- status = "disabled";
- };
-
r_i2c: i2c@1f02400 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01f02400 0x400>;
@@ -87,19 +73,3 @@
};
};
};
-
-&pio {
- emac_pins_rgmii_a: emac_rgmii@0 {
- pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5",
- "PD7", "PD8", "PD9", "PD10", "PD12", "PD13",
- "PD15", "PD16", "PD17";
- function = "emac";
- drive-strength = <40>;
- };
-
- emac_phy_reset_pin: emac_phy_reset_pin@0 {
- pins = "PD6";
- function = "emac";
- drive-strength = <10>;
- };
-};
