From patchwork Sat Jul 9 20:21:55 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: 9222165 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 0DA1260772 for ; Sat, 9 Jul 2016 20:24:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5CDD1FE82 for ; Sat, 9 Jul 2016 20:24:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6ABA289BF; Sat, 9 Jul 2016 20:24:11 +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 BB9AC1FE82 for ; Sat, 9 Jul 2016 20:24:10 +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 1bLylj-0000xb-3z; Sat, 09 Jul 2016 20:22:31 +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-0000wT-OI 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 9CF128E3C6; Sat, 9 Jul 2016 20:22:05 +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 u69KM0lQ017875; Sat, 9 Jul 2016 16:22:03 -0400 From: Hans de Goede To: Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 1/4] ARM: dts: sun8i: Extend Orange Pi PC dt to also handle the PC Plus Date: Sat, 9 Jul 2016 22:21:55 +0200 Message-Id: <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.25]); Sat, 09 Jul 2016 20:22:05 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160709_132227_850195_B1007A2B X-CRM114-Status: GOOD ( 12.58 ) 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 PC Plus available now, rather then adding yet another dts file for this variant, extend the existing Orange Pi PC to support the sdio wifi and emmc found on this variant. Downside of this approach is the following messages in dmesg when run on the non Plus Orange Pi PC: sunxi-mmc 1c10000.mmc: fatal err update clk timeout sunxi-mmc 1c11000.mmc: smc 2 err, cmd 8, RTO !! sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !! sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !! sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !! sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !! sunxi-mmc 1c11000.mmc: smc 2 err, cmd 1, RTO !! Note these are completely harmless and there is no adverse effect to the functioning of the non Plus Orange Pi PC. Signed-off-by: Hans de Goede --- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 40 +++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts index b8340f7..f9bf260 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts @@ -49,11 +49,13 @@ #include / { - model = "Xunlong Orange Pi PC"; + model = "Xunlong Orange Pi PC / PC Plus"; compatible = "xunlong,orangepi-pc", "allwinner,sun8i-h3"; aliases { serial0 = &uart0; + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet1 = &rtl8189ftv; }; chosen { @@ -118,6 +120,42 @@ status = "okay"; }; +/* Note only present on orangepi pc *plus* */ +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins_a>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + non-removable; + status = "okay"; + + /* + * Explicitly define the sdio device, so that we can add an ethernet + * alias for it (which e.g. makes u-boot set a mac-address). + */ + rtl8189ftv: sdio_wifi@1 { + reg = <1>; + }; +}; + +/* Note only present on orangepi pc *plus* */ +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <®_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&mmc2_8bit_pins { + /* Increase drive strength for DDR modes */ + allwinner,drive = ; + /* eMMC is missing pull-ups */ + allwinner,pull = ; +}; + &ohci1 { status = "okay"; };