From patchwork Fri Mar 20 12:30:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 6056151 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 57B6D9F820 for ; Fri, 20 Mar 2015 12:30:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B3B92049D for ; Fri, 20 Mar 2015 12:30:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C7C020320 for ; Fri, 20 Mar 2015 12:30:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751246AbbCTMay (ORCPT ); Fri, 20 Mar 2015 08:30:54 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33412 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751157AbbCTMax (ORCPT ); Fri, 20 Mar 2015 08:30:53 -0400 Received: by wixw10 with SMTP id w10so25933762wix.0 for ; Fri, 20 Mar 2015 05:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=p9tq0E3YAJvXRoTBsjQvFtmi54wnPsYl4SMKdOjEocM=; b=G/4mBNbaXymBPYmVrrW/9CyHq87u3nXEOQNOxPFGLs7+JrUOErOyaASz7PSmNieGV9 S1Dv+LlFY66rc7uo/vXuqs23nDFRN+bc5395r5l7WhQCI4Z2/EcKBp4C2H83IfjZv+HX RM+NVe7a0tV2vSuh4s2BdJvTSF1Dy4YbUaRQMHT5sTr4rAeW+AvZ/dYdxXo/T90t3Z3i v8gQSRJniSm9PTBkXyoLJO4K0TTIB2yqwDnZZHtaRYjCWk/dCvmNFMxIgGFAiHlDKCJ2 LbNwEejRNyMG/AXujBenoEG0Z0S490PynRnVwH3KzVBtwOAIy/qxa7dSbcSSyIfo9iPR otPQ== X-Received: by 10.194.78.231 with SMTP id e7mr157188093wjx.33.1426854652482; Fri, 20 Mar 2015 05:30:52 -0700 (PDT) Received: from groucho.site (ipbcc0217c.dynamic.kabel-deutschland.de. [188.192.33.124]) by mx.google.com with ESMTPSA id e2sm6154172wjy.46.2015.03.20.05.30.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Mar 2015 05:30:51 -0700 (PDT) From: Ulrich Hecht To: horms@verge.net.au, linux-sh@vger.kernel.org Cc: magnus.damm@gmail.com, laurent.pinchart+renesas@ideasonboard.com, kuninori.morimoto.gx@renesas.com, Ulrich Hecht Subject: [PATCH 3/3] ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups Date: Fri, 20 Mar 2015 13:30:38 +0100 Message-Id: <1426854638-9187-4-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1426854638-9187-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1426854638-9187-1-git-send-email-ulrich.hecht+renesas@gmail.com> 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Ensures that the pull-ups for pins SD0_CD and SD0_WP are enabled. This is one of two features from the DT reference platform that are still missing in MP. Signed-off-by: Ulrich Hecht --- arch/arm/boot/dts/r8a7778-bockw.dts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts index a23d41c..d71260a 100644 --- a/arch/arm/boot/dts/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/r8a7778-bockw.dts @@ -154,10 +154,14 @@ }; sdhi0_pins: sd0 { - renesas,groups = "sdhi0_data4", "sdhi0_ctrl", - "sdhi0_cd"; + renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; renesas,function = "sdhi0"; }; + sdhi0_pup_pins: sd0_pup { + renesas,groups = "sdhi0_cd", "sdhi0_wp"; + renesas,function = "sdhi0"; + bias-pull-up; + }; hspi0_pins: hspi0 { renesas,groups = "hspi0_a"; @@ -186,7 +190,7 @@ }; &sdhi0 { - pinctrl-0 = <&sdhi0_pins>; + pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>; pinctrl-names = "default"; vmmc-supply = <&fixedregulator3v3>;