From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from VA3EHSOBE006.bigfish.com (outbound-va3.frontbridge.com [216.32.180.16]) by ozlabs.org (Postfix) with ESMTP id BE153DE4C6 for ; Wed, 2 Jul 2008 03:52:57 +1000 (EST) From: John Linn To: linuxppc-dev@ozlabs.org Subject: [PATCH] [V2] powerpc: legacy_serial: reg-offset & shift aren't used Date: Tue, 1 Jul 2008 10:52:41 -0700 Message-ID: <20080701175250.E0BA41CE804D@mail117-va3.bigfish.com> MIME-Version: 1.0 Content-Type: text/plain Cc: dwg@au1.ibm.com, paulus@samba.org, John Linn List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , The legacy serial driver does not work with an 8250 type UART that uses reg-offset and reg-shift. This change updates the driver so it doesn't find the UART when those properties are present on the UART in the device tree for soc devices. Signed-off-by: John Linn Acked-by: Grant Likely --- V2 Corrected logic to use "||" rather than "&&". arch/powerpc/kernel/legacy_serial.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 61dd174..cf37f5c 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c @@ -136,6 +136,11 @@ static int __init add_legacy_soc_port(struct device_node *np, if (of_get_property(np, "clock-frequency", NULL) == NULL) return -1; + /* if reg-shift or offset, don't try to use it */ + if ((of_get_property(np, "reg-shift", NULL) != NULL) || + (of_get_property(np, "reg-offset", NULL) != NULL)) + return -1; + /* if rtas uses this device, don't try to use it as well */ if (of_get_property(np, "used-by-rtas", NULL) != NULL) return -1; -- 1.5.2.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.