From patchwork Wed Nov 13 08:40:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3177581 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 AF91F9F39E for ; Wed, 13 Nov 2013 08:41:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B12E205E8 for ; Wed, 13 Nov 2013 08:41:22 +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 55674205E4 for ; Wed, 13 Nov 2013 08:41:21 +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 1VgW0I-0001nX-FK; Wed, 13 Nov 2013 08:40:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgW0C-00007Q-Cc; Wed, 13 Nov 2013 08:40:44 +0000 Received: from mail-bk0-f42.google.com ([209.85.214.42]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgW09-00005j-Un for linux-arm-kernel@lists.infradead.org; Wed, 13 Nov 2013 08:40:42 +0000 Received: by mail-bk0-f42.google.com with SMTP id w16so158928bkz.1 for ; Wed, 13 Nov 2013 00:40:17 -0800 (PST) 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=RXxSQ2yrBTxdl33ZbIhR5yRxMdZQ1b5LhG5ayDd4dSE=; b=W56MpTA9etFKft3KUpcaXNIuxWH2cyeLEEGubIaszoxi5znF/JvrnjtcitE2ylKe// vP9279Zsq8lZorErD6p8OgULo6u0tOksELJTlUAX3k0rljQlAwYHMfQetfCEtYQj2PpS h4E6prcx2+JGNzucKcIsWjxN1c9z8AuxZCdT8G+bTK972onjBPDEi2f8ytA3/ajpofcU 2WYRTXyWWNtx/6IvIIqtkhQrwu7c0y/xRbIAi2uK8A34NQpY4u5L913rhvDE2mPCw02/ 2vWem/1uNvoFSBHmBcQ72l3t1qovqiz+qQHinIq5/pdz3TkTqy38WPcES8fbuBcGXMGM DAlg== X-Gm-Message-State: ALoCoQnBbyB6V2b5eoEpl11O5sjiCIZZIutzDANNQRMUgIxTgEbMizoIfLpxBYw7fGBBvG6ub2Uo X-Received: by 10.204.56.78 with SMTP id x14mr12939553bkg.24.1384332015970; Wed, 13 Nov 2013 00:40:15 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id w9sm21350124bkn.12.2013.11.13.00.40.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2013 00:40:15 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] Revert "ARM: ux500: Stop passing MMC's platform data for Device Tree boots" Date: Wed, 13 Nov 2013 09:40:12 +0100 Message-Id: <1384332012-14857-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131113_034042_138892_E56DF86D X-CRM114-Status: GOOD ( 10.62 ) X-Spam-Score: -2.6 (--) Cc: Linus Walleij , Lee Jones , Ulf Hansson 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=-4.2 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 This reverts commit 49c129519a7a8840767321c38d2eaf84a263529b. The special settings for the SD/MMC card parameters that are not yet fully agreed upon how to encode into the device tree went missing with this commit. We need to first put it into the device tree, and then remove the platform data. Cc: Lee Jones Cc: Ulf Hansson Signed-off-by: Linus Walleij Reviewed-by: Ulf Hansson --- 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 8e7e60d2a429..12c7e5c03ea4 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -140,10 +140,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { /* Requires call-back bindings. */ OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata), /* Requires DMA bindings. */ - 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), + 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("stericsson,ux500-msp-i2s", 0x80123000, "ux500-msp-i2s.0", &msp0_platform_data), OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,