项目 / edk2-sdm845-acpi.git / commitdiff
? 搜索: utf-8
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e7b82d)
Touchscreen works on Polaris, but disable Bluetooth for now.
authorTeguh Sobirin <teguh@sobir.in>
星期一, 16 Aug 2021 13:05:18 +0000 (20:05 +0700)
committerTeguh Sobirin <teguh@sobir.in>
星期一, 16 Aug 2021 13:05:18 +0000 (20:05 +0700)
polaris/DSDT.aml patch | blob | blame | history
polaris/DSDT.dsl patch | blob | blame | history

diff --git a/polaris/DSDT.aml b/polaris/DSDT.aml
index 19185bfc4c5048c10ad52cfc33854e56434d6e3b..ad23b7f3ff6333c6614a4de855e59b67bfbfa501 100644 (file)
Binary files a/polaris/DSDT.aml and b/polaris/DSDT.aml differ
diff --git a/polaris/DSDT.dsl b/polaris/DSDT.dsl
index c109ca07115e28f521b32d0b3d5038c9de2d114c..3c4dee1a226c4b7e367bcc970ad92c4dbb0c7182 100644 (file)
--- a/polaris/DSDT.dsl
+++ b/polaris/DSDT.dsl
@@ -42590,9 +42590,9 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RBUF) /* \_SB_.UAR7._CRS.RBUF */\r
             }\r
 \r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (0x0F)\r
+            Method (_STA, 0, NotSerialized)  // _STA: Status\r\r
+            {\r\r
+                Return (0x0B)\r\r
             }\r
         }\r
 \r
