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: 9787951 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 CCE2060348 for ; Thu, 15 Jun 2017 03:21:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C319126C9B for ; Thu, 15 Jun 2017 03:21:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7A8B2852E; Thu, 15 Jun 2017 03:21:13 +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 5D48626C9B for ; Thu, 15 Jun 2017 03:21:13 +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=4hv0e+tQ7o8OiGOjMccaF8tsMtTT18Qia6xouxxqda8=; b=nHAyCZ2vebqRFd7xqqZ8bnqT/Y D2noV0AMmhMaRZJyny2hfLsc6PExB2ifQa5d2t1g3KTRCriW7QcAvGXSIdL24qAhGFu+/2O//TEN2 4An2aCRkASVq8R5bOQY7EQzAaaMfeMdk+zX1WaeVmwEidqw0k6IWAiBsSMGuDGHgzwI5OWMpCesWi AAp3+evuetzAj/s1H5EhJzMSUzwU5VaehpVvtx9RgVKqHw2+oMq5rALtPGU6nloy57S83LLs4omtv MCl6Tlz96XnphkXU6fDLwm0bhC4W5Io/Qyi9KgsbZ0mygSuL6k+Rxpa7+zqMYwZBs+RuVfrYLuy4y 5M4qM0qA==; 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 1dLLLK-0001qf-6X; Thu, 15 Jun 2017 03:21:10 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dLLLI-0001lI-3f for linux-arm-kernel@bombadil.infradead.org; Thu, 15 Jun 2017 03:21:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=tjgA7Rai6YzqSSY85F3+bwDk1pleggZK46TWx+9vS34=; b=hLKkEHI40RqW7mkQQjX68irhE 6AZCc65ayyCLoWXuKGUkpauFsm3kGjnJUw3/rz9CjXos5vu8gUFCw3w/37xmTc2cgoEbDmpjM8rKg e+w0v17LhJYWQF7rC137GLbDP7h1EHNs7g7fHD1YzkS+ZdDmurMcOrwGhqKc7k1npOqZt04/MzkSy VO7BMwoXWgAYFyrQR0HNVzCwQVP7tK9Q3CT9mWrIbm7/8dLMqd12l+tzntwSVSvmri2OkLQ5HxGXw I2IC+mEB56VUjTvMHz08AxQ8glJWDExq0cYksV12Hb9sbCjb5qguFzgDg/NcvwXlQWrufvWHDatwf 2pycfGzZg==; Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dLL8Y-0003eZ-0U for linux-arm-kernel@lists.infradead.org; Thu, 15 Jun 2017 03:07:59 +0000 Received: by mail-pf0-x230.google.com with SMTP id x63so1373974pff.3 for ; Wed, 14 Jun 2017 20:07:37 -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=qnUgbdDv0yXOMGlxeYwel28+iEgUwtROojV3JZcJZkF78siim1BzEqst3ty/i9dkhz oyidlaJDilYQTT699H3IeC5OgVBwIToCgr6aSfsrR9qAemFhK83FFFRXQcnBwJj914se Kz5Kx02FMnZNXA8Y4CiMQJG/dgFlAveQx7kt40PnebeUQzm1XwPBCPH8gApACnoR+R9C hVWTQ0t4rdGCPyCwo89A1+EK9SrQnFebQlxmz7CaV2H+8FoBXZ9XBxSNGXP668YvmPLn S/Q7p2s8pQ4CW6E02v+S0E4QEMyfanNnX1FrOAL4NE/gkG+8AVrZ1/q52H7B5XZAzkyc fQvw== X-Gm-Message-State: AKS2vOwsUxQOCjF+b5ri9OCMvZqjkueUnWdiLE94vT4tiFJI7TvYSgHC 2cQ15RIdluljDpki 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170615_040758_192920_04AC4B5B X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. 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, hw.wangxiaoyin@hisilicon.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chen Jun , Li Wei 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 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"; + }; }; };