From patchwork Tue Jul 24 01:15:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10541295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3B7601805 for ; Tue, 24 Jul 2018 01:17:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B2972854A for ; Tue, 24 Jul 2018 01:17:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D4852855E; Tue, 24 Jul 2018 01:17:38 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B901D2854A for ; Tue, 24 Jul 2018 01:17:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GTQkhXTJFclkrMx+pmXkVTntKwfiUR9YYONbXudrMkE=; b=dT3PfYGIO+3HLTqM+797/UqKwl qmEv2G10ZdomGslvA0tIaxlS2jRMFMFA8XsADMoKmJiLQXBoSWYM61dMrM3cqdcsRAr0f7DhPWE47 IngHiiSWkNbUcm/o6g7DyuKP0e3Xi9DcthFtqm9FcBqAF14p8gVgpUmc9OqcVxMIwn5iEFPm0n3MR 8oT3vOOkDp88Ef29EQYblj5Sbx5EwAhkE5u+UUv9tVzdZ7+9NwSorwe2woPuAd4UZoGR1VWOGJJ2X j4E8W8+veKtUHQYlGY63Y5ru9vNYrCIr7YmZD7ZBRrVtJRHARysEYjDzPKGbJRJvyZWt8IJIckzq7 T3UpERzA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhlxC-0000RG-2b; Tue, 24 Jul 2018 01:17:30 +0000 Received: from glow.birch.relay.mailchannels.net ([23.83.209.71]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhlx7-0000DA-CN for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 01:17:28 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id D09FA501144; Tue, 24 Jul 2018 01:17:08 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.30.57]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id 3E97A500EB5; Tue, 24 Jul 2018 01:17:08 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [199.195.250.187]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.1); Tue, 24 Jul 2018 01:17:08 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Chemical-Reaction: 47aa8bc7518164c1_1532395028699_1359655748 X-MC-Loop-Signature: 1532395028699:3777042286 X-MC-Ingress-Time: 1532395028699 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 9DB349F64A; Tue, 24 Jul 2018 01:17:03 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 1/3] arm64: allwinner: dts: h6: add Pine H64 model B Date: Tue, 24 Jul 2018 09:15:49 +0800 Message-Id: <20180724011551.49603-2-icenowy@aosc.io> In-Reply-To: <20180724011551.49603-1-icenowy@aosc.io> References: <20180724011551.49603-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_181725_516494_C21B7060 X-CRM114-Status: GOOD ( 18.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng 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 Pine H64 model B is another variant of Pine H64 by Pine64. It features a smaller board footprint (of RPi size) and drops PCIe. It also have WLAN on board (rather than via expansion connector on the original model A) and some LED changes. Add an initial device tree for it. Only LED difference is considered now, as functionalities related to other changes are still not available now. Signed-off-by: Icenowy Zheng --- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../allwinner/sun50i-h6-pine-h64-model-b.dts | 20 +++++++++++++++++++ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 5 +++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile index 9ffa7a038791..330b5fb3715b 100644 --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile @@ -16,3 +16,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-model-b.dtb diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts new file mode 100644 index 000000000000..d0fcc25efb00 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +/* + * Copyright (c) 2017 Icenowy Zheng + */ + +#include "sun50i-h6-pine-h64.dts" + +/ { + model = "Pine H64 Model B"; + compatible = "pine64,pine-h64-model-b", "pine64,pine-h64", + "allwinner,sun50i-h6"; + + leds { + /delete-node/ heartbeat; + + status { + label = "pine-h64:red:status"; + }; + }; +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts index ceffc40810ee..a85867f8b684 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts @@ -10,8 +10,9 @@ #include / { - model = "Pine H64"; - compatible = "pine64,pine-h64", "allwinner,sun50i-h6"; + model = "Pine H64 Model A"; + compatible = "pine64,pine-h64-model-a", "pine64,pine-h64", + "allwinner,sun50i-h6"; aliases { serial0 = &uart0; From patchwork Tue Jul 24 01:15:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10541297 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1BA91805 for ; Tue, 24 Jul 2018 01:17:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DFF8285EA for ; Tue, 24 Jul 2018 01:17:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90315285EC; Tue, 24 Jul 2018 01:17:57 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 42557285EA for ; Tue, 24 Jul 2018 01:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=IrHnaYMWlOeFtfYm7uWML8B3Mas7+4xsO4jQNUO+8lg=; b=dZj0AyxQnUZynBUPxJomnMsJoZ Oe/Rh9+Vy+KjZkyfSB2YSAB+mnE8jbPw7qr/7Aulyh1DRY4mhvF+zEt2fC1bdqNl/LOlTWosDLJ6B ODurrefuUx+J3fLFWZm/oINx8YCQy4bfSPJIzw3yq9CMmmnKN+rqWqX6VDSZfdnex3WyuVLVQ+Ods Bi3sEDGsCvTADEhnwJTfD9mqRXjCcGncMqGQ7XyJqSE5okPc8hUySL+eQ0Ffqdc6LweJSJLQ7frjo 5txgB3HZB8qfp9xquRpYW3YFlpKxukmcGTqUkmvxU3FvhgrlmS0cfstXACsRMGyi0iKqZfdj8sYxx rPolbSkg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhlxV-0000hL-8O; Tue, 24 Jul 2018 01:17:49 +0000 Received: from bisque.maple.relay.mailchannels.net ([23.83.214.18]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhlxE-0000O6-Ld for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 01:17:42 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B8D5D682165; Tue, 24 Jul 2018 01:17:17 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.29.85]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id 1766268225F; Tue, 24 Jul 2018 01:17:17 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [199.195.250.187]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.1); Tue, 24 Jul 2018 01:17:17 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Illustrious-Spill: 7758a2b65dcc005d_1532395037507_1272087321 X-MC-Loop-Signature: 1532395037507:778519080 X-MC-Ingress-Time: 1532395037506 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 65D5F9F6AF; Tue, 24 Jul 2018 01:17:11 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 2/3] arm64: allwinner: dts: h6: add pinmux for MMC1 Date: Tue, 24 Jul 2018 09:15:50 +0800 Message-Id: <20180724011551.49603-3-icenowy@aosc.io> In-Reply-To: <20180724011551.49603-1-icenowy@aosc.io> References: <20180724011551.49603-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_181733_134309_AB7694E5 X-CRM114-Status: GOOD ( 13.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng 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 The MMC1 controller on H6, in the reference design and most third party design, is used to connect SDIO Wi-Fi. Add pinmux for it. Signed-off-by: Icenowy Zheng --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index cfa5fffcf62b..ba1a3a3e2149 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -134,6 +134,14 @@ bias-pull-up; }; + mmc1_pins: mmc1-pins { + pins = "PG0", "PG1", "PG2", "PG3", + "PG4", "PG5"; + function = "mmc1"; + drive-strength = <30>; + bias-pull-up; + }; + mmc2_pins: mmc2-pins { pins = "PC1", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", From patchwork Tue Jul 24 01:15:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10541299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EEE3F14BC for ; Tue, 24 Jul 2018 01:18:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA43F285ED for ; Tue, 24 Jul 2018 01:18:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC668285EE; Tue, 24 Jul 2018 01:18:43 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 794DE285EC for ; Tue, 24 Jul 2018 01:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dYD2OHL98PCXhHjF7WQ1/fQbS2N1bnapwG4BT7LLt3Y=; b=AXPxMiP2KERUpPOC3fQ450lUPL xePQ/0u7NWFnCzG+ZUUlMSSc87ZWSUAbiVRF6sjxNffqIlyVjSfQ17USnFtYEHXr2s1qzq60vvFtJ lPbMF1yOy6iqqrYz+47reCrLABkBi8ozE/CVjVK/x9nS2OlGlEiZDS+iIxg22wZpm2iGGaKKzQTcK BF95tSDeJRXn/bUF2AlY1fo77ErQyRQa7zGL7Tf+Dn6Igfk0QkXDwezQFGCY4HZQemdwEERxDPCLQ vtMbu+8rUB38B78Ug2JVfCfKscgY84ln3AMrr99Q1z8yE+p4MaSA+PPM0deIG4y1E01JdhZLtfBsT YKpSNUFg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhlyK-00014y-ND; Tue, 24 Jul 2018 01:18:40 +0000 Received: from glow.birch.relay.mailchannels.net ([23.83.209.71]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhlyH-00012f-0H for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 01:18:38 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 66E8C5E03C1; Tue, 24 Jul 2018 01:18:23 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.26.113]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id D27185E1922; Tue, 24 Jul 2018 01:18:22 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [199.195.250.187]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.1); Tue, 24 Jul 2018 01:18:23 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Chief-Desert: 49dd029345a478c2_1532395103284_3512955032 X-MC-Loop-Signature: 1532395103284:1790144638 X-MC-Ingress-Time: 1532395103283 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id BD2E59F6AF; Tue, 24 Jul 2018 01:18:17 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 3/3] arm64: allwinner: dts: h6: add Wi-Fi support for Pine H64 model A/B Date: Tue, 24 Jul 2018 09:15:51 +0800 Message-Id: <20180724011551.49603-4-icenowy@aosc.io> In-Reply-To: <20180724011551.49603-1-icenowy@aosc.io> References: <20180724011551.49603-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_181837_147775_00E5F423 X-CRM114-Status: GOOD ( 17.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng 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 The Pine H64 model A has a Wi-Fi module connector and the model B has an on-board RTL8723BS Wi-Fi module. Add support for them. For model A, as it's not defaultly present, keep it disabled now. Signed-off-by: Icenowy Zheng --- .../allwinner/sun50i-h6-pine-h64-model-b.dts | 8 +++++ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 29 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts index d0fcc25efb00..d0f775613c9b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts @@ -18,3 +18,11 @@ }; }; }; + +&mmc1 { + status = "okay"; +}; + +&wifi_pwrseq { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts index a85867f8b684..75db6d4139bf 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts @@ -40,6 +40,12 @@ gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ }; }; + + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PL2 */ + status = "disabled"; + }; }; &mmc0 { @@ -50,6 +56,17 @@ status = "okay"; }; +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + vmmc-supply = <®_cldo2>; + vqmmc-supply = <®_bldo2>; + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; + status = "disabled"; +}; + &mmc2 { pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; @@ -128,12 +145,24 @@ }; reg_cldo2: cldo2 { + /* + * This regulator is connected with CLDO3. + * Before the kernel can support synchronized + * enable of coupled regulators, keep them + * both always on as a ugly hack. + */ + regulator-always-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc-wifi-1"; }; reg_cldo3: cldo3 { + /* + * This regulator is connected with CLDO2. + * See the comments for CLDO2. + */ + regulator-always-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc-wifi-2";