diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-12-12 19:02:42 +0200 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-12-21 09:18:05 +0800 |
| commit | 1602d215b595b9cf4be460101f5c8892623fe3a0 (patch) | |
| tree | d88caba2674fc191082eb4f6c2b1b6884134dee0 /arch/x86/include/asm/arch-tangier/acpi | |
| parent | b55c89ce0207d3a504238c1b8f268c56035656a3 (diff) | |
x86: tangier: Use official ACPI HID for FLIS IP
FLIS IP since now gets its own ACPI ID.
Drop PRP0001 workaround in favour of official ACPI HID.
Corresponding kernel commit dabd4bc6de2b
pinctrl: intel: merrifield: Introduce ACPI device table
in the pin control subsystem tree [1] targeting v4.16.
[1]: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/commit/?h=for-next&id=dabd4bc6de2b
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/arch-tangier/acpi')
| -rw-r--r-- | arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index e80ec0a9be..288b57cb80 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl @@ -264,7 +264,7 @@ Device (PCI0) Device (FLIS) { - Name (_HID, "PRP0001") + Name (_HID, "INTC1002") Name (_DDN, "Intel Merrifield Family-Level Interface Shim") Name (RBUF, ResourceTemplate() { @@ -284,13 +284,6 @@ Device (FLIS) Return (RBUF) } - Name (_DSD, Package () { - ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () { - Package () {"compatible", "intel,merrifield-pinctrl"}, - } - }) - Method (_STA, 0, NotSerialized) { Return (STA_VISIBLE) |