From patchwork Wed Feb 18 20:07:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 44801 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3ACF821554 for ; Wed, 18 Feb 2015 20:08:54 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id b15sf2749699eek.0 for ; Wed, 18 Feb 2015 12:08:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=hUXz6lTpR2bG7vlWiNCEuoX0ocF52VBtn5f8h/NJmRw=; b=kLhrtGCPM9CzuLuwLmKT9OVdowEsStaOMw+XRX7trNgpW9qlxW2vi6wOI9YDr9dHQv AFeqMtWKCYQb3ojIeGFKpsRdW7qTq2AEerNq3ByVxqBsXj0blSoMPqOK87bIoWjqzaIK 2ZqbjFI5dhOOTziAht1DYsUkoUj4E3C3w8GhVPNMn5KPq2lThUipuMqYlrXrR5zcs8Uf jjOUy8FAMNPB61ykPyqROW/ETyoStBUCtf78wGft/6/F2DKDWIwI19yKKtlFx6abPNMW dPa8rVupZLa7VF3ANmfXOa6s3HIkHvfOdqiCM/NyNs33xWn9dK4VpD1LKSbdDez35jN9 6r9w== X-Gm-Message-State: ALoCoQm/PoBxekGuF0y12PAYemHQHZDFx5eG2Kd05ZBGQ5b4dus3cKQL6uCMXBV+ySfNdqcbNKBc X-Received: by 10.194.86.1 with SMTP id l1mr155683wjz.0.1424290133423; Wed, 18 Feb 2015 12:08:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.6 with SMTP id i6ls78922lam.10.gmail; Wed, 18 Feb 2015 12:08:53 -0800 (PST) X-Received: by 10.152.23.98 with SMTP id l2mr1073724laf.46.1424290133271; Wed, 18 Feb 2015 12:08:53 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id ep5si3232728lbb.114.2015.02.18.12.08.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 12:08:53 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbjb6 with SMTP id b6so3482872lbj.2 for ; Wed, 18 Feb 2015 12:08:53 -0800 (PST) X-Received: by 10.152.87.3 with SMTP id t3mr954674laz.19.1424290133190; Wed, 18 Feb 2015 12:08:53 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.35.133 with SMTP id h5csp55695lbj; Wed, 18 Feb 2015 12:08:52 -0800 (PST) X-Received: by 10.107.19.202 with SMTP id 71mr1349631iot.83.1424290131863; Wed, 18 Feb 2015 12:08:51 -0800 (PST) Received: from mail-ie0-f175.google.com (mail-ie0-f175.google.com. [209.85.223.175]) by mx.google.com with ESMTPS id 8si5385430icb.83.2015.02.18.12.08.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 12:08:51 -0800 (PST) Received-SPF: pass (google.com: domain of jorge.ramirez-ortiz@linaro.org designates 209.85.223.175 as permitted sender) client-ip=209.85.223.175; Received: by iecrd18 with SMTP id rd18so4149620iec.8 for ; Wed, 18 Feb 2015 12:08:51 -0800 (PST) X-Received: by 10.43.45.1 with SMTP id ui1mr2006827icb.51.1424290131126; Wed, 18 Feb 2015 12:08:51 -0800 (PST) Received: from localhost.localdomain (cpe-67-247-86-207.rochester.res.rr.com. [67.247.86.207]) by mx.google.com with ESMTPSA id n17sm12726931igi.2.2015.02.18.12.08.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Feb 2015 12:08:50 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, devicetree@vger.kernel.org, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] drivers/tty: pl011: read fifo size from OF if present Date: Wed, 18 Feb 2015 15:07:49 -0500 Message-Id: <1424290069-8760-3-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424290069-8760-1-git-send-email-jorge.ramirez-ortiz@linaro.org> References: <1424290069-8760-1-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: jorge.ramirez-ortiz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Jorge Ramirez-Ortiz --- drivers/tty/serial/amba-pl011.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 02016fc..c6a2dd8 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -84,6 +84,11 @@ struct vendor_data { static unsigned int get_fifosize_arm(struct amba_device *dev) { + u32 val; + + if (!of_property_read_u32(dev->dev.of_node, "fifo-size", &val)) + return val; + return amba_rev(dev) < 3 ? 16 : 32; }