From patchwork Fri Mar 22 15:27:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15551 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9D2B923E66 for ; Fri, 22 Mar 2013 15:28:36 +0000 (UTC) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) by fiordland.canonical.com (Postfix) with ESMTP id 59366A18227 for ; Fri, 22 Mar 2013 15:28:36 +0000 (UTC) Received: by mail-la0-f45.google.com with SMTP id er20so7571620lab.18 for ; Fri, 22 Mar 2013 08:28:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=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; bh=cqsMbHK0OcQoFyil0zhPxoaIMIoWgmhDTI7HEYvXggE=; b=f7RLzbObJHbjY7i6bprnMnnFNXY76LWLcFSuVv/POHgRJKTPapyV4ao0CdtWrJwGAY zdJzjn2fi9fa6YrIgEO367JWy8J+wYibtedu+qWHtLxb8KiD+evXf6EoKWDlgKU81OwE zypn3WZcxL60PSrVQCLuvcW+uejG1skqkN2Nh6iqC+EeXycY4fYlohpciViFE77pqn5v yJXnkNPDaRXjTBZMTvE4RPxsWM7WGu/mRYcntVXt78oAZl3D9Pa7FMdRB7f4SVCtqymB lv/p+hRFjivXLLqoqewAmifwoHH3XFtePvunLEjXXtaD349plQ0/LCHN3woLAk07h1aj qbVg== X-Received: by 10.112.39.138 with SMTP id p10mr1376786lbk.31.1363966115958; Fri, 22 Mar 2013 08:28:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.112.91.146 with SMTP id ce18csp114164lbb; Fri, 22 Mar 2013 08:28:35 -0700 (PDT) X-Received: by 10.180.185.170 with SMTP id fd10mr12304807wic.0.1363966085243; Fri, 22 Mar 2013 08:28:05 -0700 (PDT) Received: from mail-we0-x22c.google.com ([2a00:1450:400c:c03::22c]) by mx.google.com with ESMTPS id f2si2612376wik.34.2013.03.22.08.28.05 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:28:05 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22c is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::22c; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::22c is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f172.google.com with SMTP id u50so2341083wey.3 for ; Fri, 22 Mar 2013 08:28:05 -0700 (PDT) X-Received: by 10.180.78.168 with SMTP id c8mr3750669wix.27.1363966085000; Fri, 22 Mar 2013 08:28:05 -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 r7sm4249093wiz.2.2013.03.22.08.28.03 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:28:04 -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 5/5] ARM: ux500: Do not supply DMA platform data when booting u8540 platform Date: Fri, 22 Mar 2013 15:27:45 +0000 Message-Id: <1363966065-2478-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363966065-2478-1-git-send-email-lee.jones@linaro.org> References: <1363966065-2478-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlxKcmxKw/qp7s98ZTvOuL9kKp4n1i36AnIjvxfGThIH24VcIdcVlXZQp3hEhDJi/zB/Ydi The u8540 platform DMA settings are not currently supported. In this patch we ensure they are not passed to the serial driver during boot. This allows us to reach a terminal when booting with Device Tree enabled. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 19235cf..da425f7 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -257,9 +257,6 @@ 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,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), @@ -297,6 +294,22 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { {}, }; +static struct of_dev_auxdata u8500_auxdata_uart_lookup[] __initdata = { + /* 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), + {}, +}; + +static struct of_dev_auxdata u8540_auxdata_uart_lookup[] __initdata = { + /* Requires DMA 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), + {}, +}; + static const struct of_device_id u8500_local_bus_nodes[] = { /* only create devices below soc node */ { .compatible = "stericsson,db8500", }, @@ -324,6 +337,13 @@ static void __init u8500_init_machine(void) /* automatically probe child nodes of db8500 device */ of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); + + if (of_machine_is_compatible("st-ericsson,u8540")) + of_platform_populate(NULL, u8500_local_bus_nodes, + u8540_auxdata_uart_lookup, parent); + else + of_platform_populate(NULL, u8500_local_bus_nodes, + u8500_auxdata_uart_lookup, parent); } static const char * stericsson_dt_platform_compat[] = {