From patchwork Thu Sep 17 18:19:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duc Dang X-Patchwork-Id: 7209731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4074B9F380 for ; Thu, 17 Sep 2015 18:23:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 638502072F for ; Thu, 17 Sep 2015 18:23:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 89954206F8 for ; Thu, 17 Sep 2015 18:23:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zcdoh-0007c1-Bf; Thu, 17 Sep 2015 18:21:55 +0000 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZcdoI-00076S-DY for linux-arm-kernel@lists.infradead.org; Thu, 17 Sep 2015 18:21:31 +0000 Received: by pacfv12 with SMTP id fv12so26549681pac.2 for ; Thu, 17 Sep 2015 11:21:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Cf3/AwZ7Stcf6/jHVqPtO7dvUU261TRCIjyx6GOXQvE=; b=KD8roZm6Ksd6fnEm+RYm4OC8E7s/UKAPwryPwLANpBPhv5EOf1Q0Ze/bLkrB1qIrgy Of+pMVdwGEFJ5DHZa0JkXdVpQjX2XIISD0n7nk2tQFkUMJMbIGZ4EAHkxbT1Ho/f2v9I xQwyhBIReJSJ9Xok0U3TiJ8YvqDXGl/4/bZc0= 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:in-reply-to:references; bh=Cf3/AwZ7Stcf6/jHVqPtO7dvUU261TRCIjyx6GOXQvE=; b=faddDNmiimAK5NUMzOp6d7qHbPOFQLWKH4foG8u4BcCV1O60GvyJ2OgaZ7X5UwcEqR bi9n9OQhAtzfbBHTfJL2mIAncOThmaeKnm1Ev5vU3XmprOHkYm0j8yWmq5Pdr0Fe0dWJ T2t6FdNSDb0ucUH/DQQ8y0hkQnw5WQyN3+sNTxRNoF/v0JgTsu1dsU6x9YZdlXOWP14L evYQB7mAfYFzEuP9zc212hR4yKn3ydpLW88e9zBQe6YMCXeut5+LOFcE+Ixtfdz6rD7L /eROjyegx213mRJY9pOI0vLTv5tOzSQD2NjzWDFq6qYpqj+QCgVSE0j+ran3PM2tQxpa w7Pw== X-Gm-Message-State: ALoCoQm/TKHAsiyMCVm26CWxNO7GM73+c4GHo7tszFCMcbs0fN1cux4KCEINM+S+TDXfHtWF7Qyl X-Received: by 10.68.238.161 with SMTP id vl1mr1018548pbc.114.1442514069607; Thu, 17 Sep 2015 11:21:09 -0700 (PDT) Received: from dhdang-Precision-WorkStation-T3400.amcc.com (70-35-53-82.static.wiline.com. [70.35.53.82]) by smtp.gmail.com with ESMTPSA id bs3sm4649923pbd.89.2015.09.17.11.21.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Sep 2015 11:21:08 -0700 (PDT) From: Duc Dang To: Greg KH , Russell King - ARM Linux , Loc Ho , Arnd Bergmann , mathias.nyman@intel.com Subject: [PATCH v8 2/3] usb: Add support for ACPI identification to xhci-platform Date: Thu, 17 Sep 2015 11:19:47 -0700 Message-Id: <03831105dc007f572a5c642740837435783baa55.1442513540.git.dhdang@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150917_112130_540420_579DF0A6 X-CRM114-Status: GOOD ( 15.13 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Feng Kan , Mark Langsdorf , Duc Dang , USB list , patches , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Provide the methods to let ACPI identify the need to use xhci-platform. Change the Kconfig files so the xhci-plat.o file is selectable during kernel config. This has been tested on an ARM64 machine with platform XHCI, an x86_64 machine with XHCI, and an x86_64 machine without XHCI. There were no regressions or error messages on the machines without platform XHCI. [dhdang: regenerate the patch over v4.3-rc1 and address new comments] Signed-off-by: Mark Langsdorf Signed-off-by: Duc Dang --- drivers/usb/host/xhci-plat.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 34c93e8..05647e6 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "xhci.h" #include "xhci-mvebu.h" @@ -268,6 +269,13 @@ static const struct of_device_id usb_xhci_of_match[] = { MODULE_DEVICE_TABLE(of, usb_xhci_of_match); #endif +static const struct acpi_device_id usb_xhci_acpi_match[] = { + /* XHCI-compliant USB Controller */ + { "PNP0D10", }, + { } +}; +MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match); + static struct platform_driver usb_xhci_driver = { .probe = xhci_plat_probe, .remove = xhci_plat_remove, @@ -275,6 +283,7 @@ static struct platform_driver usb_xhci_driver = { .name = "xhci-hcd", .pm = DEV_PM_OPS, .of_match_table = of_match_ptr(usb_xhci_of_match), + .acpi_match_table = ACPI_PTR(usb_xhci_acpi_match), }, }; MODULE_ALIAS("platform:xhci-hcd");