From patchwork Sun Oct 7 01:53:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Domenico Andreoli X-Patchwork-Id: 1560251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 53A8F3FD56 for ; Sun, 7 Oct 2012 01:56:55 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TKg4r-0007ib-H9; Sun, 07 Oct 2012 01:54:45 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TKg4K-0007ej-Na for linux-arm-kernel@lists.infradead.org; Sun, 07 Oct 2012 01:54:16 +0000 Received: by mail-wg0-f49.google.com with SMTP id gg4so1743285wgb.18 for ; Sat, 06 Oct 2012 18:54:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:user-agent:date:from:to:cc:subject:references :content-disposition; bh=ecC1hjfBZiQZZxoRFs3a7O33BlvSAng1EqY9PcT8uW0=; b=Krb/GE9q/4dMHFufNy6DIl2rkyUDJAshrrMTY4DaZgoDOAzsugm1bl/Zcrj6V4AMjk Ex7UUC7AoBiPCakF+B+5UNXh248SBYuXPQQzPHeHsbILI9R9+qz108Zk/0hE/YEXjGtI dMnw5GT26XqTeVNDjYj2tFqwFOmdDeezL5jBBdjKRosauHT9H5AApiPPFOjXpdF+jkm3 rIbEJawv099cd2fwMeq8I2WVoYy8VXcLf9V5PNb3mYjLjqhtVnnfIzhssl+tAvoeH6rX smJx1F24OEJBXShcCjyUQdAupE8E3duq45VbzIpypId73KZXHA0SSjlgPfXCyUVaQNTD j3JA== Received: by 10.180.87.34 with SMTP id u2mr11978850wiz.3.1349574850835; Sat, 06 Oct 2012 18:54:10 -0700 (PDT) Received: from raptus.dandreoli.com (178-85-163-250.dynamic.upc.nl. [178.85.163.250]) by mx.google.com with ESMTPS id fb20sm12737031wid.1.2012.10.06.18.54.09 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 06 Oct 2012 18:54:10 -0700 (PDT) Received: by raptus.dandreoli.com (Postfix, from userid 1000) id 2455F3C4B5; Sun, 7 Oct 2012 03:54:08 +0200 (CEST) Message-Id: <20121007015407.840781689@gmail.com> User-Agent: quilt/0.60-1 Date: Sun, 07 Oct 2012 03:53:06 +0200 From: Domenico Andreoli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] ARM: bcm476x: Instantiate console UART References: <20121007015300.828366635@gmail.com> Content-Disposition: inline; filename=arm-bcm476x-instantiate-console-uart.patch X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cavokz[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Domenico Andreoli , devicetree-discuss@lists.ozlabs.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Domenico Andreoli The BCM476x sports standard PL011 UARTs which are fully described and put to use with these few changes. Signed-off-by: Domenico Andreoli --- arch/arm/Kconfig.debug | 16 ++++++++++++++++ arch/arm/boot/dts/bcm476x.dtsi | 23 ++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) Index: b/arch/arm/boot/dts/bcm476x.dtsi =================================================================== --- a/arch/arm/boot/dts/bcm476x.dtsi +++ b/arch/arm/boot/dts/bcm476x.dtsi @@ -5,7 +5,7 @@ model = "Broadcom BCM476x"; chosen { - bootargs = "earlyprintk"; + bootargs = "console=ttyAMA1"; }; amba { @@ -41,5 +41,26 @@ interrupt-controller; #interrupt-cells = <1>; }; + + uart0@c0000 { + compatible = "brcm,bcm476x-pl011", "arm,pl011", "arm,primecell"; + reg = <0xc0000 0x1000>; + interrupt-parent = <&vic0>; + interrupts = <14>; + }; + + uart1@c1000 { + compatible = "brcm,bcm476x-pl011", "arm,pl011", "arm,primecell"; + reg = <0xc1000 0x1000>; + interrupt-parent = <&vic0>; + interrupts = <15>; + }; + + uart2@b2000 { + compatible = "brcm,bcm476x-pl011", "arm,pl011", "arm,primecell"; + reg = <0xb2000 0x1000>; + interrupt-parent = <&vic0>; + interrupts = <16>; + }; }; }; Index: b/arch/arm/Kconfig.debug =================================================================== --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -89,6 +89,18 @@ choice bool "Kernel low-level debugging on 9263 and 9g45" depends on HAVE_AT91_DBGU1 + config DEBUG_BCM476X_UART0 + depends on ARCH_BCM476X + bool "Kernel low-level debugging on BCM476x UART 0" + + config DEBUG_BCM476X_UART1 + depends on ARCH_BCM476X + bool "Kernel low-level debugging on BCM476x UART 1" + + config DEBUG_BCM476X_UART2 + depends on ARCH_BCM476X + bool "Kernel low-level debugging on BCM476x UART 2" + config DEBUG_CLPS711X_UART1 bool "Kernel low-level debugging messages via UART1" depends on ARCH_CLPS711X @@ -404,6 +416,8 @@ endchoice config DEBUG_LL_INCLUDE string + default "debug/bcm476x.S" if DEBUG_BCM476X_UART0 || \ + DEBUG_BCM476X_UART1 || DEBUG_BCM476X_UART2 default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/highbank.S" if DEBUG_HIGHBANK_UART default "debug/mvebu.S" if DEBUG_MVEBU_UART @@ -416,6 +430,8 @@ config DEBUG_LL_INCLUDE config UNCOMPRESS_INCLUDE string + default "debug/bcm476x-uncompress.h" if DEBUG_BCM476X_UART0 || \ + DEBUG_BCM476X_UART1 || DEBUG_BCM476X_UART2 default "debug/icedcc-uncompress.h" if DEBUG_ICEDCC default "debug/mvebu-uncompress.h" if DEBUG_MVEBU_UART default "debug/tegra-uncompress.h" if DEBUG_TEGRA_UART