From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Subject: Re: [PATCH 3/5] tty/8250_dw: Add support for OCTEON UARTS. Date: Wed, 19 Jun 2013 09:47:08 -0700 Message-ID: <51C1E08C.9040900@gmail.com> References: <1371582775-12141-1-git-send-email-ddaney.cavm@gmail.com> <1371582775-12141-4-git-send-email-ddaney.cavm@gmail.com> <20130619141008.GA32331@xps8300> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pb0-f52.google.com ([209.85.160.52]:59571 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756651Ab3FSQrM (ORCPT ); Wed, 19 Jun 2013 12:47:12 -0400 In-Reply-To: <20130619141008.GA32331@xps8300> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: Heikki Krogerus Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, Jamie Iles , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, David Daney On 06/19/2013 07:10 AM, Heikki Krogerus wrote: > On Tue, Jun 18, 2013 at 12:12:53PM -0700, David Daney wrote: >> A few differences needed by OCTEON: >> >> o These are DWC UARTS, but have USR at a different offset. >> >> o OCTEON must have 64-bit wide register accesses, so we have OCTEON >> specific register accessors. >> >> o No UCV register, so we hard code some properties. >> >> Signed-off-by: David Daney > > > >> @@ -270,10 +301,8 @@ static int dw8250_probe(struct platform_device *pdev) >> uart.port.serial_out = dw8250_serial_out; >> uart.port.private_data = data; >> >> - dw8250_setup_port(&uart); >> - >> if (pdev->dev.of_node) { >> - err = dw8250_probe_of(&uart.port); >> + err = dw8250_probe_of(&uart.port, data); >> if (err) >> return err; >> } else if (ACPI_HANDLE(&pdev->dev)) { >> @@ -284,6 +313,9 @@ static int dw8250_probe(struct platform_device *pdev) >> return -ENODEV; >> } >> >> + if (!data->no_ucv) >> + dw8250_setup_port(&uart); > > Moving the dw8250_setup_port() call here breaks dw8250_probe_acpi(). It > expects values from the CPR register for the DMA burst size calculation. > > The DMA support can be moved to a separate function. This way it can > be called after this point, and it will then be available for both DT > and ACPI. I can make a patch tomorrow. That should solve this issue. > I am reworking the patch because other problems were found. I will try to get this part right in the next version. David Daney