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: 9785833 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 A6B99602C9 for ; Wed, 14 Jun 2017 09:03:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9625228563 for ; Wed, 14 Jun 2017 09:03:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89774285E3; Wed, 14 Jun 2017 09:03:49 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 049AB28563 for ; Wed, 14 Jun 2017 09:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=/wgAFqjgroiXBWwcmtZayh0l/euonny6B/+2ZzeBczo=; b=r1jaFVCOuhcB4CQqxWTZ/9uia9 ubgnN1r5sgBTYCKgfZFLCj2YaUiPJv3XNzo/9eYPxrGlcgbkD9qoL+e4FBX1nOiadv65T9Xc84x4f VGMowu49UKtKDMNbhRPpKM4OugRoW8mHihHKsCPiM8yG1L+FqmgpJ2DVLF1ADr/hOWyEuDxcVSIml sTCUtvpzmkOXEdeti5fxSV2GIHny6K4Ycq6fA79/iITllFSTa7g8z7zRpdxK40jsfcAwThB0zjKVh cFpf/3NeEJWuG4TajkcpPPBl3c2y7eZbR147tEwVzlX10KZeNp7BDNiKiQJHovfH+ODg6pnXa7QVP X0NV24sA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dL4DG-0000nC-TR; Wed, 14 Jun 2017 09:03:42 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dL3zF-0001A1-8Z for linux-arm-kernel@bombadil.infradead.org; Wed, 14 Jun 2017 08:49:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=3BCpOiqt4NGN+7UWQ9OrdpnNx+2nvftvE5tMnzx0MUg=; b=AXsXDQ9tgS4lvGIiyXOtjdY+k o2DTLhU42ykgAPBAWep8CAjUa6GhhCNSnJMi5vLq28Rr6DDNr5ivCOH9m81pEiWgX/vgeWeASFvUb zZFdzLldhq/jDQZrgBsGLl66Ikc5WLGh3t0gxBqDmrcJB+WOfAm1XMzleGuiyEActUk81mLjhGupw 3fbiHSI6n8UL4KJ0XJjEIn/cMB8pVdwIJqjcaF8OjwgQdozMfIUtRIrOD3I3+XxiY/R4/ZhQsmzBw 6bkX/IqJGQtJ7FcaPxXqqfxBldIQnSG/oZxbHrELdx4tsHPrv53PS9v5fBtjNE3Fsq+z1yYU1MIgx zUBTeUo+w==; Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dL3d5-0003Fb-PC for linux-arm-kernel@lists.infradead.org; Wed, 14 Jun 2017 08:26:20 +0000 Received: by mail-pf0-x233.google.com with SMTP id s66so12712836pfs.1 for ; Wed, 14 Jun 2017 01:25:59 -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=RPQ7rNnqhP7wjjos2DjTTeLJmSHLkP7YqqYDmqJQYTCx9cQEWkBwqBDfEPucEfbM3y sRiBScPD22vsR4zjZqztfBksZAs7s72rmuMnypSQGF6a1k5GkJx0tYsYkhIpWR1MqKjT YYUD0ErdqWY24JUuAjLnnOsfkWzcXi2kpdkkFT6rDir34hkHkURnlqAP6PX86Y/0rFZ5 TFB3D9mdUHz7hKf7AMr3BRXqt7KjwTbr0seI8A8OPCtH81rW7URGzlO8uatbQ0Gl7rZL p4S1O5uSMaUPQ1wBUWdVC6/k+QbX+V8tD3ncglLjzID+vIsD07mo5v2wGm67aqBDBKMV 4Adg== X-Gm-Message-State: AKS2vOwZ6/sY2378L2+8dVWgOQ2FSNTJ7qdQlz2brl3yYqR/RCFM+fO8 ETumkpehy/zkTjMQ 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 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> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-pci@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Chen Jun , Li Wei , zhangfei.gao@linaro.org, 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-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"; + }; }; };