Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753506AbbLCUGc (ORCPT ); Thu, 3 Dec 2015 15:06:32 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:50537 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753428AbbLCUG3 (ORCPT ); Thu, 3 Dec 2015 15:06:29 -0500 MIME-Version: 1.0 In-Reply-To: <1443609530-21524-4-git-send-email-graeme.gregory@linaro.org> References: <1443609530-21524-1-git-send-email-graeme.gregory@linaro.org> <1443609530-21524-4-git-send-email-graeme.gregory@linaro.org> Date: Thu, 3 Dec 2015 14:06:27 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 3/3] serial: amba-pl011: add ACPI support to AMBA probe From: Timur Tabi To: Graeme Gregory Cc: linux-acpi@vger.kernel.org, lkml , linux-serial@vger.kernel.org, shannon.zhao@linaro.org, "Rafael J. Wysocki" , Len Brown , Russell King , Greg Kroah-Hartman Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2262 Lines: 56 On Wed, Sep 30, 2015 at 5:38 AM, Graeme Gregory wrote: > @@ -2368,18 +2368,28 @@ 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); > + /* ACPI only defines SBSA variant */ > + if (!ACPI_COMPANION(&dev->dev)) { > + 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)); > + } else { > + uap->vendor = &vendor_sbsa; > + uap->fifosize = 32; > + uap->port.ops = &sbsa_uart_pops; > + uap->fixed_baud = 115200; > + > + snprintf(uap->type, sizeof(uap->type), "SBSA"); > + } > uap->port.irq = dev->irq[0]; > - uap->port.ops = &amba_pl011_pops; > - > - snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); I'm confused. We already have ACPI support in amba-pl011 driver, and pl011_probe() is never called on an SBSA system. That's what sbsa_uart_probe() is for. You even added this patch: drivers: PL011: add ACPI probing for SBSA UART -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/