From patchwork Thu May 21 16:26:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 48862 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 82E1321411 for ; Thu, 21 May 2015 16:27:58 +0000 (UTC) Received: by lbos2 with SMTP id s2sf7982156lbo.2 for ; Thu, 21 May 2015 09:27:57 -0700 (PDT) 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:cc: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=zZmtYekgIPa2B59NM+hXXLShc7SVPjgbNfGXhylCHos=; b=CIqh+JiZLw9PBoprs5wH8sYc4GMHbON4BNV7EAah9l19kWl0szzOP7aFRIOiDZof2G pkz0BrQ80BbKGM7hSC7qPaNjjO/iO+Nk92EMTbnIXcwM7QyK+ZOF8T4b48MVOJzPZVps UsC1dLoD585aaTyOYo/yS/OLy1Fn4+0+zl4y02dz/Iyi6DIdslTPIwp/pVkkPOZJp0lO 6n+Z0HJKNIVhyKjdBMiJ0Y/Vr2nFYd6RPFC32Lwc8amTEHYj11CJmWl2p0UiZoQvXqfw 6Fj+Wyc+WMAsTj69LrMTBAyMGciTMIbGi7dmAqIxZ05FxD9lGiSwlLnc+yFL21ozNx7g I6+Q== X-Gm-Message-State: ALoCoQkPeZpetj8NZnEntd+y8Sw3w596tBioY8SMPXzZ8vQZsXK2PI+7yMwHxMoUwFkyA6jjO08c X-Received: by 10.112.42.236 with SMTP id r12mr3401490lbl.2.1432225677545; Thu, 21 May 2015 09:27:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.194 with SMTP id v2ls420622lag.59.gmail; Thu, 21 May 2015 09:27:57 -0700 (PDT) X-Received: by 10.152.5.198 with SMTP id u6mr2926476lau.48.1432225677395; Thu, 21 May 2015 09:27:57 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id t10si8097396laa.17.2015.05.21.09.27.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 May 2015 09:27:57 -0700 (PDT) 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 labbd9 with SMTP id bd9so107445113lab.2 for ; Thu, 21 May 2015 09:27:57 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr3049912lbc.32.1432225677198; Thu, 21 May 2015 09:27:57 -0700 (PDT) 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.108.230 with SMTP id hn6csp712538lbb; Thu, 21 May 2015 09:27:56 -0700 (PDT) X-Received: by 10.70.124.131 with SMTP id mi3mr7237730pdb.28.1432225659140; Thu, 21 May 2015 09:27:39 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ka1si1412605pbc.194.2015.05.21.09.27.38 for ; Thu, 21 May 2015 09:27:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756269AbbEUQ04 (ORCPT ); Thu, 21 May 2015 12:26:56 -0400 Received: from foss.arm.com ([217.140.101.70]:41805 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756243AbbEUQ04 (ORCPT ); Thu, 21 May 2015 12:26:56 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D7F366A2; Thu, 21 May 2015 09:26:51 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.203.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C78403F4FF; Thu, 21 May 2015 09:26:53 -0700 (PDT) From: Andre Przywara To: rmk+kernel@arm.linux.org.uk, GregKH , Jiri Slaby Cc: Jakub Kicinski , graeme.gregory@linaro.org, dave.martin@arm.com, arnd@arndb.de, Lorenzo.Pieralisi@arm.com, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mlangsdo@redhat.com, nareshgbhat@gmail.com Subject: [PATCH v5 11/11] drivers: PL011: add ACPI probing for SBSA UART Date: Thu, 21 May 2015 17:26:24 +0100 Message-Id: <1432225584-4655-12-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1432225584-4655-1-git-send-email-andre.przywara@arm.com> References: <1432225584-4655-1-git-send-email-andre.przywara@arm.com> Sender: linux-serial-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-serial@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@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: , From: Graeme Gregory Add the necessary driver boilerplate to let the driver be used when the respective ACPI table is discovered by the ACPI subsystem. [Andre: change table name, add MODULE_DEVICE_TABLE entry and improve commit message] Reviewed-by: Hanjun Guo Signed-off-by: Graeme Gregory Signed-off-by: Andre Przywara --- drivers/tty/serial/amba-pl011.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index c0850f3..50cf5b1 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -58,6 +58,7 @@ #include #include #include +#include #define UART_NR 14 @@ -2486,12 +2487,19 @@ static const struct of_device_id sbsa_uart_of_match[] = { }; MODULE_DEVICE_TABLE(of, sbsa_uart_of_match); +static const struct acpi_device_id sbsa_uart_acpi_match[] = { + { "ARMH0011", 0 }, + {}, +}; +MODULE_DEVICE_TABLE(acpi, sbsa_uart_acpi_match); + static struct platform_driver arm_sbsa_uart_platform_driver = { .probe = sbsa_uart_probe, .remove = sbsa_uart_remove, .driver = { .name = "sbsa-uart", .of_match_table = of_match_ptr(sbsa_uart_of_match), + .acpi_match_table = ACPI_PTR(sbsa_uart_acpi_match), }, };