From patchwork Fri May 3 14:32:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16661 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ea0-f198.google.com (mail-ea0-f198.google.com [209.85.215.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F216423905 for ; Fri, 3 May 2013 14:34:37 +0000 (UTC) Received: by mail-ea0-f198.google.com with SMTP id h14sf2555938eak.9 for ; Fri, 03 May 2013 07:34:27 -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=DlqqV9jd2A3LKjS2iJCsF+hqtk7gT+YeX7aiREH8YqA=; b=V6h/W3L6yIhx9xuDrv4piyfY5A81yDRu32FUJeQg4GSDKb6Yl2cNaFdliwaLyqOUc5 7slaHK8XZKZ3AV0SUBOvEyP08JFYHj0jyqYNDvhkVuoVhxD36RrLMCtspW1ICRi3UP/o p6sgaIhTmh3EvNGxaw1DkWJ7Oh8Yl7UZ70+6UOELfsnA7/Uzm6sf19/oMLI37EhdlYMK 3ViKSE7Ca3yZwFs64L2P9prWnDCjMhLwgdA7MufdXo0jChTDyGj4B9a6TIkDs0txAzLf 9zf+qAMuoZO/6XQYi9cX6Li538S+0vkY8/f8+ss0G+RAluMFzGMQ1KWb1SWeMHnv0pZm yKlQ== X-Received: by 10.180.13.233 with SMTP id k9mr3015219wic.1.1367591667456; Fri, 03 May 2013 07:34:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.91.3 with SMTP id ca3ls194789wib.48.gmail; Fri, 03 May 2013 07:34:27 -0700 (PDT) X-Received: by 10.180.13.179 with SMTP id i19mr13714523wic.18.1367591667318; Fri, 03 May 2013 07:34:27 -0700 (PDT) Received: from mail-ve0-x234.google.com (mail-ve0-x234.google.com [2607:f8b0:400c:c01::234]) by mx.google.com with ESMTPS id r19si3598814wju.183.2013.05.03.07.34.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:34:27 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::234 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:c01::234; Received: by mail-ve0-f180.google.com with SMTP id pa12so1526540veb.25 for ; Fri, 03 May 2013 07:34:26 -0700 (PDT) X-Received: by 10.52.166.103 with SMTP id zf7mr3186680vdb.94.1367591666266; Fri, 03 May 2013 07:34:26 -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 nf2csp25213veb; Fri, 3 May 2013 07:34:25 -0700 (PDT) X-Received: by 10.180.88.162 with SMTP id bh2mr3310045wib.3.1367591665172; Fri, 03 May 2013 07:34:25 -0700 (PDT) Received: from mail-wi0-x22b.google.com (mail-wi0-x22b.google.com [2a00:1450:400c:c05::22b]) by mx.google.com with ESMTPS id m3si3591153wjq.241.2013.05.03.07.34.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:34:25 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22b is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22b; Received: by mail-wi0-f171.google.com with SMTP id l13so671329wie.10 for ; Fri, 03 May 2013 07:34:24 -0700 (PDT) X-Received: by 10.194.104.168 with SMTP id gf8mr14194044wjb.58.1367591664803; Fri, 03 May 2013 07:34:24 -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 ESMTPSA id o3sm17516019wia.2.2013.05.03.07.34.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 07:34:24 -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, srinidhi.kasagar@stericsson.com, Lee Jones Subject: [PATCH 30/63] ARM: ux500: Move SDI (MMC) and UART devices under more descriptive heading Date: Fri, 3 May 2013 15:32:16 +0100 Message-Id: <1367591569-32197-31-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> References: <1367591569-32197-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl7iDn0cZY6ItAUwxP1QL/UGz+bK+kXRRMvgJ39LY0yQpPyJHMdRU3z/KZRD3R2t+q5dHlh X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::234 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: , Now DMA DT bindings exist and are in use by he MMC and UART drivers, it should be possible to remove them from the auxdata structure. However, after doing so the drivers fail. Common clk is still reliant on the dev_name() call to do device name matching, which will fail due to the fact that Device Tree naming differs somewhat do the more traditional conventions. Reviewed-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index bb8f58f..3276472 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -236,15 +236,15 @@ 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,pl022", 0x80002000, "ssp0", &ssp0_plat), + /* Requires clock name bindings. */ OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", NULL), 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", 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), OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e000, "gpio.2", NULL),