From patchwork Wed Feb 12 06:25:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3634391 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A29C29F334 for ; Wed, 12 Feb 2014 06:25:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B805B201E7 for ; Wed, 12 Feb 2014 06:25:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE73B201CD for ; Wed, 12 Feb 2014 06:25:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750726AbaBLGZq (ORCPT ); Wed, 12 Feb 2014 01:25:46 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:60019 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711AbaBLGZp (ORCPT ); Wed, 12 Feb 2014 01:25:45 -0500 Received: by mail-pb0-f45.google.com with SMTP id un15so8777545pbc.18 for ; Tue, 11 Feb 2014 22:25:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:subject:user-agent:to:cc:in-reply-to :references:mime-version:content-type; bh=rgLTUraJow1Fs/qdXe5RvmXHrltqzIPYChKwfRU6Z6A=; b=kwMsJNpCtK3iLCPg0DxgvPCmkOzn29A27ZdR+xZ+FEcbrr+LC77ElEh168kb0OoXTd p09gQaJek7ioFUzql7c90L9MpTz8O8fYc693RWs8QuGLsIkm6N8ODcJoVOcAFjkKPmAH LXCElOfNuBVeN0Om7jlqesZU5lmEZQZJu+h1yiz+q29IQrifgvyg+/zQslg+SwNL1hHb PWjMLGTcRpcEte+frKQPIOCEzYvjc07kbbB1f75cJADak7ddXSFjJRtYWXR8RBK2qQO5 0xmdo7KDx+jSoNbGmoi/cNe1h3ByPtFhj/4NGyuBk2hjWrjYNvG8y8Ts31M2oaE++cDJ 2AKQ== X-Received: by 10.67.14.231 with SMTP id fj7mr36725458pad.115.1392186345550; Tue, 11 Feb 2014 22:25:45 -0800 (PST) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id eb5sm153326993pad.22.2014.02.11.22.25.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Feb 2014 22:25:44 -0800 (PST) Date: Tue, 11 Feb 2014 22:25:44 -0800 (PST) Message-ID: <87vbwk97a2.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 2/2 v2] ARM: shmobile: lager: add SDHI0/2 support on DTS User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87y51g97di.wl%kuninori.morimoto.gx@gmail.com> References: <87txcbba08.wl%kuninori.morimoto.gx@gmail.com> <87y51g97di.wl%kuninori.morimoto.gx@gmail.com> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Acked-by: Magnus Damm Signed-off-by: Kuninori Morimoto --- v1 -> v2 - add Acked-by: Magnus Damm - SDHI0 -> SDHI2 arch/arm/boot/dts/r8a7790-lager.dts | 84 +++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 1081c5e..58484e4 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -56,6 +56,54 @@ regulator-boot-on; regulator-always-on; }; + + vcc_sdhi0: regulator@1 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI0 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio5 24 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi0: regulator@2 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI0 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + + vcc_sdhi2: regulator@3 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI2 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio5 25 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi2: regulator@4 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI2 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; }; &extal_clk { @@ -76,6 +124,16 @@ renesas,function = "scif1"; }; + sdhi0_pins: sd0 { + renesas,gpios = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd"; + renesas,function = "sdhi0"; + }; + + sdhi2_pins: sd2 { + renesas,gpios = "sdhi2_data4", "sdhi2_ctrl", "sdhi2_cd"; + renesas,function = "sdhi2"; + }; + mmc1_pins: mmc1 { renesas,groups = "mmc1_data8", "mmc1_ctrl"; renesas,function = "mmc1"; @@ -95,3 +153,29 @@ &sata1 { status = "okay"; }; + +&sdhi0 { + pinctrl-0 = <&sdhi0_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi0>; + vqmmc-supply = <&vccq_sdhi0>; + cap-sd-highspeed; + cap-sdio-irq; + cap-power-off-card; + toshiba,mmc-wrprotect-disable; + status = "okay"; +}; + +&sdhi2 { + pinctrl-0 = <&sdhi2_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi2>; + vqmmc-supply = <&vccq_sdhi2>; + cap-sd-highspeed; + cap-sdio-irq; + cap-power-off-card; + toshiba,mmc-wrprotect-disable; + status = "okay"; +};