From patchwork Tue Jul 28 09:44:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Gregory X-Patchwork-Id: 51577 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 01F0D214B7 for ; Tue, 28 Jul 2015 09:44:36 +0000 (UTC) Received: by lbvb1 with SMTP id b1sf36009988lbv.3 for ; Tue, 28 Jul 2015 02:44:34 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=rE8ix5eEUgmIuN578MEQAK1Rh8s5DVILyERMnuN+Hcs=; b=LcaYJensw0+CUqt7rsTbOhNGbIZAdYem93dXOykfptvC91v7tFYuHBinClTNSBk0lD euZvezxNUS3HaM8q0Il7BXSJCXwiMeF/gLRGRlm0pDnHIzXokivBguNCxHm1Wke2OtK7 op2hZG2FQj1epwxyO5YCO83zCKBqkqI3texazDmx2/VzDluy+u+nWUihztagP6m+Qfcn zqWLvitS1bvAdEj38jANXaSpbSfqKTAlKjbpsPNv1LdThXMkN37qmaof9reXpXgEX2bF jZlphJ6z72ynLmK7Spr7iI45yRd5MATqSnQ61qSDXhP2oG8eVPur0G3/k0RVigX1HH9F FiLA== X-Gm-Message-State: ALoCoQk5y4D1oztMEERfJy4TmEwc1CsRQNIrziBfa9SfNZ+Vs2V6QvqNLjJdWQPqi2fi50GZOi4X X-Received: by 10.180.90.106 with SMTP id bv10mr951975wib.6.1438076674864; Tue, 28 Jul 2015 02:44:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.197 with SMTP id ks5ls704123lac.64.gmail; Tue, 28 Jul 2015 02:44:34 -0700 (PDT) X-Received: by 10.112.146.36 with SMTP id sz4mr32233642lbb.54.1438076674474; Tue, 28 Jul 2015 02:44:34 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id rl9si17825106lac.65.2015.07.28.02.44.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2015 02:44:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by laah7 with SMTP id h7so65106304laa.0 for ; Tue, 28 Jul 2015 02:44:34 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr31061692lbc.112.1438076674324; Tue, 28 Jul 2015 02:44:34 -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.7.198 with SMTP id l6csp2025692lba; Tue, 28 Jul 2015 02:44:33 -0700 (PDT) X-Received: by 10.66.62.202 with SMTP id a10mr79375342pas.42.1438076672586; Tue, 28 Jul 2015 02:44:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zl8si20583200pac.150.2015.07.28.02.44.31; Tue, 28 Jul 2015 02:44:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 S932214AbbG1JoZ (ORCPT + 28 others); Tue, 28 Jul 2015 05:44:25 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:35632 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755358AbbG1JoX (ORCPT ); Tue, 28 Jul 2015 05:44:23 -0400 Received: by wibxm9 with SMTP id xm9so148698527wib.0 for ; Tue, 28 Jul 2015 02:44:22 -0700 (PDT) X-Received: by 10.180.9.6 with SMTP id v6mr33171218wia.83.1438076661956; Tue, 28 Jul 2015 02:44:21 -0700 (PDT) Received: from xora-haswell.xora.org.uk (host-92-22-78-162.as13285.net. [92.22.78.162]) by smtp.gmail.com with ESMTPSA id wx9sm32354557wjb.6.2015.07.28.02.44.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jul 2015 02:44:21 -0700 (PDT) From: Graeme Gregory To: virtualization@lists.linux-foundation.org Cc: mst@redhat.com, linux-kernel@vger.kernel.org, Graeme Gregory Subject: [PATCH] virtio_mmio: add ACPI probing Date: Tue, 28 Jul 2015 10:44:02 +0100 Message-Id: <1438076642-12080-1-git-send-email-graeme.gregory@linaro.org> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: graeme.gregory@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.45 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: , Added the match table and pointers for ACPI probing to the driver. This uses the same identifier for virt devices as being used for qemu ARM64 ACPI support. http://git.linaro.org/people/shannon.zhao/qemu.git/commit/d0bf1955a3ecbab4b51d46f8c5dda02b7e14a17e Signed-off-by: Graeme Gregory --- drivers/virtio/virtio_mmio.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 10189b5..f499d9d 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -58,6 +58,7 @@ #define pr_fmt(fmt) "virtio-mmio: " fmt +#include #include #include #include @@ -732,12 +733,21 @@ static struct of_device_id virtio_mmio_match[] = { }; MODULE_DEVICE_TABLE(of, virtio_mmio_match); +#ifdef CONFIG_ACPI +static const struct acpi_device_id virtio_mmio_acpi_match[] = { + { "LNRO0005", }, + { } +}; +MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match); +#endif + static struct platform_driver virtio_mmio_driver = { .probe = virtio_mmio_probe, .remove = virtio_mmio_remove, .driver = { .name = "virtio-mmio", .of_match_table = virtio_mmio_match, + .acpi_match_table = ACPI_PTR(virtio_mmio_acpi_match), }, };