@@ -42631,7 +42631,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Device (IC15)\r
         {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
+            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r\r
+                       Alias (PSUB, _SUB)\r
             Name (_UID, 0x0F)  // _UID: Unique ID\r
             Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
             {\r
@@ -42705,15 +42706,491 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Name (BSRC, Package (0x0B)\r
             {\r
-                Package (0x04)\r
+                Package (0x04)\r\r
+                {\r\r
+                    "DEVICE", \r\r
+                    "\\_SB.UAR7", \r\r
+                    Package (0x12)\r\r
+                    {\r\r
+                        "COMPONENT", \r\r
+                        Zero, \r\r
+                        Package (0x07)\r\r
+                        {\r\r
+                            "FSTATE", \r\r
+                            Zero, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x02)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap_0_m_ahb_clk", \r\r
+                                    One\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x02)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap_0_s_ahb_clk", \r\r
+                                    One\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x02)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    One\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "BUSARB", \r\r
+                                Package (0x05)\r\r
+                                {\r\r
+                                    0x03, \r\r
+                                    "ICBID_MASTER_BLSP_1", \r\r
+                                    "ICBID_SLAVE_EBI1", \r\r
+                                    0x53724E00, \r\r
+                                    0x0682\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "BUSARB", \r\r
+                                Package (0x05)\r\r
+                                {\r\r
+                                    0x03, \r\r
+                                    "ICBID_MASTER_APPSS_PROC", \r\r
+                                    "ICBID_SLAVE_BLSP_1", \r\r
+                                    0x08D24D00, \r\r
+                                    0x02FAF080\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x07)\r\r
+                        {\r\r
+                            "FSTATE", \r\r
+                            One, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x02)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap_0_m_ahb_clk", \r\r
+                                    0x02\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x02)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap_0_s_ahb_clk", \r\r
+                                    0x02\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x02)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x02\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "BUSARB", \r\r
+                                Package (0x05)\r\r
+                                {\r\r
+                                    0x03, \r\r
+                                    "ICBID_MASTER_BLSP_1", \r\r
+                                    "ICBID_SLAVE_EBI1", \r\r
+                                    Zero, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "BUSARB", \r\r
+                                Package (0x05)\r\r
+                                {\r\r
+                                    0x03, \r\r
+                                    "ICBID_MASTER_APPSS_PROC", \r\r
+                                    "ICBID_SLAVE_BLSP_1", \r\r
+                                    Zero, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x06)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            Zero, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x2D, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x2E, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    Zero, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x2F, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    Zero, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x30, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x06)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            One, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x2D, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x2E, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    Zero, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x2F, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    Zero, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }, \r\r
+\r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "TLMMGPIO", \r\r
+                                Package (0x06)\r\r
+                                {\r\r
+                                    0x30, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero, \r\r
+                                    One, \r\r
+                                    Zero\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x02, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x00708000, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x03, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x00E10000, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x04, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x01C20000, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x05, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x01E84800, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x06, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x02DC6C00, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x07, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x03D09000, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x08, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x04C4B400, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x09, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x05B8D800, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x0A, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x061A8000, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x0B, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x06ACFC00, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x0C, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x07080000, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x03)\r\r
+                        {\r\r
+                            "PSTATE", \r\r
+                            0x0D, \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "CLOCK", \r\r
+                                Package (0x04)\r\r
+                                {\r\r
+                                    "gcc_qupv3_wrap0_s6_clk", \r\r
+                                    0x03, \r\r
+                                    0x07A12000, \r\r
+                                    0x04\r\r
+                                }\r\r
+                            }\r\r
+                        }\r\r
+                    }, \r\r
+\r\r
+                    Package (0x04)\r\r
+                    {\r\r
+                        "COMPONENT", \r\r
+                        One, \r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "FSTATE", \r\r
+                            Zero\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "FSTATE", \r\r
+                            One\r\r
+                        }\r\r
+                    }\r\r
+                }, \r
+\r
+                Package (0x05)\r
                 {\r
                     "DEVICE", \r
-                    "\\_SB.UAR7", \r
+                    0x02, \r
+                    "\\_SB.UARD", \r
                     Package (0x12)\r
                     {\r
                         "COMPONENT", \r
                         Zero, \r
-                        Package (0x09)\r
+                        Package (0x0A)\r
                         {\r
                             "FSTATE", \r
                             Zero, \r
@@ -42723,7 +43200,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x05)\r
                                 {\r
                                     0x03, \r
-                                    "ICBID_MASTER_BLSP_1", \r
+                                    "ICBID_MASTER_BLSP_2", \r
                                     "ICBID_SLAVE_EBI1", \r
                                     0x53724E00, \r
                                     0x0682\r
@@ -42737,7 +43214,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 {\r
                                     0x03, \r
                                     "ICBID_MASTER_APPSS_PROC", \r
-                                    "ICBID_SLAVE_BLSP_1", \r
+                                    "ICBID_SLAVE_BLSP_2", \r
                                     0x08D24D00, \r
                                     0x02FAF080\r
                                 }\r
@@ -42748,7 +43225,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap_0_m_ahb_clk", \r
+                                    "gcc_qupv3_wrap_1_m_ahb_clk", \r
                                     One\r
                                 }\r
                             }, \r
@@ -42758,17 +43235,29 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap_0_s_ahb_clk", \r
+                                    "gcc_qupv3_wrap_1_s_ahb_clk", \r
                                     One\r
                                 }\r
                             }, \r
 \r
+                            Package (0x02)\r
+                            {\r
+                                "CLOCK", \r
+                                Package (0x04)\r
+                                {\r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
+                                    0x03, \r
+                                    0x00708000, \r
+                                    0x04\r
+                                }\r
+                            }, \r
+\r
                             Package (0x02)\r
                             {\r
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_core_2x_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     One\r
                                 }\r
                             }, \r
@@ -42778,7 +43267,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_core_clk", \r
+                                    "gcc_qupv3_wrap1_core_2x_clk", \r
                                     One\r
                                 }\r
                             }, \r
@@ -42788,7 +43277,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_core_clk", \r
                                     One\r
                                 }\r
                             }\r
@@ -42803,7 +43292,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap_0_m_ahb_clk", \r
+                                    "gcc_qupv3_wrap_1_m_ahb_clk", \r
                                     0x02\r
                                 }\r
                             }, \r
@@ -42813,7 +43302,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap_0_s_ahb_clk", \r
+                                    "gcc_qupv3_wrap_1_s_ahb_clk", \r
                                     0x02\r
                                 }\r
                             }, \r
@@ -42823,7 +43312,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     0x02\r
                                 }\r
                             }, \r
@@ -42833,7 +43322,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_core_2x_clk", \r
+                                    "gcc_qupv3_wrap1_core_2x_clk", \r
                                     0x02\r
                                 }\r
                             }, \r
@@ -42843,7 +43332,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x02)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_core_clk", \r
+                                    "gcc_qupv3_wrap1_core_clk", \r
                                     0x02\r
                                 }\r
                             }, \r
