From patchwork Tue Jan 23 22:18:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 865069 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="l9J1Utbe"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="bBwiGF3U"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR3Jz0VXyz9rxj for ; Wed, 24 Jan 2018 09:44:50 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B7DECC21EB4; Tue, 23 Jan 2018 22:43:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3E15DC220DC; Tue, 23 Jan 2018 22:42:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 278DAC21D56; Tue, 23 Jan 2018 22:19:54 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lists.denx.de (Postfix) with ESMTPS id B01C2C21DB5 for ; Tue, 23 Jan 2018 22:19:53 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E12B920FAD; Tue, 23 Jan 2018 17:19:52 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 23 Jan 2018 17:19:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=wpukWMNHcFfDN+cR1 vdX7SA7CtPsQMPy0vzJfOROs74=; b=l9J1UtbeGqD3kkeH/bL8aTlAWi9CzirTr vmPymEMT4kv8fDzzmUEZddLJhOtiSLz1/wyUn8lTK9E+tgjqIS0XV6ycj/ce4LdW yN/qPiUwLBHnqBLNEJIYk5jS1lka/u/9It8GxILDxZ+ebrxESbVoFMEih5uIAkpk MvG0lsZImxy/QcAgyHmkFfB/Wcf+6aCDXa8i8ZBj55JjAKWwIKNfN1T7l4Yu8TXC tBQc6XHvy6GtOotqx76MehXnoN2IKnXBj0VId+ZO7f9k794eF83HHK0SymEpLy/I TqINzDkWx3g1aNwK/103Bs5rg2/UmgYh0ywrr0HZjKx43HujCwe+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=wpukWMNHcFfDN+cR1vdX7SA7CtPsQMPy0vzJfOROs74=; b=bBwiGF3U trBfHuXeLyxEw+BT73699VzPOPEy65sindr1uCBbAqi7435Td8IsmJAOyZf93QAS b4S4bScYUpTNA9J6gybsQ0ZDU07SKtASzx04wCNFsfIjIHBTm4WaqHcO0De0nFnX figEpIsOW2tPa+NA+/EsyntbqCVFBBrYxuZxFckkUi3AynMlOpVBU4KAi48+RPVm ZSe6WEEkGQTwG99ZBIqEDD89KIs2RbvDRtOFBx6A+MCVSXt2d6q+u9pZCHXSG62C 5FS0JX82stzUwE9VWSOLWhD2s6EliQ+lpFTn+ROPRUpgVJ1GGicAB9vPvDkElKQQ DwLfd+zbA3Inpg== X-ME-Sender: Received: from indium.zzz.sholland.net (unknown [161.130.188.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 4470A246D8; Tue, 23 Jan 2018 17:19:52 -0500 (EST) From: Samuel Holland To: u-boot@lists.denx.de Date: Tue, 23 Jan 2018 16:18:13 -0600 Message-Id: <20180123221819.29734-2-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180123221819.29734-1-samuel@sholland.org> References: <20180123221819.29734-1-samuel@sholland.org> X-Mailman-Approved-At: Tue, 23 Jan 2018 22:42:47 +0000 Cc: Hans de Goede , linux-sunxi@googlegroups.com, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH 1/7] sunxi: binman: Fix U-Boot binary size check X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If raw mode is disabled, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR is not defined, which breaks compiling the device trees. Only enable the size check when it actually matters--that is, when MMC raw mode is enabled. Signed-off-by: Samuel Holland --- arch/arm/dts/sunxi-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 72e95afd78..996f391030 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -17,7 +17,7 @@ filename = "spl/sunxi-spl.bin"; }; u-boot-img { -#ifdef CONFIG_MMC +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR size = ; #endif pos = ; From patchwork Tue Jan 23 22:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 865072 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="AKatKVtD"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="jB6zVMOH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR3LS65y5z9s7s for ; Wed, 24 Jan 2018 09:46:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 729BAC22178; Tue, 23 Jan 2018 22:44:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1BEB4C22167; Tue, 23 Jan 2018 22:42:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D62B6C21D56; Tue, 23 Jan 2018 22:19:54 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lists.denx.de (Postfix) with ESMTPS id 4AA78C21DB5 for ; Tue, 23 Jan 2018 22:19:54 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 85C072098A; Tue, 23 Jan 2018 17:19:53 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 23 Jan 2018 17:19:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=PGJaykoBBdtVTO/Ym asH79B6Dx7SFSbf7ZMCr5gIcxs=; b=AKatKVtDBdsu0IRnHnYIbapbPRereyOEd xpae4c5hzPnLu3WpECb65+p7vwp4aEEPiULMUMbYgcaPcTLRFp2wx/hTYmkLKFI+ bNNYvXF8GNBCvfHdsEe4114sFZuyD1V0LogZKvmgQmSrkp+jJX0/xhk2lW01zPfJ WS3tNfT+6vHWbVTqkcccrj+8w82CDkS3v4PB+7Y5eNy5sABooAR4wpO4di9fojLD 1DNqEtsw+AmqQGuRxhEkt6PoNaaENIYITER598f7xAF9cev9NAMAbFTjwlTVxaeX C5si4wrWpGjb57TJSsE/ecm4qYbQBeX2CykRTSbEz7fOvmFmUJqLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=PGJaykoBBdtVTO/YmasH79B6Dx7SFSbf7ZMCr5gIcxs=; b=jB6zVMOH 9fMMw6DnjMstg814CqBxgbxe4BdPMt8HGGDcTgW/PWs7xZQe++YMTl4apJDBJ2jy tm51eIGKFY5aFtBV6+dl2abv7H23bFc7FDvpxkbfX4QLiBiXnyvZ/9g8DfbR1RFt KrG7s/O+r9jrETY4ZbOOljuRQ7pC0kBCWpu1YI1vAUtl90R5sSW6Dx+7JC5TKkj7 gjVMjCST0IwOZIGCjky3HybKWyoTOjSKiTpA03caK3k4zEJvQvLS+upm14ieZytE 8JIT9gkoiXpE2Ynl1I6QDtjCPO3BfpZmBXpVZLWNZ+RQia2J8xiBeXIDRpNqLylt +jzTvz7O6mmQXg== X-ME-Sender: Received: from indium.zzz.sholland.net (unknown [161.130.188.75]) by mail.messagingengine.com (Postfix) with ESMTPA id D3B90246F4; Tue, 23 Jan 2018 17:19:52 -0500 (EST) From: Samuel Holland To: u-boot@lists.denx.de Date: Tue, 23 Jan 2018 16:18:14 -0600 Message-Id: <20180123221819.29734-3-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180123221819.29734-1-samuel@sholland.org> References: <20180123221819.29734-1-samuel@sholland.org> X-Mailman-Approved-At: Tue, 23 Jan 2018 22:42:48 +0000 Cc: Hans de Goede , linux-sunxi@googlegroups.com, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH 2/7] sun50i: a64: Fix USB clock/reset properties X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move the CLK_USB_OHCI0/1 clocks to the OHCI nodes where they belong, and make the format consistent with the H3/H5 nodes. While here, also remove leading zeros from the USB nodes' unit addresses. Signed-off-by: Samuel Holland --- arch/arm/dts/sun50i-a64.dtsi | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi index 65a344d9ce..02061cc608 100644 --- a/arch/arm/dts/sun50i-a64.dtsi +++ b/arch/arm/dts/sun50i-a64.dtsi @@ -171,7 +171,7 @@ #size-cells = <0>; }; - usb_otg: usb@01c19000 { + usb_otg: usb@1c19000 { compatible = "allwinner,sun8i-a33-musb"; reg = <0x01c19000 0x0400>; clocks = <&ccu CLK_BUS_OTG>; @@ -184,7 +184,7 @@ status = "disabled"; }; - usbphy: phy@01c19400 { + usbphy: phy@1c19400 { compatible = "allwinner,sun50i-a64-usb-phy"; reg = <0x01c19400 0x14>, <0x01c1a800 0x4>, @@ -204,49 +204,43 @@ #phy-cells = <1>; }; - ehci0: usb@01c1a000 { + ehci0: usb@1c1a000 { compatible = "allwinner,sun50i-a64-ehci", "generic-ehci"; reg = <0x01c1a000 0x100>; interrupts = ; - clocks = <&ccu CLK_BUS_OHCI0>, - <&ccu CLK_BUS_EHCI0>, - <&ccu CLK_USB_OHCI0>; - resets = <&ccu RST_BUS_OHCI0>, - <&ccu RST_BUS_EHCI0>; + clocks = <&ccu CLK_BUS_EHCI0>, <&ccu CLK_BUS_OHCI0>; + resets = <&ccu RST_BUS_EHCI0>, <&ccu RST_BUS_OHCI0>; status = "disabled"; }; - ohci0: usb@01c1a400 { + ohci0: usb@1c1a400 { compatible = "allwinner,sun50i-a64-ohci", "generic-ohci"; reg = <0x01c1a400 0x100>; interrupts = ; - clocks = <&ccu CLK_BUS_OHCI0>, + clocks = <&ccu CLK_BUS_EHCI0>, <&ccu CLK_BUS_OHCI0>, <&ccu CLK_USB_OHCI0>; - resets = <&ccu RST_BUS_OHCI0>; + resets = <&ccu RST_BUS_EHCI0>, <&ccu RST_BUS_OHCI0>; status = "disabled"; }; - ehci1: usb@01c1b000 { + ehci1: usb@1c1b000 { compatible = "allwinner,sun50i-a64-ehci", "generic-ehci"; reg = <0x01c1b000 0x100>; interrupts = ; - clocks = <&ccu CLK_BUS_OHCI1>, - <&ccu CLK_BUS_EHCI1>, - <&ccu CLK_USB_OHCI1>; - resets = <&ccu RST_BUS_OHCI1>, - <&ccu RST_BUS_EHCI1>; + clocks = <&ccu CLK_BUS_EHCI1>, <&ccu CLK_BUS_OHCI1>; + resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>; phys = <&usbphy 1>; phy-names = "usb"; status = "disabled"; }; - ohci1: usb@01c1b400 { + ohci1: usb@1c1b400 { compatible = "allwinner,sun50i-a64-ohci", "generic-ohci"; reg = <0x01c1b400 0x100>; interrupts = ; - clocks = <&ccu CLK_BUS_OHCI1>, + clocks = <&ccu CLK_BUS_EHCI1>, <&ccu CLK_BUS_OHCI1>, <&ccu CLK_USB_OHCI1>; - resets = <&ccu RST_BUS_OHCI1>; + resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>; phys = <&usbphy 1>; phy-names = "usb"; status = "disabled"; From patchwork Tue Jan 23 22:18:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 865076 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="c/324DQ7"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="EaB/S/po"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR3Ns0mvpz9s7s for ; Wed, 24 Jan 2018 09:48:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 719F2C2215F; Tue, 23 Jan 2018 22:44:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2D660C21E28; Tue, 23 Jan 2018 22:42:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 602EDC21D56; Tue, 23 Jan 2018 22:19:55 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lists.denx.de (Postfix) with ESMTPS id D62C1C21E1E for ; Tue, 23 Jan 2018 22:19:54 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 1D71E20BD2; Tue, 23 Jan 2018 17:19:54 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 23 Jan 2018 17:19:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=Q0o/gDylc02PlDcn0 E0PYnl/znihlWRENZxEdsUXLec=; b=c/324DQ7I2bqnOII0tuB4fmsSRGtrb8n5 aihkBQ68Wv/ytHW/K3BQMkJTRaGV9450u6n3wcT67kAehfN8iQWxibMFwwvZRDkU 1eDSxIOuxdZJWy4LxLEj19NzE/KLh0+tvWcikb0E597mDtQZNzksjF+iiim3zIgG LpD7g7EAbI2tlW7ZOJEPtxqWvWMZvIvgnFHw+bv5/LobZgO2E2h8Tf2I5VxweVyq GRHorO5MCg5QXzC8KzwMCQKLddiOv7DcTeg7DqEuf3tItusP3NDpvePK8A06kqv0 ZKl5OW+1pl8/foG0OxQ3FnQ3ThqQIWTbcQo6fxXablnKMPF8IiDFA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=Q0o/gDylc02PlDcn0E0PYnl/znihlWRENZxEdsUXLec=; b=EaB/S/po /wblu7CjwoZKrqohBMy9SmdMN34Y7+1BbaktdAyebGZ/C4WjfKdEZAah9zr9LbFY LxipOgT/rra1iBJOpqvxr/w/X5U/woPGvKyp+S5O2sBXK0ASUynXjygX8Hb6guwS RWw4uuQ7GO4lEjW10/8b3jQedCHExq4iWnBMUrEPMxRTelOYt/S5BdUGVWsjccpQ tUXrfai8bFpvQoG98UWD41/5D2/clOPKostu2BSVpFqEcUiAUcaz0L+sj3VBG4/Z OS6kAgD2LqNjo+VSsHLltFYplveCRUcL1XU22EnEgD3NscDg2rV+hp95iMTDmcqM Pw+GCJ3Xi3dS7Q== X-ME-Sender: Received: from indium.zzz.sholland.net (unknown [161.130.188.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 72623246D8; Tue, 23 Jan 2018 17:19:53 -0500 (EST) From: Samuel Holland To: u-boot@lists.denx.de Date: Tue, 23 Jan 2018 16:18:15 -0600 Message-Id: <20180123221819.29734-4-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180123221819.29734-1-samuel@sholland.org> References: <20180123221819.29734-1-samuel@sholland.org> X-Mailman-Approved-At: Tue, 23 Jan 2018 22:42:48 +0000 Cc: Hans de Goede , linux-sunxi@googlegroups.com, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH 3/7] sun50i: a64: Move ethernet nodes to SoC DTS X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" These nodes were previously in an unused file specific to the Pine64. Move them to the base SoC device tree for use by other boards. Require individual boards to enable the emac and provide a pin configuration. Signed-off-by: Samuel Holland --- arch/arm/dts/sun50i-a64-pine64-plus-u-boot.dtsi | 50 ------------------------- arch/arm/dts/sun50i-a64.dtsi | 28 ++++++++++++++ 2 files changed, 28 insertions(+), 50 deletions(-) delete mode 100644 arch/arm/dts/sun50i-a64-pine64-plus-u-boot.dtsi diff --git a/arch/arm/dts/sun50i-a64-pine64-plus-u-boot.dtsi b/arch/arm/dts/sun50i-a64-pine64-plus-u-boot.dtsi deleted file mode 100644 index 9c61beac01..0000000000 --- a/arch/arm/dts/sun50i-a64-pine64-plus-u-boot.dtsi +++ /dev/null @@ -1,50 +0,0 @@ -/ { - aliases { - ethernet0 = &emac; - }; - - soc { - emac: ethernet@01c30000 { - compatible = "allwinner,sun50i-a64-emac"; - reg = <0x01c30000 0x2000>, <0x01c00030 0x4>; - reg-names = "emac", "syscon"; - interrupts = ; - resets = <&ccu RST_BUS_EMAC>; - reset-names = "ahb"; - clocks = <&ccu CLK_BUS_EMAC>; - clock-names = "ahb"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&rgmii_pins>; - phy-mode = "rgmii"; - phy = <&phy1>; - status = "okay"; - - phy1: ethernet-phy@1 { - reg = <1>; - }; - }; - }; -}; - -&pio { - rmii_pins: rmii_pins { - allwinner,pins = "PD10", "PD11", "PD13", "PD14", - "PD17", "PD18", "PD19", "PD20", - "PD22", "PD23"; - allwinner,function = "emac"; - allwinner,drive = <3>; - allwinner,pull = <0>; - }; - - rgmii_pins: rgmii_pins { - allwinner,pins = "PD8", "PD9", "PD10", "PD11", - "PD12", "PD13", "PD15", - "PD16", "PD17", "PD18", "PD19", - "PD20", "PD21", "PD22", "PD23"; - allwinner,function = "emac"; - allwinner,drive = <3>; - allwinner,pull = <0>; - }; -}; diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi index 02061cc608..c686707cf5 100644 --- a/arch/arm/dts/sun50i-a64.dtsi +++ b/arch/arm/dts/sun50i-a64.dtsi @@ -51,6 +51,10 @@ #address-cells = <1>; #size-cells = <1>; + aliases { + ethernet0 = &emac; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -267,6 +271,16 @@ interrupt-controller; #interrupt-cells = <3>; + emac_rgmii_pins: emac_rgmii_pins { + allwinner,pins = "PD8", "PD9", "PD10", "PD11", + "PD12", "PD13", "PD15", + "PD16", "PD17", "PD18", "PD19", + "PD20", "PD21", "PD22", "PD23"; + allwinner,function = "emac"; + allwinner,drive = <3>; + allwinner,pull = <0>; + }; + i2c1_pins: i2c1_pins { pins = "PH2", "PH3"; function = "i2c1"; @@ -401,6 +415,20 @@ #size-cells = <0>; }; + emac: ethernet@01c30000 { + compatible = "allwinner,sun50i-a64-emac"; + reg = <0x01c30000 0x2000>, <0x01c00030 0x4>; + reg-names = "emac", "syscon"; + interrupts = ; + resets = <&ccu RST_BUS_EMAC>; + reset-names = "ahb"; + clocks = <&ccu CLK_BUS_EMAC>; + clock-names = "ahb"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + gic: interrupt-controller@1c81000 { compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>, From patchwork Tue Jan 23 22:18:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 865075 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="mbgoq+Rp"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="MCr8LbuJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR3Mn5H4sz9rxj for ; Wed, 24 Jan 2018 09:47:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 73C21C2218A; Tue, 23 Jan 2018 22:44:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0B3E4C22180; Tue, 23 Jan 2018 22:42:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CC825C21D56; Tue, 23 Jan 2018 22:19:55 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lists.denx.de (Postfix) with ESMTPS id 7282DC21DB5 for ; Tue, 23 Jan 2018 22:19:55 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id ADD5620861; Tue, 23 Jan 2018 17:19:54 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 23 Jan 2018 17:19:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=xjwEfrdZ9TGCLnPi/ NJuvn7r/XcXrcXysDgRpCfvibA=; b=mbgoq+RpIB2Rm3+EcLxk0h+Id4tCp3Wjp vatdwyUjG93V2SKRWxIQ3FVvhj8bovb70OeCkb7itaKf788jRapFC96p3+Ynh/zO Ckfu5o7y56vO1JaCBQL8Qs7fGtbZlpRR5r6LFYDiQoQ4vzkA285PdpR31DdXyUVn sVMNNijBLC4RFM8nq6/lUQKFfdzel0UG7BmS4LgxH1LGHc4LpiCtdqQ3zGrEbx0A HGzuvHijmXeHLNNr6sZtO8JSC18kHsVWIq9JLznyEBOvz+0V7JKbNG3r/25uRhxu 0pPNWm7DJFL00iBJ9CQ8QHLmywWSp370/cj79/RFJTanjutQ7jMZQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=xjwEfrdZ9TGCLnPi/NJuvn7r/XcXrcXysDgRpCfvibA=; b=MCr8LbuJ zBIFL3eS248rZhU60pkvwEPZD8FgUD7tQjglslAZ+ArxKu2myjsFzpgFmsEJZL5d t/2FAMvn6uHNCcjQz3tVVqzMqIhTix5yX5ss7J68yhY8TTXJP7v2qTPfVa3JY99k 4oiP1wrHaOeIqSbOTnyHRGF+Kt/EHz5My6oHK3OdhiJxgGRj3hOC/JpOHHnfEFHz jND9hFxpZsiaoPt2JU+UAnJxqTd4Fy7Vu8PP8lZbOGyf0Ex4lmYUSXUygy+qmjaC 29OrrR1BU/H3iZOw4PQ9FSwE6A8PTlN+tYN1S6cO9JlMuEkbNbx2+eMhq4NExLiu rHbHTq3bUAzENA== X-ME-Sender: Received: from indium.zzz.sholland.net (unknown [161.130.188.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 0B9F8246F4; Tue, 23 Jan 2018 17:19:53 -0500 (EST) From: Samuel Holland To: u-boot@lists.denx.de Date: Tue, 23 Jan 2018 16:18:16 -0600 Message-Id: <20180123221819.29734-5-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180123221819.29734-1-samuel@sholland.org> References: <20180123221819.29734-1-samuel@sholland.org> X-Mailman-Approved-At: Tue, 23 Jan 2018 22:42:48 +0000 Cc: Hans de Goede , linux-sunxi@googlegroups.com, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH 4/7] sun50i: a64: Update OrangePi Win defconfig and DTS X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable Ethernet support in the device tree and add the necessary MACPWR configuration. Also fix spacing in USB device tree nodes and add the relevant configuration options. Signed-off-by: Samuel Holland --- arch/arm/dts/sun50i-a64-orangepi-win.dts | 18 +++++++++++++++--- configs/orangepi_win_defconfig | 5 ++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-a64-orangepi-win.dts index cf76c35237..41bad328f0 100644 --- a/arch/arm/dts/sun50i-a64-orangepi-win.dts +++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts @@ -67,7 +67,19 @@ }; &ehci1 { - status = "okay"; + status = "okay"; +}; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-mode = "rgmii"; + phy = <&phy1>; + status = "okay"; + + phy1: ethernet-phy@1 { + reg = <1>; + }; }; &mmc0 { @@ -80,7 +92,7 @@ }; &ohci1 { - status = "okay"; + status = "okay"; }; &uart0 { @@ -90,5 +102,5 @@ }; &usbphy { - status = "okay"; + status = "okay"; }; diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig index f9c3d4acf9..670c1868b2 100644 --- a/configs/orangepi_win_defconfig +++ b/configs/orangepi_win_defconfig @@ -1,7 +1,10 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN50I=y -CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y +CONFIG_DRAM_ZQ=3881977 +CONFIG_MACPWR="PD14" +CONFIG_USB0_ID_DET="PH9" +CONFIG_USB1_VBUS_PIN="PD7" CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-orangepi-win" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y From patchwork Tue Jan 23 22:18:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 865077 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="h0/8o/HE"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="M8C7L3z7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR3PP0X7mz9rxj for ; Wed, 24 Jan 2018 09:48:40 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B5A0EC2218B; Tue, 23 Jan 2018 22:44:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 04B59C22184; Tue, 23 Jan 2018 22:42:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 64C91C21D56; Tue, 23 Jan 2018 22:19:56 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lists.denx.de (Postfix) with ESMTPS id 0EED4C21DB5 for ; Tue, 23 Jan 2018 22:19:56 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 49F4120C59; Tue, 23 Jan 2018 17:19:55 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 23 Jan 2018 17:19:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=7YLqC4pL3BXZS3mLL kRskR23ErubrcRV2GaAJwmz+sw=; b=h0/8o/HEPyRNb9dyadbRdGPa+BrOzUJe/ Vm7CmHccNFGQFdq48YGSjUcn9EeJls+XxSyMbkPOzfqEyVcZmMDPHKl+MWwjeAVI rQ4/eL1LmbRNURWGrLjkHW7k8QFMlGB6RQO1OF2ETIQ7117aPZXrVWG3AE0g/d5q ZtKN5BJFdunsZSZyXbql33X9kjc6mbRdJttG1w67JehIfsznHfyNdJYdx5RFObFj rW88XGe5/s2g12H5JYKSb6FgG1HVFxGtX6LLzq2zWbvpFgwCwGBFlE2t9NgL1k/5 zRE2/O7OGy8PyXc0WAlebVx72DEEwjReSyUJ6hqugcZXk57ahEZqQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=7YLqC4pL3BXZS3mLLkRskR23ErubrcRV2GaAJwmz+sw=; b=M8C7L3z7 xFUljRiDtR2Ni6upTHA2u3FQiW2f3zwO2DSk4LtB3aL6DDFihYjbMACp4/BqQYoT pIdIEAV0U7lxzYYVB4e+d0ql8CtRI4hZ9tDm2FoeRP5QX6y0tmSmh9wW/B9lVJAn wsqpJsjifpBFIGz95ukSwxoSqW46ZdcaSOGdD5iw5Hu0IaVZLnhv/rsmoruhIm3c avpPzwjb1grQFc8Bnlb9rjzwvO+TtvwH8s9enztu9mU4Rel3iOvFf2PbpaLNdFKW o3ToZvvvHuYkGUbJ1C0amDNAL2gg177CAdbWMD/VRRE9ElZyM3OrdiitnZZDcKw2 azssnlURzn3zag== X-ME-Sender: Received: from indium.zzz.sholland.net (unknown [161.130.188.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 9B401246D8; Tue, 23 Jan 2018 17:19:54 -0500 (EST) From: Samuel Holland To: u-boot@lists.denx.de Date: Tue, 23 Jan 2018 16:18:17 -0600 Message-Id: <20180123221819.29734-6-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180123221819.29734-1-samuel@sholland.org> References: <20180123221819.29734-1-samuel@sholland.org> X-Mailman-Approved-At: Tue, 23 Jan 2018 22:42:48 +0000 Cc: Hans de Goede , linux-sunxi@googlegroups.com, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH 5/7] sun50i: h5: Clean up OrangePi PC 2 device tree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Sort nodes alphabetically, and remove the ethernet alias duplicated from the SoC device tree. Signed-off-by: Samuel Holland --- arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 41 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts index 780d59a096..fd8cfc6ff3 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts @@ -60,7 +60,6 @@ aliases { serial0 = &uart0; - ethernet0 = &emac; }; soc { @@ -73,6 +72,22 @@ }; }; +&ehci1 { + status = "okay"; +}; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-mode = "rgmii"; + phy = <&phy1>; + status = "okay"; + + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + &mmc0 { compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc", @@ -86,32 +101,16 @@ status = "okay"; }; -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; -}; - -&usbphy { - status = "okay"; -}; - &ohci1 { status = "okay"; }; -&ehci1 { +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; status = "okay"; }; -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-mode = "rgmii"; - phy = <&phy1>; +&usbphy { status = "okay"; - - phy1: ethernet-phy@1 { - reg = <1>; - }; }; From patchwork Tue Jan 23 22:18:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 865078 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="iOXp6XS9"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="YAQ7Dedw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR3PR4hV8z9s9Y for ; Wed, 24 Jan 2018 09:48:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 584B0C2217E; Tue, 23 Jan 2018 22:45:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D8913C2217E; Tue, 23 Jan 2018 22:42:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 10D0AC21DB5; Tue, 23 Jan 2018 22:19:57 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lists.denx.de (Postfix) with ESMTPS id B30EDC21D56 for ; Tue, 23 Jan 2018 22:19:56 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E3E9520FFC; Tue, 23 Jan 2018 17:19:55 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 23 Jan 2018 17:19:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ZpKKPdoDvP+Qh4Nfw 0Vyj8pSS0MWQPDjldYbR+KV4kU=; b=iOXp6XS9MmPUZiNYyALGPzBZFVOffx/A8 YvK67oyWNRc1kFEr0P0931m4DpLETxMJszfP2Y0P4ey+hHE4B89RsD3wgfVUdVDO oi082nztnbRnBtXYXH2sNPS00WhKfhPEuFV87XUbWWf6W9c51+iKF7CJJmRmI9aq Jo0OSVajvrqTNL864PbmXGXMJberUud1F2HQljku0K1S7dynyE+gBGx/ecpKn5Zn Qw+E4eygTOqTXMfp7U740tqo/MDTOE0jYMADqAlw6nrRsQ9i0/F476axD/CyWfPU X7UY8pyr+oYLYGTCXod2G/H5PQ+xcK7gHEC+Ed/aLGaZY9c6m8HRg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=ZpKKPdoDvP+Qh4Nfw0Vyj8pSS0MWQPDjldYbR+KV4kU=; b=YAQ7Dedw j+7Ped82ZGwQOPpS243330iC5r8b6Dj1tuPB9tuwPx1eGEEO8km8nXZz+gdDzfal gZ+P9qmPtZ5kxywCfTFIg5MMnasc+hyDt50PFcSLZaqCIbyeyqUqActkrGo3wtWl idyNSXj+eh1wurH2MZZ+1uWE0ScsOJ+BRw2OM7ZXQr7ChIGmKLu/mCIgvbfI7BMX 7pKOItvDViWGmSL0ybZmU3/CCTKujIdu8v4mGlAIpxaRFWkUgS0zOMYxZpQmMHs0 Pee11JXm6AUp6Aa7k0uD9+RY2G3Xcb0wRsHtnJqnwm4MJF9uyrHe1HK3XUy+Xwlu +h0tCpZhVOp9rg== X-ME-Sender: Received: from indium.zzz.sholland.net (unknown [161.130.188.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 3D2D224751; Tue, 23 Jan 2018 17:19:55 -0500 (EST) From: Samuel Holland To: u-boot@lists.denx.de Date: Tue, 23 Jan 2018 16:18:18 -0600 Message-Id: <20180123221819.29734-7-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180123221819.29734-1-samuel@sholland.org> References: <20180123221819.29734-1-samuel@sholland.org> X-Mailman-Approved-At: Tue, 23 Jan 2018 22:42:48 +0000 Cc: Hans de Goede , linux-sunxi@googlegroups.com, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH 6/7] sun50i: h5: Enable remaining USB ports on OrangePi PC2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The OrangePi PC 2 has three USB type A ports, with one connected to each EHCI/OHCI controller. Enable the controllers for the other two ports. Signed-off-by: Samuel Holland --- arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts index fd8cfc6ff3..dd0cb2dc50 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts @@ -76,6 +76,14 @@ status = "okay"; }; +&ehci2 { + status = "okay"; +}; + +&ehci3 { + status = "okay"; +}; + &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_rgmii_pins>; @@ -105,6 +113,14 @@ status = "okay"; }; +&ohci2 { + status = "okay"; +}; + +&ohci3 { + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; From patchwork Tue Jan 23 22:18:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 865074 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="aC+m2Q6z"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="RjxsQp/r"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR3M54WHwz9rxj for ; Wed, 24 Jan 2018 09:46:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5F0F1C22170; Tue, 23 Jan 2018 22:45:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 97B36C22196; Tue, 23 Jan 2018 22:42:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E81B3C21DB5; Tue, 23 Jan 2018 22:19:57 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lists.denx.de (Postfix) with ESMTPS id 5EFAFC21D56 for ; Tue, 23 Jan 2018 22:19:57 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9B28C20C0D; Tue, 23 Jan 2018 17:19:56 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 23 Jan 2018 17:19:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=SZn68gxEO2QqHLX/r Sf97dahux/TUX1gDE98X5JgSX0=; b=aC+m2Q6z6zFuZDuu4zSKx3jDA6vfobFiv 0GwsZOwbT2jj78/1e1yoKMqkdVQoTON0m8N/L6xnD1WoJj7BiPXJwpGoOjrR+Il8 1yKmY41mFhQa8zWTMenEekj7vgrkKaR1pFtpdY/M2lINkyBv5VPg6dgXC9DymcJ2 +l1eGNcyDqnry84cmbghsG2qtchCnjzoH47llBQ1koux4jPe04a5BPeRViXPemBZ xWtsSAeEWnyQI7v0PxjWP1iOLKZVMW7jY0VX026+/dJZYYzmZhVp16DkC3Yq7uiC gXXRdrY2KtDdfOu+IcENpdoRk/q8MZcQTjzcoMql6M5/6jeqW+apQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=SZn68gxEO2QqHLX/rSf97dahux/TUX1gDE98X5JgSX0=; b=RjxsQp/r aCDGSo0mONv3/g1xCkb3DbFs16wNZOaQFEv0PBwzKl3Yph8KMIfZHjMI50VKApLS 1Rv5omw8wcukD2UlLYZ+1J0TYMcxKhdybLSYqy/FqIn8PUftWs2oHxT2s366uv1g puwB2/mua4DA/ztd+7Z4kZncGuYUWfUu9ywJJaUDkvSIVzoXdMFhT09jQZz4SQ/P 0YZ+GUvW+vH5t/RaslmQqB67JRZs4nJMg9smbm2STwqPnArFRQYCLclzqCBCpRGO t9fjto27sB1xukFqVwH7+E6yXtWngNi28dMJUUstZSEvguDnwhfPmp7iRQS6TCCi IpznZ+sSLw+UGg== X-ME-Sender: Received: from indium.zzz.sholland.net (unknown [161.130.188.75]) by mail.messagingengine.com (Postfix) with ESMTPA id D1A2E246F4; Tue, 23 Jan 2018 17:19:55 -0500 (EST) From: Samuel Holland To: u-boot@lists.denx.de Date: Tue, 23 Jan 2018 16:18:19 -0600 Message-Id: <20180123221819.29734-8-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180123221819.29734-1-samuel@sholland.org> References: <20180123221819.29734-1-samuel@sholland.org> X-Mailman-Approved-At: Tue, 23 Jan 2018 22:42:48 +0000 Cc: Hans de Goede , linux-sunxi@googlegroups.com, Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH 7/7] sun50i: h5: Add support for the Orange Pi Zero Plus X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The Orange Pi Zero Plus is a single board computer based on the Allwinner H5 SoC. It has 512MiB RAM, gigabit Ethernet, and one USB 2.0 port, with headers for two additional ports. Signed-off-by: Samuel Holland --- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts | 115 +++++++++++++++++++++++++ arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts | 1 + board/sunxi/MAINTAINERS | 6 ++ configs/orangepi_zero_plus_defconfig | 18 ++++ 5 files changed, 141 insertions(+) create mode 100644 arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts create mode 100644 configs/orangepi_zero_plus_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 9540ba4313..67635662cb 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -356,6 +356,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \ sun50i-h5-nanopi-neo-plus2.dtb \ sun50i-h5-orangepi-pc2.dtb \ sun50i-h5-orangepi-prime.dtb \ + sun50i-h5-orangepi-zero-plus.dtb \ sun50i-h5-orangepi-zero-plus2.dtb dtb-$(CONFIG_MACH_SUN50I) += \ sun50i-a64-bananapi-m64.dtb \ diff --git a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts new file mode 100644 index 0000000000..bcdde8b3f2 --- /dev/null +++ b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts @@ -0,0 +1,115 @@ +/* + * 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 = "OrangePi Zero Plus"; + compatible = "xunlong,orangepi-zero-plus", "allwinner,sun50i-h5"; + + aliases { + ethernet0 = &emac; + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory { + reg = <0x40000000 0x20000000>; + }; + + reg_vcc3v3: vcc3v3 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; + +&ehci1 { + status = "okay"; +}; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-mode = "rgmii"; + phy = <&phy1>; + status = "okay"; + + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + +&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_HIGH>; + cd-inverted; + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; diff --git a/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts index 3f4baba310..e44e75733e 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 Jagan Teki + * Copyright (C) 2017 Samuel Holland * * 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 diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 362edffc42..7b165e4ba0 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -321,6 +321,12 @@ M: Icenowy Zheng S: Maintained F: configs/orangepi_zero_defconfig +ORANGEPI ZERO PLUS BOARD +M: Samuel Holland +S: Maintained +F: arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts +F: configs/orangepi_zero_plus_defconfig + ORANGEPI ZERO PLUS 2 BOARD M: Jagan Teki S: Maintained diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig new file mode 100644 index 0000000000..49954bbe4f --- /dev/null +++ b/configs/orangepi_zero_plus_defconfig @@ -0,0 +1,18 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN50I_H5=y +CONFIG_DRAM_ZQ=3881977 +CONFIG_MACPWR="PD6" +CONFIG_USB0_ID_DET="PG12" +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-zero-plus" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_SPI_SUNXI=y +CONFIG_SUN8I_EMAC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y