From patchwork Wed Dec 23 14:19:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 58982 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp3889809lbb; Wed, 23 Dec 2015 06:22:36 -0800 (PST) X-Received: by 10.66.253.71 with SMTP id zy7mr43865691pac.20.1450880554954; Wed, 23 Dec 2015 06:22:34 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id or3si3832417pac.233.2015.12.23.06.22.34; Wed, 23 Dec 2015 06:22:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755152AbbLWOWT (ORCPT + 6 others); Wed, 23 Dec 2015 09:22:19 -0500 Received: from mail-lf0-f51.google.com ([209.85.215.51]:32830 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755478AbbLWOWS (ORCPT ); Wed, 23 Dec 2015 09:22:18 -0500 Received: by mail-lf0-f51.google.com with SMTP id p203so149488901lfa.0 for ; Wed, 23 Dec 2015 06:22:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mVbeFgKxI3SetVf6GOdUxku9smw7Fwu2xXmaveW42Fg=; b=M/XD33RyHOtPzzpEGyrk5LNE++8kWT/uq5yGN+qOx+CbL0dn1ZHDU5x6cAmImYE3Ma GfizQ0rGX4OmXn0uQc6qA9YZ5rDYIFGaxsKVl1emS2xheNvnbTveCTx0/zI8SWY2VU+r kMB+ggKOfFvqipHBuMwG38a/11toyYaYC5Yus= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mVbeFgKxI3SetVf6GOdUxku9smw7Fwu2xXmaveW42Fg=; b=lwbJ7DAn5yczlOxOceMADQHoA16vAnfic2ufp5TwwvidRzTYqKhZajpyxEyYqtWJLk pR/qcl158zw1hlVgD1shAXkNlvnPeilYQLOA/UJZhY9EZyLI9mQfBnSUZ65cuUynrGTi btrZAaexUkgjGiMmbjb9fdT7iRaK/MixWCcktXvLtVrIrjV+RZpA7+L35F7ahXA8ZGVC lLCuyRr08WrGVKx+UOCSOkCObJ4SpdrpzZaTcntAT62yWefotvzh+Nryz7YcM9+zHCjD j7XG9j56rEPe6GzEYb35gZ3xl1okT9pmDNWoyPdh2IGeoX/QPZdCcBJailHVDO1PtMtN DjNQ== X-Gm-Message-State: ALoCoQmXKkUflG1o1b18v3MANotdPQhiIA0uycsIgm+h5V91R6+s7l5c4saxqgMdkIk9tdzWZPI4GY8ATpKqbZOl69KXjpytnw== X-Received: by 10.25.144.5 with SMTP id s5mr10795695lfd.154.1450880536890; Wed, 23 Dec 2015 06:22:16 -0800 (PST) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id a75sm6693381lfe.34.2015.12.23.06.22.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 06:22:15 -0800 (PST) From: Aleksey Makarov To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aleksey Makarov , Graeme Gregory , Russell King , Greg Kroah-Hartman , "Rafael J . Wysocki" , Shannon Zhao , Andy Shevchenko , Vladimir Zapolskiy , Jiri Slaby Subject: [PATCH v4 3/3] serial: amba-pl011: add ACPI support to AMBA probe Date: Wed, 23 Dec 2015 17:19:42 +0300 Message-Id: <1450880383-29560-4-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450880383-29560-1-git-send-email-aleksey.makarov@linaro.org> References: <1450880383-29560-1-git-send-email-aleksey.makarov@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Graeme Gregory In ACPI this device is only defined in SBSA mode so if we are coming from ACPI use this mode. Signed-off-by: Graeme Gregory Signed-off-by: Aleksey Makarov --- drivers/tty/serial/amba-pl011.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) -- 2.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 899a771..974cb9e 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2368,18 +2368,33 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) if (!uap) return -ENOMEM; - uap->clk = devm_clk_get(&dev->dev, NULL); - if (IS_ERR(uap->clk)) - return PTR_ERR(uap->clk); - - uap->vendor = vendor; - uap->lcrh_rx = vendor->lcrh_rx; - uap->lcrh_tx = vendor->lcrh_tx; - uap->fifosize = vendor->get_fifosize(dev); - uap->port.irq = dev->irq[0]; - uap->port.ops = &amba_pl011_pops; + /* ACPI only defines SBSA variant */ + if (has_acpi_companion(&dev->dev)) { + /* + * According to ARM ARMH0011 is currently the only mapping + * of pl011 in ACPI and it's mapped to SBSA UART mode + */ + uap->vendor = &vendor_sbsa; + uap->fifosize = 32; + uap->port.ops = &sbsa_uart_pops; + uap->fixed_baud = 115200; - snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); + snprintf(uap->type, sizeof(uap->type), "SBSA"); + } else { + uap->clk = devm_clk_get(&dev->dev, NULL); + if (IS_ERR(uap->clk)) + return PTR_ERR(uap->clk); + + uap->vendor = vendor; + uap->lcrh_rx = vendor->lcrh_rx; + uap->lcrh_tx = vendor->lcrh_tx; + uap->fifosize = vendor->get_fifosize(dev); + uap->port.ops = &amba_pl011_pops; + + snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", + amba_rev(dev)); + } + uap->port.irq = dev->irq[0]; ret = pl011_setup_port(&dev->dev, uap, &dev->res, portnr); if (ret)