From patchwork Sat Feb 21 22:27:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 5860771 X-Patchwork-Delegate: horms@verge.net.au 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5DE9D9F373 for ; Sat, 21 Feb 2015 22:27:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A05720527 for ; Sat, 21 Feb 2015 22:27:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DCFD20503 for ; Sat, 21 Feb 2015 22:27:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751867AbbBUW1r (ORCPT ); Sat, 21 Feb 2015 17:27:47 -0500 Received: from mail-la0-f52.google.com ([209.85.215.52]:43162 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751742AbbBUW1q (ORCPT ); Sat, 21 Feb 2015 17:27:46 -0500 Received: by labms9 with SMTP id ms9so12293352lab.10 for ; Sat, 21 Feb 2015 14:27:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=5a918eQenOTTqNIgkxeqATqfgUDZhEwTjlhi9fhTLaE=; b=Ru4f0Ssa1GXWOOgvz6NaNw/+9lYGq6SYJc5x2VjxvvWu3QVT/fRWoVF6N7wn0PBJz0 OQCBrZtx5r8Awb3fqM3Gwxg+FKCKT6ZflRCFH5OBC9m0MEU+oVeRwR+6iuMgaj0bu1RA qTbCKp0tqXrMdC5AIu5finxnUIO/5L3lO/K9vniRw/FjWB59V3l110Ba2zpnwfjJ5c2K STKi+0/a0/PKokNRA5Mx5+JXxQy/tmnfrOCtc4UweOlyy0ATSrAwtuu84QXCkiX5XWXb nIymy1GHECv7Kk3VgGdSqgk4lTq428kzoLPwF7g+kRuAr0affPwEcoZHs3D9aOUAJTLP Aw5A== X-Gm-Message-State: ALoCoQlUC4oUPwf8YX5/u3RVgB03XIx0G1x9K/rbAEsiqd3UchlZYpZrs/wkQXK8bGXHVoZmy0vR X-Received: by 10.112.141.225 with SMTP id rr1mr2843292lbb.71.1424557664911; Sat, 21 Feb 2015 14:27:44 -0800 (PST) Received: from wasted.cogentembedded.com (ppp20-60.pppoe.mtu-net.ru. [81.195.20.60]) by mx.google.com with ESMTPSA id j8sm6335110lbd.15.2015.02.21.14.27.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Feb 2015 14:27:44 -0800 (PST) From: Sergei Shtylyov To: horms@verge.net.au, linux-sh@vger.kernel.org, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, devicetree@vger.kernel.org Cc: magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: shmobile: silk: add SDHI0/1 DT support Date: Sun, 22 Feb 2015 01:27:42 +0300 Message-ID: <2348421.LHyZ4ZOiiG@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.4 (Linux/3.18.6-100.fc20.x86_64; KDE/4.14.4; x86_64; ; ) In-Reply-To: <10037494.4LD4T2QGPX@wasted.cogentembedded.com> References: <10037494.4LD4T2QGPX@wasted.cogentembedded.com> MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Define the SILK board dependent parts of the SDHI0 (connected to SDIO Wi-Fi chip) and SDHI1 (connected to micro-SD slot) device nodes along with the necessary voltage regulators. Based on the original patch by Vladimir Barinov . Signed-off-by: Sergei Shtylyov --- arch/arm/boot/dts/r8a7794-silk.dts | 81 +++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts =================================================================== --- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts @@ -12,6 +12,7 @@ /dts-v1/; #include "r8a7794.dtsi" +#include / { model = "SILK"; @@ -39,6 +40,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 = <&gpio2 26 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 = <&gpio2 29 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + + vcc_sdhi1: regulator@3 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI1 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi1: regulator@4 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI1 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; }; &extal_clk { @@ -65,6 +114,16 @@ renesas,groups = "mmc_data8", "mmc_ctrl"; renesas,function = "mmc"; }; + + sdhi0_pins: sd0 { + renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; + renesas,function = "sdhi0"; + }; + + sdhi1_pins: sd1 { + renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; + renesas,function = "sdhi1"; + }; }; &scif2 { @@ -100,3 +159,25 @@ non-removable; status = "okay"; }; + +&sdhi0 { + pinctrl-0 = <&sdhi0_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi0>; + vqmmc-supply = <&vccq_sdhi0>; + cd-gpios = <&gpio6 6 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio6 7 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&sdhi1 { + pinctrl-0 = <&sdhi1_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi1>; + vqmmc-supply = <&vccq_sdhi1>; + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>; + status = "okay"; +};