From patchwork Wed May 11 00:02:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9064061 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1177EBF29F for ; Wed, 11 May 2016 00:03:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14BA020160 for ; Wed, 11 May 2016 00:03:42 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 488D620173 for ; Wed, 11 May 2016 00:03:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b0Hco-0002zH-Vi; Wed, 11 May 2016 00:03:38 +0000 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b0Hcm-0002tY-Ck for linux-rockchip@lists.infradead.org; Wed, 11 May 2016 00:03:37 +0000 Received: by mail-pf0-x22c.google.com with SMTP id 206so11297501pfu.0 for ; Tue, 10 May 2016 17:03:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=dXm0DZ7ic2SeCh/dvRvRWRkNgJPSECcobMVBXW9mlMQ=; b=YYtAoDO64AzaXsleAZI75FZVd8DRBb0tj7+mlnemS5hjo2S5U9DZgCRzhqpFJzZKGw SaBmXmA0V6x8Y6Fv6/AKphodxELZKzhdfESwfTIPbxtavLxS0BsVU2qgJ5/ILbREKZa5 QlU20NYIgjlHhq2aZP+Yhr1mfpUCtyt1bqTgc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dXm0DZ7ic2SeCh/dvRvRWRkNgJPSECcobMVBXW9mlMQ=; b=A2rHlW8p/Q8l2Syso3ggwfq/NqC7/vsTp508201ja55OuaDiFQwjIQdLMw5nkcdQZW rLhlo6VzWdoHJnEsJFu0diZNZ32OraIw5Q28Ahi29PP1o/HFaKE9i7HF4XbR3dZ/BF1J 6i9eIrKZt0JCE3G8gniUNDTm1hl38XK01ZBJyiMEIzkfr0Gq860lcYf0FKXGkYm+rIfZ UdVsBnf48v1oM97PlNuPgVPOtu/JX0J+jpXBsU8Pmn9e0d3C+S+Rc58SUoATVtMQ/vEK B67kKXUsmWi2I/eajV5JKM5QSymUzJWGFM7fZPyim9C0+oJJas6RczEkKFM58XJgPn3J Qkhg== X-Gm-Message-State: AOPr4FUA8qSjvHvATL/TWPooYOQMw8YTSNKO15jo8FtdAk57xDnDFIrDO/RbXzIj3tLwgzxz X-Received: by 10.98.80.196 with SMTP id g65mr430337pfj.91.1462924995448; Tue, 10 May 2016 17:03:15 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id t14sm7105885pfj.12.2016.05.10.17.03.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 17:03:14 -0700 (PDT) From: Brian Norris To: Heiko Stuebner Subject: [PATCH 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Date: Tue, 10 May 2016 17:02:54 -0700 Message-Id: <1462924975-69072-1-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160510_170336_521689_8C841F68 X-CRM114-Status: UNSURE ( 9.58 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Shawn Lin , Brian Norris , linux-kernel@vger.kernel.org, dianders@chromium.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The bindings for rk3399's SDHCI + eMMC PHY have been accepted, so let's support eMMC now. Note that 'rockchip,rk3399-sdhci-5.1' is not documented, but per Heiko's previous suggestion, we don't want to clutter the arasan doc, and it's just a precautionary measure to have it. Signed-off-by: Brian Norris --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 46f325a143b0..947d1221592d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -215,6 +215,17 @@ status = "disabled"; }; + sdhci: sdhci@fe330000 { + compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; + reg = <0x0 0xfe330000 0x0 0x10000>; + interrupts = ; + clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>; + clock-names = "clk_xin", "clk_ahb"; + phys = <&emmc_phy>; + phy-names = "phy_arasan"; + status = "disabled"; + }; + usb_host0_ehci: usb@fe380000 { compatible = "generic-ehci"; reg = <0x0 0xfe380000 0x0 0x20000>; @@ -481,8 +492,18 @@ }; grf: syscon@ff770000 { - compatible = "rockchip,rk3399-grf", "syscon"; + compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; reg = <0x0 0xff770000 0x0 0x10000>; + + #address-cells = <1>; + #size-cells = <1>; + + emmc_phy: phy@f780 { + compatible = "rockchip,rk3399-emmc-phy"; + reg = <0xf780 0x20>; + #phy-cells = <0>; + status = "disabled"; + }; }; watchdog@ff840000 {