@@ -42854,7 +43343,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x05)\r
                                 {\r
                                     0x03, \r
-                                    "ICBID_MASTER_BLSP_1", \r
+                                    "ICBID_MASTER_BLSP_2", \r
                                     "ICBID_SLAVE_EBI1", \r
                                     Zero, \r
                                     Zero\r
@@ -42868,14 +43357,14 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 {\r
                                     0x03, \r
                                     "ICBID_MASTER_APPSS_PROC", \r
-                                    "ICBID_SLAVE_BLSP_1", \r
+                                    "ICBID_SLAVE_BLSP_2", \r
                                     Zero, \r
                                     Zero\r
                                 }\r
                             }\r
                         }, \r
 \r
-                        Package (0x06)\r
+                        Package (0x04)\r
                         {\r
                             "PSTATE", \r
                             Zero, \r
@@ -42884,25 +43373,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "TLMMGPIO", \r
                                 Package (0x06)\r
                                 {\r
-                                    0x2D, \r
-                                    Zero, \r
-                                    One, \r
+                                    0x05, \r
                                     Zero, \r
                                     One, \r
-                                    Zero\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x2E, \r
                                     Zero, \r
                                     One, \r
-                                    Zero, \r
-                                    Zero, \r
                                     Zero\r
                                 }\r
                             }, \r
@@ -42912,31 +43387,17 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "TLMMGPIO", \r
                                 Package (0x06)\r
                                 {\r
-                                    0x2F, \r
+                                    0x04, \r
                                     Zero, \r
                                     One, \r
                                     Zero, \r
                                     Zero, \r
                                     Zero\r
                                 }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x30, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero\r
-                                }\r
                             }\r
                         }, \r
 \r
-                        Package (0x06)\r
+                        Package (0x04)\r
                         {\r
                             "PSTATE", \r
                             One, \r
@@ -42945,25 +43406,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "TLMMGPIO", \r
                                 Package (0x06)\r
                                 {\r
-                                    0x2D, \r
-                                    Zero, \r
-                                    One, \r
+                                    0x05, \r
                                     Zero, \r
                                     One, \r
-                                    Zero\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x2E, \r
                                     Zero, \r
                                     One, \r
-                                    Zero, \r
-                                    Zero, \r
                                     Zero\r
                                 }\r
                             }, \r
@@ -42973,27 +43420,13 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "TLMMGPIO", \r
                                 Package (0x06)\r
                                 {\r
-                                    0x2F, \r
+                                    0x04, \r
                                     Zero, \r
                                     One, \r
                                     Zero, \r
                                     Zero, \r
                                     Zero\r
                                 }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x30, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero\r
-                                }\r
                             }\r
                         }, \r
 \r
@@ -43006,7 +43439,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x04)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     0x03, \r
                                     0x00708000, \r
                                     0x04\r
@@ -43023,7 +43456,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x04)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     0x03, \r
                                     0x00E10000, \r
                                     0x04\r
@@ -43040,7 +43473,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x04)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     0x03, \r
                                     0x01C20000, \r
                                     0x04\r
@@ -43057,7 +43490,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x04)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     0x03, \r
                                     0x01E84800, \r
                                     0x04\r
@@ -43074,7 +43507,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x04)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     0x03, \r
                                     0x02DC6C00, \r
                                     0x04\r
@@ -43091,7 +43524,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "CLOCK", \r
                                 Package (0x04)\r
                                 {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
                                     0x03, \r
                                     0x03D09000, \r
                                     0x04\r
@@ -43099,807 +43532,375 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             }\r
                         }, \r
 \r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x08, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
