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: 21474 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f70.google.com (mail-pb0-f70.google.com [209.85.160.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0355B23FBD for ; Wed, 13 Nov 2013 08:40:10 +0000 (UTC) Received: by mail-pb0-f70.google.com with SMTP id rp16sf162097pbb.9 for ; Wed, 13 Nov 2013 00:40:09 -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=pd9aXRrrxjHLbU4As+AtAGklYsq1ir+idnENpRWa7KY=; b=byoRRczmr//VkgtjtKC2k5PbkNVR2aXs/NzBEnPwc8/w41yDjDeW7oSTAEPOlXCqwM HR82dGU4CWeEKOTs7AzSz5tB5jeiD6qOeGpQc1fQqO4fb23WLMWRFA7B0OAiZdhxoLNA bLKsxz6aOJE5npxK4Fp5PpR7q0pfiejLD6k2GMteU92T0UsULzxLx2mIW/ynuhU/SVEt Ohlf4sTDNGK5pNK1wEzoIgMzsepPdLTEa3OuR9c/G8LwX32ynUwSHeoWMG5yIEesA7F8 LfjKltJRnBhbJt1xNsSLh+RjAJ2RaEm6JOOCcTJQrY2fSJjGVPQdBJfayvARSF0RaTiY 0Z7Q== X-Gm-Message-State: ALoCoQlG/AKOqw3tTT08gUnKv27Yqi1G8sWlVD/hZGdCT9SvN9L6A0YI/vFj/dnXF7eAGS04HiWV X-Received: by 10.66.235.36 with SMTP id uj4mr14599409pac.9.1384332009791; Wed, 13 Nov 2013 00:40:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.3.106 with SMTP id b10ls437196qeb.40.gmail; Wed, 13 Nov 2013 00:40:09 -0800 (PST) X-Received: by 10.220.17.131 with SMTP id s3mr14337349vca.20.1384332009635; Wed, 13 Nov 2013 00:40:09 -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 rw8si14074999vdc.18.2013.11.13.00.40.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Nov 2013 00:40:09 -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 p6so58503vbe.4 for ; Wed, 13 Nov 2013 00:40:09 -0800 (PST) X-Received: by 10.52.243.138 with SMTP id wy10mr28530352vdc.2.1384332009416; Wed, 13 Nov 2013 00:40:09 -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 u4csp222052vcz; Wed, 13 Nov 2013 00:40:09 -0800 (PST) X-Received: by 10.194.88.225 with SMTP id bj1mr507830wjb.50.1384332008434; Wed, 13 Nov 2013 00:40:08 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id fv15si13525277wjc.70.2013.11.13.00.40.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Nov 2013 00:40:08 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id a1so85912wgh.0 for ; Wed, 13 Nov 2013 00:40:07 -0800 (PST) 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 Cc: Linus Walleij , Lee Jones , Ulf Hansson 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-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 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 --- 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,