MdePkg: Refine the function comments in Keyword Handler Protocol

[mirror_edk2.git] / ArmPlatformPkg / ArmJunoPkg / AcpiTables / Dsdt.asl

diff --git a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Dsdt.asl b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Dsdt.asl
index 32d066748a44372236a24163cebf130f3875145f..c80f46a4ce64467b7ce4eece0a551691627a98cd 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Dsdt.asl
+++ b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Dsdt.asl
@@ -1,7 +1,7 @@
 /** @file\r
   Differentiated System Description Table Fields (DSDT)\r
 \r
-  Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>\r
+  Copyright (c) 2014-2015, ARM Ltd. All rights reserved.<BR>\r
     This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -19,27 +19,27 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_O
     //\r
     // A57x2-A53x4 Processor declaration\r
     //\r
-    Device(CPU0) { // A57-0: Cluster 0, Cpu 0\r
+    Device(CPU0) { // A53-0: Cluster 1, Cpu 0\r
       Name(_HID, "ACPI0007")\r
       Name(_UID, 0)\r
     }\r
-    Device(CPU1) { // A57-1: Cluster 0, Cpu 1\r
+    Device(CPU1) { // A53-1: Cluster 1, Cpu 1\r
       Name(_HID, "ACPI0007")\r
       Name(_UID, 1)\r
     }\r
-    Device(CPU2) { // A53-0: Cluster 1, Cpu 0\r
+    Device(CPU2) { // A53-2: Cluster 1, Cpu 2\r
       Name(_HID, "ACPI0007")\r
       Name(_UID, 2)\r
     }\r
-    Device(CPU3) { // A53-1: Cluster 1, Cpu 1\r
+    Device(CPU3) { // A53-3: Cluster 1, Cpu 3\r
       Name(_HID, "ACPI0007")\r
       Name(_UID, 3)\r
     }\r
-    Device(CPU4) { // A53-2: Cluster 1, Cpu 2\r
+    Device(CPU4) { // A57-0: Cluster 0, Cpu 0\r
       Name(_HID, "ACPI0007")\r
       Name(_UID, 4)\r
     }\r
-    Device(CPU5) { // A53-3: Cluster 1, Cpu 3\r
+    Device(CPU5) { // A57-1: Cluster 0, Cpu 1\r
       Name(_HID, "ACPI0007")\r
       Name(_UID, 5)\r
     }\r
@@ -63,23 +63,45 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_O
     //\r
     Device(ETH0) {\r
       Name(_HID, "ARMH9118")\r
+      Name(_UID, Zero)\r
       Name(_CRS, ResourceTemplate() {\r
               Memory32Fixed(ReadWrite, 0x1A000000, 0x1000)\r
               Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 192 }\r
       })\r
+      Name(_DSD, Package() {\r
+                   ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),\r
+                       Package() {\r
+                               Package(2) {"phy-mode", "mii"},\r
+                               Package(2) {"reg-io-width", 4 },\r
+                               Package(2) {"smsc,irq-active-high",1},\r
+                               Package(2) {"smsc,irq-push-pull",1}\r
+                      }\r
+      }) // _DSD()\r
+    }\r
+\r
+    // UART PL011\r
+    Device(COM0) {\r
+      Name(_HID, "ARMH0011")\r
+      Name(_CID, "PL011")\r
+      Name(_UID, Zero)\r
+      Name(_CRS, ResourceTemplate() {\r
+        Memory32Fixed(ReadWrite, 0x7FF80000, 0x1000)\r
+        Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 115 }\r
+      })\r
     }\r
 \r
     //\r
-    // USB Host Controller\r
+    // USB EHCI Host Controller\r
     //\r
     Device(USB0){\r
         Name(_HID, "ARMH0D20")\r
         Name(_CID, "PNP0D20")\r
         Name(_UID, 2)\r
+        Name(_CCA, 0) //EHCI on this platform is not coherent!\r
 \r
         Method(_CRS, 0x0, Serialized){\r
             Name(RBUF, ResourceTemplate(){\r
-                Memory32Fixed(ReadWrite, 0x7FFC0000, 0x000000B0)\r
+                Memory32Fixed(ReadWrite, 0x7FFC0000, 0x10000)\r
                 Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) {149}  // INT ID=149 GIC IRQ ID=117 for Juno SoC USB EHCI Controller\r
             })\r
             Return(RBUF)\r