From patchwork Sun Sep 1 20:02:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 19662 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8DF5225E36 for ; Sun, 1 Sep 2013 20:02:16 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id 1sf4581700qee.10 for ; Sun, 01 Sep 2013 13:02:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=f0Dmw94mGlc0edk1s9U3yz7yKV2Sr0yZ15FTcEn+Eu0=; b=MykBr7JE59byEhY5LJ5e6115yteneXTzlltH2s1gQS4jy1PSz1fznhCWhORLNqLocX pA5K9iqxplND6nq33Uzhh2w0jVlDVBrTabOWb2Swy7EKuU4x+uRqqYEV5t4zfbMQrfe/ WXSvG0EUeRUCyJaNWXFPOl/L/XcYrFgPW/iQ5xJ6X7UW8HnXADOSiqBHHHcaImN2A+9F e/wCOpji8kYrs0qwFVqAz3Q4tcGHyli2EMNb7Kap8UA9xM6dDUBbBuw+T+Ib1NMq/L+r 2AeXFuH/kK+e5X5qi6AkEkS1f6Spoh1aXmF4s6BEdSp+QSW/RakDJvkqhbTcylc+sgGk 6TWg== X-Received: by 10.236.103.97 with SMTP id e61mr2861934yhg.31.1378065736371; Sun, 01 Sep 2013 13:02:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.42.39 with SMTP id k7ls2074318qel.52.gmail; Sun, 01 Sep 2013 13:02:16 -0700 (PDT) X-Received: by 10.59.8.232 with SMTP id dn8mr19219469ved.8.1378065736234; Sun, 01 Sep 2013 13:02:16 -0700 (PDT) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id p7si712417vdv.42.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 01 Sep 2013 13:02:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.46; Received: by mail-vb0-f46.google.com with SMTP id p13so2530294vbe.33 for ; Sun, 01 Sep 2013 13:02:16 -0700 (PDT) X-Gm-Message-State: ALoCoQn4JivVp3x+/UmBK8dT8r+RyMQPQP85rsueb1YwYWZI1nKa2g+zajSCN2YLWjU4g9YLivvb X-Received: by 10.52.244.116 with SMTP id xf20mr15708490vdc.16.1378065736160; Sun, 01 Sep 2013 13:02:16 -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.174.196 with SMTP id u4csp78806vcz; Sun, 1 Sep 2013 13:02:15 -0700 (PDT) X-Received: by 10.152.228.130 with SMTP id si2mr2108968lac.32.1378065734967; Sun, 01 Sep 2013 13:02:14 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) by mx.google.com with ESMTPS id ao5si3928945lac.129.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 01 Sep 2013 13:02:14 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.175 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id y6so3279476lbh.20 for ; Sun, 01 Sep 2013 13:02:14 -0700 (PDT) X-Received: by 10.112.155.39 with SMTP id vt7mr2668624lbb.29.1378065734372; Sun, 01 Sep 2013 13:02:14 -0700 (PDT) Received: from localhost.localdomain (c83-249-209-93.bredband.comhem.se. [83.249.209.93]) by mx.google.com with ESMTPSA id yl7sm4247191lbb.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 01 Sep 2013 13:02:13 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Cc: Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org, Liam Girdwood , Mark Brown , Linus Walleij Subject: [PATCH 4/4] ARM: nomadik: delete MMCI platform data Date: Sun, 1 Sep 2013 22:02:08 +0200 Message-Id: <1378065728-18232-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.46 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: , Now that we have a proper regulator set up for the MMCI driver and managed through the device tree, we no longer need the platform data providing the OCR voltages for the MMCI block. Signed-off-by: Linus Walleij --- arch/arm/mach-nomadik/cpu-8815.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 13e0df9..be7530d 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -190,15 +190,6 @@ static int __init cpu8815_eth_init(void) device_initcall(cpu8815_eth_init); /* - * TODO: - * cannot be set from device tree, convert to a proper DT - * binding. - */ -static struct mmci_platform_data mmcsd_plat_data = { - .ocr_mask = MMC_VDD_29_30, -}; - -/* * This GPIO pin turns on a line that is used to detect card insertion * on this board. */ @@ -232,13 +223,10 @@ static int __init cpu8815_mmcsd_init(void) } device_initcall(cpu8815_mmcsd_init); - -/* These are mostly to get the right device names for the clock lookups */ +/* This still waits for a device tree enablement patch */ static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE, NULL, &cpu8815_nand_data), - OF_DEV_AUXDATA("arm,primecell", NOMADIK_SDI_BASE, - NULL, &mmcsd_plat_data), { /* sentinel */ }, };