From patchwork Wed Feb 18 18:53:13 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: 44793 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D7EA221573 for ; Wed, 18 Feb 2015 18:54:57 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id y19sf2044482wgg.1 for ; Wed, 18 Feb 2015 10:54:56 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=q/+qxM9reij4juNyd+YlqcJPCeXHq70Vew4qagBxoCY=; b=W5TgnvSOMK070T6TdSerX/5mtV2ZATnbdlXddtQwXXLE5nZd0t4+shNM0MdtrB6EIl v0BgCCsDy6vO3Oko8UOltgTtkj/oeYfr+2m9OFEeuSVrM/7uOrk74/NY74UzX1rhlD2t Dcv96kL6ei5kw9Wlkn5HSuA4qPy+atAQXDU361qw3JJJ6cfABWpAMNZMAL3k/fXwcgwi 6xu4K0FFI5lhqVNO8Nk4GXQse/KPDDg/BOavrzOyt/Rarwd1imARq5KslNmbqBouCy/q ZKKI/IqyA7n83m2VATbw5NoQYgIGU6IUZtah7b+tF7n/OiNa3jQsOo5ZvtbMjJDFEiqD BqIg== X-Gm-Message-State: ALoCoQlgucvDJNcUeDBzvNbibCUoKKkg4NtNXbezowNu7H3ztZ4oKV+4SH2+O2Pr4FH/2w0bODOX X-Received: by 10.112.131.106 with SMTP id ol10mr115417lbb.20.1424285695992; Wed, 18 Feb 2015 10:54:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.137 with SMTP id s9ls61970las.15.gmail; Wed, 18 Feb 2015 10:54:55 -0800 (PST) X-Received: by 10.152.204.69 with SMTP id kw5mr697292lac.3.1424285695848; Wed, 18 Feb 2015 10:54:55 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id qn8si13689109lbb.159.2015.02.18.10.54.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 10:54:55 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by labms9 with SMTP id ms9so3103491lab.10 for ; Wed, 18 Feb 2015 10:54:55 -0800 (PST) X-Received: by 10.112.161.34 with SMTP id xp2mr611226lbb.73.1424285695731; Wed, 18 Feb 2015 10:54:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp15953lbj; Wed, 18 Feb 2015 10:54:54 -0800 (PST) X-Received: by 10.70.38.163 with SMTP id h3mr895114pdk.95.1424285693968; Wed, 18 Feb 2015 10:54:53 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ny4si7670656pbb.247.2015.02.18.10.54.23; Wed, 18 Feb 2015 10:54:53 -0800 (PST) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbbBRSxZ (ORCPT + 5 others); Wed, 18 Feb 2015 13:53:25 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:40882 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752492AbbBRSxY (ORCPT ); Wed, 18 Feb 2015 13:53:24 -0500 Received: by iebtr6 with SMTP id tr6so3627307ieb.7 for ; Wed, 18 Feb 2015 10:53:23 -0800 (PST) X-Received: by 10.50.78.232 with SMTP id e8mr2115306igx.5.1424285603836; Wed, 18 Feb 2015 10:53:23 -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 g20sm12442587igt.14.2015.02.18.10.53.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Feb 2015 10:53:23 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, devicetree@vger.kernel.org, linux@arm.linux.org.uk Subject: [PATCH 2/2] drivers/tty: pl011: read fifo size from OF if present Date: Wed, 18 Feb 2015 13:53:13 -0500 Message-Id: <1424285593-2886-3-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424285593-2886-1-git-send-email-jorge.ramirez-ortiz@linaro.org> References: <1424285593-2886-1-git-send-email-jorge.ramirez-ortiz@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.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.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 02016fc..23fef63 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -84,6 +84,12 @@ struct vendor_data { static unsigned int get_fifosize_arm(struct amba_device *dev) { + const void *prop; + + prop = of_get_property(dev->dev.of_node, "fifo-size", NULL); + if (prop) + return of_read_ulong(prop, 1); + return amba_rev(dev) < 3 ? 16 : 32; }