From patchwork Wed Nov 13 08:39:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3177571 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 264779F39E for ; Wed, 13 Nov 2013 08:40:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2DF3205E8 for ; Wed, 13 Nov 2013 08:40:47 +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 975F1205E4 for ; Wed, 13 Nov 2013 08:40:46 +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 1VgW06-0001j7-G5; Wed, 13 Nov 2013 08:40:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgW04-00006d-2C; Wed, 13 Nov 2013 08:40:36 +0000 Received: from mail-wg0-f54.google.com ([74.125.82.54]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgW00-00005a-Mk for linux-arm-kernel@lists.infradead.org; Wed, 13 Nov 2013 08:40:33 +0000 Received: by mail-wg0-f54.google.com with SMTP id y10so82888wgg.33 for ; Wed, 13 Nov 2013 00:40:07 -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=pd9aXRrrxjHLbU4As+AtAGklYsq1ir+idnENpRWa7KY=; b=DO9HKNdml+4mhNSkhTr9pgdNN+uD5XODEWhAgemQjjYW7i9VSfu/9q/XqXwQ+SGwLd YG1WRsGaLvLjpk7rPB8sAA5SZ6LFGaRoMbe6AnJu1v1TXn73iibHkV0m3x2SHZBrXhd3 alrFAjJeN/UDy4i5FZ/nirUU27kaAvbHzisUoKTYlz4fFZhMv/3YlP0bpqwEVUsW4p5b O7ZsUjy/s5QVLKyo51B3Wp+Msoyjar3M3g4TOlm3+fz2YrODBz0usznVULBLqee6ampU zq74Wh3k/TLwbqaLviN2ulhzyMh2UzulVZBL/+fN/Zaj3JCVzfKKc2mqlKnCG5hR0x7y 0wgg== X-Gm-Message-State: ALoCoQly7IwrXv9UV/h4DLy39pgXaphfSxRGkHJuSKbcjHCHJME4nvThtFB12HZaO7Myd4OpfotJ X-Received: by 10.194.1.139 with SMTP id 11mr12581227wjm.33.1384332007897; Wed, 13 Nov 2013 00:40:07 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id dj8sm52571731wid.2.2013.11.13.00.40.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2013 00:40:07 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] Revert "ARM: ux500: Remove AUXDATA relating to SDI (MMC) clock-name bindings" Date: Wed, 13 Nov 2013 09:39:58 +0100 Message-Id: <1384331998-14818-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_034032_865778_659608E9 X-CRM114-Status: UNSURE ( 9.51 ) X-CRM114-Notice: Please train this message. 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 ce16feb8510cbbcd090c2320c35db2fbbffde210. This commit stopped tying down the name of the MMC/SD devices, but these names are used in the pin control table, so the MMC/SD cards stopped working. Cc: Lee Jones Cc: Ulf Hansson Signed-off-by: Linus Walleij Reviewed-by: Ulf Hansson --- arch/arm/mach-ux500/cpu-db8500.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 2e85c1e72535..8e7e60d2a429 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -140,6 +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("stericsson,ux500-msp-i2s", 0x80123000, "ux500-msp-i2s.0", &msp0_platform_data), OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,