From patchwork Fri Nov 27 01:55:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7709841 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 968E69F1D3 for ; Fri, 27 Nov 2015 01:56:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2E0520616 for ; Fri, 27 Nov 2015 01:56:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CA55205FD for ; Fri, 27 Nov 2015 01:56:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753866AbbK0B4I (ORCPT ); Thu, 26 Nov 2015 20:56:08 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:46737 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753858AbbK0B4I (ORCPT ); Thu, 26 Nov 2015 20:56:08 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p5254-ipbfp1403kobeminato.hyogo.ocn.ne.jp [114.152.48.254]) by kirsty.vergenet.net (Postfix) with ESMTPA id D6C8425BEDD; Fri, 27 Nov 2015 12:55:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1448589360; bh=GKHe5HHvKltc9PhFLxVFqpdrDcRrWjoCkuUzs0W+Y0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D4tOSnQf5uJ64p9o1DtpzN2oL1FTNSkGEbndcFEV5mgFm/SVmYO6IJ51GjYwXDUok GD0jWNFX5F1+6Fl3TqQHJy+XkhY3Gcj1oXUi/69iRQv/fpGf6MBDO+ignlnCLQSVJr dyvF8stA5Q4L+PP0FWv2EDjkJF6xp+VfoXVmr/ew= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id D8664940504; Fri, 27 Nov 2015 10:55:58 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Ulrich Hecht , Geert Uytterhoeven , Simon Horman Subject: [PATCH 02/15] ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups Date: Fri, 27 Nov 2015 10:55:45 +0900 Message-Id: <781f278a16fbd74ffa2acf3f14134953631f076d.1448586938.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Ulrich Hecht 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 Acked-by: Linus Walleij Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- 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 90543b12d7e2..8a5407678717 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>;