From patchwork Fri Oct 31 20:45:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 39979 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6BBA82405B for ; Fri, 31 Oct 2014 20:48:34 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e51sf1174081eek.2 for ; Fri, 31 Oct 2014 13:48:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=bE5xtMY4tVs5bd+gU6thMSzkeLjN9vAYak8MgNo16JE=; b=NEvVCojRDa9eQsfngzPXBG5asYFaJ8cpzKK6WgVE3CzBeBF2vqDTRM4zONpmRNWhxC q56ansSAAoZINuq8lok2+hChpj5gUxUcGsVt96K0E74YOOY/opjo7JB//z7vNOS9yJY/ eQ9IwKkKV05PHVOEP5D/AcA2OnZMnhQF1uc3b+sldrCK8ml16Musg/EHOmGZI6Hin2LN HlTXfIVsq1jJLn1uPfs6I/fhVj0vEVn1fA2RayCIKrNHWMIXneyqfXn4rA2i2FowtETH vs4BIJmReHpAEXkhYZgjf0zVBrAApg7dQ/KPjMfmubwYQpqOX7iwcwJn2wUeWBN98ohL ISWA== X-Gm-Message-State: ALoCoQkJ80qMDwk5zSeceW5E62xzGvVLauqu4t+dMtNBDOErKO/97czckCSceWoNd/shIcELiy7Q X-Received: by 10.112.77.9 with SMTP id o9mr962074lbw.6.1414788513726; Fri, 31 Oct 2014 13:48:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.98 with SMTP id k2ls491948lag.15.gmail; Fri, 31 Oct 2014 13:48:33 -0700 (PDT) X-Received: by 10.152.28.101 with SMTP id a5mr29768627lah.52.1414788513314; Fri, 31 Oct 2014 13:48:33 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id lc1si18730250lab.14.2014.10.31.13.48.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 13:48:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id s18so1514034lam.27 for ; Fri, 31 Oct 2014 13:48:32 -0700 (PDT) X-Received: by 10.112.189.10 with SMTP id ge10mr28922874lbc.23.1414788512814; Fri, 31 Oct 2014 13:48:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp258706lbz; Fri, 31 Oct 2014 13:48:31 -0700 (PDT) X-Received: by 10.68.200.100 with SMTP id jr4mr27309128pbc.69.1414788510300; Fri, 31 Oct 2014 13:48:30 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sg8si5580142pac.21.2014.10.31.13.48.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 13:48:30 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XkJ5H-0000M8-7L; Fri, 31 Oct 2014 20:46:11 +0000 Received: from mail-la0-f54.google.com ([209.85.215.54]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XkJ5E-0000Kw-Gi for linux-arm-kernel@lists.infradead.org; Fri, 31 Oct 2014 20:46:09 +0000 Received: by mail-la0-f54.google.com with SMTP id s18so1482558lam.41 for ; Fri, 31 Oct 2014 13:45:45 -0700 (PDT) X-Received: by 10.112.137.202 with SMTP id qk10mr29119837lbb.0.1414788345200; Fri, 31 Oct 2014 13:45:45 -0700 (PDT) Received: from localhost.localdomain (c83-254-157-117.bredband.comhem.se. [83.254.157.117]) by mx.google.com with ESMTPSA id 8sm3087368lav.15.2014.10.31.13.45.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 13:45:44 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/6] ARM: nomadik: move MMC/SD card detect GPIO to board DTS Date: Fri, 31 Oct 2014 21:45:30 +0100 Message-Id: <1414788335-28334-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141031_134608_813603_FBD494BB X-CRM114-Status: GOOD ( 14.16 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.54 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.54 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This pushes the setting of the card detect GPIO pin down into the top-level file for the board, since it is not a property of the ASIC (which this DTSI is about) but a property of the board design. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-s8815.dts | 7 +++++++ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 90d8b6c7a205..c795ee8a356a 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -65,6 +65,13 @@ }; }; + /* Configure card detect for the uSD slot */ + amba { + mmcsd: sdi@101f6000 { + cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; + }; + }; + /* Custom board node with GPIO pins to active etc */ usb-s8815 { /* This will bias the MMC/SD card detect line */ diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index dbcf521b017f..35c79eb24f93 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -844,7 +844,6 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>; vmmc-supply = <&vmmc_regulator>;