From c557d05ca81143e8e1dc0fdb5b4c4489549d692a Mon Sep 17 00:00:00 2001
From: CoolStar <coolstarorganization@gmail.com>
Date: Fri, 5 Jan 2024 22:11:40 -0800
Subject: [PATCH] Platform/RK3588: Move _SB.I2Cx scope into _SB to remove
 prefix

---
 .../Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl  | 6 +++---
 .../Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl     | 6 +++---
 edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl     | 6 +++---
 edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl     | 6 +++---
 edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl | 6 +++---
 .../Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl         | 6 +++---
 .../Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl     | 6 +++---
 edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl     | 6 +++---
 edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl     | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl
index 3942d92d..9b753667 100644
--- a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl
@@ -34,9 +34,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C7) {
-    include ("Es8388.asl")
+    Scope (I2C7) {
+      include ("Es8388.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
index 91f07b28..fdb81d58 100644
--- a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl
@@ -34,9 +34,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C3) {
-    include ("Es8388.asl")
+    Scope (I2C3) {
+      include ("Es8388.asl")
+    }
   }
 }
diff --git a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
index 408dfe82..749d0ada 100755
--- a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
@@ -35,9 +35,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C7) {
-    include ("Es8388.asl")
+    Scope (I2C7) {
+      include ("Es8388.asl")
+    }
   }
 }
diff --git a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
index b021aa36..f0eb450e 100644
--- a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
@@ -34,9 +34,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C3) {
-    include ("Es8388.asl")
+    Scope (I2C3) {
+      include ("Es8388.asl")
+    }
   }
 }
diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl
index e308d1b0..94a521cd 100644
--- a/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl
@@ -36,9 +36,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C3) {
-    include ("Es8388.asl")
+    Scope (I2C3) {
+      include ("Es8388.asl")
+    }
   }
 }
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
index 0bee2a6e..d14e7d42 100755
--- a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
@@ -34,9 +34,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C6) {
-    include ("Es8388.asl")
+    Scope (I2C6) {
+      include ("Es8388.asl")
+    }
   }
 }
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
index 3d9c22c5..42412edc 100644
--- a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
@@ -34,9 +34,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
-  }
 
-  Scope (\_SB_.I2C7) {
-    include ("Es8388.asl")
+    Scope (I2C7) {
+      include ("Es8388.asl")
+    }
   }
 }
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
index 0522295d..980d1967 100755
--- a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
@@ -34,9 +34,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C7) {
-    include ("Es8388.asl")
+    Scope (I2C7) {
+      include ("Es8388.asl")
+    }
   }
 }
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
index 8f6470c5..1b31b29c 100755
--- a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
@@ -35,9 +35,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")
-  }
 
-  Scope (\_SB_.I2C7) {
-    include ("Es8388.asl")
+    Scope (I2C7) {
+      include ("Es8388.asl")
+    }
   }
 }