From patchwork Thu May 23 13:13:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 17129 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9F48B23976 for ; Thu, 23 May 2013 13:15:29 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id gd11sf4211055vcb.5 for ; Thu, 23 May 2013 06:14:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=dTbuZzp8fLGs1qQ9z/wHOhXeATKcy5yizLUM1b/Olwk=; b=QZOmPj0Hm2QiT2IbXqVXnScheDOSVB5o9n0iiORlI3SVhJBNHiOhwtutt2zc+8OKX/ +BXByLZJNhluO75qEQfR/LxmkkWbPlmZB+uUsNi3aASaX8sQPozVXaIZj79kvFKIq3ZY XTYX+e/j6bFGz9bgN/caCXzKuDiw1GKV9m04HDmlolExTBXSNadKX+SlluCgPx+kEnvg C9AgnETQuMbHB5P7jRkQ6PuNx4B1EXtb7BkUlHbWbIw7jNIluWmzgOYiTWzqHILe9Ck8 4SkwHpfiIdaddzQtVhXTQsYJRbBVwNI9oyVINd74D0b+auf5l4JROZl+5DgDAuAdqpVU L2ag== X-Received: by 10.224.36.66 with SMTP id s2mr6312176qad.6.1369314874341; Thu, 23 May 2013 06:14:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.60.231 with SMTP id k7ls1423452qer.22.gmail; Thu, 23 May 2013 06:14:34 -0700 (PDT) X-Received: by 10.58.75.46 with SMTP id z14mr5118334vev.52.1369314874146; Thu, 23 May 2013 06:14:34 -0700 (PDT) Received: from mail-vb0-x234.google.com (mail-vb0-x234.google.com [2607:f8b0:400c:c02::234]) by mx.google.com with ESMTPS id q13si6303023vcw.36.2013.05.23.06.14.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 May 2013 06:14:34 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::234 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::234; Received: by mail-vb0-f52.google.com with SMTP id p12so1228084vbe.25 for ; Thu, 23 May 2013 06:14:34 -0700 (PDT) X-Received: by 10.52.34.114 with SMTP id y18mr4396684vdi.56.1369314873939; Thu, 23 May 2013 06:14:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp50841vcs; Thu, 23 May 2013 06:14:31 -0700 (PDT) X-Received: by 10.14.99.198 with SMTP id x46mr31292256eef.38.1369314871155; Thu, 23 May 2013 06:14:31 -0700 (PDT) Received: from eu1sys200aog106.obsmtp.com (eu1sys200aog106.obsmtp.com [207.126.144.121]) by mx.google.com with SMTP id 8si15743784eeg.239.2013.05.23.06.14.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 May 2013 06:14:31 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.121 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.121; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob106.postini.com ([207.126.147.11]) with SMTP ID DSNKUZ4WHtEyMRFmhMwUEzWEfvWEN7Bs6S81@postini.com; Thu, 23 May 2013 13:14:30 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id D82E658; Thu, 23 May 2013 13:13:06 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id E175B54; Thu, 23 May 2013 13:14:04 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 8980C24C2C0; Thu, 23 May 2013 15:13:57 +0200 (CEST) Received: from steludxu1397.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 23 May 2013 15:14:04 +0200 From: Ulf Hansson To: , Linus Walleij , Srinidhi Kasagar Cc: Lee Jones , Arnd Bergmann , Ulf Hansson Subject: [PATCH 5/6] ARM: ux500: Set eMMC and WLAN card slot as non-removable Date: Thu, 23 May 2013 15:13:49 +0200 Message-ID: <1369314830-3727-6-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1369314830-3727-1-git-send-email-ulf.hansson@stericsson.com> References: <1369314830-3727-1-git-send-email-ulf.hansson@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQk485DAxHP7s68/+hUMTCH/OJTxs3WLKUFv5LascXQtX5T/bBZJJ7PsQqMNQzUsybKWwMph X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::234 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Ulf Hansson For several reasons, the mmc protocol layer expects devices being non-removable to use MMC_CAP_NONREMOVABLE, so then we adapt to this expectation. Signed-off-by: Ulf Hansson --- arch/arm/mach-ux500/board-mop500-sdi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 3c07f55..2e341fb 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -107,7 +107,8 @@ static struct stedma40_chan_cfg sdi1_dma_cfg_tx = { struct mmci_platform_data mop500_sdi1_data = { .ocr_mask = MMC_VDD_29_30, .f_max = 100000000, - .capabilities = MMC_CAP_4_BIT_DATA, + .capabilities = MMC_CAP_4_BIT_DATA | + MMC_CAP_NONREMOVABLE, .gpio_cd = -1, .gpio_wp = -1, #ifdef CONFIG_STE_DMA40 @@ -146,6 +147,7 @@ struct mmci_platform_data mop500_sdi2_data = { .f_max = 100000000, .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | + MMC_CAP_NONREMOVABLE | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_ERASE | MMC_CAP_CMD23, @@ -186,6 +188,7 @@ struct mmci_platform_data mop500_sdi4_data = { .f_max = 100000000, .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | + MMC_CAP_NONREMOVABLE | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_ERASE | MMC_CAP_CMD23,