From patchwork Tue May 12 14:14:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 48387 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 045CE2121F for ; Tue, 12 May 2015 14:15:47 +0000 (UTC) Received: by lbos2 with SMTP id s2sf2210097lbo.2 for ; Tue, 12 May 2015 07:15:45 -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=+ya/eOaWhvNw3R2VgUStyYQaC4O/zcaXACF8ZQnzlbM=; b=OE1D1NWYicOq0lrohALfe3NGAFmliKXe+9jN8gDs3KA4kccITyYE6QW8WHY13RpaPO exuiz/Dfc1XLCCrvRed3qQMtBW11OkC/7iCJQWgHBFSsikY7N7FObYI3UkVWFyO0FRv8 7Ad+IO8oFUdax4qkBJBGVQ47+EyOaWjDEV+SBEU/Shc1tulOoNQVMAQAvdYaq7yjLAO6 jFO6DpGAGzpj05d03WqBsaULFrAfhI+wX+k6ypZK7kK8Ug/9ffK2bWkCgcJB21wTfFSE xHOVgZ+f0HcS4G8U6980YDgXHlIM8CxJcQAVBkH9kUWpHYwK9fQmNhSrfnWjpOGiK+Vi pFDQ== X-Gm-Message-State: ALoCoQlOQB1gAljlQ2EFtzjIRGCbyxv4DYqFRA7BDqo5jyaWxxER/HnE3A6CduhSbzPybxsIZNHM X-Received: by 10.112.53.102 with SMTP id a6mr10729541lbp.16.1431440145906; Tue, 12 May 2015 07:15:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.103 with SMTP id kx7ls40615lac.62.gmail; Tue, 12 May 2015 07:15:45 -0700 (PDT) X-Received: by 10.112.17.8 with SMTP id k8mr12186960lbd.28.1431440145799; Tue, 12 May 2015 07:15:45 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id r10si10459753lal.5.2015.05.12.07.15.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 May 2015 07:15:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by labbd9 with SMTP id bd9so6958439lab.2 for ; Tue, 12 May 2015 07:15:45 -0700 (PDT) X-Received: by 10.152.87.204 with SMTP id ba12mr12483026lab.35.1431440145702; Tue, 12 May 2015 07:15:45 -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 hn6csp2118895lbb; Tue, 12 May 2015 07:15:44 -0700 (PDT) X-Received: by 10.66.193.228 with SMTP id hr4mr29042811pac.48.1431440135048; Tue, 12 May 2015 07:15:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id db5si1250860pbb.103.2015.05.12.07.15.34 for ; Tue, 12 May 2015 07:15:35 -0700 (PDT) Received-SPF: none (google.com: linux-serial-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 S933208AbbELOPd (ORCPT ); Tue, 12 May 2015 10:15:33 -0400 Received: from foss.arm.com ([217.140.101.70]:60979 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933166AbbELOPc (ORCPT ); Tue, 12 May 2015 10:15:32 -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 6C79C6A3; Tue, 12 May 2015 07:14:55 -0700 (PDT) Received: from e104803-lin.cambridge.arm.com (unknown [10.1.203.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 483833F218; Tue, 12 May 2015 07:15:30 -0700 (PDT) From: Andre Przywara To: rmk+kernel@arm.linux.org.uk, Greg KH , Jiri Slaby Cc: Jakub Kicinski , Graeme Gregory , dave.martin@arm.com, arnd@arndb.de, Lorenzo Pieralisi , linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 11/11] drivers: PL011: add ACPI probing for SBSA UART Date: Tue, 12 May 2015 15:14:55 +0100 Message-Id: <1431440095-5146-12-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1431440095-5146-1-git-send-email-andre.przywara@arm.com> References: <1431440095-5146-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.41 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] Signed-off-by: Graeme Gregory Signed-off-by: Andre Przywara Acked-by: Lorenzo Pieralisi Acked-by: Sudeep Holla --- 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 cca93d9..79f716c 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 @@ -2483,12 +2484,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), }, };