81 lines
2.5 KiB
Diff
81 lines
2.5 KiB
Diff
From: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
|
|
Subject: [PATCH v3 2/2] [usb] dd support for ACPI identification to xhci-platform
|
|
Date: Tue, 25 Nov 2014 15:19:26 -0600
|
|
Origin: http://permalink.gmane.org/gmane.linux.usb.general/118784
|
|
Bug-Debian: https://bugs.debian.org/785707
|
|
|
|
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.
|
|
|
|
Signed-off-by: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
|
|
---
|
|
Changes from v2
|
|
Replaced tristate with a boolean as the driver doesn't
|
|
compile as a module
|
|
Correct --help-- to ---help---
|
|
Changes from v1
|
|
Renamed from "add support for APM X-Gene to xhci-platform"
|
|
Removed changes to arm64/Kconfig
|
|
Made CONFIG_USB_XHCI_PLATFORM a user selectable config option
|
|
|
|
drivers/usb/host/Kconfig | 7 ++++++-
|
|
drivers/usb/host/xhci-plat.c | 11 +++++++++++
|
|
2 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/usb/host/Kconfig
|
|
+++ b/drivers/usb/host/Kconfig
|
|
@@ -32,7 +32,12 @@ config USB_XHCI_PCI
|
|
default y
|
|
|
|
config USB_XHCI_PLATFORM
|
|
- tristate
|
|
+ boolean "xHCI platform driver support"
|
|
+ ---help---
|
|
+ Say 'Y' to enable the support for the xHCI host controller
|
|
+ as a platform device. Many ARM SoCs provide USB this way.
|
|
+
|
|
+ If unsure, say 'Y'.
|
|
|
|
config USB_XHCI_MVEBU
|
|
tristate "xHCI support for Marvell Armada 375/38x"
|
|
--- a/drivers/usb/host/xhci-plat.c
|
|
+++ b/drivers/usb/host/xhci-plat.c
|
|
@@ -18,6 +18,7 @@
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/usb/xhci_pdriver.h>
|
|
+#include <linux/acpi.h>
|
|
|
|
#include "xhci.h"
|
|
#include "xhci-mvebu.h"
|
|
@@ -241,6 +242,15 @@ static const struct of_device_id usb_xhc
|
|
MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
|
|
#endif
|
|
|
|
+#ifdef CONFIG_ACPI
|
|
+static const struct acpi_device_id usb_xhci_acpi_match[] = {
|
|
+ { "PNP0D10", },
|
|
+ { "PNP0D15", },
|
|
+ { }
|
|
+};
|
|
+MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match);
|
|
+#endif
|
|
+
|
|
static struct platform_driver usb_xhci_driver = {
|
|
.probe = xhci_plat_probe,
|
|
.remove = xhci_plat_remove,
|
|
@@ -248,6 +258,7 @@ static struct platform_driver usb_xhci_d
|
|
.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");
|