Merge git://git.denx.de/u-boot-x86

6 years ago · 48a346061d
parent b55c89ce02 1602d215b5
commit 48a346061d
1 changed files with 1 additions and 8 deletions
--- 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)