From patchwork Wed Jun 14 08:23:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 105484 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp180582qgd; Wed, 14 Jun 2017 01:26:16 -0700 (PDT) X-Received: by 10.99.104.69 with SMTP id d66mr3286153pgc.12.1497428776205; Wed, 14 Jun 2017 01:26:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497428776; cv=none; d=google.com; s=arc-20160816; b=a/LNqQxs9tM5C3Xq0lv9+7GK92GYbFvhxEuw6XG7PLLC2YqoQcFpCB4TsGmOjxg2jd Z/7SFrkjZYq46Gq8chA0WaWK0EqrOlylfv61QRZhI8mrFoajkSmO+JF5LudzupPwYBm7 D4gDaEg/gCZkRti980IMIoWZ/TpMEmZJmC06vCRIzfSGFMBfXVZKtlaRrnupnAv8cwK8 6/ifHjJn4pX16hZtvCLC3SLRVi28eQ803AjTMAa5RDgdYHvs7di2IRliOIXQwGGGRh+H XbbWUBwQOWeHSoOxyZsgmhoiH/TKaABsn25KpDQVBHobh58HgPHV4sXppqldmk+6MLNu sBDg== 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=3BCpOiqt4NGN+7UWQ9OrdpnNx+2nvftvE5tMnzx0MUg=; b=CmUcRYEUBSqnMpKDryEmD9quaxKZegC5302qy7K74dTqOdNUV1f2hzpOMR+XFl0DyB cWIVRxEPeUxNOakxh4d/ldVJQk1Ye08yxLTTJPbIm81ic3TCH48F9+/X+mJlqbmD7qWK Wg97X16tDAvwX9MgcKvsM17F1A+XmncShBxWwgpTmSXRIdYEXat6CjBlrArYbPbIH4Ee ro5Bahmt+wL3dBuIsSKLf0NUIMonJ1H/hwHK+u4JnDQwASbe/EjZwoXONfRBRefkbaC2 VuGXK67HwRY0+kKW4XqHFAsRyVFo7aUzzEs48Oel6qcCiSbEwfqnJgN43wrvMyPa9/aG FmFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=FlFmp50v; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 q8si154001plk.486.2017.06.14.01.26.15; Wed, 14 Jun 2017 01:26:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=FlFmp50v; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932148AbdFNI0H (ORCPT + 25 others); Wed, 14 Jun 2017 04:26:07 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34713 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754774AbdFNI0D (ORCPT ); Wed, 14 Jun 2017 04:26:03 -0400 Received: by mail-pf0-f169.google.com with SMTP id s66so12712830pfs.1 for ; Wed, 14 Jun 2017 01:25:58 -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=3BCpOiqt4NGN+7UWQ9OrdpnNx+2nvftvE5tMnzx0MUg=; b=FlFmp50vFGlSyqHRe5mM8mCCmeuAk6vveaKcSKrS45YuuM/88TqWf2d43THL8aL8cc /GN/4a7n93A4LgWfWRy6+ScFIbSzdE9lyPPTe9WZTst5l9a/fdcYmcmXUsYLJsJZKHky wpuOyO14vFTmi22HzKzU3CUtdyzPXm+sDjpVs= 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=3BCpOiqt4NGN+7UWQ9OrdpnNx+2nvftvE5tMnzx0MUg=; b=cINkjZ/LNW7IQtp5+kw2D+cvldKbm9T1JpbTAPnlBi0/vxkRa7GQTgYSiZd96TmIBE dey0vsrtXJjiR0H46ZAcC5CP+FZsCsw4zid6Y8DYzsF5f9f5wl//L6SP3KgWKnPde2RO 8Z/2uOMIGRkHrexSDkdN8YXSsBb2CppAldieYc4P/a5IrNg6Hbkos0ODPHgaSdvfqwey at93p3TGs3uqIIETpjGrtT+j6xNqWJ3oY/qPhXVeM4spSH/zEohObEZ50+9YcDU3d7Ig izx20GDefEN9JHwJDFrlSZ4IWFpLUsmzPrzeYXbLJIdfzSeNtCfUwdFKTGpzsfJ6fqp8 bxdg== X-Gm-Message-State: AKS2vOwqlZRC/VJhVD8O7xpDAvuRHZ0LaaW+8J0e9/TefkPgaRhTQEox h6d/CRo3uLqcTDaZ X-Received: by 10.84.211.136 with SMTP id c8mr3654877pli.96.1497428757568; Wed, 14 Jun 2017 01:25:57 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.99]) by smtp.gmail.com with ESMTPSA id h14sm766802pfh.71.2017.06.14.01.25.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 01:25:57 -0700 (PDT) From: Guodong Xu To: robh+dt@kernel.org, mark.rutland@arm.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com, wangkefeng.wang@huawei.com, xuejiancheng@hisilicon.com, peter.griffin@linaro.org, puck.chen@hisilicon.com, lee.jones@linaro.org, ulf.hansson@linaro.org, bhelgaas@google.com, arnd@arndb.de Cc: zhangfei.gao@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org, Li Wei , Chen Jun Subject: [PATCH v3 20/21] arm64: dts: hi3660: add sd/sdio device nodes Date: Wed, 14 Jun 2017 16:23:37 +0800 Message-Id: <20170614082338.15673-21-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170614082338.15673-1-guodong.xu@linaro.org> References: <20170614082338.15673-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 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 bdfdf27..e102b95 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -849,5 +849,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"; + }; }; };