From patchwork Wed Mar 14 13:05:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7289 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 2334023DEE for ; Wed, 14 Mar 2012 13:05:26 +0000 (UTC) Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by fiordland.canonical.com (Postfix) with ESMTP id 18F23A18747 for ; Wed, 14 Mar 2012 13:05:26 +0000 (UTC) Received: by mail-ee0-f52.google.com with SMTP id d4so969646eek.11 for ; Wed, 14 Mar 2012 06:05:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=DydTgwJ/aTYweSZYJJJ91JjnBS5KPHF+skFVv0UwcOs=; b=pkWXKQlSD05sxrKArODrXXel8DOsohD0p9yx71/pu031hu8+nUNCFnlEzrO/Yi2OIE pIqPpGNfeJmJdgflZyaGXJywh1Mm54FD/JPSZcC03qOYnWZNA8vmEu+oLR25szHSO5sx v3tragOKdQm5B/jlLMwLlAIxv3DUA3Z8HpgNre77TnjVQ2KLBJsTlR+cVuemtt8USYKj jRGx23BQrdGV97mN3OMhg336aVmPXBciFhlWEuoINzglrMP/yACibFrDVdCP7N8CFh+n 3YHXyl/D7CVOCXLQFhubz2QSwV2rUtdK9Ffjl1UjehHEoE/o8p1wHSVGHIKns08bLPm9 XznQ== Received: by 10.50.159.135 with SMTP id xc7mr4452523igb.50.1331730325467; Wed, 14 Mar 2012 06:05:25 -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.231.53.18 with SMTP id k18csp9548ibg; Wed, 14 Mar 2012 06:05:24 -0700 (PDT) Received: by 10.180.78.225 with SMTP id e1mr6282204wix.0.1331730324177; Wed, 14 Mar 2012 06:05:24 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id n6si5405177wic.47.2012.03.14.06.05.23 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Mar 2012 06:05:24 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 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-f178.google.com with SMTP id a13so2183990wer.37 for ; Wed, 14 Mar 2012 06:05:23 -0700 (PDT) Received: by 10.180.24.4 with SMTP id q4mr16855569wif.7.1331730323682; Wed, 14 Mar 2012 06:05:23 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id fi4sm11477024wib.4.2012.03.14.06.05.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Mar 2012 06:05:22 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: linus.walleij@linaro.org, arnd@arndb.de, niklas.hernaeus@stericsson.com, Lee Jones Subject: [PATCH 08/10] ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree Date: Wed, 14 Mar 2012 13:05:04 +0000 Message-Id: <1331730306-11461-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1331730306-11461-1-git-send-email-lee.jones@linaro.org> References: <1331730306-11461-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQl/U8MP9TPY9Qo8ZpGnN30zxw1R4pLu3BCfu84LYY7L0P0lQnOMqWZdUp56OSYe0qILK11X Enables the 3 UARTs found on a u8500 using DT. Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 6 +++--- arch/arm/boot/dts/snowball.dts | 12 ++++++++++++ arch/arm/mach-ux500/board-mop500.c | 4 +++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 35d0146..9b5e06e 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -208,19 +208,19 @@ uart@80120000 { compatible = "arm,pl011", "arm,primecell"; reg = <0x80120000 0x1000>; - interrupts = <11>; + interrupts = <0 11 0x4>; status = "disabled"; }; uart@80121000 { compatible = "arm,pl011", "arm,primecell"; reg = <0x80121000 0x1000>; - interrupts = <19>; + interrupts = <0 19 0x4>; status = "disabled"; }; uart@80007000 { compatible = "arm,pl011", "arm,primecell"; reg = <0x80007000 0x1000>; - interrupts = <26>; + interrupts = <0 26 0x4>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 34bfd79..359c6d6 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -96,6 +96,18 @@ status = "enabled"; }; + uart@80120000 { + status = "okay"; + }; + + uart@80121000 { + status = "okay"; + }; + + uart@80007000 { + status = "okay"; + }; + i2c@80004000 { tc3589x@42 { //compatible = "tc3589x"; diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 482b86e..ea0242a 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -746,6 +746,9 @@ MACHINE_END #ifdef CONFIG_MACH_UX500_DT struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { + 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), {}, }; @@ -802,7 +805,6 @@ static void __init u8500_init_machine(void) } mop500_i2c_init(parent); mop500_spi_init(parent); - mop500_uart_init(parent); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); i2c_register_board_info(2, mop500_i2c2_devices,