From patchwork Fri Mar 22 15:27:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15550 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 1DBF623E66 for ; Fri, 22 Mar 2013 15:28:04 +0000 (UTC) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by fiordland.canonical.com (Postfix) with ESMTP id DFB8AA18227 for ; Fri, 22 Mar 2013 15:28:03 +0000 (UTC) Received: by mail-la0-f54.google.com with SMTP id gw10so7579779lab.27 for ; Fri, 22 Mar 2013 08:28:03 -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=QZsSaKrTLFY/ObTu03kad7Del2Orwi7PnCTwaAoJiCs=; b=pq7tEeW5gSeBi7fnMQz7gTZ4yXMl9RSTZx6WH+x6tl7UckXhfIbOniyaEAIu0cjQMm 8eZ3C8S25Bt2ozQcJylTWD44D35D7ZvnHJ0UopI8GEuiArqfe9E9lsxBFdQV5H3eyl+e nqihbmsMWSJQMCMONI3VJWXeAdnelm6N5+AKbGzuj9L0ndUXZB9Zen93zVBHmFqwPeOt yMR8hAUy3geW8SBolzl+58k0UICgSxRAcO7ARL5APA5ypiq0loEsopHzvIyp15lx037a +0sXir+S/gRTlzKUauLgX9c2PHym85m59x/HDQS/dPI8qze8rqhwpTTzg1QoJhaHy6lZ Ej1A== X-Received: by 10.112.59.104 with SMTP id y8mr1386634lbq.39.1363966083482; Fri, 22 Mar 2013 08:28:03 -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 ce18csp114144lbb; Fri, 22 Mar 2013 08:28:02 -0700 (PDT) X-Received: by 10.180.72.165 with SMTP id e5mr12127493wiv.7.1363966081938; Fri, 22 Mar 2013 08:28:01 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id wl3si1116361wjb.110.2013.03.22.08.28.01 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:28:01 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 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-wg0-f50.google.com with SMTP id es5so975803wgb.17 for ; Fri, 22 Mar 2013 08:28:01 -0700 (PDT) X-Received: by 10.180.185.44 with SMTP id ez12mr11913624wic.33.1363966079272; Fri, 22 Mar 2013 08:27:59 -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.27.57 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:27:58 -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 2/5] ARM: ux500: Allow the ccu8540 to register its serial devices without pdata Date: Fri, 22 Mar 2013 15:27:42 +0000 Message-Id: <1363966065-2478-2-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: ALoCoQmRKLV8J6MEm6GhedRCq4Y0EMM1gmjwsD5DsEqWLXkGiDTt4eaH8L9a3+xVbKtSjks9ad0a The u8540 doesn't have DMA support yet, so in order to enable serial and receive post-bootconsole output, we cannot supply the same platform data as we would for the u8500. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 4fade16..c22550d 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -611,6 +611,13 @@ static void __init mop500_uart_init(struct device *parent) db8500_add_uart2(parent, &uart2_plat); } +static void __init ccu8540_uart_init(struct device *parent) +{ + db8500_add_uart0(parent, NULL); + db8500_add_uart1(parent, NULL); + db8500_add_uart2(parent, NULL); +} + static void __init u8500_cryp1_hash1_init(struct device *parent) { db8500_add_cryp1(parent, &u8500_cryp1_platform_data); @@ -662,6 +669,18 @@ static void __init mop500_init_machine(void) regulator_has_full_constraints(); } +static void __init ccu8540_init_machine(void) +{ + struct device *parent = NULL; + + parent = u8500_init_devices(&ab8500_platdata); + + ccu8540_uart_init(parent); + + /* This board has full regulator constraints */ + regulator_has_full_constraints(); +} + static void __init snowball_init_machine(void) { struct device *parent = NULL; @@ -745,7 +764,7 @@ MACHINE_START(U8540, "ST-Ericsson U8540 Platform ccu8540") .map_io = u8500_map_io, .init_irq = ux500_init_irq, .init_time = ux500_timer_init, - .init_machine = mop500_init_machine, + .init_machine = ccu8540_init_machine, .init_late = ux500_init_late, MACHINE_END