-                                    0x03, \r
-                                    0x04C4B400, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x09, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
-                                    0x03, \r
-                                    0x05B8D800, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0A, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
-                                    0x03, \r
-                                    0x061A8000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0B, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
-                                    0x03, \r
-                                    0x06ACFC00, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0C, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
-                                    0x03, \r
-                                    0x07080000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0D, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap0_s6_clk", \r
-                                    0x03, \r
-                                    0x07A12000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }\r
-                    }, \r
-\r
-                    Package (0x04)\r
-                    {\r
-                        "COMPONENT", \r
-                        One, \r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            Zero\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            One\r
-                        }\r
-                    }\r
-                }, \r
-\r
-                Package (0x05)\r
-                {\r
-                    "DEVICE", \r
-                    0x02, \r
-                    "\\_SB.UARD", \r
-                    Package (0x12)\r
-                    {\r
-                        "COMPONENT", \r
-                        Zero, \r
-                        Package (0x0A)\r
-                        {\r
-                            "FSTATE", \r
-                            Zero, \r
-                            Package (0x02)\r
-                            {\r
-                                "BUSARB", \r
-                                Package (0x05)\r
-                                {\r
-                                    0x03, \r
-                                    "ICBID_MASTER_BLSP_2", \r
-                                    "ICBID_SLAVE_EBI1", \r
-                                    0x53724E00, \r
-                                    0x0682\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "BUSARB", \r
-                                Package (0x05)\r
-                                {\r
-                                    0x03, \r
-                                    "ICBID_MASTER_APPSS_PROC", \r
-                                    "ICBID_SLAVE_BLSP_2", \r
-                                    0x08D24D00, \r
-                                    0x02FAF080\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap_1_m_ahb_clk", \r
-                                    One\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap_1_s_ahb_clk", \r
-                                    One\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x00708000, \r
-                                    0x04\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    One\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_core_2x_clk", \r
-                                    One\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_core_clk", \r
-                                    One\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x09)\r
-                        {\r
-                            "FSTATE", \r
-                            One, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap_1_m_ahb_clk", \r
-                                    0x02\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap_1_s_ahb_clk", \r
-                                    0x02\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x02\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_core_2x_clk", \r
-                                    0x02\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x02)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_core_clk", \r
-                                    0x02\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "BUSARB", \r
-                                Package (0x05)\r
-                                {\r
-                                    0x03, \r
-                                    "ICBID_MASTER_BLSP_2", \r
-                                    "ICBID_SLAVE_EBI1", \r
-                                    Zero, \r
-                                    Zero\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "BUSARB", \r
-                                Package (0x05)\r
-                                {\r
-                                    0x03, \r
-                                    "ICBID_MASTER_APPSS_PROC", \r
-                                    "ICBID_SLAVE_BLSP_2", \r
-                                    Zero, \r
-                                    Zero\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x04)\r
-                        {\r
-                            "PSTATE", \r
-                            Zero, \r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x05, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x04, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero, \r
-                                    Zero, \r
-                                    Zero\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x04)\r
-                        {\r
-                            "PSTATE", \r
-                            One, \r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x05, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero\r
-                                }\r
-                            }, \r
-\r
-                            Package (0x02)\r
-                            {\r
-                                "TLMMGPIO", \r
-                                Package (0x06)\r
-                                {\r
-                                    0x04, \r
-                                    Zero, \r
-                                    One, \r
-                                    Zero, \r
-                                    Zero, \r
-                                    Zero\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x02, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x00708000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x03, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x00E10000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x04, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x01C20000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x05, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x01E84800, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x06, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x02DC6C00, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x07, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x03D09000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x08, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x04C4B400, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x09, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x05B8D800, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0A, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x061A8000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0B, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x06ACFC00, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0C, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x07080000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x03)\r
-                        {\r
-                            "PSTATE", \r
-                            0x0D, \r
-                            Package (0x02)\r
-                            {\r
-                                "CLOCK", \r
-                                Package (0x04)\r
-                                {\r
-                                    "gcc_qupv3_wrap1_s1_clk", \r
-                                    0x03, \r
-                                    0x07A12000, \r
-                                    0x04\r
-                                }\r
-                            }\r
-                        }\r
-                    }, \r
-\r
-                    Package (0x04)\r
-                    {\r
-                        "COMPONENT", \r
-                        One, \r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            Zero\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            One\r
-                        }\r
-                    }\r
-                }, \r
-\r
-                Package (0x07)\r
-                {\r
-                    "DEVICE", \r
-                    "\\_SB.IC15", \r
-                    Package (0x03)\r
-                    {\r
-                        "COMPONENT", \r
-                        Zero, \r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            Zero\r
-                        }\r
-                    }, \r
-\r
-                    Package (0x09)\r
-                    {\r
-                        "DSTATE", \r
-                        Zero, \r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap_1_m_ahb_clk", \r
-                                One\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap_1_s_ahb_clk", \r
-                                One\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x04)\r
-                            {\r
-                                "gcc_qupv3_wrap1_s6_clk", \r
-                                0x08, \r
-                                0x0124F800, \r
-                                0x04\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_BLSP_2", \r
-                                "ICBID_SLAVE_EBI1", \r
-                                0x53724E00, \r
-                                0x0682\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_APPSS_PROC", \r
-                                "ICBID_SLAVE_BLSP_2", \r
-                                0x08D24D00, \r
-                                0x02FAF080\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
-                            {\r
-                                0x21, \r
-                                One, \r
-                                One, \r
-                                One, \r
-                                0x03, \r
-                                Zero\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
+                        Package (0x03)\r
                         {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
+                            "PSTATE", \r
+                            0x08, \r
+                            Package (0x02)\r
                             {\r
-                                0x22, \r
-                                One, \r
-                                One, \r
-                                One, \r
-                                0x03, \r
-                                Zero\r
+                                "CLOCK", \r
+                                Package (0x04)\r
+                                {\r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
+                                    0x03, \r
+                                    0x04C4B400, \r
+                                    0x04\r
+                                }\r
                             }\r
-                        }\r
-                    }, \r
-\r
-                    Package (0x02)\r
-                    {\r
-                        "DSTATE", \r
-                        One\r
-                    }, \r
-\r
-                    Package (0x02)\r
-                    {\r
-                        "DSTATE", \r
-                        0x02\r
-                    }, \r
+                        }, \r
 \r
-                    Package (0x09)\r
-                    {\r
-                        "DSTATE", \r
-                        0x03, \r
-                        Package (0x02)\r
+                        Package (0x03)\r
                         {\r
-                            "CLOCK", \r
+                            "PSTATE", \r
+                            0x09, \r
                             Package (0x02)\r
                             {\r
-                                "gcc_qupv3_wrap_1_m_ahb_clk", \r
-                                0x02\r
+                                "CLOCK", \r
+                                Package (0x04)\r
+                                {\r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
+                                    0x03, \r
+                                    0x05B8D800, \r
+                                    0x04\r
+                                }\r
                             }\r
                         }, \r
 \r
-                        Package (0x02)\r
+                        Package (0x03)\r
                         {\r
-                            "CLOCK", \r
+                            "PSTATE", \r
+                            0x0A, \r
                             Package (0x02)\r
                             {\r
-                                "gcc_qupv3_wrap_1_s_ahb_clk", \r
-                                0x02\r
+                                "CLOCK", \r
+                                Package (0x04)\r
+                                {\r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
+                                    0x03, \r
+                                    0x061A8000, \r
+                                    0x04\r
+                                }\r
                             }\r
                         }, \r
 \r
-                        Package (0x02)\r
+                        Package (0x03)\r
                         {\r
-                            "CLOCK", \r
+                            "PSTATE", \r
+                            0x0B, \r
                             Package (0x02)\r
                             {\r
-                                "gcc_qupv3_wrap1_s6_clk", \r
-                                0x02\r
+                                "CLOCK", \r
+                                Package (0x04)\r
+                                {\r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
+                                    0x03, \r
+                                    0x06ACFC00, \r
+                                    0x04\r
+                                }\r
                             }\r
                         }, \r
 \r
-                        Package (0x02)\r
+                        Package (0x03)\r
                         {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
+                            "PSTATE", \r
+                            0x0C, \r
+                            Package (0x02)\r
                             {\r
-                                0x03, \r
-                                "ICBID_MASTER_BLSP_2", \r
-                                "ICBID_SLAVE_EBI1", \r
-                                Zero, \r
-                                Zero\r
+                                "CLOCK", \r
+                                Package (0x04)\r
+                                {\r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
+                                    0x03, \r
+                                    0x07080000, \r
+                                    0x04\r
+                                }\r
                             }\r
                         }, \r
 \r
-                        Package (0x02)\r
+                        Package (0x03)\r
                         {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
+                            "PSTATE", \r
+                            0x0D, \r
+                            Package (0x02)\r
                             {\r
-                                0x03, \r
-                                "ICBID_MASTER_APPSS_PROC", \r
-                                "ICBID_SLAVE_BLSP_2", \r
-                                Zero, \r
-                                Zero\r
+                                "CLOCK", \r
+                                Package (0x04)\r
+                                {\r
+                                    "gcc_qupv3_wrap1_s1_clk", \r
+                                    0x03, \r
+                                    0x07A12000, \r
+                                    0x04\r
+                                }\r
                             }\r
-                        }, \r
+                        }\r
+                    }, \r
 \r
+                    Package (0x04)\r
+                    {\r
+                        "COMPONENT", \r
+                        One, \r
                         Package (0x02)\r
                         {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
-                            {\r
-                                0x21, \r
-                                Zero, \r
-                                Zero, \r
-                                Zero, \r
-                                0x03, \r
-                                Zero\r
-                            }\r
+                            "FSTATE", \r
+                            Zero\r
                         }, \r
 \r
                         Package (0x02)\r
                         {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
-                            {\r
-                                0x22, \r
-                                Zero, \r
-                                Zero, \r
-                                Zero, \r
-                                0x03, \r
-                                Zero\r
-                            }\r
+                            "FSTATE", \r
+                            One\r
                         }\r
                     }\r
                 }, \r
 \r
+                Package (0x07)\r\r
+                {\r\r
+                    "DEVICE", \r\r
+                    "\\_SB.IC15", \r\r
+                    Package (0x03)\r\r
+                    {\r\r
+                        "COMPONENT", \r\r
+                        Zero, \r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "FSTATE", \r\r
+                            Zero\r\r
+                        }\r\r
+                    }, \r\r
+\r\r
+                    Package (0x0B)\r\r
+                    {\r\r
+                        "DSTATE", \r\r
+                        Zero, \r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "BUSARB", \r\r
+                            Package (0x05)\r\r
+                            {\r\r
+                                0x03, \r\r
+                                "ICBID_MASTER_BLSP_2", \r\r
+                                "ICBID_SLAVE_EBI1", \r\r
+                                0x53724E00, \r\r
+                                0x0682\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "BUSARB", \r\r
+                            Package (0x05)\r\r
+                            {\r\r
+                                0x03, \r\r
+                                "ICBID_MASTER_APPSS_PROC", \r\r
+                                "ICBID_SLAVE_BLSP_2", \r\r
+                                0x08F0D180, \r\r
+                                0x02FAF080\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap_1_m_ahb_clk", \r\r
+                                One\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap_1_s_ahb_clk", \r\r
+                                One\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x04)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap1_s6_clk", \r\r
+                                0x08, \r\r
+                                0x0124F800, \r\r
+                                0x04\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap1_core_2x_clk", \r\r
+                                One\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap1_core_clk", \r\r
+                                One\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "TLMMGPIO", \r\r
+                            Package (0x06)\r\r
+                            {\r\r
+                                0x21, \r\r
+                                One, \r\r
+                                0x02, \r\r
+                                One, \r\r
+                                0x03, \r\r
+                                Zero\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "TLMMGPIO", \r\r
+                            Package (0x06)\r\r
+                            {\r\r
+                                0x22, \r\r
+                                One, \r\r
+                                0x02, \r\r
+                                One, \r\r
+                                0x03, \r\r
+                                Zero\r\r
+                            }\r\r
+                        }\r\r
+                    }, \r\r
+\r\r
+                    Package (0x02)\r\r
+                    {\r\r
+                        "DSTATE", \r\r
+                        One\r\r
+                    }, \r\r
+\r\r
+                    Package (0x02)\r\r
+                    {\r\r
+                        "DSTATE", \r\r
+                        0x02\r\r
+                    }, \r\r
+\r\r
+                    Package (0x0B)\r\r
+                    {\r\r
+                        "DSTATE", \r\r
+                        0x03, \r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap_1_m_ahb_clk", \r\r
+                                0x02\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap_1_s_ahb_clk", \r\r
+                                0x02\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap1_s6_clk", \r\r
+                                0x02\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap1_core_2x_clk", \r\r
+                                0x02\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "CLOCK", \r\r
+                            Package (0x02)\r\r
+                            {\r\r
+                                "gcc_qupv3_wrap1_core_clk", \r\r
+                                0x02\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "BUSARB", \r\r
+                            Package (0x05)\r\r
+                            {\r\r
+                                0x03, \r\r
+                                "ICBID_MASTER_BLSP_2", \r\r
+                                "ICBID_SLAVE_EBI1", \r\r
+                                Zero, \r\r
+                                Zero\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "BUSARB", \r\r
+                            Package (0x05)\r\r
+                            {\r\r
+                                0x03, \r\r
+                                "ICBID_MASTER_APPSS_PROC", \r\r
+                                "ICBID_SLAVE_BLSP_2", \r\r
+                                Zero, \r\r
+                                Zero\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "TLMMGPIO", \r\r
+                            Package (0x06)\r\r
+                            {\r\r
+                                0x21, \r\r
+                                Zero, \r\r
+                                Zero, \r\r
+                                Zero, \r\r
+                                0x03, \r\r
+                                Zero\r\r
+                            }\r\r
+                        }, \r\r
+\r\r
+                        Package (0x02)\r\r
+                        {\r\r
+                            "TLMMGPIO", \r\r
+                            Package (0x06)\r\r
+                            {\r\r
+                                0x22, \r\r
+                                Zero, \r\r
+                                Zero, \r\r
+                                Zero, \r\r
+                                0x03, \r\r
+                                Zero\r\r
+                            }\r\r
+                        }\r\r
+                    }\r\r
+                }, \r
+\r
                 Package (0x07)\r
                 {\r
                     "DEVICE", \r
@@ -54420,110 +54421,64 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        Device (GIO0)\r
-        {\r
-            Name (_HID, "QCOM0217")  // _HID: Hardware ID\r
-            Alias (PSUB, _SUB)\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (HPD1, ResourceTemplate ()\r
-            {\r
-                GpioIo (Shared, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                    "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                    )\r
-                    {   // Pin list\r
-                        0x0071\r
-                    }\r
-            })\r
-            OperationRegion (HPD2, GeneralPurposeIo, Zero, One)\r
-            Field (HPD2, ByteAcc, NoLock, Preserve)\r
-            {\r
-                Connection (HPD1), \r
-                ESTA,   1\r
-            }\r
-\r
-            OperationRegion (GPOR, GeneralPurposeIo, Zero, One)\r
-            Field (GPOR, ByteAcc, NoLock, Preserve)\r
-            {\r
-            }\r
-\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x03400000,         // Address Base\r
-                        0x00C00000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x000000F0,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x000000F0,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x000000F0,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x00000288,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x00000238,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x00000226,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x00000232,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x00000284,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x0000021F,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x00000236,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r
-                    {\r
-                        0x0000023D,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.GIO0._CRS.RBUF */\r
-            }\r
-\r
-            Method (OFNI, 0, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (0x02)\r
-                {\r
-                     0x96, 0x00                                       // ..\r
-                })\r
-                Return (RBUF) /* \_SB_.GIO0.OFNI.RBUF */\r
-            }\r
-\r
-            Name (GABL, Zero)\r
-            Method (_REG, 2, NotSerialized)  // _REG: Region Availability\r
-            {\r
-                If ((Arg0 == 0x08))\r
-                {\r
-                    GABL = Arg1\r
-                }\r
-            }\r
-\r
-            Name (_AEI, Buffer (0x02)  // _AEI: ACPI Event Interrupts\r
-            {\r
-                 0x79, 0x00                                       // y.\r
-            })\r
+         Device (GIO0)\r\r
+        {\r\r
+            Name (_HID, "QCOM0217")  // _HID: Hardware ID\r\r
+            Alias (\_SB.PSUB, _SUB)\r\r
+            Name (_UID, Zero)  // _UID: Unique ID\r\r
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r\r
+            {\r\r
+                Name (RBUF, ResourceTemplate ()\r\r
+                {\r\r
+                    Memory32Fixed (ReadWrite,\r\r
+                        0x03400000,         // Address Base\r\r
+                        0x00C00000,         // Address Length\r\r
+                        )\r\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r\r
+                    {\r\r
+                        0x000000F0,\r\r
+                    }\r\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r\r
+                    {\r\r
+                        0x000000F0,\r\r
+                    }\r\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r\r
+                    {\r\r
+                        0x000000F0,\r\r
+                    }\r\r
+                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r\r
+                    {\r\r
+                        0x00000288,\r\r
+                    }\r\r
+                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r\r
+                    {\r\r
+                        0x00000238,\r\r
+                    }\r\r
+                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Shared, ,, )\r\r
+                    {\r\r
+                        0x00000286,\r\r
+                    }\r\r
+                })\r\r
+                Return (RBUF) /* \_SB_.GIO0._CRS.RBUF */\r\r
+            }\r\r
+\r\r
+            Method (OFNI, 0, NotSerialized)\r\r
+            {\r\r
+                Name (RBUF, Buffer (0x02)\r\r
+                {\r\r
+                     0x96, 0x00                                       // ..\r\r
+                })\r\r
+                Return (RBUF) /* \_SB_.GIO0.OFNI.RBUF */\r\r
+            }\r\r
+\r\r
+            Name (GABL, Zero)\r\r
+            Method (_REG, 2, NotSerialized)  // _REG: Region Availability\r\r
+            {\r\r
+                If ((Arg0 == 0x08))\r\r
+                {\r\r
+                    GABL = Arg1\r\r
+                }\r\r
+            }\r\r
         }\r
 \r
         OperationRegion (CP00, SystemMemory, 0x13000000, 0x24)\r
@@ -57478,51 +57433,62 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        Device (QGP1)\r
-        {\r
-            Name (_HID, "QCOM02F4")  // _HID: Hardware ID\r
-            Alias (PSUB, _SUB)\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x00A04000,         // Address Base\r
-                        0x00050000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x00000138,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x0000013A,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.QGP1._CRS.RBUF */\r
-            }\r
-\r
-            Method (GPII, 0, Serialized)\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    Package (0x03)\r
-                    {\r
-                        One, \r
-                        One, \r
-                        0x0138\r
-                    }, \r
-\r
-                    Package (0x03)\r
-                    {\r
-                        One, \r
-                        0x03, \r
-                        0x013A\r
-                    }\r
-                })\r
-            }\r
+        Device (QGP1)\r\r
+        {\r\r
+            Name (_HID, "QCOM02F4")  // _HID: Hardware ID\r\r
+            Alias (\_SB.PSUB, _SUB)\r\r
+            Name (_UID, One)  // _UID: Unique ID\r\r
+            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r\r
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings\r\r
+            {\r\r
+                Name (RBUF, ResourceTemplate ()\r\r
+                {\r\r
+                    Memory32Fixed (ReadWrite,\r\r
+                        0x00A04000,         // Address Base\r\r
+                        0x00050000,         // Address Length\r\r
+                        )\r\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r\r
+                    {\r\r
+                        0x00000138,\r\r
+                    }\r\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r\r
+                    {\r\r
+                        0x0000013A,\r\r
+                    }\r\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r\r
+                    {\r\r
+                        0x00000145,\r\r
+                    }\r\r
+                })\r\r
+                Return (RBUF) /* \_SB_.QGP1._CRS.RBUF */\r\r
+            }\r\r
+\r\r
+            Method (GPII, 0, Serialized)\r\r
+            {\r\r
+                Return (Package (0x03)\r\r
+                {\r\r
+                    Package (0x03)\r\r
+                    {\r\r
+                        One, \r\r
+                        One, \r\r
+                        0x0138\r\r
+                    }, \r\r
+\r\r
+                    Package (0x03)\r\r
+                    {\r\r
+                        One, \r\r
+                        0x03, \r\r
+                        0x013A\r\r
+                    }, \r\r
+\r\r
+                    Package (0x03)\r\r
+                    {\r\r
+                        One, \r\r
+                        0x06, \r\r
+                        0x0145\r\r
+                    }\r\r
+                })\r\r
+            }\r\r
         }\r
 \r
         Device (SARM)\r
@@ -58792,7 +58758,7 @@ Include("cust_thermal_zones.asl")
 \r
         Device (TSC1)\r
         {\r
-            Name (_HID, "MSHW1000")  // _HID: Hardware ID\r
+            Name (_HID, "MSHW1003")  // _HID: Hardware ID\r
             Name (_UID, One)  // _UID: Unique ID\r
             Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
             {\r
@@ -58975,7 +58941,7 @@ Include("cust_thermal_zones.asl")
 \r
         Device (BTH0)\r
         {\r
-            Name (_HID, "QCOM02B5")  // _HID: Hardware ID\r
+            Name (_HID, "QCON02B5")  // _HID: Hardware ID\r
             Alias (PSUB, _SUB)\r
             Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
             {\r
acpi tables for edk2-sdm845