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: 2852606 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 673CF9F3DC for ; Sun, 1 Sep 2013 20:03:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D4A82021E for ; Sun, 1 Sep 2013 20:03:04 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96FBE20256 for ; Sun, 1 Sep 2013 20:03:03 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGDrA-0008VO-Pu; Sun, 01 Sep 2013 20:02:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGDr8-0000UE-Qi; Sun, 01 Sep 2013 20:02:42 +0000 Received: from mail-la0-f47.google.com ([209.85.215.47]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGDr4-0000TP-7B for linux-arm-kernel@lists.infradead.org; Sun, 01 Sep 2013 20:02:40 +0000 Received: by mail-la0-f47.google.com with SMTP id eo20so2980737lab.34 for ; Sun, 01 Sep 2013 13:02:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f0Dmw94mGlc0edk1s9U3yz7yKV2Sr0yZ15FTcEn+Eu0=; b=CPGN1SLJtviOgHapWalODrSdrSr2buLlMZuptEEe/pCKycSYCFdTDYLQzInLnnNww4 NshaR71YbysUI/0BDXwaVWDbnLzQLtMfc1eXGLz2BitDxL2vYWwNviZ/Q0RpBmOHRR+Z rmZWFfm4cTeuzMqYFpYDlXiDHNHV6OzCIOUUFPhEesoP0qrPk/0lk1KsXlW8HRLUdXFS CH7IHoYCMxfjURIs6Dxz0eqIaGJ9tIGfMIBTW4F0+UXaHVBhJyFJCIIQJHztbEbLJCVX ihQaMfsBhKk+P1/erI6NwhGaarNbccq6+S2airTyu27S1VE2IvfdkCjDLDYmbKMMWHmw 4Lmg== X-Gm-Message-State: ALoCoQmLymk2VtGFp3ckKm3ABppK1ibC0NpNg1dFvNbZ9j3BR3RsyeCspVfpCm+bPbX0tKA/7ObF 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130901_160238_419500_0A398DCD X-CRM114-Status: GOOD ( 14.05 ) X-Spam-Score: -2.6 (--) Cc: Samuel Ortiz , Linus Walleij , Liam Girdwood , linux-kernel@vger.kernel.org, Mark Brown , Lee Jones X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 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 */ }, };