head 1.4; access; symbols pkgsrc-2018Q3:1.3.0.4 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.2 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.1.0.2 pkgsrc-2018Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2018.12.14.00.52.26; author jmcneill; state dead; branches; next 1.3; commitid AKgfN5HadMtGAH3B; 1.3 date 2018.05.25.20.49.52; author jakllsch; state Exp; branches; next 1.2; commitid 5S89tnqKgeB3KIDA; 1.2 date 2018.05.25.10.45.22; author jmcneill; state dead; branches; next 1.1; commitid asIaF1oVbj5OoFDA; 1.1 date 2018.01.10.00.55.27; author jakllsch; state Exp; branches; next ; commitid Wlbm18Xtudo7tgmA; desc @@ 1.4 log @Update U-Boot to 2018.11. @ text @$NetBSD: patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts,v 1.3 2018/05/25 20:49:52 jakllsch Exp $ Enable use of the NanoPi Neo Plus2's onboard Ethernet. Templated from the orangepi-pc2.dts. --- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts.orig 2018-05-07 15:32:36.000000000 +0000 +++ arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts @@@@ -104,3 +104,18 @@@@ &usbphy { status = "okay"; }; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-mode = "rgmii"; + phy-handle = <&ext_rgmii_phy>; + status = "okay"; +}; + +&external_mdio { + ext_rgmii_phy: ethernet-phy@@7 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <7>; + }; +}; @ 1.3 log @Restore Ethernet support in u-boot-nanopi-neo-plus2. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update U-Boot to 2018.05. @ text @d1 1 a1 1 $NetBSD: patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts,v 1.1 2018/01/10 00:55:27 jakllsch Exp $ d3 5 a7 1 --- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts.orig 2018-01-10 00:43:42.000000000 +0000 d9 4 a12 109 @@@@ -0,0 +1,120 @@@@ +/* + * Copyright (C) 2017 Icenowy Zheng + * Copyright (C) 2017 Jagan Teki + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; + +#include "sun50i-h5.dtsi" + +#include + +/ { + model = "FriendlyARM NanoPi NEO Plus 2"; + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + reg_vcc3v3: vcc3v3 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; + +&ehci1 { + status = "okay"; +}; + +&mmc0 { + compatible = "allwinner,sun50i-h5-mmc", + "allwinner,sun50i-a64-mmc", + "allwinner,sun5i-a13-mmc"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + status = "okay"; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <®_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; d18 1 a18 1 + phy = <&phy7>; d20 1 d22 3 a24 1 + phy7: ethernet-phy@@7 { @ 1.1 log @Add u-boot for nanopi-neo-plus2. Backported from u-boot master, with some added adjustments. @ text @d1 1 a1 1 $NetBSD$ @