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/com...

Reviewed-by: Bin Meng bmeng.cn@gmail.com Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- In v2: - added RB tag - expanded commit message to refer to Linux kernel commit which brings that ID there

arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 9 +-------- 1 file changed, 1 insertion(+), 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)