From patchwork Wed Sep 16 15:58:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 7196361 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 EDB359F6CD for ; Wed, 16 Sep 2015 15:59:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FE5320888 for ; Wed, 16 Sep 2015 15:59:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBB69208A2 for ; Wed, 16 Sep 2015 15:59:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752299AbbIPP7H (ORCPT ); Wed, 16 Sep 2015 11:59:07 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:38794 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbbIPP7G (ORCPT ); Wed, 16 Sep 2015 11:59:06 -0400 Received: by wiclk2 with SMTP id lk2so77688723wic.1 for ; Wed, 16 Sep 2015 08:59:05 -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=Pz6bCgwC52pTqZG+FO4pEIOL2EmFC/5VvIctQFDTFhs=; b=zHX0lT4Qljus0sPBqiVXGna6PEJQDV8xQplTJaSmgbGW++ulEPsFQwGAGEXltGbgiz nso7jYiYO24+Hnry8UK2mnrHMyJ0Dho89HzzTykRsjsGeMsjos4H+xEzBeOZ/97GOnFF 35461VlKQCxYSc7grQZRwPEQiD+BozV4WsXbuhCIYIvwl9bxB0zYndqifBjLAjlcBGyT 44LJctt3KQqCUWOZ9vdgeCd4KNRGP7rC75SQEDAOGeevzG2FTFBer2fZCm8Sx1fOv07f g1sDRTZSssz53Rd+5X/n309XeqkfeXghqfjGkC7wN7jNoqWjEc9XxR+1Idqmd8/pjnzK gXTg== X-Received: by 10.180.103.2 with SMTP id fs2mr20833810wib.9.1442419145372; Wed, 16 Sep 2015 08:59:05 -0700 (PDT) Received: from groucho.site (ipbcc0ddf2.dynamic.kabel-deutschland.de. [188.192.221.242]) by smtp.gmail.com with ESMTPSA id uo6sm27214559wjc.1.2015.09.16.08.59.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Sep 2015 08:59:04 -0700 (PDT) From: Ulrich Hecht To: horms@verge.net.au, geert+renesas@glider.be, laurent.pinchart+renesas@ideasonboard.com Cc: linux-sh@vger.kernel.org, linus.walleij@linaro.org, kuninori.morimoto.gx@renesas.com, magnus.damm@gmail.com, Ulrich Hecht Subject: [RESEND PATCH v2 3/3] ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups Date: Wed, 16 Sep 2015 17:58:51 +0200 Message-Id: <1442419131-14816-4-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1442419131-14816-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1442419131-14816-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 90543b1..8a54076 100644 --- a/arch/arm/boot/dts/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/r8a7778-bockw.dts @@ -137,10 +137,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"; @@ -169,7 +173,7 @@ }; &sdhi0 { - pinctrl-0 = <&sdhi0_pins>; + pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>; pinctrl-names = "default"; vmmc-supply = <&fixedregulator3v3>;