From patchwork Fri May 13 21:47:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9093811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8CB399F372 for ; Fri, 13 May 2016 21:49:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C47362020F for ; Fri, 13 May 2016 21:49:41 +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 EEA8C201D3 for ; Fri, 13 May 2016 21:49:40 +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 1b1KwE-0006NH-FC; Fri, 13 May 2016 21:48:02 +0000 Received: from mail-pf0-x229.google.com ([2607:f8b0:400e:c00::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b1KwB-0006Kb-LN for linux-arm-kernel@lists.infradead.org; Fri, 13 May 2016 21:48:00 +0000 Received: by mail-pf0-x229.google.com with SMTP id 77so46117846pfv.2 for ; Fri, 13 May 2016 14:47:39 -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=aiquR1EF6ol2iC6zAadQE7s0hFIMXEdyfwgkVL5fAiI=; b=BBDAamWxsSdBixpQwsOwP6hlfbQa36GGWN+EiKbVjHM+pxLfnu/FYbD0pX7zaI2/4d eTg+UAkRm4Pe9xLeouN6JlN+boqmWkPyN5bXedrTWw8VB9ELxz0vmkbLqAUWGjDdcNZ9 OWVQsZrHr6eRxYd0TyJmwSahuW5KuzGPXFXwc= 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=aiquR1EF6ol2iC6zAadQE7s0hFIMXEdyfwgkVL5fAiI=; b=gmEnyDm2IPkLWFgrRy7PMxBmjGsmMmzxjZD/EBz2DNYFAeGF2+VZOMERtdOx52Imhp okTLG5uZ83Nxfhz+z6LD6YEDM38ZJuy6DJYv8n4HGN6HT1QmcePh1+Sp8GEkSByfKy56 OsKAEiOWcxzAO6nLY5n1lbJ1m4/T2T6sYboHROejp0ee1OZCK+iIgVVF5c07KkuWBiM9 hkICuCQe/tj1gIf8p/2MApTgXN89Hzyp4V3QBIEp9b6fewdjheoS+SUq5BTBX7XBgNf1 WyzXRbYM8LpmK0sSGQO2KL1tJ1CxkhN/iNHrDEmNtt0gpzQvfr/Ei32ZgASLkdoBgV2S lqEA== X-Gm-Message-State: AOPr4FWfkAtZpKooxhycWgEVvxDXlPT1LUghekG3dWViDI8Nm8VEzqAvwrwUO6mhSvwULYPk X-Received: by 10.98.47.66 with SMTP id v63mr26351898pfv.67.1463176058972; Fri, 13 May 2016 14:47:38 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id ba9sm29670253pab.24.2016.05.13.14.47.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 May 2016 14:47:38 -0700 (PDT) From: Brian Norris To: Heiko Stuebner Subject: [PATCH v3 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Date: Fri, 13 May 2016 14:47:24 -0700 Message-Id: <1463176045-109748-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-20160513_144759_748242_A600BAEB X-CRM114-Status: GOOD ( 11.61 ) X-Spam-Score: -2.7 (--) 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: Shawn Lin , Brian Norris , linux-kernel@vger.kernel.org, Doug Anderson , linux-rockchip@lists.infradead.org, Brian Norris , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Add description for the SDHCI v5.1 eMMC controller on rk3399. Fix it to 200 MHz, to support all supported timing modes. Note that 'rockchip,rk3399-sdhci-5.1' is not documented; we presumably have a compliant Arasan controller, but let's have a rockchip property as the canonical backup/precautionary measure. Per Heiko's previous suggestion, let's not clutter the arasan doc with it. Signed-off-by: Brian Norris Reviewed-by: Doug Anderson Reviewed-by: Shawn Lin --- v3: * correct emmc_phy reg length to 0x24 v2: * improved commit message * assign eMMC clock to 200 MHz arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 46f325a143b0..99078f5ebeb9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -215,6 +215,19 @@ 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"; + assigned-clocks = <&cru SCLK_EMMC>; + assigned-clock-rates = <200000000>; + phys = <&emmc_phy>; + phy-names = "phy_arasan"; + status = "disabled"; + }; + usb_host0_ehci: usb@fe380000 { compatible = "generic-ehci"; reg = <0x0 0xfe380000 0x0 0x20000>; @@ -481,8 +494,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 0x24>; + #phy-cells = <0>; + status = "disabled"; + }; }; watchdog@ff840000 {