From patchwork Thu Jun 15 03:04:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 105628 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp596043qgd; Wed, 14 Jun 2017 20:07:49 -0700 (PDT) X-Received: by 10.98.197.130 with SMTP id j124mr3013600pfg.239.1497496069792; Wed, 14 Jun 2017 20:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497496069; cv=none; d=google.com; s=arc-20160816; b=qPB20aW0nDGCtBHu6LAT1OmLSCLwCrgE0MqTo12CzcA40DvonjRQwiJuQzlK0L2Kvs 0eD03wJKgrQLn9xmMgvpVhwCqe25rkWwvzs/Z/OyvfkkmexfIVb07fv396FJn5QZdBIY TUCQOBInUjtcuT5lJ3LC8xGkfINbIklYXveuDOQe7RDd7F3Cekvd4i5xmQJsobQqeh4K UGd8yCmlbVDGsN8DV4fkRiordBpIrldcBB3cxnMhYgXmdGpN4SW+mWyGm7sGdA19VhID 8CCY4g8LgP8T8IXNMUED+ISvsaWBkgdJs6OrlJ9a8034BToXrPZS1Z4kcjlL7xX2wEyL XGmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=X3qjqK6b5sCu3RV72IoyHREV914RIMUDEe6VwioaacE=; b=fSDXZ+oCBPVmRajBwWeDXWW59NXcaW54NoSDax3d0Yh3b73il1dIDKR1G8Wj4kg2rH JGbUoAHqK9dXdwNuucMMfl6CDBWQ//gHlDYu8thGlR5z88zwrS6osF0Hzq6xa7IbPc6q gyZn6azfRcP0tu1DsJTGJbmr3zar9yWNuBoQJWO7BawbUfYgNviU7/SXcbQVgG2J8HyA 3WiToVr5DdN5s+1CmMj8c4IX3bMe7gd9BMJAGQGeaFldxMOoY8ULnPRSwWtNrwWZz6CM ExhNuPsZLqJP7XwPQ00dYfjKDzWzp0PkHrWCGk+bFqvNtuApMPVTKSb71vKfJpuwlLNq kPbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=aAI5bahW; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si1366399pli.466.2017.06.14.20.07.49; Wed, 14 Jun 2017 20:07:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=aAI5bahW; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752530AbdFODHj (ORCPT + 7 others); Wed, 14 Jun 2017 23:07:39 -0400 Received: from mail-pg0-f44.google.com ([74.125.83.44]:35373 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752520AbdFODHh (ORCPT ); Wed, 14 Jun 2017 23:07:37 -0400 Received: by mail-pg0-f44.google.com with SMTP id k71so1269170pgd.2 for ; Wed, 14 Jun 2017 20:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tjgA7Rai6YzqSSY85F3+bwDk1pleggZK46TWx+9vS34=; b=aAI5bahW32OWW+pqKMcFNN7KDzqpHDUo4bEaPbpvSetaArNdlBxTnw4E4mfCjd5G1P mO+hYeTT+Y35EBZoIo4GF69gIE81VzM/lTrTGlp6sCzOi9J/elAsFrXL56buPKxbaFnh j2S+R4ZhAmkB4NnNaezkcgrWzuKW6asPg7Jy8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tjgA7Rai6YzqSSY85F3+bwDk1pleggZK46TWx+9vS34=; b=Rpb2pucuxkYGd5mS7uHEta1QW5VbLe6FaeaxcPAsVBCAAxlF6JEAPA8CsqZKiMLOkj Meyj3YWWawhn+L82KqifI/5h9eB/CD1rMb7d2M9HUXwNkYRvABfipLCeJEvRUsaCCoot +918etmVFgv/shmuqXqwaPixCp0Np+ar6lrOmhXIFJXOAmxs4fZ/qfVNav6ReZIxgJoW hf5u/13P9YUHlNNWmA67rqqY9f7uJwpNVn9xeqbmMN6vwd1yW6I03jK0dgVULnnhqN8k 4NBkU5nT6GmvEtx4bCSbn+ZtG8qrtuh7MuhDtiREdKtJAyGVFPgw1pA7d1N8Cc7ythYy 3YaQ== X-Gm-Message-State: AKS2vOwz2aeGXuItlvlpN3H9bvalqOV3QpjicGF1+qql9ZjiCAfuVCJk Ejw/0pPQW8CHbvqn X-Received: by 10.98.93.7 with SMTP id r7mr3141456pfb.10.1497496056394; Wed, 14 Jun 2017 20:07:36 -0700 (PDT) Received: from localhost.localdomain ([45.56.159.17]) by smtp.gmail.com with ESMTPSA id y65sm2156656pgd.33.2017.06.14.20.07.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 20:07:35 -0700 (PDT) From: Guodong Xu To: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com, lgirdwood@gmail.com, broonie@kernel.org, khilman@baylibre.com, arnd@arndb.de, gregory.clement@free-electrons.com, horms+renesas@verge.net.au, olof@lixom.net, thomas.petazzoni@free-electrons.com, yamada.masahiro@socionext.com, riku.voipio@linaro.org, treding@nvidia.com, krzk@kernel.org, eric@anholt.net, damm+renesas@opensource.se, ard.biesheuvel@linaro.org, linus.walleij@linaro.org, geert+renesas@glider.be Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, hw.wangxiaoyin@hisilicon.com, Li Wei , Chen Jun Subject: [PATCH v4 19/20] arm64: dts: hi3660: add sd/sdio device nodes Date: Thu, 15 Jun 2017 11:04:16 +0800 Message-Id: <20170615030417.14059-20-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170615030417.14059-1-guodong.xu@linaro.org> References: <20170615030417.14059-1-guodong.xu@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Li Wei Add sd/sdio device nodes for hi3660 soc Signed-off-by: Li Wei Signed-off-by: Chen Jun --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 8 ++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 58 +++++++++++++++++++++++ 2 files changed, 66 insertions(+) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index e579333..cec0b60 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -18,6 +18,8 @@ compatible = "hisilicon,hi3660-hikey960", "hisilicon,hi3660"; aliases { + mshc1 = &dwmmc1; + mshc2 = &dwmmc2; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; @@ -200,3 +202,9 @@ label = "HS-SPI1"; status = "okay"; }; + +&dwmmc1 { + vmmc-supply = <&ldo16>; + vqmmc-supply = <&ldo9>; + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index 529cf08..f7ff593 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -786,5 +786,63 @@ reset-gpios = <&gpio11 1 0 >; status = "ok"; }; + + /* SD */ + dwmmc1: dwmmc1@ff37f000 { + #address-cells = <1>; + #size-cells = <0>; + cd-inverted; + compatible = "hisilicon,hi3660-dw-mshc"; + num-slots = <1>; + bus-width = <0x4>; + disable-wp; + cap-sd-highspeed; + supports-highspeed; + card-detect-delay = <200>; + reg = <0x0 0xff37f000 0x0 0x1000>; + interrupts = ; + clocks = <&crg_ctrl HI3660_CLK_GATE_SD>, + <&crg_ctrl HI3660_HCLK_GATE_SD>; + clock-names = "ciu", "biu"; + clock-frequency = <3200000>; + resets = <&crg_rst 0x94 18>; + cd-gpios = <&gpio25 3 0>; + hisilicon,peripheral-syscon = <&sctrl>; + pinctrl-names = "default"; + pinctrl-0 = <&sd_pmx_func + &sd_clk_cfg_func + &sd_cfg_func>; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + status = "disabled"; + + slot@0 { + reg = <0x0>; + bus-width = <4>; + disable-wp; + }; + }; + + /* SDIO */ + dwmmc2: dwmmc2@ff3ff000 { + compatible = "hisilicon,hi3660-dw-mshc"; + reg = <0x0 0xff3ff000 0x0 0x1000>; + interrupts = ; + num-slots = <1>; + clocks = <&crg_ctrl HI3660_CLK_GATE_SDIO0>, + <&crg_ctrl HI3660_HCLK_GATE_SDIO0>; + clock-names = "ciu", "biu"; + resets = <&crg_rst 0x94 20>; + card-detect-delay = <200>; + supports-highspeed; + keep-power-in-suspend; + pinctrl-names = "default"; + pinctrl-0 = <&sdio_pmx_func + &sdio_clk_cfg_func + &sdio_cfg_func>; + status = "disabled"; + }; }; };