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: 9785717 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2325360325 for ; Wed, 14 Jun 2017 08:26:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C38426E1A for ; Wed, 14 Jun 2017 08:26:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00E5A28560; Wed, 14 Jun 2017 08:26:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A652B26E1A for ; Wed, 14 Jun 2017 08:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932149AbdFNI0H (ORCPT ); Wed, 14 Jun 2017 04:26:07 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33593 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754773AbdFNI0D (ORCPT ); Wed, 14 Jun 2017 04:26:03 -0400 Received: by mail-pf0-f172.google.com with SMTP id 83so80794489pfr.0 for ; Wed, 14 Jun 2017 01:26:03 -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=UQJfyqMbNxea7LGiH41Bq2Vs36CP2vIrG6sUeyv9n2Ak74BQV9pav3aUhQAcSfXqaz /hBzufiZ8Pw3SfbimfDUhIzObUX6cu/dQcsd4NIw0M5qRvCtJpHOvx6uu2V3rWls/fmf ZOnfp8xTmwaquAuGLoPyxQssDBvX5oGaoRPNyYj8409SH4tRoz26a6NHdM8hz1rNz46i ChhgBpfoQ3/j3wMs+DqqIfYoTqugrRQwvKaJ8cTdlO3tvoEuxXjvAC2+hmsOQ5futK5u 8pOtIBHklfc3c7uKRt+04YjMBaNMhynPCqxvB6qC/lyaUh1G23pVWTj/6D86savBnE6O e49g== X-Gm-Message-State: AKS2vOy2dqVfMahQWLaoxJ+R9QEAvx5727XUTwStC1uAUwf+g0WkjNnh IRDaY+iBG7a4Z0HJ 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-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(+) 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"; + }; }; };