From patchwork Thu Apr 18 10:12:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16217 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A4E4C23974 for ; Thu, 18 Apr 2013 10:14:03 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id b10sf4772854qen.10 for ; Thu, 18 Apr 2013 03:13:26 -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=AsnUgyPTZ6FY+e47Pw5iD7LSz7WswXU5kKqBDxitrtI=; b=BvfDmBGekGKIB3Carsq2Amze9D9dUexBG3/GojYQwQ2xRnbabJ5OsvXlZiCB1PjFY/ 7u0JeiNR/Gl2/qMJ55xYPcWY3Q7N7hgiIPMRiTvuiJtJw+Lcrj22r5bv050njVLqNJ5n m4TMsmach6gqubit4bF6IGW4N96dwnleLvK6+YuOFm59pbmsBREEAHIyDdU25j0UQzw0 kRRhdDkxWAH+tdtimQXd2yuGsPFDJybINOF9J9ECggB6qzdTtCTxL8Z8g6xqdAxwynF5 sqm23/tMmAaw5qDZBVnYRyVlxbhPqFBFMzZYCTc/IXjfItIF/qM9GHPDVylA977P4QWX 7YJQ== X-Received: by 10.224.88.200 with SMTP id b8mr7559970qam.8.1366280006694; Thu, 18 Apr 2013 03:13:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.82.130 with SMTP id i2ls648797qey.12.gmail; Thu, 18 Apr 2013 03:13:26 -0700 (PDT) X-Received: by 10.52.91.49 with SMTP id cb17mr6665819vdb.0.1366280006424; Thu, 18 Apr 2013 03:13:26 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id ij9si6225059vdb.108.2013.04.18.03.13.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id gf12so2260860vcb.4 for ; Thu, 18 Apr 2013 03:13:26 -0700 (PDT) X-Received: by 10.220.73.68 with SMTP id p4mr7741823vcj.41.1366280006317; Thu, 18 Apr 2013 03:13: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 nf2csp115778veb; Thu, 18 Apr 2013 03:13:25 -0700 (PDT) X-Received: by 10.194.133.232 with SMTP id pf8mr17348845wjb.31.1366280005330; Thu, 18 Apr 2013 03:13:25 -0700 (PDT) Received: from mail-we0-x234.google.com (mail-we0-x234.google.com [2a00:1450:400c:c03::234]) by mx.google.com with ESMTPS id 12si756241wjq.129.2013.04.18.03.13.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13:25 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::234 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::234; Received: by mail-we0-f180.google.com with SMTP id r5so2011909wey.39 for ; Thu, 18 Apr 2013 03:13:25 -0700 (PDT) X-Received: by 10.180.24.65 with SMTP id s1mr17117352wif.0.1366280004952; Thu, 18 Apr 2013 03:13: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 ESMTPS id t7sm30483773wij.2.2013.04.18.03.13.23 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:13: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, Lee Jones Subject: [PATCH 29/32] ARM: ux500: Stop passing UART's platform data for Device Tree boots Date: Thu, 18 Apr 2013 11:12:11 +0100 Message-Id: <1366279934-30761-30-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366279934-30761-1-git-send-email-lee.jones@linaro.org> References: <1366279934-30761-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl6t0WGGqln+2MGhysfSe0uf6UJmldMdup6QayYUB2bl1lxAtbgHQcufxr5TvkKwdJjcHkI X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 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: , It was required to pass DMA channel configuration information to the UART driver before the new DMA API was in place. Now that it is, and is fully compatible with Device Tree we can stop doing that. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index b216233..27d75c8 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -236,9 +236,9 @@ 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,pl011", 0x80120000, "uart0", &uart0_plat), - OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat), - OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", &uart2_plat), + 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", &mop500_sdi0_data), OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data),