From patchwork Thu Jan 9 15:42:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Reichl X-Patchwork-Id: 205926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F085C33CA1 for ; Thu, 9 Jan 2020 16:10:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F5C8206ED for ; Thu, 9 Jan 2020 16:10:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387462AbgAIQKH (ORCPT ); Thu, 9 Jan 2020 11:10:07 -0500 Received: from wp126.webpack.hosteurope.de ([80.237.132.133]:56728 "EHLO wp126.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731832AbgAIQKG (ORCPT ); Thu, 9 Jan 2020 11:10:06 -0500 X-Greylist: delayed 1668 seconds by postgrey-1.27 at vger.kernel.org; Thu, 09 Jan 2020 11:10:05 EST Received: from [2003:a:659:3f00:1e6f:65ff:fe31:d1d5] (helo=hermes.fivetechno.de); authenticated by wp126.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1ipZws-0004wt-5f; Thu, 09 Jan 2020 16:42:14 +0100 X-Virus-Scanned: by amavisd-new 2.11.1 using newest ClamAV at linuxbbg.five-lan.de Received: from roc-pc (p5098d998.dip0.t-ipconnect.de [80.152.217.152]) (authenticated bits=0) by hermes.fivetechno.de (8.15.2/8.14.5/SuSE Linux 0.8) with ESMTPSA id 009FgCHr032463 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 9 Jan 2020 16:42:13 +0100 From: Markus Reichl To: linux-rockchip@lists.infradead.org, Rob Herring , Mark Rutland , Heiko Stuebner Cc: Markus Reichl , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 3/3] arm64: dts: rockchip: Enable sdio0 and uart0 on rk3399-roc-pc-mezzanine Date: Thu, 9 Jan 2020 16:42:10 +0100 Message-Id: <20200109154211.1530-1-m.reichl@fivetechno.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de; m.reichll@fivetechno.de; 1578586205; 388935da; X-HE-SMSGID: 1ipZws-0004wt-5f Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The mezzanine board carries an E key type M.2 slot. This is connected to USB, SDIO and UART0. Enable sdio and uart0 for use with wlan and/or bt M.2 cards. Signed-off-by: Markus Reichl --- Wifi via SDIO has been tested with Laird ST60-2230C (Marvell 88W8997) Bluetoth via USB has been tested with Intel 9260 Bluetooth via UART has not been tested. --- Patch 1/3 of this series has been merged already [1] Patch 2/3 of this series needs further discussion [2] [1] https://lkml.org/lkml/2019/12/10/516 [2] https://lkml.org/lkml/2019/12/10/517 --- .../dts/rockchip/rk3399-roc-pc-mezzanine.dts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts index 2db9d32ad54a..2acb3d500fb9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts @@ -70,3 +70,24 @@ pcie_perst: pcie-perst { }; }; }; + +&sdio0 { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; + sd-uhs-sdr104; + vmmc-supply = <&vcc3v3_ngff>; + vqmmc-supply = <&vcc_1v8>; + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; + status = "okay"; +};