From patchwork Sat Jul 9 20:21:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 9222167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C45BD60772 for ; Sat, 9 Jul 2016 20:24:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E61828966 for ; Sat, 9 Jul 2016 20:24:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92CCF28988; Sat, 9 Jul 2016 20:24:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 482EE28966 for ; Sat, 9 Jul 2016 20:24:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bLylp-0000yU-II; Sat, 09 Jul 2016 20:22:37 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bLylf-0000wV-OM for linux-arm-kernel@lists.infradead.org; Sat, 09 Jul 2016 20:22:28 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 985C246210; Sat, 9 Jul 2016 20:22:07 +0000 (UTC) Received: from shalem.localdomain.com (vpn1-5-157.ams2.redhat.com [10.36.5.157]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u69KM0lR017875; Sat, 9 Jul 2016 16:22:05 -0400 From: Hans de Goede To: Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 2/4] ARM: dts: sun8i: Extend Orange Pi Plus dt to also handle the Plus 2E Date: Sat, 9 Jul 2016 22:21:56 +0200 Message-Id: <1468095718-18515-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1468095718-18515-1-git-send-email-hdegoede@redhat.com> References: <1468095718-18515-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Sat, 09 Jul 2016 20:22:07 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160709_132227_839037_56A3A720 X-CRM114-Status: GOOD ( 12.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree , linux-arm-kernel@lists.infradead.org, Hans de Goede MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There is a new Orange Pi Plus 2E available now, rather then adding yet another dts file for this variant, extend the existing Plus / Plus2 dt to also support this variant. The 2E goes from 4 to 3 USB ports and drops the sata connector, so it no longer has a USB hub or an USB <-> sata bridge on the board. This commit enables all 3 ehci and ohci controllers to support the 3 USB connectors which are now directly connected to the SoC. Downside of this approach is 4 unused USB busses now showing up on the original Plus / Plus 2. Signed-off-by: Hans de Goede --- arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts index b0cb417..28f74f6 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts @@ -44,7 +44,7 @@ #include "sun8i-h3-orangepi-2.dts" / { - model = "Xunlong Orange Pi Plus"; + model = "Xunlong Orange Pi Plus / Plus 2 / Plus 2E"; compatible = "xunlong,orangepi-plus", "allwinner,sun8i-h3"; reg_usb3_vbus: usb3-vbus { @@ -60,6 +60,10 @@ }; }; +&ehci2 { + status = "okay"; +}; + &ehci3 { status = "okay"; }; @@ -81,6 +85,18 @@ allwinner,pull = ; }; +&ohci1 { + status = "okay"; +}; + +&ohci2 { + status = "okay"; +}; + +&ohci3 { + status = "okay"; +}; + &pio { usb3_vbus_pin_a: usb3_vbus_pin@0 { allwinner,pins = "PG11";