From patchwork Tue Jan 4 11:41:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Hellstrom X-Patchwork-Id: 77455 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B6D6CB70B3 for ; Tue, 4 Jan 2011 22:41:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751099Ab1ADLlt (ORCPT ); Tue, 4 Jan 2011 06:41:49 -0500 Received: from mail202c2.megamailservers.com ([69.49.111.103]:34451 "EHLO mail202c2.megamailservers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298Ab1ADLls (ORCPT ); Tue, 4 Jan 2011 06:41:48 -0500 X-POP-User: marko.gaisler.com Received: from localhost.localdomain (static-92-33-28-242.sme.bredbandsbolaget.se [92.33.28.242]) by mail202c2.megamailservers.com (8.13.6/8.13.1) with ESMTP id p04BfaH0015739; Tue, 4 Jan 2011 06:41:44 -0500 From: Daniel Hellstrom To: davem@davemloft.net Cc: sparclinux@vger.kernel.org, sam@ravnborg.org Subject: [PATCH 7/7] Added support for ampopts in APBUART driver. Used in AMP systems. Date: Tue, 4 Jan 2011 12:41:35 +0100 Message-Id: <1294141295-26584-7-git-send-email-daniel@gaisler.com> X-Mailer: git-send-email 1.5.4 In-Reply-To: <1294141295-26584-1-git-send-email-daniel@gaisler.com> References: <1294141295-26584-1-git-send-email-daniel@gaisler.com> X-CSC: 0 X-CHA: v=1.1 cv=CDb0R4Z6TO0sOUMNi4VR3AiCY0jfodj/AVBUGp8lLvg= c=1 sm=1 a=NNFx1THG7UkA:10 a=jXKJviUpWSOlMmIvGrHOfw==:17 a=ebG-ZW-8AAAA:8 a=oKEy-A8jFxkDsvPDxc0A:9 a=P9TKRFY9yLicIYlkYoXgTgboAu8A:4 a=cCYF7-FHeg4A:10 a=jXKJviUpWSOlMmIvGrHOfw==:117 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Signed-off-by: Daniel Hellstrom --- drivers/serial/apbuart.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c index 7160345..767ce9e 100644 --- a/drivers/serial/apbuart.c +++ b/drivers/serial/apbuart.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -573,7 +574,6 @@ static int __devinit apbuart_probe(struct platform_device *op, printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n", (unsigned long long) port->mapbase, port->irq); return 0; - } static struct of_device_id __initdata apbuart_match[] = { @@ -623,9 +623,12 @@ static void grlib_apbuart_configure(void) int *vendor = (int *) of_get_property(np, "vendor", NULL); int *device = (int *) of_get_property(np, "device", NULL); int *irqs = (int *) of_get_property(np, "interrupts", NULL); + int *ampopts = (int *) of_get_property(np, "ampopts", NULL); regs = (struct amba_prom_registers *) of_get_property(np, "reg", NULL); + if (ampopts && (*ampopts == 0)) + continue; /* Ignore if used by another OS instance */ if (vendor) v = *vendor; if (device)