Silicon/RK3588: Adjust GPIO for Windows driver and enable in boards (#…

…106)
edk2-porting · Dec 2, 2023 · 83fe408 · 83fe408
1 parent 9529bc4
commit 83fe408
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 19 deletions.
diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     // include ("Gmac.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Gmac1.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     // include ("Gmac.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588S", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Gmac1.asl")
-    //include ("Gpio.asl")
+    include ("Gpio.asl")
     //include ("I2c.asl")
     include ("Uart.asl")
     //include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Gmac1.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Gmac0.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     // include ("Gmac.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Gmac0.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     // include ("Gmac.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     // include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Gmac1.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     // include ("Gmac.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Gmac1.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Emmc.asl")
     include ("Sdhc.asl")
     // include ("Gmac.asl")
-    // include ("Gpio.asl")
+    include ("Gpio.asl")
     // include ("I2c.asl")
     include ("Uart.asl")
     // include ("Spi.asl")

diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Gpio.asl b/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Gpio.asl
@@ -12,7 +12,8 @@
 //
 Device (GPI0)
 {
-  Name (_HID, "PRP0001")
+  Name (_HID, "RKCP3002")
+  Name (_CID, "PRP0001")
   Name (_UID, 0x0)
   Name (_DSD, Package () {
     ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -38,7 +39,8 @@ Device (GPI0)
 
 Device (GPI1)
 {
-  Name (_HID, "PRP0001")
+  Name (_HID, "RKCP3002")
+  Name (_CID, "PRP0001")
   Name (_UID, 0x1)
   Name (_DSD, Package () {
     ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -63,7 +65,8 @@ Device (GPI1)
 
 Device (GPI2)
 {
-  Name (_HID, "PRP0001")
+  Name (_HID, "RKCP3002")
+  Name (_CID, "PRP0001")
   Name (_UID, 0x2)
   Name (_DSD, Package () {
     ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -88,7 +91,8 @@ Device (GPI2)
 
 Device (GPI3)
 {
-  Name (_HID, "PRP0001")
+  Name (_HID, "RKCP3002")
+  Name (_CID, "PRP0001")
   Name (_UID, 0x3)
   Name (_DSD, Package () {
     ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -113,7 +117,8 @@ Device (GPI3)
 
 Device (GPI4)
 {
-  Name (_HID, "PRP0001")
+  Name (_HID, "RKCP3002")
+  Name (_CID, "PRP0001")
   Name (_UID, 0x4)
   Name (_DSD, Package () {
     ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -158,4 +163,4 @@ Device (PINC)
   {
     Return(0xf)
   }
-}
+}