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: 21475 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E29623FBD for ; Wed, 13 Nov 2013 08:40:18 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md4sf160121pbc.8 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:mime-version: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=RXxSQ2yrBTxdl33ZbIhR5yRxMdZQ1b5LhG5ayDd4dSE=; b=hVQVQytPQ/fleDiwWKGr9/ZlXHa90gnojPXDjaLSTkvj37wE5Emv/xK4roREmiMort bDtEjddjlTiNb/mzRlx1wQ6fRGlokPs8BAOxceLjYP/9PwTOesyHgEOYH/Du6TAKfHti tKWlQH7v4NdeeRrhiUby19DJszigTsn/cluunOM2Kr42K2/9kzLh41kygKRaIO15GQcJ k0a9MYQXCv8YmTEOJjDsc3vKv445SwtZFAjuseojygn89yaJgoh4RzyVxe0/dbppwZej 70D7fDI5I/1xha6W3BVMi/QTioB5mbluMkR+168TPjKKYPNw8xUsuk9FSv9G+emVlgKB SPCg== X-Gm-Message-State: ALoCoQluC3gXjC1uV6B6wkMb0MB6k7FLkXb/kFQBaAaOFk2H4S7XXxcQsECbRvSTQm0EslnH6PNk X-Received: by 10.66.102.69 with SMTP id fm5mr13503055pab.24.1384332017718; Wed, 13 Nov 2013 00:40:17 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.72 with SMTP id i8ls430553qeh.10.gmail; Wed, 13 Nov 2013 00:40:17 -0800 (PST) X-Received: by 10.52.230.35 with SMTP id sv3mr9850867vdc.27.1384332017556; Wed, 13 Nov 2013 00:40:17 -0800 (PST) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id g6si10810883vdw.2.2013.11.13.00.40.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Nov 2013 00:40:17 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.45 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.45; Received: by mail-vb0-f45.google.com with SMTP id p6so58605vbe.4 for ; Wed, 13 Nov 2013 00:40:17 -0800 (PST) X-Received: by 10.52.227.6 with SMTP id rw6mr28276322vdc.19.1384332017476; Wed, 13 Nov 2013 00:40:17 -0800 (PST) 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 u4csp222060vcz; Wed, 13 Nov 2013 00:40:17 -0800 (PST) X-Received: by 10.204.2.140 with SMTP id 12mr327124bkj.47.1384332016628; Wed, 13 Nov 2013 00:40:16 -0800 (PST) Received: from mail-bk0-f41.google.com (mail-bk0-f41.google.com [209.85.214.41]) by mx.google.com with ESMTPS id k2si5115634bkr.246.2013.11.13.00.40.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Nov 2013 00:40:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.214.41 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.214.41; Received: by mail-bk0-f41.google.com with SMTP id v15so164193bkz.0 for ; Wed, 13 Nov 2013 00:40:16 -0800 (PST) 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 Cc: Linus Walleij , Lee Jones , Ulf Hansson 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-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.45 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: , 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 --- 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,