From patchwork Thu Apr 18 10:12:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16219 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6C05D23974 for ; Thu, 18 Apr 2013 10:14:07 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id i72sf4165524yha.2 for ; Thu, 18 Apr 2013 03:13:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references: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; bh=44L5KPDDc6JA9B8Shuu047Us5qPP5l5oVqNJpkweI8A=; b=EG76C8GrQRBX28j6oH9TsVVwpXEXb9Pdrw7DMI3IuRd19k7Pjnczvrt0eQg9XVfrOz jNT9d9S6F6nsS6gJj9Xzl0+3ZpUEDz/4FL+0uVfSbCwbjQXrwKTUHZwAhjNxSf8j4u+f fFHWrycF97OL5cqMvEzA4SMKFS6bbqs2qk6QdXVDIJv9reD09LWh4x0FmrmxpFQPTzXf 74uSNmipyu0oNuJKNz9f+f2K1q4BtFbnglVoGENtmnVSe/dLj40JKMtKYqm6YqpottiP ESNLOrKaNnH5oXvBpkyLGfE77ankdn3s1SgpHdr0Pz40VBJyKJmV6B3tuJEjNuzFgx8g vyGQ== X-Received: by 10.224.178.205 with SMTP id bn13mr7580094qab.3.1366280010456; Thu, 18 Apr 2013 03:13:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.60.5 with SMTP id d5ls1480165qer.10.gmail; Thu, 18 Apr 2013 03:13:30 -0700 (PDT) X-Received: by 10.52.157.194 with SMTP id wo2mr6551660vdb.30.1366280010309; Thu, 18 Apr 2013 03:13:30 -0700 (PDT) Received: from mail-vb0-x229.google.com (mail-vb0-x229.google.com [2607:f8b0:400c:c02::229]) by mx.google.com with ESMTPS id l4si6244807vcu.32.2013.04.18.03.13.30 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:30 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::229 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::229; Received: by mail-vb0-f41.google.com with SMTP id f13so2214828vbg.0 for ; Thu, 18 Apr 2013 03:13:30 -0700 (PDT) X-Received: by 10.52.166.103 with SMTP id zf7mr6550686vdb.94.1366280010180; Thu, 18 Apr 2013 03:13:30 -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.58.127.98 with SMTP id nf2csp115781veb; Thu, 18 Apr 2013 03:13:29 -0700 (PDT) X-Received: by 10.180.87.97 with SMTP id w1mr17041985wiz.2.1366280009151; Thu, 18 Apr 2013 03:13:29 -0700 (PDT) Received: from mail-we0-x22c.google.com (mail-we0-x22c.google.com [2a00:1450:400c:c03::22c]) by mx.google.com with ESMTPS id s3si1225183wia.10.2013.04.18.03.13.28 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:29 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22c is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::22c; Received: by mail-we0-f172.google.com with SMTP id r3so2103765wey.17 for ; Thu, 18 Apr 2013 03:13:28 -0700 (PDT) X-Received: by 10.194.133.232 with SMTP id pf8mr17349213wjb.31.1366280008656; Thu, 18 Apr 2013 03:13:28 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id t7sm30483773wij.2.2013.04.18.03.13.27 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:27 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 31/32] ARM: ux500: Stop passing MMC's platform data for Device Tree boots Date: Thu, 18 Apr 2013 11:12:13 +0100 Message-Id: <1366279934-30761-32-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366279934-30761-1-git-send-email-lee.jones@linaro.org> References: <1366279934-30761-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmAByFfR9fHD82eLHGhrJQJo1S02qX9c4UICz7aglKo1TnmAedn2d9jTws8HOrsQoreycYZ X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::229 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: , It was required to pass DMA channel configuration information to the MMC driver before the new DMA API was in place. Now that it is, and is fully compatible with Device Tree we can stop doing that. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 27d75c8..501281c 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -240,10 +240,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL), OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL), OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0", &ssp0_plat), - OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", &mop500_sdi0_data), - OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data), - OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", &mop500_sdi2_data), - OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", &mop500_sdi4_data), + OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", NULL), + OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", NULL), + OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", NULL), + OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", NULL), /* Requires clock name bindings. */ OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL), OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),