diff --git a/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml b/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml
index 5888ad54d..3262a474f 100644
--- a/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml
+++ b/misc/config_tools/data/cfl-k700-i7/cfl-k700-i7.xml
@@ -18,40 +18,41 @@
 	Region 0: Memory at a0000000 (64-bit, non-prefetchable) [size=16M]
 	Region 2: Memory at 90000000 (64-bit, prefetchable) [size=256M]
 	00:08.0 System peripheral: Intel Corporation Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model
-	Region 0: Memory at a1838000 (64-bit, non-prefetchable) [size=4K]
+	Region 0: Memory at a1938000 (64-bit, non-prefetchable) [size=4K]
 	00:12.0 Signal processing controller: Intel Corporation Cannon Lake PCH Thermal Controller (rev 10)
-	Region 0: Memory at a1839000 (64-bit, non-prefetchable) [size=4K]
+	Region 0: Memory at a1939000 (64-bit, non-prefetchable) [size=4K]
 	00:14.0 USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller (rev 10)
-	Region 0: Memory at a1820000 (64-bit, non-prefetchable) [size=64K]
+	Region 0: Memory at a1920000 (64-bit, non-prefetchable) [size=64K]
 	00:14.2 RAM memory: Intel Corporation Cannon Lake PCH Shared SRAM (rev 10)
-	Region 0: Memory at a1834000 (64-bit, non-prefetchable) [size=8K]
-	Region 2: Memory at a183a000 (64-bit, non-prefetchable) [size=4K]
+	Region 0: Memory at a1934000 (64-bit, non-prefetchable) [size=8K]
+	Region 2: Memory at a193a000 (64-bit, non-prefetchable) [size=4K]
 	00:15.0 Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH Serial IO I2C Controller #0 (rev 10)
 	Region 0: Memory at 8f800000 (64-bit, non-prefetchable) [virtual] [size=4K]
 	00:15.1 Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH Serial IO I2C Controller #1 (rev 10)
 	Region 0: Memory at 8f801000 (64-bit, non-prefetchable) [virtual] [size=4K]
 	00:17.0 SATA controller: Intel Corporation Cannon Lake PCH SATA AHCI Controller (rev 10)
-	Region 0: Memory at a1836000 (32-bit, non-prefetchable) [size=8K]
-	Region 1: Memory at a1842000 (32-bit, non-prefetchable) [size=256]
-	Region 5: Memory at a1841000 (32-bit, non-prefetchable) [size=2K]
+	Region 0: Memory at a1936000 (32-bit, non-prefetchable) [size=8K]
+	Region 1: Memory at a1942000 (32-bit, non-prefetchable) [size=256]
+	Region 5: Memory at a1941000 (32-bit, non-prefetchable) [size=2K]
 	00:1b.0 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #17 (rev f0)
 	00:1b.6 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #23 (rev f0)
-	00:1c.0 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #7 (rev f0)
+	00:1c.0 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #3 (rev f0)
+	00:1c.6 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #7 (rev f0)
 	00:1c.7 PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #8 (rev f0)
 	00:1e.0 Communication controller: Intel Corporation Cannon Lake PCH Serial IO UART Host Controller (rev 10)
 	Region 0: Memory at 8f802000 (64-bit, non-prefetchable) [virtual] [size=4K]
 	00:1f.0 ISA bridge: Intel Corporation Cannon Point-LP LPC Controller (rev 10)
 	00:1f.3 Audio device: Intel Corporation Cannon Lake PCH cAVS (rev 10)
-	Region 0: Memory at a1830000 (64-bit, non-prefetchable) [size=16K]
+	Region 0: Memory at a1930000 (64-bit, non-prefetchable) [size=16K]
 	Region 4: Memory at a1000000 (64-bit, non-prefetchable) [size=1M]
 	00:1f.4 SMBus: Intel Corporation Cannon Lake PCH SMBus Controller (rev 10)
-	Region 0: Memory at a183f000 (64-bit, non-prefetchable) [size=256]
+	Region 0: Memory at a193f000 (64-bit, non-prefetchable) [size=256]
 	00:1f.5 Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH SPI Controller (rev 10)
 	Region 0: Memory at fe010000 (32-bit, non-prefetchable) [size=4K]
 	00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev 10)
-	Region 0: Memory at a1800000 (32-bit, non-prefetchable) [size=128K]
+	Region 0: Memory at a1900000 (32-bit, non-prefetchable) [size=128K]
 	01:00.0 Non-Volatile memory controller: Silicon Motion, Inc. Device 2263 (rev 03)
-	Region 0: Memory at a1700000 (64-bit, non-prefetchable) [size=16K]
+	Region 0: Memory at a1800000 (64-bit, non-prefetchable) [size=16K]
 	02:00.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
 	03:01.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
 	03:02.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
@@ -59,21 +60,23 @@
 	03:04.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
 	03:05.0 PCI bridge: Pericom Semiconductor PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
 	04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
+	Region 0: Memory at a1700000 (32-bit, non-prefetchable) [size=512K]
+	Region 3: Memory at a1780000 (32-bit, non-prefetchable) [size=16K]
+	05:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
 	Region 0: Memory at a1600000 (32-bit, non-prefetchable) [size=512K]
 	Region 3: Memory at a1680000 (32-bit, non-prefetchable) [size=16K]
-	05:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
+	06:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
 	Region 0: Memory at a1500000 (32-bit, non-prefetchable) [size=512K]
 	Region 3: Memory at a1580000 (32-bit, non-prefetchable) [size=16K]
-	06:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
+	07:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
 	Region 0: Memory at a1400000 (32-bit, non-prefetchable) [size=512K]
 	Region 3: Memory at a1480000 (32-bit, non-prefetchable) [size=16K]
-	07:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
-	Region 0: Memory at a1300000 (32-bit, non-prefetchable) [size=512K]
-	Region 3: Memory at a1380000 (32-bit, non-prefetchable) [size=16K]
-	09:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
+	09:00.0 Non-Volatile memory controller: Marvell Technology Group Ltd. Device 1160 (rev b0)
+	Region 0: Memory at a1300000 (64-bit, non-prefetchable) [size=16K]
+	0a:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
 	Region 0: Memory at a1200000 (32-bit, non-prefetchable) [size=512K]
 	Region 3: Memory at a1280000 (32-bit, non-prefetchable) [size=16K]
-	0a:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
+	0b:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
 	Region 0: Memory at a1100000 (32-bit, non-prefetchable) [size=512K]
 	Region 3: Memory at a1180000 (32-bit, non-prefetchable) [size=16K]
 	</PCI_DEVICE>
@@ -89,7 +92,8 @@
 	00:17.0 0106: 8086:a352 (rev 10)
 	00:1b.0 0604: 8086:a340 (rev f0)
 	00:1b.6 0604: 8086:a32e (rev f0)
-	00:1c.0 0604: 8086:a33e (rev f0)
+	00:1c.0 0604: 8086:a33a (rev f0)
+	00:1c.6 0604: 8086:a33e (rev f0)
 	00:1c.7 0604: 8086:a33f (rev f0)
 	00:1e.0 0780: 8086:a328 (rev 10)
 	00:1f.0 0601: 8086:a309 (rev 10)
@@ -108,12 +112,13 @@
 	05:00.0 0200: 8086:1533 (rev 03)
 	06:00.0 0200: 8086:1533 (rev 03)
 	07:00.0 0200: 8086:1533 (rev 03)
-	09:00.0 0200: 8086:1533 (rev 03)
+	09:00.0 0108: 1b4b:1160 (rev b0)
 	0a:00.0 0200: 8086:1533 (rev 03)
+	0b:00.0 0200: 8086:1533 (rev 03)
 	</PCI_VID_PID>
   <WAKE_VECTOR_INFO>
-	#define WAKE_VECTOR_32          0x8BB3000CUL
-	#define WAKE_VECTOR_64          0x8BB30018UL
+	#define WAKE_VECTOR_32          0x89B3000CUL
+	#define WAKE_VECTOR_64          0x89B30018UL
 	</WAKE_VECTOR_INFO>
   <RESET_REGISTER_INFO>
 	#define RESET_REGISTER_ADDRESS  0xB2UL
@@ -184,23 +189,10 @@
 	"Intel(R) Core(TM) i7-9700TE CPU @ 1.80GHz"
 	</CPU_BRAND>
   <CX_INFO>
-	{{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x01U, 0x00U},	/* C1 */
-	{{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1816UL}, 0x02U, 0x97U, 0x00U},	/* C2 */
-	{{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1819UL}, 0x03U, 0x40AU, 0x00U},	/* C3 */
+	{{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x00U, 0x00U},	/* C1 */
 	</CX_INFO>
   <PX_INFO>
-	{0x709UL, 0x00UL, 0x0AUL, 0x0AUL, 0x002600UL, 0x002600UL},	/* P0 */
-	{0x708UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001200UL, 0x001200UL},	/* P1 */
-	{0x6A4UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001100UL, 0x001100UL},	/* P2 */
-	{0x640UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001000UL, 0x001000UL},	/* P3 */
-	{0x5DCUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000F00UL, 0x000F00UL},	/* P4 */
-	{0x578UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000E00UL, 0x000E00UL},	/* P5 */
-	{0x514UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000D00UL, 0x000D00UL},	/* P6 */
-	{0x4B0UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000C00UL, 0x000C00UL},	/* P7 */
-	{0x44CUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000B00UL, 0x000B00UL},	/* P8 */
-	{0x3E8UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000A00UL, 0x000A00UL},	/* P9 */
-	{0x384UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000900UL, 0x000900UL},	/* P10 */
-	{0x320UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000800UL, 0x000800UL},	/* P11 */
+	/* Px data is not available */
 	</PX_INFO>
   <MMCFG_BASE_INFO>
 	/* PCI mmcfg base of MCFG */
@@ -217,17 +209,17 @@
 	0009f000-000fffff : Reserved
 	  000a0000-000bffff : PCI Bus 0000:00
 	  000f0000-000fffff : System ROM
-	00100000-71170017 : System RAM
-	71170018-71180057 : System RAM
-	71180058-79088fff : System RAM
-	79089000-7913bfff : Reserved
-	7913c000-8938dfff : System RAM
-	8938e000-8a78dfff : Reserved
-	8a78e000-8bb8dfff : ACPI Non-volatile Storage
-	8bb8e000-8bc0dfff : ACPI Tables
-	8bc0e000-8bc0efff : System RAM
-	8bc0f000-8f7fffff : Reserved
-	  8d800000-8f7fffff : Graphics Stolen Memory
+	00100000-6f170017 : System RAM
+	6f170018-6f180057 : System RAM
+	6f180058-76bdefff : System RAM
+	76bdf000-76c91fff : Reserved
+	76c92000-8738dfff : System RAM
+	8738e000-8878dfff : Reserved
+	8878e000-89b8dfff : ACPI Non-volatile Storage
+	89b8e000-89c0dfff : ACPI Tables
+	89c0e000-89c0efff : System RAM
+	89c0f000-8f7fffff : Reserved
+	  8b800000-8f7fffff : Graphics Stolen Memory
 	8f800000-dfffffff : PCI Bus 0000:00
 	  8f800000-8f800fff : 0000:00:15.0
 	    8f800000-8f8001ff : lpss_dev
@@ -251,59 +243,62 @@
 	  a0000000-a0ffffff : 0000:00:02.0
 	  a1000000-a10fffff : 0000:00:1f.3
 	    a1000000-a10fffff : Audio DSP
-	  a1100000-a11fffff : PCI Bus 0000:0a
-	    a1100000-a117ffff : 0000:0a:00.0
+	  a1100000-a11fffff : PCI Bus 0000:0b
+	    a1100000-a117ffff : 0000:0b:00.0
 	      a1100000-a117ffff : igb
-	    a1180000-a1183fff : 0000:0a:00.0
+	    a1180000-a1183fff : 0000:0b:00.0
 	      a1180000-a1183fff : igb
-	  a1200000-a12fffff : PCI Bus 0000:09
-	    a1200000-a127ffff : 0000:09:00.0
+	  a1200000-a12fffff : PCI Bus 0000:0a
+	    a1200000-a127ffff : 0000:0a:00.0
 	      a1200000-a127ffff : igb
-	    a1280000-a1283fff : 0000:09:00.0
+	    a1280000-a1283fff : 0000:0a:00.0
 	      a1280000-a1283fff : igb
-	  a1300000-a16fffff : PCI Bus 0000:02
-	    a1300000-a16fffff : PCI Bus 0000:03
-	      a1300000-a13fffff : PCI Bus 0000:07
-	        a1300000-a137ffff : 0000:07:00.0
-	          a1300000-a137ffff : igb
-	        a1380000-a1383fff : 0000:07:00.0
-	          a1380000-a1383fff : igb
-	      a1400000-a14fffff : PCI Bus 0000:06
-	        a1400000-a147ffff : 0000:06:00.0
+	  a1300000-a13fffff : PCI Bus 0000:09
+	    a1300000-a1303fff : 0000:09:00.0
+	      a1300000-a1303fff : nvme
+	  a1400000-a17fffff : PCI Bus 0000:02
+	    a1400000-a17fffff : PCI Bus 0000:03
+	      a1400000-a14fffff : PCI Bus 0000:07
+	        a1400000-a147ffff : 0000:07:00.0
 	          a1400000-a147ffff : igb
-	        a1480000-a1483fff : 0000:06:00.0
+	        a1480000-a1483fff : 0000:07:00.0
 	          a1480000-a1483fff : igb
-	      a1500000-a15fffff : PCI Bus 0000:05
-	        a1500000-a157ffff : 0000:05:00.0
+	      a1500000-a15fffff : PCI Bus 0000:06
+	        a1500000-a157ffff : 0000:06:00.0
 	          a1500000-a157ffff : igb
-	        a1580000-a1583fff : 0000:05:00.0
+	        a1580000-a1583fff : 0000:06:00.0
 	          a1580000-a1583fff : igb
-	      a1600000-a16fffff : PCI Bus 0000:04
-	        a1600000-a167ffff : 0000:04:00.0
+	      a1600000-a16fffff : PCI Bus 0000:05
+	        a1600000-a167ffff : 0000:05:00.0
 	          a1600000-a167ffff : igb
-	        a1680000-a1683fff : 0000:04:00.0
+	        a1680000-a1683fff : 0000:05:00.0
 	          a1680000-a1683fff : igb
-	  a1700000-a17fffff : PCI Bus 0000:01
-	    a1700000-a1703fff : 0000:01:00.0
-	      a1700000-a1703fff : nvme
-	  a1800000-a181ffff : 0000:00:1f.6
-	    a1800000-a181ffff : e1000e
-	  a1820000-a182ffff : 0000:00:14.0
-	    a1820000-a182ffff : xhci-hcd
-	  a1830000-a1833fff : 0000:00:1f.3
-	    a1830000-a1833fff : Audio DSP
-	  a1834000-a1835fff : 0000:00:14.2
-	  a1836000-a1837fff : 0000:00:17.0
-	    a1836000-a1837fff : ahci
-	  a1838000-a1838fff : 0000:00:08.0
-	  a1839000-a1839fff : 0000:00:12.0
-	    a1839000-a1839fff : Intel PCH thermal driver
-	  a183a000-a183afff : 0000:00:14.2
-	  a183f000-a183f0ff : 0000:00:1f.4
-	  a1841000-a18417ff : 0000:00:17.0
-	    a1841000-a18417ff : ahci
-	  a1842000-a18420ff : 0000:00:17.0
-	    a1842000-a18420ff : ahci
+	      a1700000-a17fffff : PCI Bus 0000:04
+	        a1700000-a177ffff : 0000:04:00.0
+	          a1700000-a177ffff : igb
+	        a1780000-a1783fff : 0000:04:00.0
+	          a1780000-a1783fff : igb
+	  a1800000-a18fffff : PCI Bus 0000:01
+	    a1800000-a1803fff : 0000:01:00.0
+	      a1800000-a1803fff : nvme
+	  a1900000-a191ffff : 0000:00:1f.6
+	    a1900000-a191ffff : e1000e
+	  a1920000-a192ffff : 0000:00:14.0
+	    a1920000-a192ffff : xhci-hcd
+	  a1930000-a1933fff : 0000:00:1f.3
+	    a1930000-a1933fff : Audio DSP
+	  a1934000-a1935fff : 0000:00:14.2
+	  a1936000-a1937fff : 0000:00:17.0
+	    a1936000-a1937fff : ahci
+	  a1938000-a1938fff : 0000:00:08.0
+	  a1939000-a1939fff : 0000:00:12.0
+	    a1939000-a1939fff : Intel PCH thermal driver
+	  a193a000-a193afff : 0000:00:14.2
+	  a193f000-a193f0ff : 0000:00:1f.4
+	  a1941000-a19417ff : 0000:00:17.0
+	    a1941000-a19417ff : ahci
+	  a1942000-a19420ff : 0000:00:17.0
+	    a1942000-a19420ff : ahci
 	e0000000-efffffff : PCI MMCONFIG 0000 [bus 00-ff]
 	  e0000000-efffffff : Reserved
 	    e0000000-efffffff : pnp 00:08
@@ -337,14 +332,15 @@
 	  fee00000-fee00fff : Reserved
 	ff600000-ffffffff : Reserved
 	100000000-86c7fffff : System RAM
-	  178a00000-179800db6 : Kernel code
-	  179a00000-179f53fff : Kernel rodata
-	  17a000000-17a27a83f : Kernel data
-	  17a534000-17a9fffff : Kernel bss
+	  24c000000-24ce025b6 : Kernel code
+	  24d000000-24d554fff : Kernel rodata
+	  24d600000-24d9658bf : Kernel data
+	  24dc2a000-24e1fffff : Kernel bss
 	86c800000-86fffffff : RAM buffer
 	</IOMEM_INFO>
   <BLOCK_DEVICE_INFO>
 	/dev/sda3: TYPE="ext4"
+	/dev/nvme1n1p2: TYPE="ext4"
 	/dev/nvme0n1p3: TYPE="ext4"
 	/dev/nvme0n1p4: TYPE="ext4"
 	</BLOCK_DEVICE_INFO>
@@ -357,13 +353,13 @@
 	5, 6, 7, 10, 11, 12, 13, 15
 	</AVAILABLE_IRQ_INFO>
   <TOTAL_MEM_INFO>
-	32718028 kB
+	32683232 kB
 	</TOTAL_MEM_INFO>
   <CPU_PROCESSOR_INFO>
 	0, 1, 2, 3, 4, 5, 6, 7
 	</CPU_PROCESSOR_INFO>
   <MAX_MSIX_TABLE_NUM>
-	16
+	32
 	</MAX_MSIX_TABLE_NUM>
   <processors>
     <model description="Intel(R) Core(TM) i7-9700TE CPU @ 1.80GHz">
@@ -946,8 +942,8 @@
   </caches>
   <memory>
     <range start="0x0000000000000000" end="0x000000000009efff" size="651264"/>
-    <range start="0x0000000000100000" end="0x000000008938dfff" size="2301157376"/>
-    <range start="0x000000008bc0e000" end="0x000000008bc0efff" size="4096"/>
+    <range start="0x0000000000100000" end="0x000000008738dfff" size="2267602944"/>
+    <range start="0x0000000089c0e000" end="0x0000000089c0efff" size="4096"/>
     <range start="0x0000000100000000" end="0x000000086c7fffff" size="31885099008"/>
   </memory>
   <devices>
@@ -985,21 +981,21 @@
         <resource id="res1" type="io_port" min="0x0" max="0xcf7" len="0xcf8"/>
         <resource id="res2" type="io_port" min="0xcf8" max="0xcf8" len="0x8"/>
         <resource id="res3" type="io_port" min="0xd00" max="0xffff" len="0xf300"/>
-        <resource id="res19" type="memory" min="0x10000" max="0x1ffff" len="0x0"/>
+        <resource id="res19" type="memory" min="0x10000" max="0xffff" len="0x0"/>
         <resource id="res4" type="memory" min="0xa0000" max="0xbffff" len="0x20000"/>
-        <resource id="res5" type="memory" min="0xc0000" max="0xc3fff" len="0x0"/>
-        <resource id="res6" type="memory" min="0xc4000" max="0xc7fff" len="0x0"/>
-        <resource id="res7" type="memory" min="0xc8000" max="0xcbfff" len="0x0"/>
-        <resource id="res8" type="memory" min="0xcc000" max="0xcffff" len="0x0"/>
-        <resource id="res9" type="memory" min="0xd0000" max="0xd3fff" len="0x0"/>
-        <resource id="res10" type="memory" min="0xd4000" max="0xd7fff" len="0x0"/>
-        <resource id="res11" type="memory" min="0xd8000" max="0xdbfff" len="0x0"/>
-        <resource id="res12" type="memory" min="0xdc000" max="0xdffff" len="0x0"/>
-        <resource id="res13" type="memory" min="0xe0000" max="0xe3fff" len="0x0"/>
-        <resource id="res14" type="memory" min="0xe4000" max="0xe7fff" len="0x0"/>
-        <resource id="res15" type="memory" min="0xe8000" max="0xebfff" len="0x0"/>
-        <resource id="res16" type="memory" min="0xec000" max="0xeffff" len="0x0"/>
-        <resource id="res17" type="memory" min="0xf0000" max="0xfffff" len="0x0"/>
+        <resource id="res5" type="memory" min="0xc0000" max="0xbffff" len="0x0"/>
+        <resource id="res6" type="memory" min="0xc4000" max="0xc3fff" len="0x0"/>
+        <resource id="res7" type="memory" min="0xc8000" max="0xc7fff" len="0x0"/>
+        <resource id="res8" type="memory" min="0xcc000" max="0xcbfff" len="0x0"/>
+        <resource id="res9" type="memory" min="0xd0000" max="0xcffff" len="0x0"/>
+        <resource id="res10" type="memory" min="0xd4000" max="0xd3fff" len="0x0"/>
+        <resource id="res11" type="memory" min="0xd8000" max="0xd7fff" len="0x0"/>
+        <resource id="res12" type="memory" min="0xdc000" max="0xdbfff" len="0x0"/>
+        <resource id="res13" type="memory" min="0xe0000" max="0xdffff" len="0x0"/>
+        <resource id="res14" type="memory" min="0xe4000" max="0xe3fff" len="0x0"/>
+        <resource id="res15" type="memory" min="0xe8000" max="0xe7fff" len="0x0"/>
+        <resource id="res16" type="memory" min="0xec000" max="0xebfff" len="0x0"/>
+        <resource id="res17" type="memory" min="0xf0000" max="0xeffff" len="0x0"/>
         <resource id="res18" type="memory" min="0x8f800000" max="0xdfffffff" len="0x50800000"/>
         <resource id="res20" type="memory" min="0xfc800000" max="0xfe7fffff" len="0x2000000"/>
         <capability id="Vendor-Specific"/>
@@ -1098,7 +1094,7 @@
           <acpi_object>\_SB_.PCI0.CLP0</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50434930434c5030085f53544100085f4849440d494e543334364600085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50434930434c5030085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1241,7 +1237,7 @@
           <subsystem_identifier>0x7270</subsystem_identifier>
           <class>0x088000</class>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
-          <resource type="memory" min="0xa1838000" max="0xa1838fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
+          <resource type="memory" min="0xa1938000" max="0xa1938fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
           <capability id="MSI">
             <count>1</count>
           </capability>
@@ -1255,7 +1251,7 @@
           <subsystem_identifier>0x7270</subsystem_identifier>
           <class>0x118000</class>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
-          <resource type="memory" min="0xa1839000" max="0xa1839fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
+          <resource type="memory" min="0xa1939000" max="0xa1939fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="MSI">
             <count>1</count>
@@ -1282,7 +1278,7 @@
           <acpi_object>\_SB_.PCI0.XHC_</acpi_object>
           <aml_template>5b821a5c2f035f53425f504349305848435f085f4144520c00001400</aml_template>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
-          <resource type="memory" min="0xa1820000" max="0xa182ffff" len="0x10000" id="bar0" width="64" prefetchable="0"/>
+          <resource type="memory" min="0xa1920000" max="0xa192ffff" len="0x10000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="MSI">
             <count>8</count>
@@ -1409,8 +1405,8 @@
           <subsystem_vendor>0x8086</subsystem_vendor>
           <subsystem_identifier>0xa36f</subsystem_identifier>
           <class>0x050000</class>
-          <resource type="memory" min="0xa1834000" max="0xa1835fff" len="0x2000" id="bar0" width="64" prefetchable="0"/>
-          <resource type="memory" min="0xa183a000" max="0xa183afff" len="0x1000" id="bar2" width="64" prefetchable="0"/>
+          <resource type="memory" min="0xa1934000" max="0xa1935fff" len="0x2000" id="bar0" width="64" prefetchable="0"/>
+          <resource type="memory" min="0xa193a000" max="0xa193afff" len="0x1000" id="bar2" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
         </device>
         <device address="0x140003">
@@ -1441,15 +1437,15 @@
           <resource type="memory" min="0x8f800000" max="0x8f800fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="Vendor-Specific"/>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C0.TPD0</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C0.UCMX</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C0.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C0.TPD0</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C0.PA01</dependency>
           <device id="MAX34407">
             <acpi_object>\_SB_.PCI0.I2C0.PA01</acpi_object>
             <compatible_id>MAX34407</compatible_id>
             <acpi_uid>1</acpi_uid>
-            <aml_template>5b824c055c2f045f53425f504349304932433050413031085f53544100085f4849440d4d4158333434303700085f55494401085f43525311260a238e1e00010001020000010600801a060010005c5f53422e504349302e49324330007900</aml_template>
+            <aml_template>5b824b065c2f045f53425f504349304932433050413031085f53544100085f4849440d4d4158333434303700085f4349440d4d4158333434303700085f55494401085f43525311260a238e1e00010001020000010600801a060010005c5f53422e504349302e49324330007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1461,7 +1457,7 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C0.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433054504430085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324330008906001501180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433054504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324330008906001501180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1474,7 +1470,7 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C0.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433054504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324330008906000101180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433054504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324330008906000101180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1522,7 +1518,7 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C1.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433154504430085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324331008906001501180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433154504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324331008906001501180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1535,7 +1531,7 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C1.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433154504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324331008906000101180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433154504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324331008906000101180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1581,9 +1577,9 @@
           <resource type="io_port" min="0x9060" max="0x907f" len="0x20" id="bar4"/>
           <resource type="io_port" min="0x9080" max="0x9087" len="0x8" id="bar2"/>
           <resource type="io_port" min="0x9088" max="0x908b" len="0x4" id="bar3"/>
-          <resource type="memory" min="0xa1836000" max="0xa1837fff" len="0x2000" id="bar0" width="32" prefetchable="0"/>
-          <resource type="memory" min="0xa1841000" max="0xa18417ff" len="0x800" id="bar5" width="32" prefetchable="0"/>
-          <resource type="memory" min="0xa1842000" max="0xa18420ff" len="0x100" id="bar1" width="32" prefetchable="0"/>
+          <resource type="memory" min="0xa1936000" max="0xa1937fff" len="0x2000" id="bar0" width="32" prefetchable="0"/>
+          <resource type="memory" min="0xa1941000" max="0xa19417ff" len="0x800" id="bar5" width="32" prefetchable="0"/>
+          <resource type="memory" min="0xa1942000" max="0xa19420ff" len="0x100" id="bar1" width="32" prefetchable="0"/>
           <capability id="MSI">
             <count>1</count>
           </capability>
@@ -1660,7 +1656,7 @@
           <identifier>0xa340</identifier>
           <class>0x060400</class>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
-          <resource type="memory" min="0xa1700000" max="0xa17fffff" len="0x100000"/>
+          <resource type="memory" min="0xa1800000" max="0xa18fffff" len="0x100000"/>
           <capability id="PCI Express"/>
           <capability id="MSI">
             <count>1</count>
@@ -1681,7 +1677,7 @@
               <subsystem_identifier>0x2263</subsystem_identifier>
               <class>0x010802</class>
               <resource type="interrupt_pin" pin="INTA#"/>
-              <resource type="memory" min="0xa1700000" max="0xa1703fff" len="0x4000" id="bar0" width="64" prefetchable="0"/>
+              <resource type="memory" min="0xa1800000" max="0xa1803fff" len="0x4000" id="bar0" width="64" prefetchable="0"/>
               <capability id="Power Management"/>
               <capability id="MSI">
                 <count>8</count>
@@ -1710,7 +1706,7 @@
           <class>0x060400</class>
           <resource type="interrupt_pin" pin="INTC#" source="18"/>
           <resource type="io_port" min="0x5000" max="0x8fff" len="0x4000"/>
-          <resource type="memory" min="0xa1300000" max="0xa16fffff" len="0x400000"/>
+          <resource type="memory" min="0xa1400000" max="0xa17fffff" len="0x400000"/>
           <capability id="PCI Express"/>
           <capability id="MSI">
             <count>1</count>
@@ -1729,7 +1725,7 @@
               <identifier>0x2608</identifier>
               <class>0x060400</class>
               <resource type="io_port" min="0x5000" max="0x8fff" len="0x4000"/>
-              <resource type="memory" min="0xa1300000" max="0xa16fffff" len="0x400000"/>
+              <resource type="memory" min="0xa1400000" max="0xa17fffff" len="0x400000"/>
               <capability id="Power Management"/>
               <capability id="VPD"/>
               <capability id="Vendor-Specific"/>
@@ -1746,7 +1742,7 @@
                   <identifier>0x2608</identifier>
                   <class>0x060400</class>
                   <resource type="io_port" min="0x8000" max="0x8fff" len="0x1000"/>
-                  <resource type="memory" min="0xa1600000" max="0xa16fffff" len="0x100000"/>
+                  <resource type="memory" min="0xa1700000" max="0xa17fffff" len="0x100000"/>
                   <capability id="Power Management"/>
                   <capability id="Vendor-Specific"/>
                   <capability id="Subsystem ID and Subsystem Vendor ID"/>
@@ -1765,8 +1761,8 @@
                       <class>0x020000</class>
                       <resource type="interrupt_pin" pin="INTA#"/>
                       <resource type="io_port" min="0x8000" max="0x801f" len="0x20" id="bar2"/>
-                      <resource type="memory" min="0xa1600000" max="0xa167ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
-                      <resource type="memory" min="0xa1680000" max="0xa1683fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1700000" max="0xa177ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1780000" max="0xa1783fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
                       <capability id="Power Management"/>
                       <capability id="MSI">
                         <count>1</count>
@@ -1792,7 +1788,7 @@
                   <identifier>0x2608</identifier>
                   <class>0x060400</class>
                   <resource type="io_port" min="0x7000" max="0x7fff" len="0x1000"/>
-                  <resource type="memory" min="0xa1500000" max="0xa15fffff" len="0x100000"/>
+                  <resource type="memory" min="0xa1600000" max="0xa16fffff" len="0x100000"/>
                   <capability id="Power Management"/>
                   <capability id="Vendor-Specific"/>
                   <capability id="Subsystem ID and Subsystem Vendor ID"/>
@@ -1811,8 +1807,8 @@
                       <class>0x020000</class>
                       <resource type="interrupt_pin" pin="INTA#"/>
                       <resource type="io_port" min="0x7000" max="0x701f" len="0x20" id="bar2"/>
-                      <resource type="memory" min="0xa1500000" max="0xa157ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
-                      <resource type="memory" min="0xa1580000" max="0xa1583fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1600000" max="0xa167ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1680000" max="0xa1683fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
                       <capability id="Power Management"/>
                       <capability id="MSI">
                         <count>1</count>
@@ -1838,7 +1834,7 @@
                   <identifier>0x2608</identifier>
                   <class>0x060400</class>
                   <resource type="io_port" min="0x6000" max="0x6fff" len="0x1000"/>
-                  <resource type="memory" min="0xa1400000" max="0xa14fffff" len="0x100000"/>
+                  <resource type="memory" min="0xa1500000" max="0xa15fffff" len="0x100000"/>
                   <capability id="Power Management"/>
                   <capability id="Vendor-Specific"/>
                   <capability id="Subsystem ID and Subsystem Vendor ID"/>
@@ -1857,8 +1853,8 @@
                       <class>0x020000</class>
                       <resource type="interrupt_pin" pin="INTA#"/>
                       <resource type="io_port" min="0x6000" max="0x601f" len="0x20" id="bar2"/>
-                      <resource type="memory" min="0xa1400000" max="0xa147ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
-                      <resource type="memory" min="0xa1480000" max="0xa1483fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1500000" max="0xa157ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1580000" max="0xa1583fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
                       <capability id="Power Management"/>
                       <capability id="MSI">
                         <count>1</count>
@@ -1884,7 +1880,7 @@
                   <identifier>0x2608</identifier>
                   <class>0x060400</class>
                   <resource type="io_port" min="0x5000" max="0x5fff" len="0x1000"/>
-                  <resource type="memory" min="0xa1300000" max="0xa13fffff" len="0x100000"/>
+                  <resource type="memory" min="0xa1400000" max="0xa14fffff" len="0x100000"/>
                   <capability id="Power Management"/>
                   <capability id="Vendor-Specific"/>
                   <capability id="Subsystem ID and Subsystem Vendor ID"/>
@@ -1903,8 +1899,8 @@
                       <class>0x020000</class>
                       <resource type="interrupt_pin" pin="INTA#"/>
                       <resource type="io_port" min="0x5000" max="0x501f" len="0x20" id="bar2"/>
-                      <resource type="memory" min="0xa1300000" max="0xa137ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
-                      <resource type="memory" min="0xa1380000" max="0xa1383fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1400000" max="0xa147ffff" len="0x80000" id="bar0" width="32" prefetchable="0"/>
+                      <resource type="memory" min="0xa1480000" max="0xa1483fff" len="0x4000" id="bar3" width="32" prefetchable="0"/>
                       <capability id="Power Management"/>
                       <capability id="MSI">
                         <count>1</count>
@@ -1944,7 +1940,53 @@
             </device>
           </bus>
         </device>
-        <device address="0x1c0000" id="0xa33e" description="PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #7">
+        <device address="0x1c0000" id="0xa33a" description="PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #3">
+          <vendor>0x8086</vendor>
+          <identifier>0xa33a</identifier>
+          <class>0x060400</class>
+          <resource type="interrupt_pin" pin="INTC#" source="18"/>
+          <resource type="memory" min="0xa1300000" max="0xa13fffff" len="0x100000"/>
+          <capability id="PCI Express"/>
+          <capability id="MSI">
+            <count>1</count>
+          </capability>
+          <capability id="Subsystem ID and Subsystem Vendor ID"/>
+          <capability id="Power Management"/>
+          <capability id="Advanced Error Reporting"/>
+          <capability id="ACS"/>
+          <capability id="TPM"/>
+          <capability id="L1 PM Substates"/>
+          <capability id="Secondary PCI Express"/>
+          <capability id="DPC"/>
+          <bus type="pci" address="0x9">
+            <device address="0x0" id="0x1160" description="Non-Volatile memory controller: Marvell Technology Group Ltd.">
+              <vendor>0x1b4b</vendor>
+              <identifier>0x1160</identifier>
+              <subsystem_vendor>0x1b4b</subsystem_vendor>
+              <subsystem_identifier>0x1160</subsystem_identifier>
+              <class>0x010802</class>
+              <resource type="interrupt_pin" pin="INTA#"/>
+              <resource type="memory" min="0xa1300000" max="0xa1303fff" len="0x4000" id="bar0" width="64" prefetchable="0"/>
+              <capability id="Power Management"/>
+              <capability id="MSI">
+                <count>1</count>
+                <capability id="64-bit address"/>
+              </capability>
+              <capability id="PCI Express"/>
+              <capability id="MSI-X">
+                <table_size>32</table_size>
+                <table_bir>1</table_bir>
+                <table_offset>0x10000000</table_offset>
+                <pba_bir>1</pba_bir>
+                <pba_offset>0x0</pba_offset>
+              </capability>
+              <capability id="Advanced Error Reporting"/>
+              <capability id="Secondary PCI Express"/>
+              <capability id="LTR"/>
+            </device>
+          </bus>
+        </device>
+        <device address="0x1c0006" id="0xa33e" description="PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port #7">
           <vendor>0x8086</vendor>
           <identifier>0xa33e</identifier>
           <class>0x060400</class>
@@ -1963,7 +2005,7 @@
           <capability id="L1 PM Substates"/>
           <capability id="Secondary PCI Express"/>
           <capability id="DPC"/>
-          <bus type="pci" address="0x9">
+          <bus type="pci" address="0xa">
             <device address="0x0" id="0x1533" description="Ethernet controller: Intel Corporation I210 Gigabit Network Connection">
               <vendor>0x8086</vendor>
               <identifier>0x1533</identifier>
@@ -2013,7 +2055,7 @@
           <capability id="L1 PM Substates"/>
           <capability id="Secondary PCI Express"/>
           <capability id="DPC"/>
-          <bus type="pci" address="0xa">
+          <bus type="pci" address="0xb">
             <device address="0x0" id="0x1533" description="Ethernet controller: Intel Corporation I210 Gigabit Network Connection">
               <vendor>0x8086</vendor>
               <identifier>0x1533</identifier>
@@ -2068,7 +2110,7 @@
           <device id="INT3F0D">
             <acpi_object>\_SB_.PCI0.LPCB.CWDT</acpi_object>
             <compatible_id>PNP0C02</compatible_id>
-            <aml_template>5b82385c2f045f53425f504349304c50434243574454085f5354410a0f085f4849440c25d43f0d085f435253110d0a0a47015418541804047900</aml_template>
+            <aml_template>5b8243045c2f045f53425f504349304c50434243574454085f5354410a0f085f4849440c25d43f0d085f4349440c41d00c02085f435253110d0a0a47015418541804047900</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -2161,7 +2203,7 @@
               <acpi_object>\_SB_.PCI0.LPCB.SIO0.PS2K</acpi_object>
               <compatible_id>PNP030B</compatible_id>
               <acpi_uid>SD28201K</acpi_uid>
-              <aml_template>5b824b055c2f055f53425f504349304c50434253494f305053324b085f53544100085f4849440d4d5346543030303100085f5549440d534432383230314b00085f43525311180a15470160006000010147016400640001012202007900</aml_template>
+              <aml_template>5b8245065c2f055f53425f504349304c50434253494f305053324b085f53544100085f4849440d4d5346543030303100085f4349440c41d0030b085f5549440d534432383230314b00085f43525311180a15470160006000010147016400640001012202007900</aml_template>
               <status>
                 <present>n</present>
                 <enabled>n</enabled>
@@ -2175,7 +2217,7 @@
               <acpi_object>\_SB_.PCI0.LPCB.SIO0.PS2M</acpi_object>
               <compatible_id>PNP0F13</compatible_id>
               <acpi_uid>SD28201M</acpi_uid>
-              <aml_template>5b824b055c2f055f53425f504349304c50434253494f305053324d085f53544100085f4849440d4d5346543030303300085f5549440d534432383230314d00085f43525311180a15470160006000010147016400640001012200107900</aml_template>
+              <aml_template>5b8245065c2f055f53425f504349304c50434253494f305053324d085f53544100085f4849440d4d5346543030303300085f4349440c41d00f13085f5549440d534432383230314d00085f43525311180a15470160006000010147016400640001012200107900</aml_template>
               <status>
                 <present>n</present>
                 <enabled>n</enabled>
@@ -2240,7 +2282,7 @@
           <aml_template>5b821a5c2f035f53425f5043493048444153085f4144520c03001f00</aml_template>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
           <resource type="memory" min="0xa1000000" max="0xa10fffff" len="0x100000" id="bar4" width="64" prefetchable="0"/>
-          <resource type="memory" min="0xa1830000" max="0xa1833fff" len="0x4000" id="bar0" width="64" prefetchable="0"/>
+          <resource type="memory" min="0xa1930000" max="0xa1933fff" len="0x4000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="Vendor-Specific"/>
           <capability id="MSI">
@@ -2251,7 +2293,7 @@
             <acpi_object>\_SB_.PCI0.HDAS.SNDW</acpi_object>
             <compatible_id>PRP00001</compatible_id>
             <compatible_id>PNP0A05</compatible_id>
-            <aml_template>5b82255c2f045f53425f5043493048444153534e4457085f5354410a0b085f4144520c00000040</aml_template>
+            <aml_template>5b8241045c2f045f53425f5043493048444153534e4457085f5354410a0b085f4349441215020d5052503030303031000d504e503041303500085f4144520c00000040</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -2301,7 +2343,7 @@
           <aml_template>5b821a5c2f035f53425f5043493053425553085f4144520c04001f00</aml_template>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
           <resource type="io_port" min="0x9040" max="0x905f" len="0x20" id="bar4"/>
-          <resource type="memory" min="0xa183f000" max="0xa183f0ff" len="0x100" id="bar0" width="64" prefetchable="0"/>
+          <resource type="memory" min="0xa193f000" max="0xa193f0ff" len="0x100" id="bar0" width="64" prefetchable="0"/>
         </device>
         <device address="0x1f0005" id="0xa324" description="Serial bus controller: Intel Corporation Cannon Lake PCH SPI Controller">
           <vendor>0x8086</vendor>
@@ -2320,7 +2362,7 @@
           <acpi_object>\_SB_.PCI0.GLAN</acpi_object>
           <aml_template>5b821a5c2f035f53425f50434930474c414e085f4144520c06001f00</aml_template>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
-          <resource type="memory" min="0xa1800000" max="0xa181ffff" len="0x20000" id="bar0" width="32" prefetchable="0"/>
+          <resource type="memory" min="0xa1900000" max="0xa191ffff" len="0x20000" id="bar0" width="32" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="MSI">
             <count>1</count>
@@ -2331,7 +2373,7 @@
           <acpi_object>\_SB_.PCI0.CLP1</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50434930434c5031085f53544100085f4849440d494e543334364600085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504349302e49324333007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50434930434c5031085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504349302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2344,7 +2386,7 @@
           <acpi_object>\_SB_.PCI0.CLP2</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50434930434c5032085f53544100085f4849440d494e543334364600085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50434930434c5032085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2357,7 +2399,7 @@
           <acpi_object>\_SB_.PCI0.CLP3</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50434930434c5033085f53544100085f4849440d494e543334364600085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50434930434c5033085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2370,7 +2412,7 @@
           <acpi_object>\_SB_.PCI0.DOCK</acpi_object>
           <compatible_id>PNP0C15</compatible_id>
           <acpi_uid>SADDLESTRING</acpi_uid>
-          <aml_template>5b82385c2f035f53425f50434930444f434b085f53544100085f4849440d414243443030303000085f5549440d534144444c45535452494e4700</aml_template>
+          <aml_template>5b8243045c2f035f53425f50434930444f434b085f53544100085f4849440d414243443030303000085f4349440c41d00c15085f5549440d534144444c45535452494e4700</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2381,7 +2423,7 @@
           <acpi_object>\_SB_.PCI0.DSC0</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b823b5c2f035f53425f5043493044534330085f53544100085f4849440d494e543334364600085f55494400085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824a045c2f035f53425f5043493044534330085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494400085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2392,7 +2434,7 @@
           <acpi_object>\_SB_.PCI0.DSC1</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b824d085c2f035f53425f5043493044534331085f53544100085f4849440d494e543334364600085f55494401085f41445200085f4352531146050a528c25000101010002000000000000170000190028000000f6005c5f53422e504349302e47504930008c2500010101000200000000000017000019002800000010005c5f53422e504349302e47504930007900</aml_template>
+          <aml_template>5b824b095c2f035f53425f5043493044534331085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494401085f41445200085f4352531146050a528c25000101010002000000000000170000190028000000f6005c5f53422e504349302e47504930008c2500010101000200000000000017000019002800000010005c5f53422e504349302e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2406,7 +2448,7 @@
           <acpi_object>\_SB_.PCI0.DSC2</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043493044534332085f53544100085f4849440d494e543334364600085f5549440a02085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824b045c2f035f53425f5043493044534332085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a02085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2417,7 +2459,7 @@
           <acpi_object>\_SB_.PCI0.DSC3</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043493044534333085f53544100085f4849440d494e543334364600085f5549440a03085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824b045c2f035f53425f5043493044534333085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a03085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2437,8 +2479,8 @@
           <resource id="res2" type="memory" min="0xfd6b0000" max="0xfd6bffff" len="0x10000"/>
           <resource id="res1" type="memory" min="0xfd6d0000" max="0xfd6dffff" len="0x10000"/>
           <resource id="res0" type="memory" min="0xfd6e0000" max="0xfd6effff" len="0x10000"/>
-          <dependency type="provides resources to">\_SB_.PCI0.DSC1</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.PSDC</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.DSC1</dependency>
         </device>
         <device id="INT34B4">
           <acpi_object>\_SB_.PCI0.I2C2</acpi_object>
@@ -2450,23 +2492,23 @@
           </status>
           <resource id="res1" type="irq" int="18"/>
           <resource id="res0" type="memory" min="0xfe024000" max="0xfe024fff" len="0x1000"/>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C2.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.LNK3</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.CLP0</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C2.CAM0</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C2.HDAC</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.CLP3</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.CLP2</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.LNK0</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C2.PMIC</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.LNK1</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.CLP0</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.CLP3</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.LNK3</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C2.TPL1</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C2.UCMX</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.LNK1</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.CLP2</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C2.TPD0</dependency>
           <device id="INT3471" address="0x0">
             <acpi_object>\_SB_.PCI0.I2C2.CAM0</acpi_object>
             <compatible_id>INT3471</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8249105c2f045f53425f504349304932433243414d30085f53544100085f4849440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504349302e49324332008e1e00010001020000010600801a06000e005c5f53422e504349302e49324332008e1e00010001020000010600801a060050005c5f53422e504349302e49324332008e1e00010001020000010600801a060051005c5f53422e504349302e49324332008e1e00010001020000010600801a060052005c5f53422e504349302e49324332008e1e00010001020000010600801a060053005c5f53422e504349302e49324332007900</aml_template>
+            <aml_template>5b8247115c2f045f53425f504349304932433243414d30085f53544100085f4849440d494e543334373100085f4349440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504349302e49324332008e1e00010001020000010600801a06000e005c5f53422e504349302e49324332008e1e00010001020000010600801a060050005c5f53422e504349302e49324332008e1e00010001020000010600801a060051005c5f53422e504349302e49324332008e1e00010001020000010600801a060052005c5f53422e504349302e49324332008e1e00010001020000010600801a060053005c5f53422e504349302e49324332007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2484,7 +2526,7 @@
             <acpi_object>\_SB_.PCI0.I2C2.HDAC</acpi_object>
             <compatible_id>INT0000</compatible_id>
             <acpi_uid>1</acpi_uid>
-            <aml_template>5b8244065c2f045f53425f504349304932433248444143085f53544100085f4849440d494e543030303000085f55494401085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906001101180000007900</aml_template>
+            <aml_template>5b8242075c2f045f53425f504349304932433248444143085f53544100085f4849440d494e543030303000085f4349440d494e543030303000085f55494401085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906001101180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2498,7 +2540,7 @@
             <acpi_object>\_SB_.PCI0.I2C2.PMIC</acpi_object>
             <compatible_id>INT346F</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f5043493049324332504d4943085f53544100085f4849440d494e543334364600085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504349302e49324332007900</aml_template>
+            <aml_template>5b8241075c2f045f53425f5043493049324332504d4943085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504349302e49324332007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2510,7 +2552,7 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C2.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433254504430085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324332008906001501180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433254504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324332008906001501180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2523,7 +2565,7 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C2.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433254504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906000101180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433254504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906000101180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2563,15 +2605,15 @@
           </status>
           <resource id="res1" type="irq" int="19"/>
           <resource id="res0" type="memory" min="0xfe026000" max="0xfe026fff" len="0x1000"/>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C3.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.CLP1</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C3.UCMX</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C3.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.CLP1</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C3.TPD0</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.LNK2</dependency>
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C3.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433354504430085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324333008906001501180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433354504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060020005c5f53422e504349302e49324333008906001501180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2584,7 +2626,7 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C3.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433354504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324333008906000101180000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433354504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324333008906000101180000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2629,7 +2671,7 @@
             <acpi_object>\_SB_.PCI0.I2C4.CAM1</acpi_object>
             <compatible_id>INT3474</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f504349304932433443414d31085f53544100085f4849440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324334007900</aml_template>
+            <aml_template>5b8241075c2f045f53425f504349304932433443414d31085f53544100085f4849440d494e543334373400085f4349440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324334007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2660,7 +2702,7 @@
           <acpi_object>\_SB_.PCI0.LNK0</acpi_object>
           <compatible_id>OVTIF860</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b82410a5c2f035f53425f504349304c4e4b30085f53544100085f4849440d4f5654494638363000085f55494400085f41445200085f4352531149060a658e1e00010001020000010600801a060010005c5f53422e504349302e49324332008e1e00010001020000010600801a060072005c5f53422e504349302e49324332008e1e00010001020000010600801a060051005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b82400b5c2f035f53425f504349304c4e4b30085f53544100085f4849440d4f5654494638363000085f4349440d4f5654494638363000085f55494400085f41445200085f4352531149060a658e1e00010001020000010600801a060010005c5f53422e504349302e49324332008e1e00010001020000010600801a060072005c5f53422e504349302e49324332008e1e00010001020000010600801a060051005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2675,7 +2717,7 @@
           <acpi_object>\_SB_.PCI0.LNK1</acpi_object>
           <compatible_id>OVTI9234</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f504349304c4e4b31085f53544100085f4849440d4f5654493932333400085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824d065c2f035f53425f504349304c4e4b31085f53544100085f4849440d4f5654493932333400085f4349440d4f5654493932333400085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2688,7 +2730,7 @@
           <acpi_object>\_SB_.PCI0.LNK2</acpi_object>
           <compatible_id>OVTI8856</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b824f055c2f035f53425f504349304c4e4b32085f53544100085f4849440d4f5654493838353600085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a060010005c5f53422e504349302e49324333007900</aml_template>
+          <aml_template>5b824e065c2f035f53425f504349304c4e4b32085f53544100085f4849440d4f5654493838353600085f4349440d4f5654493838353600085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a060010005c5f53422e504349302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2701,7 +2743,7 @@
           <acpi_object>\_SB_.PCI0.LNK3</acpi_object>
           <compatible_id>OVTI9234</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b824f055c2f035f53425f504349304c4e4b33085f53544100085f4849440d4f5654493932333400085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824e065c2f035f53425f504349304c4e4b33085f53544100085f4849440d4f5654493932333400085f4349440d4f5654493932333400085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2714,8 +2756,8 @@
           <acpi_object>\_SB_.PCI0.PDRC</acpi_object>
           <acpi_uid>1</acpi_uid>
           <aml_template>5b82205c2f035f53425f5043493050445243085f4849440c41d00c02085f55494401</aml_template>
-          <resource id="res8" type="memory" min="0x0" max="-0x1" len="0x0"/>
-          <resource id="res9" type="memory" min="0x0" max="-0x1" len="0x0"/>
+          <resource id="res8" type="memory" min="0x0" max="0x0" len="0x0"/>
+          <resource id="res9" type="memory" min="0x0" max="0x0" len="0x0"/>
           <resource id="res3" type="memory" min="0xe0000000" max="0xefffffff" len="0x10000000"/>
           <resource id="res0" type="memory" min="0xfed10000" max="0xfed17fff" len="0x8000"/>
           <resource id="res1" type="memory" min="0xfed18000" max="0xfed18fff" len="0x1000"/>
@@ -3019,7 +3061,7 @@
         <acpi_object>\_SB_.PEPD</acpi_object>
         <compatible_id>PNP0D80</compatible_id>
         <acpi_uid>1</acpi_uid>
-        <aml_template>5b82265c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f55494401</aml_template>
+        <aml_template>5b82305c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f4349440c41d00d80085f55494401</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -3029,7 +3071,7 @@
       <device id="INT340E">
         <acpi_object>\_SB_.PTID</acpi_object>
         <compatible_id>PNP0C02</compatible_id>
-        <aml_template>5b821c5c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e</aml_template>
+        <aml_template>5b82265c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e085f4349440c41d00c02</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -3049,7 +3091,7 @@
         <acpi_object>\_SB_.UBTC</acpi_object>
         <compatible_id>PNP0CA0</compatible_id>
         <acpi_uid>0</acpi_uid>
-        <aml_template>5b82385c2e5f53425f55425443085f4849440c5662c000085f55494400085f41445200085f43525311110a0e8609000100000000001000007900</aml_template>
+        <aml_template>5b8243045c2e5f53425f55425443085f4849440c5662c000085f4349440c41d00ca0085f55494400085f41445200085f43525311110a0e8609000100000000001000007900</aml_template>
         <status>
           <present>n</present>
           <enabled>n</enabled>
diff --git a/misc/config_tools/data/generic_board/generic_board.xml b/misc/config_tools/data/generic_board/generic_board.xml
index cc628704d..6732fd155 100644
--- a/misc/config_tools/data/generic_board/generic_board.xml
+++ b/misc/config_tools/data/generic_board/generic_board.xml
@@ -227,9 +227,9 @@
 	  000ec000-000effff : PCI Bus 0000:00
 	  000f0000-000fffff : PCI Bus 0000:00
 	    000f0000-000fffff : System ROM
-	00100000-2f7cefff : System RAM
-	2f7cf000-2f86dfff : Reserved
-	2f86e000-33e6afff : System RAM
+	00100000-2f7cdfff : System RAM
+	2f7ce000-2f86cfff : Reserved
+	2f86d000-33e6afff : System RAM
 	33e6b000-33e6bfff : Reserved
 	33e6c000-38136fff : System RAM
 	38137000-40b51fff : Reserved
@@ -291,13 +291,13 @@
 	ff000000-ffffffff : Reserved
 	  ff000000-ffffffff : pnp 00:05
 	100000000-3b07fffff : System RAM
-	  15de00000-15ec00ed0 : Kernel code
-	  15ec00ed1-15f65357f : Kernel data
-	  15f91d000-15fdfffff : Kernel bss
+	  292a00000-293800ea0 : Kernel code
+	  293800ea1-29425363f : Kernel data
+	  29451d000-2949fffff : Kernel bss
 	3b0800000-3b3ffffff : RAM buffer
 	4000000000-7fffffffff : PCI Bus 0000:00
 	  4000000000-400fffffff : 0000:00:02.0
-	    4000000000-40007e8fff : efifb
+	    4000000000-40001d4fff : efifb
 	  4010000000-4016ffffff : 0000:00:02.0
 	  4017000000-4017000fff : 0000:00:15.0
 	    4017000000-40170001ff : lpss_dev
@@ -337,7 +337,6 @@
   <BLOCK_DEVICE_INFO>
 	/dev/nvme0n1p3: TYPE="ext4"
 	/dev/sda3: TYPE="ext4"
-	/dev/sdb3: TYPE="ext4"
 	</BLOCK_DEVICE_INFO>
   <TTYS_INFO>
 	seri:/dev/ttyS0 type:portio base:0x3F8 irq:4
@@ -346,7 +345,7 @@
 	3, 5, 6, 7, 10, 11, 12, 13, 14, 15
 	</AVAILABLE_IRQ_INFO>
   <TOTAL_MEM_INFO>
-	11884896 kB
+	11884904 kB
 	</TOTAL_MEM_INFO>
   <CPU_PROCESSOR_INFO>
 	0, 1, 2, 3
@@ -788,7 +787,7 @@
         <acpi_object>\_SB_.PC00</acpi_object>
         <compatible_id>PNP0A03</compatible_id>
         <acpi_uid>0</acpi_uid>
-        <resource id="res0" type="bus_number" min="0x0" max="0xfffe" len="0xffff"/>
+        <resource id="res0" type="bus_number" min="0x0" max="0xfe" len="0xff"/>
         <resource id="res1" type="io_port" min="0x0" max="0xcf7" len="0xcf8"/>
         <resource id="res2" type="io_port" min="0xcf8" max="0xcf8" len="0x8"/>
         <resource id="res3" type="io_port" min="0xd00" max="0xffff" len="0xf300"/>
@@ -933,7 +932,7 @@
           <acpi_object>\_SB_.PC00.CLP0</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50433030434c5030085f53544100085f4849440d494e543334373200085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50433030434c5030085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1028,73 +1027,73 @@
           <capability id="ATS"/>
           <capability id="PRI"/>
           <capability id="SR-IOV"/>
-          <device address="0x0">
+          <device address="0x1">
             <acpi_object>\_SB_.PC00.GFX0.DD01</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443031085f41445200</aml_template>
+            <aml_template>5b821a5c2f045f53425f504330304746583044443031085f41445201</aml_template>
           </device>
-          <device>
+          <device address="0x2">
             <acpi_object>\_SB_.PC00.GFX0.DD02</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443032085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443032085f4144520a02</aml_template>
           </device>
-          <device>
+          <device address="0x3">
             <acpi_object>\_SB_.PC00.GFX0.DD03</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443033085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443033085f4144520a03</aml_template>
           </device>
-          <device>
+          <device address="0x4">
             <acpi_object>\_SB_.PC00.GFX0.DD04</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443034085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443034085f4144520a04</aml_template>
           </device>
-          <device>
+          <device address="0x5">
             <acpi_object>\_SB_.PC00.GFX0.DD05</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443035085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443035085f4144520a05</aml_template>
           </device>
-          <device>
+          <device address="0x6">
             <acpi_object>\_SB_.PC00.GFX0.DD06</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443036085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443036085f4144520a06</aml_template>
           </device>
-          <device>
+          <device address="0x7">
             <acpi_object>\_SB_.PC00.GFX0.DD07</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443037085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443037085f4144520a07</aml_template>
           </device>
-          <device>
+          <device address="0x8">
             <acpi_object>\_SB_.PC00.GFX0.DD08</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443038085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443038085f4144520a08</aml_template>
           </device>
-          <device>
+          <device address="0x9">
             <acpi_object>\_SB_.PC00.GFX0.DD09</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443039085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443039085f4144520a09</aml_template>
           </device>
-          <device>
+          <device address="0xa">
             <acpi_object>\_SB_.PC00.GFX0.DD0A</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443041085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443041085f4144520a0a</aml_template>
           </device>
-          <device>
+          <device address="0xb">
             <acpi_object>\_SB_.PC00.GFX0.DD0B</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443042085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443042085f4144520a0b</aml_template>
           </device>
-          <device>
+          <device address="0xc">
             <acpi_object>\_SB_.PC00.GFX0.DD0C</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443043085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443043085f4144520a0c</aml_template>
           </device>
-          <device>
+          <device address="0xd">
             <acpi_object>\_SB_.PC00.GFX0.DD0D</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443044085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443044085f4144520a0d</aml_template>
           </device>
-          <device>
+          <device address="0xe">
             <acpi_object>\_SB_.PC00.GFX0.DD0E</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443045085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443045085f4144520a0e</aml_template>
           </device>
-          <device>
+          <device address="0xf">
             <acpi_object>\_SB_.PC00.GFX0.DD0F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443046085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443046085f4144520a0f</aml_template>
           </device>
-          <device>
+          <device address="0x1f">
             <acpi_object>\_SB_.PC00.GFX0.DD1F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443146085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443146085f4144520a1f</aml_template>
           </device>
           <device>
             <acpi_object>\_SB_.PC00.GFX0.DD2F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443246085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443246085f4144520a1f</aml_template>
           </device>
         </device>
         <device address="0x40000">
@@ -1110,11 +1109,11 @@
           <identifier>0x9a09</identifier>
           <class>0x060400</class>
           <acpi_object>\_SB_.PC00.PEG0</acpi_object>
-          <aml_template>5b82205c2f035f53425f5043303050454730085f53544100085f4144520c00000600</aml_template>
+          <aml_template>5b82215c2f035f53425f5043303050454730085f5354410a0f085f4144520c00000600</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTD#" source="19"/>
           <resource type="memory" min="0x6a400000" max="0x6a4fffff" len="0x100000"/>
@@ -1193,11 +1192,11 @@
           <identifier>0x9a25</identifier>
           <class>0x060400</class>
           <acpi_object>\_SB_.PC00.TRP1</acpi_object>
-          <aml_template>5b82205c2f035f53425f5043303054525031085f53544100085f4144520c00000700</aml_template>
+          <aml_template>5b82215c2f035f53425f5043303054525031085f5354410a0f085f4144520c00000700</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTB#" source="17"/>
           <resource type="io_port" min="0x4000" max="0x4fff" len="0x1000"/>
@@ -1251,11 +1250,11 @@
           <identifier>0x9a27</identifier>
           <class>0x060400</class>
           <acpi_object>\_SB_.PC00.TRP2</acpi_object>
-          <aml_template>5b82205c2f035f53425f5043303054525032085f53544100085f4144520c02000700</aml_template>
+          <aml_template>5b82215c2f035f53425f5043303054525032085f5354410a0f085f4144520c02000700</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTC#" source="18"/>
           <resource type="io_port" min="0x5000" max="0x5fff" len="0x1000"/>
@@ -1328,11 +1327,11 @@
           <subsystem_identifier>0x0000</subsystem_identifier>
           <class>0x0c0330</class>
           <acpi_object>\_SB_.PC00.TXHC</acpi_object>
-          <aml_template>5b824e055c2f035f53425f5043303054584843085f53544100085f53545211370a34490043004c0020004e006f0072007400680020005800480043004900200063006f006e00740072006f006c006c00650072000000085f4144520c00000d00</aml_template>
+          <aml_template>5b824f055c2f035f53425f5043303054584843085f5354410a0f085f53545211370a34490043004c0020004e006f0072007400680020005800480043004900200063006f006e00740072006f006c006c00650072000000085f4144520c00000d00</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="memory" min="0x603d190000" max="0x603d19ffff" len="0x10000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
@@ -1375,11 +1374,11 @@
           <subsystem_identifier>0x1111</subsystem_identifier>
           <class>0x0c0340</class>
           <acpi_object>\_SB_.PC00.TDM0</acpi_object>
-          <aml_template>5b824a055c2f035f53425f5043303054444d30085f53544100085f53545211330a30490043004c002000540042005400200044004d0041003000200063006f006e00740072006f006c006c00650072000000085f4144520c02000d00</aml_template>
+          <aml_template>5b824b055c2f035f53425f5043303054444d30085f5354410a0f085f53545211330a30490043004c002000540042005400200044004d0041003000200063006f006e00740072006f006c006c00650072000000085f4144520c02000d00</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
           <resource type="memory" min="0x603d140000" max="0x603d17ffff" len="0x40000" id="bar0" width="64" prefetchable="0"/>
@@ -1404,11 +1403,11 @@
           <subsystem_identifier>0x1111</subsystem_identifier>
           <class>0x0c0340</class>
           <acpi_object>\_SB_.PC00.TDM1</acpi_object>
-          <aml_template>5b824a055c2f035f53425f5043303054444d31085f53544100085f53545211330a30490043004c002000540042005400200044004d0041003100200063006f006e00740072006f006c006c00650072000000085f4144520c03000d00</aml_template>
+          <aml_template>5b824b055c2f035f53425f5043303054444d31085f5354410a0f085f53545211330a30490043004c002000540042005400200044004d0041003100200063006f006e00740072006f006c006c00650072000000085f4144520c03000d00</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
           <resource type="memory" min="0x603d100000" max="0x603d13ffff" len="0x40000" id="bar0" width="64" prefetchable="0"/>
@@ -1426,6 +1425,14 @@
             <pba_offset>0x2000000</pba_offset>
           </capability>
         </device>
+        <device address="0x100000">
+          <acpi_object>\_SB_.PC00.I2C6</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324336085f4144520c00001000</aml_template>
+        </device>
+        <device address="0x100001">
+          <acpi_object>\_SB_.PC00.I2C7</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324337085f4144520c01001000</aml_template>
+        </device>
         <device address="0x100006">
           <acpi_object>\_SB_.PC00.THC0</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303054484330085f4144520c06001000</aml_template>
@@ -1508,6 +1515,35 @@
           <acpi_object>\_SB_.PC00.ISHD</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303049534844085f4144520c00001200</aml_template>
         </device>
+        <device address="0x120006">
+          <acpi_object>\_SB_.PC00.SPI2</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504932085f4144520c06001200</aml_template>
+          <device id="DUMY0000">
+            <acpi_object>\_SB_.PC00.SPI2.FPNT</acpi_object>
+            <aml_template>5b82295c2f045f53425f504330305350493246504e54085f53544100085f4849440d44554d593030303000</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+          </device>
+        </device>
+        <device address="0x130000">
+          <acpi_object>\_SB_.PC00.SPI3</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504933085f4144520c00001300</aml_template>
+        </device>
+        <device address="0x130001">
+          <acpi_object>\_SB_.PC00.SPI4</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504934085f4144520c01001300</aml_template>
+        </device>
+        <device address="0x130002">
+          <acpi_object>\_SB_.PC00.SPI5</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504935085f4144520c02001300</aml_template>
+        </device>
+        <device address="0x130003">
+          <acpi_object>\_SB_.PC00.SPI6</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504936085f4144520c03001300</aml_template>
+        </device>
         <device address="0x140000" id="0xa0ed" description="USB controller: Intel Corporation">
           <vendor>0x8086</vendor>
           <identifier>0xa0ed</identifier>
@@ -1529,10 +1565,6 @@
           <device address="0x0">
             <acpi_object>\_SB_.PC00.XHCI.RHUB</acpi_object>
             <aml_template>5b821a5c2f045f53425f504330305848434952485542085f41445200</aml_template>
-            <device address="0x0">
-              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS01</acpi_object>
-              <aml_template>5b821e5c2f055f53425f50433030584843495248554253533031085f41445200</aml_template>
-            </device>
             <device address="0x1">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.HS01</acpi_object>
               <aml_template>5b821e5c2f055f53425f50433030584843495248554248533031085f41445201</aml_template>
@@ -1573,25 +1605,53 @@
               <acpi_object>\_SB_.PC00.XHCI.RHUB.HS08</acpi_object>
               <aml_template>5b821f5c2f055f53425f50433030584843495248554248533038085f4144520a08</aml_template>
             </device>
-            <device>
+            <device address="0x9">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS09</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533039085f4144520a09</aml_template>
+            </device>
+            <device address="0xa">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS10</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533130085f4144520a0a</aml_template>
+            </device>
+            <device address="0xb">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS11</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533131085f4144520a0b</aml_template>
+            </device>
+            <device address="0xc">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS12</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533132085f4144520a0c</aml_template>
+            </device>
+            <device address="0xd">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS01</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533031085f4144520a0d</aml_template>
+            </device>
+            <device address="0xe">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS02</acpi_object>
-              <aml_template>5b821e5c2f055f53425f50433030584843495248554253533032085f41445201</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533032085f4144520a0e</aml_template>
             </device>
-            <device>
+            <device address="0xf">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS03</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533033085f4144520a02</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533033085f4144520a0f</aml_template>
             </device>
-            <device>
+            <device address="0x10">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS04</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533034085f4144520a03</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533034085f4144520a10</aml_template>
             </device>
-            <device>
+            <device address="0x11">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS05</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533035085f4144520a04</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533035085f4144520a11</aml_template>
+            </device>
+            <device address="0x12">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS06</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533036085f4144520a12</aml_template>
             </device>
             <device>
-              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS06</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533036085f4144520a05</aml_template>
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.USR1</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554255535231085f4144520a0b</aml_template>
+            </device>
+            <device>
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.USR2</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554255535232085f4144520a0c</aml_template>
             </device>
           </device>
         </device>
@@ -1641,10 +1701,47 @@
           <subsystem_vendor>0x8086</subsystem_vendor>
           <subsystem_identifier>0x3002</subsystem_identifier>
           <class>0x0c8000</class>
+          <acpi_object>\_SB_.PC00.I2C0</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324330085f4144520c00001500</aml_template>
           <resource type="interrupt_pin" pin="INTA#" source="27"/>
           <resource type="memory" min="0x4017000000" max="0x4017000fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="Vendor-Specific"/>
+          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C1.UCM1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPL1</dependency>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C0.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433054504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C0.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433054504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
         </device>
         <device address="0x150001" id="0xa0e9" description="Serial bus controller: Intel Corporation">
           <vendor>0x8086</vendor>
@@ -1652,10 +1749,163 @@
           <subsystem_vendor>0x8086</subsystem_vendor>
           <subsystem_identifier>0x3002</subsystem_identifier>
           <class>0x0c8000</class>
+          <acpi_object>\_SB_.PC00.I2C1</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324331085f4144520c01001500</aml_template>
           <resource type="interrupt_pin" pin="INTB#" source="40"/>
           <resource type="memory" min="0x4017001000" max="0x4017001fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="Vendor-Specific"/>
+          <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C1.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433154504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C1.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433154504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="INT3515">
+            <acpi_object>\_SB_.PC00.I2C1.UCM1</acpi_object>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8247085c2f045f53425f504330304932433155434d31085f5354410a0f085f4849440d494e543335313500085f55494400085f4352531141050a4d8e1e00010001020000010600801a060021005c5f53422e504330302e49324330008e1e00010001020000010600801a060025005c5f53422e504330302e49324330008906000701760000007900</aml_template>
+            <status>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+            <resource id="res2" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+        </device>
+        <device address="0x150002">
+          <acpi_object>\_SB_.PC00.I2C2</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324332085f4144520c02001500</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.PMIC</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK2</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.CAM0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
+          <device id="INT3471" address="0x0">
+            <acpi_object>\_SB_.PC00.I2C2.CAM0</acpi_object>
+            <compatible_id>INT3471</compatible_id>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8247115c2f045f53425f504330304932433243414d30085f53544100085f4849440d494e543334373100085f4349440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324332008e1e00010001020000010600801a06000e005c5f53422e504330302e49324332008e1e00010001020000010600801a060050005c5f53422e504330302e49324332008e1e00010001020000010600801a060051005c5f53422e504330302e49324332008e1e00010001020000010600801a060052005c5f53422e504330302e49324332008e1e00010001020000010600801a060053005c5f53422e504330302e49324332007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
+          </device>
+          <device id="INT3472">
+            <acpi_object>\_SB_.PC00.I2C2.PMIC</acpi_object>
+            <compatible_id>INT3472</compatible_id>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8241075c2f045f53425f5043303049324332504d4943085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504330302e49324332007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
+          </device>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C2.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433254504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C2.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433254504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+        </device>
+        <device address="0x150003">
+          <acpi_object>\_SB_.PC00.I2C3</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324333085f4144520c03001500</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.LNK5</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP4</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP3</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM4</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK3</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP5</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK4</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP2</dependency>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C3.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433354504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C3.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433354504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
         </device>
         <device address="0x160000" id="0xa0e0" description="Communication controller: Intel Corporation">
           <vendor>0x8086</vendor>
@@ -1747,6 +1997,80 @@
             <aml_template>5b821e5c2f045f53425f50433030534154304e564d33085f4144520cffffc300</aml_template>
           </device>
         </device>
+        <device address="0x190000">
+          <acpi_object>\_SB_.PC00.I2C4</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324334085f4144520c00001900</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.I2C4.CAM1</dependency>
+          <device id="INT3474" address="0x0">
+            <acpi_object>\_SB_.PC00.I2C4.CAM1</acpi_object>
+            <compatible_id>INT3474</compatible_id>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8241075c2f045f53425f504330304932433443414d31085f53544100085f4849440d494e543334373400085f4349440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504330302e49324334007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C4</dependency>
+          </device>
+        </device>
+        <device address="0x190001">
+          <acpi_object>\_SB_.PC00.I2C5</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324335085f4144520c01001900</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA03</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA01</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA02</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA04</dependency>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA01</acpi_object>
+            <acpi_uid>1</acpi_uid>
+            <aml_template>5b824c055c2f045f53425f504330304932433550413031085f53544100085f4849440d4d4348503139333000085f55494401085f43525311260a238e1e00010001020000010600801a060018005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA02</acpi_object>
+            <acpi_uid>2</acpi_uid>
+            <aml_template>5b824d055c2f045f53425f504330304932433550413032085f53544100085f4849440d4d4348503139333000085f5549440a02085f43525311260a238e1e00010001020000010600801a060011005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA03</acpi_object>
+            <acpi_uid>3</acpi_uid>
+            <aml_template>5b824d055c2f045f53425f504330304932433550413033085f53544100085f4849440d4d4348503139333000085f5549440a03085f43525311260a238e1e00010001020000010600801a06001e005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA04</acpi_object>
+            <acpi_uid>4</acpi_uid>
+            <aml_template>5b824d055c2f045f53425f504330304932433550413034085f53544100085f4849440d4d4348503139333000085f5549440a04085f43525311260a238e1e00010001020000010600801a060000005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+        </device>
         <device address="0x190002">
           <acpi_object>\_SB_.PC00.UA02</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303055413032085f4144520c02001900</aml_template>
@@ -2189,15 +2513,15 @@
           <dependency type="provides resources to">\_SB_.PC00.UA00.BTH0</dependency>
           <device id="INT33E1">
             <acpi_object>\_SB_.PC00.UA00.BTH0</acpi_object>
-            <aml_template>5b8246085c2f045f53425f504330305541303042544830085f53544100085f4849440d494e543333453100085f4352531147050a538e2200010003023500010a0000c201002000200000c05c5f53422e504330302e55413030008c2000010101000200000000000017000019002300000000005c5f53422e47504930008906001701000000007900</aml_template>
+            <aml_template>5b82400a5c2f045f53425f504330305541303042544830085f53544100085f4849440d494e543333453100085f4352531141070a6d8e2200010003023500010a0000c201002000200000c05c5f53422e504330302e55413030008c200001010100020000000000001700001900230000004d005c5f53422e47504930008c2000010001001300000000000017000019002300000000005c5f53422e47504930007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+            <resource type="LargeResourceItemGPIOConnection" id="res2"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res2" type="irq" int="0"/>
             <dependency type="consumes resources from">\_SB_.PC00.UA00</dependency>
             <dependency type="consumes resources from">\_SB_.GPI0</dependency>
           </device>
@@ -2206,6 +2530,23 @@
           <acpi_object>\_SB_.PC00.UA01</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303055413031085f4144520c01001e00</aml_template>
         </device>
+        <device address="0x1e0002">
+          <acpi_object>\_SB_.PC00.SPI0</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504930085f4144520c02001e00</aml_template>
+        </device>
+        <device address="0x1e0003">
+          <acpi_object>\_SB_.PC00.SPI1</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504931085f4144520c03001e00</aml_template>
+          <device id="DUMY0000">
+            <acpi_object>\_SB_.PC00.SPI1.FPNT</acpi_object>
+            <aml_template>5b82295c2f045f53425f504330305350493146504e54085f53544100085f4849440d44554d593030303000</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+          </device>
+        </device>
         <device address="0x1f0000" id="0xa082" description="ISA bridge: Intel Corporation">
           <vendor>0x8086</vendor>
           <identifier>0xa082</identifier>
@@ -2217,13 +2558,13 @@
           <device id="INTC1028">
             <acpi_object>\_SB_.PC00.LPCB.CWDT</acpi_object>
             <compatible_id>PNP0C02</compatible_id>
-            <aml_template>5b823d5c2f045f53425f504330304c50434243574454085f5354410a0f085f4849440d494e54433130323800085f435253110d0a0a47010000000004047900</aml_template>
+            <aml_template>5b8248045c2f045f53425f504330304c50434243574454085f5354410a0f085f4849440d494e54433130323800085f4349440c41d00c02085f435253110d0a0a47015418541804047900</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
               <functioning>y</functioning>
             </status>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x4"/>
+            <resource id="res0" type="io_port" min="0x1854" max="0x1854" len="0x4"/>
           </device>
           <device id="PNP0103">
             <acpi_object>\_SB_.PC00.LPCB.HPET</acpi_object>
@@ -2371,15 +2712,15 @@
           <device id="PNP0501">
             <acpi_object>\_SB_.PC00.LPCB.UAR1</acpi_object>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8244045c2f045f53425f504330304c50434255415231085f53544100085f4849440c41d00501085f55494400085f43525311130a1047010000000001082200002a00007900</aml_template>
+            <aml_template>5b8245045c2f045f53425f504330304c50434255415231085f5354410a0f085f4849440c41d00501085f55494400085f43525311130a104701f803f80301082210002a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x3f8" max="0x3f8" len="0x8"/>
+            <resource id="res1" type="irq" int="4"/>
           </device>
         </device>
         <device address="0x1f0003" id="0xa0c8" description="Audio device: Intel Corporation">
@@ -2407,7 +2748,7 @@
             <acpi_object>\_SB_.PC00.HDAS.SNDW</acpi_object>
             <compatible_id>PRP00001</compatible_id>
             <compatible_id>PNP0A05</compatible_id>
-            <aml_template>5b82255c2f045f53425f5043303048444153534e4457085f5354410a0b085f4144520c00000040</aml_template>
+            <aml_template>5b8241045c2f045f53425f5043303048444153534e4457085f5354410a0b085f4349441215020d5052503030303031000d504e503041303500085f4144520c00000040</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -2450,7 +2791,7 @@
             <acpi_object>\_SB_.PC00.HDAS.UAOL</acpi_object>
             <compatible_id>PRP00001</compatible_id>
             <compatible_id>PNP0A05</compatible_id>
-            <aml_template>5b82255c2f045f53425f504330304844415355414f4c085f5354410a0b085f4144520c00000050</aml_template>
+            <aml_template>5b8241045c2f045f53425f504330304844415355414f4c085f5354410a0b085f4349441215020d5052503030303031000d504e503041303500085f4144520c00000050</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -2478,10 +2819,6 @@
           <class>0x0c8000</class>
           <resource type="memory" min="0x4f800000" max="0x4f800fff" len="0x1000" id="bar0" width="32" prefetchable="0"/>
         </device>
-        <device address="0x1f0006">
-          <acpi_object>\_SB_.PC00.GLAN</acpi_object>
-          <aml_template>5b821a5c2f035f53425f50433030474c414e085f4144520c06001f00</aml_template>
-        </device>
         <device address="0x1f0007">
           <acpi_object>\_SB_.PC00.PTHT</acpi_object>
           <aml_template>5b82205c2f035f53425f5043303050544854085f53544100085f4144520c07001f00</aml_template>
@@ -2495,7 +2832,7 @@
           <acpi_object>\_SB_.PC00.CLP1</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50433030434c5031085f53544100085f4849440d494e543334373200085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50433030434c5031085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2508,7 +2845,7 @@
           <acpi_object>\_SB_.PC00.CLP2</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5032085f53544100085f4849440d494e543334373200085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5032085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2521,7 +2858,7 @@
           <acpi_object>\_SB_.PC00.CLP3</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5033085f53544100085f4849440d494e543334373200085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5033085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2534,7 +2871,7 @@
           <acpi_object>\_SB_.PC00.CLP4</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>4</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5034085f53544100085f4849440d494e543334373200085f5549440a04085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5034085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a04085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2547,7 +2884,7 @@
           <acpi_object>\_SB_.PC00.CLP5</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>5</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5035085f53544100085f4849440d494e543334373200085f5549440a05085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5035085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a05085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2560,7 +2897,7 @@
           <acpi_object>\_SB_.PC00.DOCK</acpi_object>
           <compatible_id>PNP0C15</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b822c5c2f035f53425f50433030444f434b085f53544100085f4849440d414243443030303000085f5549440a02</aml_template>
+          <aml_template>5b82365c2f035f53425f50433030444f434b085f53544100085f4849440d414243443030303000085f4349440c41d00c15085f5549440a02</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2571,7 +2908,7 @@
           <acpi_object>\_SB_.PC00.DSC0</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b823b5c2f035f53425f5043303044534330085f53544100085f4849440d494e543334373200085f55494400085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824a045c2f035f53425f5043303044534330085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494400085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2582,62 +2919,77 @@
           <acpi_object>\_SB_.PC00.DSC1</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b823b5c2f035f53425f5043303044534331085f53544100085f4849440d494e543334373200085f55494401085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8241095c2f035f53425f5043303044534331085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494401085f41445200085f435253114c040a488c200001010100020000000000001700001900230000008d005c5f53422e47504930008c200001010100020000000000001700001900230000008f005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC2</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534332085f53544100085f4849440d494e543334373200085f5549440a02085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534332085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a02085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC3</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534333085f53544100085f4849440d494e543334373200085f5549440a03085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534333085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a03085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC4</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>4</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534334085f53544100085f4849440d494e543334373200085f5549440a04085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534334085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a04085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC5</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>5</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534335085f53544100085f4849440d494e543334373200085f5549440a05085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534335085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a05085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="PWRC0000">
           <acpi_object>\_SB_.PC00.FLM0</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d30085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324331007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d30085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a5005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324331007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2652,7 +3004,7 @@
           <acpi_object>\_SB_.PC00.FLM1</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d31085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324332007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d31085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2667,7 +3019,7 @@
           <acpi_object>\_SB_.PC00.FLM2</acpi_object>
           <compatible_id>TXNW3643</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d32085f53544100085f4849440d54584e573336343300085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060063005c5f53422e504330302e49324332007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d32085f53544100085f4849440d54584e573336343300085f4349440d54584e573336343300085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000b2005c5f53422e47504930008e1e00010001020000010600801a060063005c5f53422e504330302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2682,7 +3034,7 @@
           <acpi_object>\_SB_.PC00.FLM3</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d33085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d33085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2697,7 +3049,7 @@
           <acpi_object>\_SB_.PC00.FLM4</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d34085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d34085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2712,7 +3064,7 @@
           <acpi_object>\_SB_.PC00.FLM5</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d35085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d35085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2723,412 +3075,123 @@
           <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
           <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C0</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C1.UCM1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPL1</dependency>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C0.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433054504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C0.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433054504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C1</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C1.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433154504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C1.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433154504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="INT3515">
-            <acpi_object>\_SB_.PC00.I2C1.UCM1</acpi_object>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8247085c2f045f53425f504330304932433155434d31085f5354410a0f085f4849440d494e543335313500085f55494400085f4352531141050a4d8e1e00010001020000010600801a060021005c5f53422e504330302e49324330008e1e00010001020000010600801a060025005c5f53422e504330302e49324330008906000701000000007900</aml_template>
-            <status>
-              <present>y</present>
-              <enabled>y</enabled>
-              <functioning>y</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
-            <resource id="res2" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C2</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.PMIC</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.CAM0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.FLM1</dependency>
-          <device id="INT3471" address="0x0">
-            <acpi_object>\_SB_.PC00.I2C2.CAM0</acpi_object>
-            <compatible_id>INT3471</compatible_id>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8249105c2f045f53425f504330304932433243414d30085f53544100085f4849440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324332008e1e00010001020000010600801a06000e005c5f53422e504330302e49324332008e1e00010001020000010600801a060050005c5f53422e504330302e49324332008e1e00010001020000010600801a060051005c5f53422e504330302e49324332008e1e00010001020000010600801a060052005c5f53422e504330302e49324332008e1e00010001020000010600801a060053005c5f53422e504330302e49324332007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
-          </device>
-          <device id="INT3472">
-            <acpi_object>\_SB_.PC00.I2C2.PMIC</acpi_object>
-            <compatible_id>INT3472</compatible_id>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f5043303049324332504d4943085f53544100085f4849440d494e543334373200085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504330302e49324332007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
-          </device>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C2.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433254504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C2.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433254504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C3</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP2</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP3</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP4</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.FLM4</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP5</dependency>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C3.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433354504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C3.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433354504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C4</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.I2C4.CAM1</dependency>
-          <device id="INT3474" address="0x0">
-            <acpi_object>\_SB_.PC00.I2C4.CAM1</acpi_object>
-            <compatible_id>INT3474</compatible_id>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f504330304932433443414d31085f53544100085f4849440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504330302e49324334007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C4</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C5</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA04</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA01</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA03</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA02</dependency>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA01</acpi_object>
-            <acpi_uid>1</acpi_uid>
-            <aml_template>5b824c055c2f045f53425f504330304932433550413031085f53544100085f4849440d4d4348503139333000085f55494401085f43525311260a238e1e00010001020000010600801a060018005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA02</acpi_object>
-            <acpi_uid>2</acpi_uid>
-            <aml_template>5b824d055c2f045f53425f504330304932433550413032085f53544100085f4849440d4d4348503139333000085f5549440a02085f43525311260a238e1e00010001020000010600801a060011005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA03</acpi_object>
-            <acpi_uid>3</acpi_uid>
-            <aml_template>5b824d055c2f045f53425f504330304932433550413033085f53544100085f4849440d4d4348503139333000085f5549440a03085f43525311260a238e1e00010001020000010600801a06001e005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA04</acpi_object>
-            <acpi_uid>4</acpi_uid>
-            <aml_template>5b824d055c2f045f53425f504330304932433550413034085f53544100085f4849440d4d4348503139333000085f5549440a04085f43525311260a238e1e00010001020000010600801a060000005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C6</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C7</acpi_object>
-        </device>
         <device id="SONY362A">
           <acpi_object>\_SB_.PC00.LNK0</acpi_object>
           <compatible_id>SONY362A</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b30085f53544100085f4849440d534f4e593336324100085f55494400085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824f085c2f035f53425f504330304c4e4b30085f53544100085f4849440d534f4e593336324100085f4349440d534f4e593336324100085f55494400085f41445200085f4352531148040a448e1e00010001020000010600801a06001a005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="SONY488A">
           <acpi_object>\_SB_.PC00.LNK1</acpi_object>
           <compatible_id>SONY488A</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b31085f53544100085f4849440d534f4e593438384100085f55494401085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824d065c2f035f53425f504330304c4e4b31085f53544100085f4849440d534f4e593438384100085f4349440d534f4e593438384100085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060037005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="SONY362A">
           <acpi_object>\_SB_.PC00.LNK2</acpi_object>
           <compatible_id>SONY362A</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b823d5c2f035f53425f504330304c4e4b32085f53544100085f4849440d534f4e593336324100085f5549440a02085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824e065c2f035f53425f504330304c4e4b32085f53544100085f4849440d534f4e593336324100085f4349440d534f4e593336324100085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a06001a005c5f53422e504330302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
         </device>
         <device id="INT33BE">
           <acpi_object>\_SB_.PC00.LNK3</acpi_object>
           <compatible_id>INT33BE</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b33085f53544100085f4849440d494e543333424500085f5549440a03085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242115c2f035f53425f504330304c4e4b33085f53544100085f4849440d494e543333424500085f4349440d494e543333424500085f5549440a03085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333008e1e00010001020000010600801a060050005c5f53422e504330302e49324333008e1e00010001020000010600801a060051005c5f53422e504330302e49324333008e1e00010001020000010600801a060052005c5f53422e504330302e49324333008e1e00010001020000010600801a060053005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="INT33BE">
           <acpi_object>\_SB_.PC00.LNK4</acpi_object>
           <compatible_id>INT33BE</compatible_id>
           <acpi_uid>4</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b34085f53544100085f4849440d494e543333424500085f5549440a04085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242115c2f035f53425f504330304c4e4b34085f53544100085f4849440d494e543333424500085f4349440d494e543333424500085f5549440a04085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333008e1e00010001020000010600801a060050005c5f53422e504330302e49324333008e1e00010001020000010600801a060051005c5f53422e504330302e49324333008e1e00010001020000010600801a060052005c5f53422e504330302e49324333008e1e00010001020000010600801a060053005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="INT33BE">
           <acpi_object>\_SB_.PC00.LNK5</acpi_object>
           <compatible_id>INT33BE</compatible_id>
           <acpi_uid>5</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b35085f53544100085f4849440d494e543333424500085f5549440a05085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242115c2f035f53425f504330304c4e4b35085f53544100085f4849440d494e543333424500085f4349440d494e543333424500085f5549440a05085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333008e1e00010001020000010600801a060050005c5f53422e504330302e49324333008e1e00010001020000010600801a060051005c5f53422e504330302e49324333008e1e00010001020000010600801a060052005c5f53422e504330302e49324333008e1e00010001020000010600801a060053005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="PNP0C02">
           <acpi_object>\_SB_.PC00.PDRC</acpi_object>
           <acpi_uid>1</acpi_uid>
           <aml_template>5b82205c2f035f53425f5043303050445243085f4849440c41d00c02085f55494401</aml_template>
-          <resource id="res0" type="memory" min="0x0" max="0x7fff" len="0x8000"/>
-          <resource id="res1" type="memory" min="0x0" max="0xfff" len="0x1000"/>
-          <resource id="res2" type="memory" min="0x0" max="0xfff" len="0x1000"/>
-          <resource id="res3" type="memory" min="0x0" max="0xfffffff" len="0x10000000"/>
-          <resource id="res8" type="memory" min="0x0" max="-0x1" len="0x0"/>
-          <resource id="res9" type="memory" min="0x0" max="-0x1" len="0x0"/>
+          <resource id="res8" type="memory" min="0x0" max="0x0" len="0x0"/>
+          <resource id="res9" type="memory" min="0x0" max="0x0" len="0x0"/>
+          <resource id="res3" type="memory" min="0xc0000000" max="0xcfffffff" len="0x10000000"/>
           <resource id="res4" type="memory" min="0xfed20000" max="0xfed7ffff" len="0x60000"/>
           <resource id="res6" type="memory" min="0xfed45000" max="0xfed8ffff" len="0x4b000"/>
           <resource id="res5" type="memory" min="0xfed90000" max="0xfed93fff" len="0x4000"/>
+          <resource id="res1" type="memory" min="0xfeda0000" max="0xfeda0fff" len="0x1000"/>
+          <resource id="res2" type="memory" min="0xfeda1000" max="0xfeda1fff" len="0x1000"/>
+          <resource id="res0" type="memory" min="0xfedc0000" max="0xfedc7fff" len="0x8000"/>
           <resource id="res7" type="memory" min="0xfee00000" max="0xfeefffff" len="0x100000"/>
         </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI0</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI1</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.SPI1.SPFD</dependency>
-          <device id="DUMY0000">
-            <acpi_object>\_SB_.PC00.SPI1.FPNT</acpi_object>
-            <aml_template>5b82295c2f045f53425f504330305350493146504e54085f53544100085f4849440d44554d593030303000</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-          </device>
-          <device id="INTC1058">
-            <acpi_object>\_SB_.PC00.SPI1.SPFD</acpi_object>
-            <aml_template>5b82400e5c2f045f53425f504330305350493153504644085f4849440d494e54433130353800085f43525311460b0ab28c200001010100090000000000001700001900230000008f005c5f53422e47504930008c200001010100020000000000001700001900230000008d005c5f53422e47504930008c2000010101000200000000000017000019002300000065015c5f53422e47504930008c2000010001000b0000000000001700001900230000008f005c5f53422e47504930008e2100010002020000010900809fd50008010100005c5f53422e504330302e53504931007900</aml_template>
-            <resource type="LargeResourceItemGPIOConnection" id="res0"/>
-            <resource type="LargeResourceItemGPIOConnection" id="res1"/>
-            <resource type="LargeResourceItemGPIOConnection" id="res2"/>
-            <resource type="LargeResourceItemGPIOConnection" id="res3"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
-            <dependency type="consumes resources from">\_SB_.PC00.SPI1</dependency>
-            <dependency type="consumes resources from">\_SB_.GPI0</dependency>
-            <device id="INTC1059">
-              <acpi_object>\_SB_.PC00.SPI1.SPFD.CVFD</acpi_object>
-              <aml_template>5b82275c2f055f53425f50433030535049315350464443564644085f4849440d494e54433130353900</aml_template>
-            </device>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI2</acpi_object>
-          <device id="DUMY0000">
-            <acpi_object>\_SB_.PC00.SPI2.FPNT</acpi_object>
-            <aml_template>5b82295c2f045f53425f504330305350493246504e54085f53544100085f4849440d44554d593030303000</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI3</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI4</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI5</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI6</acpi_object>
-        </device>
       </bus>
       <device id="ACPI000E">
         <acpi_object>\_SB_.AWAC</acpi_object>
-        <aml_template>5b82205c2e5f53425f41574143085f53544100085f4849440d414350493030304500</aml_template>
+        <aml_template>5b82215c2e5f53425f41574143085f5354410a0f085f4849440d414350493030304500</aml_template>
         <status>
-          <present>n</present>
-          <enabled>n</enabled>
-          <functioning>n</functioning>
+          <present>y</present>
+          <enabled>y</enabled>
+          <functioning>y</functioning>
         </status>
       </device>
       <device id="INT3519" description="CoExistence Manager">
@@ -3142,35 +3205,39 @@
       </device>
       <device id="INT0E0C" description="Enclave Page Cache 1.0">
         <acpi_object>\_SB_.EPC_</acpi_object>
-        <aml_template>5b824d085c2e5f53425f4550435f085f5354410a0f085f4849440c25d40e0c085f53545211310a2e45006e0063006c0061007600650020005000610067006500200043006100630068006500200031002e0030000000085f43525311330a308a2b0000010100000000000000000000000000000000ffffffffffffffff000000000000000000000000000000007900</aml_template>
+        <aml_template>5b824c085c2e5f53425f4550435f085f53544100085f4849440c25d40e0c085f53545211310a2e45006e0063006c0061007600650020005000610067006500200043006100630068006500200031002e0030000000085f43525311330a308a2b0000010100000000000000000000000000000000ffffffffffffffff000000000000000000000000000000007900</aml_template>
         <status>
-          <present>y</present>
-          <enabled>y</enabled>
-          <functioning>y</functioning>
+          <present>n</present>
+          <enabled>n</enabled>
+          <functioning>n</functioning>
         </status>
         <resource id="res0" type="memory" min="0x0" max="-0x1" len="0x0"/>
       </device>
       <device id="INT34C5">
         <acpi_object>\_SB_.GPI0</acpi_object>
-        <aml_template>5b8245065c2e5f53425f47504930085f5354410a0f085f4849440d494e543334433500085f435253113e0a3b8906000d010e0000008609000100000000000001008609000100000000000001008609000100000000000001008609000100000000000001007900</aml_template>
+        <aml_template>5b8245065c2e5f53425f47504930085f5354410a0f085f4849440d494e543334433500085f435253113e0a3b8906000d010e0000008609000100006efd000001008609000100006dfd000001008609000100006afd0000010086090001000069fd000001007900</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="14"/>
-        <resource id="res1" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <resource id="res2" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <resource id="res3" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <resource id="res4" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.UA00.BTH0</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.SPI1.SPFD</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
+        <resource id="res4" type="memory" min="0xfd690000" max="0xfd69ffff" len="0x10000"/>
+        <resource id="res3" type="memory" min="0xfd6a0000" max="0xfd6affff" len="0x10000"/>
+        <resource id="res2" type="memory" min="0xfd6d0000" max="0xfd6dffff" len="0x10000"/>
+        <resource id="res1" type="memory" min="0xfd6e0000" max="0xfd6effff" len="0x10000"/>
+        <dependency type="provides resources to">\_SB_.PC00.DSC5</dependency>
         <dependency type="provides resources to">\_SB_.PC00.FLM1</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC3</dependency>
         <dependency type="provides resources to">\_SB_.PC00.FLM4</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC4</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC1</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.UA00.BTH0</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC2</dependency>
       </device>
       <device id="INTC1051">
         <acpi_object>\_SB_.HIDD</acpi_object>
@@ -3184,7 +3251,8 @@
       <device id="PNP0C02">
         <acpi_object>\_SB_.IOTR</acpi_object>
         <acpi_uid>IoTraps</acpi_uid>
-        <aml_template>5b822e5c2e5f53425f494f5452085f4849440c41d00c02085f5549440d496f547261707300085f43525311050a027900</aml_template>
+        <aml_template>5b82365c2e5f53425f494f5452085f4849440c41d00c02085f5549440d496f547261707300085f435253110d0a0a47010020002001ff7900</aml_template>
+        <resource id="res0" type="io_port" min="0x2000" max="0x2000" len="0xff"/>
       </device>
       <device id="PNP0C0D">
         <acpi_object>\_SB_.LID0</acpi_object>
@@ -3198,10 +3266,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKA</acpi_object>
         <acpi_uid>1</acpi_uid>
-        <aml_template>5b82315c2e5f53425f4c4e4b41085f5354410a0b085f4849440c41d00c0f085f55494401085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82315c2e5f53425f4c4e4b41085f5354410a09085f4849440c41d00c0f085f55494401085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3209,10 +3277,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKB</acpi_object>
         <acpi_uid>2</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b42085f5354410a0b085f4849440c41d00c0f085f5549440a02085f43525311090a06238a00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b42085f5354410a09085f4849440c41d00c0f085f5549440a02085f43525311090a06238a00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="1, 3, 7"/>
@@ -3220,10 +3288,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKC</acpi_object>
         <acpi_uid>3</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b43085f5354410a0b085f4849440c41d00c0f085f5549440a03085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b43085f5354410a09085f4849440c41d00c0f085f5549440a03085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3231,10 +3299,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKD</acpi_object>
         <acpi_uid>4</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b44085f5354410a0b085f4849440c41d00c0f085f5549440a04085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b44085f5354410a09085f4849440c41d00c0f085f5549440a04085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3242,10 +3310,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKE</acpi_object>
         <acpi_uid>5</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b45085f5354410a0b085f4849440c41d00c0f085f5549440a05085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b45085f5354410a09085f4849440c41d00c0f085f5549440a05085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3253,10 +3321,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKF</acpi_object>
         <acpi_uid>6</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b46085f5354410a0b085f4849440c41d00c0f085f5549440a06085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b46085f5354410a09085f4849440c41d00c0f085f5549440a06085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3264,10 +3332,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKG</acpi_object>
         <acpi_uid>7</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b47085f5354410a0b085f4849440c41d00c0f085f5549440a07085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b47085f5354410a09085f4849440c41d00c0f085f5549440a07085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3275,10 +3343,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKH</acpi_object>
         <acpi_uid>8</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b48085f5354410a0b085f4849440c41d00c0f085f5549440a08085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b48085f5354410a09085f4849440c41d00c0f085f5549440a08085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3296,7 +3364,7 @@
         <acpi_object>\_SB_.PEPD</acpi_object>
         <compatible_id>PNP0D80</compatible_id>
         <acpi_uid>1</acpi_uid>
-        <aml_template>5b82265c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f55494401</aml_template>
+        <aml_template>5b82305c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f4349440c41d00d80085f55494401</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -3306,16 +3374,16 @@
       <device id="PNP0C02">
         <acpi_object>\_SB_.PRRE</acpi_object>
         <acpi_uid>PCHRESV</acpi_uid>
-        <aml_template>5b824b0a5c2e5f53425f50525245085f5354410a0b085f4849440c41d00c02085f5549440d5043485245535600085f435253114a070a7686090001000000fe000002008609000100c004fe0040000086090001000005fe000006008609000100000dfe0000030086090001000020fe0000600086090000000000ff0000000147010018001801ff86090001000000fd000069008609000100000000000002008609000100000000000000007900</aml_template>
+        <aml_template>5b824b0a5c2e5f53425f50525245085f5354410a0b085f4849440c41d00c02085f5549440d5043485245535600085f435253114a070a7686090001000000fe000002008609000100c004fe0040000086090001000005fe000006008609000100000dfe0000030086090001000020fe0000600086090000000000ff0000000147010018001801ff86090001000000fd000069008609000100006bfd000002008609000100006ffd000091007900</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res6" type="io_port" min="0x1800" max="0x1800" len="0xff"/>
-        <resource id="res8" type="memory" min="0x0" max="0x1ffff" len="0x20000"/>
-        <resource id="res9" type="memory" min="0x0" max="-0x1" len="0x0"/>
         <resource id="res7" type="memory" min="0xfd000000" max="0xfd68ffff" len="0x690000"/>
+        <resource id="res8" type="memory" min="0xfd6b0000" max="0xfd6cffff" len="0x20000"/>
+        <resource id="res9" type="memory" min="0xfd6f0000" max="0xfdffffff" len="0x910000"/>
         <resource id="res0" type="memory" min="0xfe000000" max="0xfe01ffff" len="0x20000"/>
         <resource id="res1" type="memory" min="0xfe04c000" max="0xfe04ffff" len="0x4000"/>
         <resource id="res2" type="memory" min="0xfe050000" max="0xfe0affff" len="0x60000"/>
@@ -3337,7 +3405,7 @@
       <device id="INT340E">
         <acpi_object>\_SB_.PTID</acpi_object>
         <compatible_id>PNP0C02</compatible_id>
-        <aml_template>5b821c5c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e</aml_template>
+        <aml_template>5b82265c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e085f4349440c41d00c02</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -3372,6 +3440,28 @@
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="memory" min="0xfed40000" max="0xfed44fff" len="0x5000"/>
+        <capability id="control_area">
+          <address_of_control_area>0xfed40040</address_of_control_area>
+        </capability>
+        <capability id="start_method">
+          <value>0x7</value>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+        </capability>
+        <capability id="log_area">
+          <log_area_minimum_length>0x10000</log_area_minimum_length>
+          <log_area_start_address>0x40ca7000</log_area_start_address>
+        </capability>
       </device>
       <device id="PNP0C02">
         <acpi_object>\_SB_.URSC</acpi_object>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index 70650e9f1..e18804ce4 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -47,8 +47,6 @@
     </FEATURES>
     <MEMORY>
       <STACK_SIZE>0x2000</STACK_SIZE>
-      <HV_RAM_SIZE/>
-      <HV_RAM_START/>
       <LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
       <PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
     </MEMORY>
diff --git a/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml b/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml
index 34bccbf00..221c5b0dd 100644
--- a/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml
+++ b/misc/config_tools/data/nuc11tnbi5/nuc11tnbi5.xml
@@ -227,9 +227,9 @@
 	  000ec000-000effff : PCI Bus 0000:00
 	  000f0000-000fffff : PCI Bus 0000:00
 	    000f0000-000fffff : System ROM
-	00100000-2f7cefff : System RAM
-	2f7cf000-2f86dfff : Reserved
-	2f86e000-33e6afff : System RAM
+	00100000-2f7cdfff : System RAM
+	2f7ce000-2f86cfff : Reserved
+	2f86d000-33e6afff : System RAM
 	33e6b000-33e6bfff : Reserved
 	33e6c000-38136fff : System RAM
 	38137000-40b51fff : Reserved
@@ -291,13 +291,13 @@
 	ff000000-ffffffff : Reserved
 	  ff000000-ffffffff : pnp 00:05
 	100000000-3b07fffff : System RAM
-	  15de00000-15ec00ed0 : Kernel code
-	  15ec00ed1-15f65357f : Kernel data
-	  15f91d000-15fdfffff : Kernel bss
+	  292a00000-293800ea0 : Kernel code
+	  293800ea1-29425363f : Kernel data
+	  29451d000-2949fffff : Kernel bss
 	3b0800000-3b3ffffff : RAM buffer
 	4000000000-7fffffffff : PCI Bus 0000:00
 	  4000000000-400fffffff : 0000:00:02.0
-	    4000000000-40007e8fff : efifb
+	    4000000000-40001d4fff : efifb
 	  4010000000-4016ffffff : 0000:00:02.0
 	  4017000000-4017000fff : 0000:00:15.0
 	    4017000000-40170001ff : lpss_dev
@@ -337,7 +337,6 @@
   <BLOCK_DEVICE_INFO>
 	/dev/nvme0n1p3: TYPE="ext4"
 	/dev/sda3: TYPE="ext4"
-	/dev/sdb3: TYPE="ext4"
 	</BLOCK_DEVICE_INFO>
   <TTYS_INFO>
 	seri:/dev/ttyS0 type:portio base:0x3F8 irq:4
@@ -346,7 +345,7 @@
 	3, 5, 6, 7, 10, 11, 12, 13, 14, 15
 	</AVAILABLE_IRQ_INFO>
   <TOTAL_MEM_INFO>
-	11884896 kB
+	11884904 kB
 	</TOTAL_MEM_INFO>
   <CPU_PROCESSOR_INFO>
 	0, 1, 2, 3
@@ -788,7 +787,7 @@
         <acpi_object>\_SB_.PC00</acpi_object>
         <compatible_id>PNP0A03</compatible_id>
         <acpi_uid>0</acpi_uid>
-        <resource id="res0" type="bus_number" min="0x0" max="0xfffe" len="0xffff"/>
+        <resource id="res0" type="bus_number" min="0x0" max="0xfe" len="0xff"/>
         <resource id="res1" type="io_port" min="0x0" max="0xcf7" len="0xcf8"/>
         <resource id="res2" type="io_port" min="0xcf8" max="0xcf8" len="0x8"/>
         <resource id="res3" type="io_port" min="0xd00" max="0xffff" len="0xf300"/>
@@ -933,7 +932,7 @@
           <acpi_object>\_SB_.PC00.CLP0</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50433030434c5030085f53544100085f4849440d494e543334373200085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50433030434c5030085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1028,73 +1027,73 @@
           <capability id="ATS"/>
           <capability id="PRI"/>
           <capability id="SR-IOV"/>
-          <device address="0x0">
+          <device address="0x1">
             <acpi_object>\_SB_.PC00.GFX0.DD01</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443031085f41445200</aml_template>
+            <aml_template>5b821a5c2f045f53425f504330304746583044443031085f41445201</aml_template>
           </device>
-          <device>
+          <device address="0x2">
             <acpi_object>\_SB_.PC00.GFX0.DD02</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443032085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443032085f4144520a02</aml_template>
           </device>
-          <device>
+          <device address="0x3">
             <acpi_object>\_SB_.PC00.GFX0.DD03</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443033085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443033085f4144520a03</aml_template>
           </device>
-          <device>
+          <device address="0x4">
             <acpi_object>\_SB_.PC00.GFX0.DD04</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443034085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443034085f4144520a04</aml_template>
           </device>
-          <device>
+          <device address="0x5">
             <acpi_object>\_SB_.PC00.GFX0.DD05</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443035085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443035085f4144520a05</aml_template>
           </device>
-          <device>
+          <device address="0x6">
             <acpi_object>\_SB_.PC00.GFX0.DD06</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443036085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443036085f4144520a06</aml_template>
           </device>
-          <device>
+          <device address="0x7">
             <acpi_object>\_SB_.PC00.GFX0.DD07</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443037085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443037085f4144520a07</aml_template>
           </device>
-          <device>
+          <device address="0x8">
             <acpi_object>\_SB_.PC00.GFX0.DD08</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443038085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443038085f4144520a08</aml_template>
           </device>
-          <device>
+          <device address="0x9">
             <acpi_object>\_SB_.PC00.GFX0.DD09</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443039085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443039085f4144520a09</aml_template>
           </device>
-          <device>
+          <device address="0xa">
             <acpi_object>\_SB_.PC00.GFX0.DD0A</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443041085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443041085f4144520a0a</aml_template>
           </device>
-          <device>
+          <device address="0xb">
             <acpi_object>\_SB_.PC00.GFX0.DD0B</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443042085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443042085f4144520a0b</aml_template>
           </device>
-          <device>
+          <device address="0xc">
             <acpi_object>\_SB_.PC00.GFX0.DD0C</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443043085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443043085f4144520a0c</aml_template>
           </device>
-          <device>
+          <device address="0xd">
             <acpi_object>\_SB_.PC00.GFX0.DD0D</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443044085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443044085f4144520a0d</aml_template>
           </device>
-          <device>
+          <device address="0xe">
             <acpi_object>\_SB_.PC00.GFX0.DD0E</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443045085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443045085f4144520a0e</aml_template>
           </device>
-          <device>
+          <device address="0xf">
             <acpi_object>\_SB_.PC00.GFX0.DD0F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443046085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443046085f4144520a0f</aml_template>
           </device>
-          <device>
+          <device address="0x1f">
             <acpi_object>\_SB_.PC00.GFX0.DD1F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443146085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443146085f4144520a1f</aml_template>
           </device>
           <device>
             <acpi_object>\_SB_.PC00.GFX0.DD2F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504330304746583044443246085f41445200</aml_template>
+            <aml_template>5b821b5c2f045f53425f504330304746583044443246085f4144520a1f</aml_template>
           </device>
         </device>
         <device address="0x40000">
@@ -1110,11 +1109,11 @@
           <identifier>0x9a09</identifier>
           <class>0x060400</class>
           <acpi_object>\_SB_.PC00.PEG0</acpi_object>
-          <aml_template>5b82205c2f035f53425f5043303050454730085f53544100085f4144520c00000600</aml_template>
+          <aml_template>5b82215c2f035f53425f5043303050454730085f5354410a0f085f4144520c00000600</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTD#" source="19"/>
           <resource type="memory" min="0x6a400000" max="0x6a4fffff" len="0x100000"/>
@@ -1193,11 +1192,11 @@
           <identifier>0x9a25</identifier>
           <class>0x060400</class>
           <acpi_object>\_SB_.PC00.TRP1</acpi_object>
-          <aml_template>5b82205c2f035f53425f5043303054525031085f53544100085f4144520c00000700</aml_template>
+          <aml_template>5b82215c2f035f53425f5043303054525031085f5354410a0f085f4144520c00000700</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTB#" source="17"/>
           <resource type="io_port" min="0x4000" max="0x4fff" len="0x1000"/>
@@ -1251,11 +1250,11 @@
           <identifier>0x9a27</identifier>
           <class>0x060400</class>
           <acpi_object>\_SB_.PC00.TRP2</acpi_object>
-          <aml_template>5b82205c2f035f53425f5043303054525032085f53544100085f4144520c02000700</aml_template>
+          <aml_template>5b82215c2f035f53425f5043303054525032085f5354410a0f085f4144520c02000700</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTC#" source="18"/>
           <resource type="io_port" min="0x5000" max="0x5fff" len="0x1000"/>
@@ -1328,11 +1327,11 @@
           <subsystem_identifier>0x0000</subsystem_identifier>
           <class>0x0c0330</class>
           <acpi_object>\_SB_.PC00.TXHC</acpi_object>
-          <aml_template>5b824e055c2f035f53425f5043303054584843085f53544100085f53545211370a34490043004c0020004e006f0072007400680020005800480043004900200063006f006e00740072006f006c006c00650072000000085f4144520c00000d00</aml_template>
+          <aml_template>5b824f055c2f035f53425f5043303054584843085f5354410a0f085f53545211370a34490043004c0020004e006f0072007400680020005800480043004900200063006f006e00740072006f006c006c00650072000000085f4144520c00000d00</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="memory" min="0x603d190000" max="0x603d19ffff" len="0x10000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
@@ -1375,11 +1374,11 @@
           <subsystem_identifier>0x1111</subsystem_identifier>
           <class>0x0c0340</class>
           <acpi_object>\_SB_.PC00.TDM0</acpi_object>
-          <aml_template>5b824a055c2f035f53425f5043303054444d30085f53544100085f53545211330a30490043004c002000540042005400200044004d0041003000200063006f006e00740072006f006c006c00650072000000085f4144520c02000d00</aml_template>
+          <aml_template>5b824b055c2f035f53425f5043303054444d30085f5354410a0f085f53545211330a30490043004c002000540042005400200044004d0041003000200063006f006e00740072006f006c006c00650072000000085f4144520c02000d00</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
           <resource type="memory" min="0x603d140000" max="0x603d17ffff" len="0x40000" id="bar0" width="64" prefetchable="0"/>
@@ -1404,11 +1403,11 @@
           <subsystem_identifier>0x1111</subsystem_identifier>
           <class>0x0c0340</class>
           <acpi_object>\_SB_.PC00.TDM1</acpi_object>
-          <aml_template>5b824a055c2f035f53425f5043303054444d31085f53544100085f53545211330a30490043004c002000540042005400200044004d0041003100200063006f006e00740072006f006c006c00650072000000085f4144520c03000d00</aml_template>
+          <aml_template>5b824b055c2f035f53425f5043303054444d31085f5354410a0f085f53545211330a30490043004c002000540042005400200044004d0041003100200063006f006e00740072006f006c006c00650072000000085f4144520c03000d00</aml_template>
           <status>
-            <present>n</present>
-            <enabled>n</enabled>
-            <functioning>n</functioning>
+            <present>y</present>
+            <enabled>y</enabled>
+            <functioning>y</functioning>
           </status>
           <resource type="interrupt_pin" pin="INTA#" source="16"/>
           <resource type="memory" min="0x603d100000" max="0x603d13ffff" len="0x40000" id="bar0" width="64" prefetchable="0"/>
@@ -1426,6 +1425,14 @@
             <pba_offset>0x2000000</pba_offset>
           </capability>
         </device>
+        <device address="0x100000">
+          <acpi_object>\_SB_.PC00.I2C6</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324336085f4144520c00001000</aml_template>
+        </device>
+        <device address="0x100001">
+          <acpi_object>\_SB_.PC00.I2C7</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324337085f4144520c01001000</aml_template>
+        </device>
         <device address="0x100006">
           <acpi_object>\_SB_.PC00.THC0</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303054484330085f4144520c06001000</aml_template>
@@ -1508,6 +1515,35 @@
           <acpi_object>\_SB_.PC00.ISHD</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303049534844085f4144520c00001200</aml_template>
         </device>
+        <device address="0x120006">
+          <acpi_object>\_SB_.PC00.SPI2</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504932085f4144520c06001200</aml_template>
+          <device id="DUMY0000">
+            <acpi_object>\_SB_.PC00.SPI2.FPNT</acpi_object>
+            <aml_template>5b82295c2f045f53425f504330305350493246504e54085f53544100085f4849440d44554d593030303000</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+          </device>
+        </device>
+        <device address="0x130000">
+          <acpi_object>\_SB_.PC00.SPI3</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504933085f4144520c00001300</aml_template>
+        </device>
+        <device address="0x130001">
+          <acpi_object>\_SB_.PC00.SPI4</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504934085f4144520c01001300</aml_template>
+        </device>
+        <device address="0x130002">
+          <acpi_object>\_SB_.PC00.SPI5</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504935085f4144520c02001300</aml_template>
+        </device>
+        <device address="0x130003">
+          <acpi_object>\_SB_.PC00.SPI6</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504936085f4144520c03001300</aml_template>
+        </device>
         <device address="0x140000" id="0xa0ed" description="USB controller: Intel Corporation">
           <vendor>0x8086</vendor>
           <identifier>0xa0ed</identifier>
@@ -1529,10 +1565,6 @@
           <device address="0x0">
             <acpi_object>\_SB_.PC00.XHCI.RHUB</acpi_object>
             <aml_template>5b821a5c2f045f53425f504330305848434952485542085f41445200</aml_template>
-            <device address="0x0">
-              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS01</acpi_object>
-              <aml_template>5b821e5c2f055f53425f50433030584843495248554253533031085f41445200</aml_template>
-            </device>
             <device address="0x1">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.HS01</acpi_object>
               <aml_template>5b821e5c2f055f53425f50433030584843495248554248533031085f41445201</aml_template>
@@ -1573,25 +1605,53 @@
               <acpi_object>\_SB_.PC00.XHCI.RHUB.HS08</acpi_object>
               <aml_template>5b821f5c2f055f53425f50433030584843495248554248533038085f4144520a08</aml_template>
             </device>
-            <device>
+            <device address="0x9">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS09</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533039085f4144520a09</aml_template>
+            </device>
+            <device address="0xa">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS10</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533130085f4144520a0a</aml_template>
+            </device>
+            <device address="0xb">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS11</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533131085f4144520a0b</aml_template>
+            </device>
+            <device address="0xc">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.HS12</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554248533132085f4144520a0c</aml_template>
+            </device>
+            <device address="0xd">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS01</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533031085f4144520a0d</aml_template>
+            </device>
+            <device address="0xe">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS02</acpi_object>
-              <aml_template>5b821e5c2f055f53425f50433030584843495248554253533032085f41445201</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533032085f4144520a0e</aml_template>
             </device>
-            <device>
+            <device address="0xf">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS03</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533033085f4144520a02</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533033085f4144520a0f</aml_template>
             </device>
-            <device>
+            <device address="0x10">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS04</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533034085f4144520a03</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533034085f4144520a10</aml_template>
             </device>
-            <device>
+            <device address="0x11">
               <acpi_object>\_SB_.PC00.XHCI.RHUB.SS05</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533035085f4144520a04</aml_template>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533035085f4144520a11</aml_template>
+            </device>
+            <device address="0x12">
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS06</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533036085f4144520a12</aml_template>
             </device>
             <device>
-              <acpi_object>\_SB_.PC00.XHCI.RHUB.SS06</acpi_object>
-              <aml_template>5b821f5c2f055f53425f50433030584843495248554253533036085f4144520a05</aml_template>
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.USR1</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554255535231085f4144520a0b</aml_template>
+            </device>
+            <device>
+              <acpi_object>\_SB_.PC00.XHCI.RHUB.USR2</acpi_object>
+              <aml_template>5b821f5c2f055f53425f50433030584843495248554255535232085f4144520a0c</aml_template>
             </device>
           </device>
         </device>
@@ -1641,10 +1701,47 @@
           <subsystem_vendor>0x8086</subsystem_vendor>
           <subsystem_identifier>0x3002</subsystem_identifier>
           <class>0x0c8000</class>
+          <acpi_object>\_SB_.PC00.I2C0</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324330085f4144520c00001500</aml_template>
           <resource type="interrupt_pin" pin="INTA#" source="27"/>
           <resource type="memory" min="0x4017000000" max="0x4017000fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="Vendor-Specific"/>
+          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C1.UCM1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPL1</dependency>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C0.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433054504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C0.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433054504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
         </device>
         <device address="0x150001" id="0xa0e9" description="Serial bus controller: Intel Corporation">
           <vendor>0x8086</vendor>
@@ -1652,10 +1749,163 @@
           <subsystem_vendor>0x8086</subsystem_vendor>
           <subsystem_identifier>0x3002</subsystem_identifier>
           <class>0x0c8000</class>
+          <acpi_object>\_SB_.PC00.I2C1</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324331085f4144520c01001500</aml_template>
           <resource type="interrupt_pin" pin="INTB#" source="40"/>
           <resource type="memory" min="0x4017001000" max="0x4017001fff" len="0x1000" id="bar0" width="64" prefetchable="0"/>
           <capability id="Power Management"/>
           <capability id="Vendor-Specific"/>
+          <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C1.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433154504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C1.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433154504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="INT3515">
+            <acpi_object>\_SB_.PC00.I2C1.UCM1</acpi_object>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8247085c2f045f53425f504330304932433155434d31085f5354410a0f085f4849440d494e543335313500085f55494400085f4352531141050a4d8e1e00010001020000010600801a060021005c5f53422e504330302e49324330008e1e00010001020000010600801a060025005c5f53422e504330302e49324330008906000701760000007900</aml_template>
+            <status>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+            <resource id="res2" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+        </device>
+        <device address="0x150002">
+          <acpi_object>\_SB_.PC00.I2C2</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324332085f4144520c02001500</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.PMIC</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK2</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C2.CAM0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
+          <device id="INT3471" address="0x0">
+            <acpi_object>\_SB_.PC00.I2C2.CAM0</acpi_object>
+            <compatible_id>INT3471</compatible_id>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8247115c2f045f53425f504330304932433243414d30085f53544100085f4849440d494e543334373100085f4349440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324332008e1e00010001020000010600801a06000e005c5f53422e504330302e49324332008e1e00010001020000010600801a060050005c5f53422e504330302e49324332008e1e00010001020000010600801a060051005c5f53422e504330302e49324332008e1e00010001020000010600801a060052005c5f53422e504330302e49324332008e1e00010001020000010600801a060053005c5f53422e504330302e49324332007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
+          </device>
+          <device id="INT3472">
+            <acpi_object>\_SB_.PC00.I2C2.PMIC</acpi_object>
+            <compatible_id>INT3472</compatible_id>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8241075c2f045f53425f5043303049324332504d4943085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504330302e49324332007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
+          </device>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C2.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433254504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C2.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433254504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+        </device>
+        <device address="0x150003">
+          <acpi_object>\_SB_.PC00.I2C3</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324333085f4144520c03001500</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.LNK5</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP4</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP3</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM4</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK3</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP5</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK4</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.LNK0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP1</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP0</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.CLP2</dependency>
+          <device id="PNP0C50">
+            <acpi_object>\_SB_.PC00.I2C3.TPD0</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824c065c2f045f53425f504330304932433354504430085f53544100085f4849440d504e503043353000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
+          <device id="XXXX0000">
+            <acpi_object>\_SB_.PC00.I2C3.TPL1</acpi_object>
+            <compatible_id>PNP0C50</compatible_id>
+            <aml_template>5b824d065c2f045f53425f504330304932433354504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101760000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="118"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
+          </device>
         </device>
         <device address="0x160000" id="0xa0e0" description="Communication controller: Intel Corporation">
           <vendor>0x8086</vendor>
@@ -1747,6 +1997,80 @@
             <aml_template>5b821e5c2f045f53425f50433030534154304e564d33085f4144520cffffc300</aml_template>
           </device>
         </device>
+        <device address="0x190000">
+          <acpi_object>\_SB_.PC00.I2C4</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324334085f4144520c00001900</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.I2C4.CAM1</dependency>
+          <device id="INT3474" address="0x0">
+            <acpi_object>\_SB_.PC00.I2C4.CAM1</acpi_object>
+            <compatible_id>INT3474</compatible_id>
+            <acpi_uid>0</acpi_uid>
+            <aml_template>5b8241075c2f045f53425f504330304932433443414d31085f53544100085f4849440d494e543334373400085f4349440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504330302e49324334007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C4</dependency>
+          </device>
+        </device>
+        <device address="0x190001">
+          <acpi_object>\_SB_.PC00.I2C5</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303049324335085f4144520c01001900</aml_template>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA03</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA01</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA02</dependency>
+          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA04</dependency>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA01</acpi_object>
+            <acpi_uid>1</acpi_uid>
+            <aml_template>5b824c055c2f045f53425f504330304932433550413031085f53544100085f4849440d4d4348503139333000085f55494401085f43525311260a238e1e00010001020000010600801a060018005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA02</acpi_object>
+            <acpi_uid>2</acpi_uid>
+            <aml_template>5b824d055c2f045f53425f504330304932433550413032085f53544100085f4849440d4d4348503139333000085f5549440a02085f43525311260a238e1e00010001020000010600801a060011005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA03</acpi_object>
+            <acpi_uid>3</acpi_uid>
+            <aml_template>5b824d055c2f045f53425f504330304932433550413033085f53544100085f4849440d4d4348503139333000085f5549440a03085f43525311260a238e1e00010001020000010600801a06001e005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+          <device id="MCHP1930">
+            <acpi_object>\_SB_.PC00.I2C5.PA04</acpi_object>
+            <acpi_uid>4</acpi_uid>
+            <aml_template>5b824d055c2f045f53425f504330304932433550413034085f53544100085f4849440d4d4348503139333000085f5549440a04085f43525311260a238e1e00010001020000010600801a060000005c5f53422e504330302e49324335007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
+          </device>
+        </device>
         <device address="0x190002">
           <acpi_object>\_SB_.PC00.UA02</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303055413032085f4144520c02001900</aml_template>
@@ -2189,15 +2513,15 @@
           <dependency type="provides resources to">\_SB_.PC00.UA00.BTH0</dependency>
           <device id="INT33E1">
             <acpi_object>\_SB_.PC00.UA00.BTH0</acpi_object>
-            <aml_template>5b8246085c2f045f53425f504330305541303042544830085f53544100085f4849440d494e543333453100085f4352531147050a538e2200010003023500010a0000c201002000200000c05c5f53422e504330302e55413030008c2000010101000200000000000017000019002300000000005c5f53422e47504930008906001701000000007900</aml_template>
+            <aml_template>5b82400a5c2f045f53425f504330305541303042544830085f53544100085f4849440d494e543333453100085f4352531141070a6d8e2200010003023500010a0000c201002000200000c05c5f53422e504330302e55413030008c200001010100020000000000001700001900230000004d005c5f53422e47504930008c2000010001001300000000000017000019002300000000005c5f53422e47504930007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+            <resource type="LargeResourceItemGPIOConnection" id="res2"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res2" type="irq" int="0"/>
             <dependency type="consumes resources from">\_SB_.PC00.UA00</dependency>
             <dependency type="consumes resources from">\_SB_.GPI0</dependency>
           </device>
@@ -2206,6 +2530,23 @@
           <acpi_object>\_SB_.PC00.UA01</acpi_object>
           <aml_template>5b821a5c2f035f53425f5043303055413031085f4144520c01001e00</aml_template>
         </device>
+        <device address="0x1e0002">
+          <acpi_object>\_SB_.PC00.SPI0</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504930085f4144520c02001e00</aml_template>
+        </device>
+        <device address="0x1e0003">
+          <acpi_object>\_SB_.PC00.SPI1</acpi_object>
+          <aml_template>5b821a5c2f035f53425f5043303053504931085f4144520c03001e00</aml_template>
+          <device id="DUMY0000">
+            <acpi_object>\_SB_.PC00.SPI1.FPNT</acpi_object>
+            <aml_template>5b82295c2f045f53425f504330305350493146504e54085f53544100085f4849440d44554d593030303000</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+          </device>
+        </device>
         <device address="0x1f0000" id="0xa082" description="ISA bridge: Intel Corporation">
           <vendor>0x8086</vendor>
           <identifier>0xa082</identifier>
@@ -2217,13 +2558,13 @@
           <device id="INTC1028">
             <acpi_object>\_SB_.PC00.LPCB.CWDT</acpi_object>
             <compatible_id>PNP0C02</compatible_id>
-            <aml_template>5b823d5c2f045f53425f504330304c50434243574454085f5354410a0f085f4849440d494e54433130323800085f435253110d0a0a47010000000004047900</aml_template>
+            <aml_template>5b8248045c2f045f53425f504330304c50434243574454085f5354410a0f085f4849440d494e54433130323800085f4349440c41d00c02085f435253110d0a0a47015418541804047900</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
               <functioning>y</functioning>
             </status>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x4"/>
+            <resource id="res0" type="io_port" min="0x1854" max="0x1854" len="0x4"/>
           </device>
           <device id="PNP0103">
             <acpi_object>\_SB_.PC00.LPCB.HPET</acpi_object>
@@ -2371,15 +2712,15 @@
           <device id="PNP0501">
             <acpi_object>\_SB_.PC00.LPCB.UAR1</acpi_object>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8244045c2f045f53425f504330304c50434255415231085f53544100085f4849440c41d00501085f55494400085f43525311130a1047010000000001082200002a00007900</aml_template>
+            <aml_template>5b8245045c2f045f53425f504330304c50434255415231085f5354410a0f085f4849440c41d00501085f55494400085f43525311130a104701f803f80301082210002a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x3f8" max="0x3f8" len="0x8"/>
+            <resource id="res1" type="irq" int="4"/>
           </device>
         </device>
         <device address="0x1f0003" id="0xa0c8" description="Audio device: Intel Corporation">
@@ -2407,7 +2748,7 @@
             <acpi_object>\_SB_.PC00.HDAS.SNDW</acpi_object>
             <compatible_id>PRP00001</compatible_id>
             <compatible_id>PNP0A05</compatible_id>
-            <aml_template>5b82255c2f045f53425f5043303048444153534e4457085f5354410a0b085f4144520c00000040</aml_template>
+            <aml_template>5b8241045c2f045f53425f5043303048444153534e4457085f5354410a0b085f4349441215020d5052503030303031000d504e503041303500085f4144520c00000040</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -2450,7 +2791,7 @@
             <acpi_object>\_SB_.PC00.HDAS.UAOL</acpi_object>
             <compatible_id>PRP00001</compatible_id>
             <compatible_id>PNP0A05</compatible_id>
-            <aml_template>5b82255c2f045f53425f504330304844415355414f4c085f5354410a0b085f4144520c00000050</aml_template>
+            <aml_template>5b8241045c2f045f53425f504330304844415355414f4c085f5354410a0b085f4349441215020d5052503030303031000d504e503041303500085f4144520c00000050</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -2478,10 +2819,6 @@
           <class>0x0c8000</class>
           <resource type="memory" min="0x4f800000" max="0x4f800fff" len="0x1000" id="bar0" width="32" prefetchable="0"/>
         </device>
-        <device address="0x1f0006">
-          <acpi_object>\_SB_.PC00.GLAN</acpi_object>
-          <aml_template>5b821a5c2f035f53425f50433030474c414e085f4144520c06001f00</aml_template>
-        </device>
         <device address="0x1f0007">
           <acpi_object>\_SB_.PC00.PTHT</acpi_object>
           <aml_template>5b82205c2f035f53425f5043303050544854085f53544100085f4144520c07001f00</aml_template>
@@ -2495,7 +2832,7 @@
           <acpi_object>\_SB_.PC00.CLP1</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50433030434c5031085f53544100085f4849440d494e543334373200085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50433030434c5031085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2508,7 +2845,7 @@
           <acpi_object>\_SB_.PC00.CLP2</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5032085f53544100085f4849440d494e543334373200085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5032085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2521,7 +2858,7 @@
           <acpi_object>\_SB_.PC00.CLP3</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5033085f53544100085f4849440d494e543334373200085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5033085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2534,7 +2871,7 @@
           <acpi_object>\_SB_.PC00.CLP4</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>4</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5034085f53544100085f4849440d494e543334373200085f5549440a04085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5034085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a04085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2547,7 +2884,7 @@
           <acpi_object>\_SB_.PC00.CLP5</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>5</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50433030434c5035085f53544100085f4849440d494e543334373200085f5549440a05085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50433030434c5035085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a05085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2560,7 +2897,7 @@
           <acpi_object>\_SB_.PC00.DOCK</acpi_object>
           <compatible_id>PNP0C15</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b822c5c2f035f53425f50433030444f434b085f53544100085f4849440d414243443030303000085f5549440a02</aml_template>
+          <aml_template>5b82365c2f035f53425f50433030444f434b085f53544100085f4849440d414243443030303000085f4349440c41d00c15085f5549440a02</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2571,7 +2908,7 @@
           <acpi_object>\_SB_.PC00.DSC0</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b823b5c2f035f53425f5043303044534330085f53544100085f4849440d494e543334373200085f55494400085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824a045c2f035f53425f5043303044534330085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494400085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2582,62 +2919,77 @@
           <acpi_object>\_SB_.PC00.DSC1</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b823b5c2f035f53425f5043303044534331085f53544100085f4849440d494e543334373200085f55494401085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8241095c2f035f53425f5043303044534331085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f55494401085f41445200085f435253114c040a488c200001010100020000000000001700001900230000008d005c5f53422e47504930008c200001010100020000000000001700001900230000008f005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC2</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534332085f53544100085f4849440d494e543334373200085f5549440a02085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534332085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a02085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC3</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534333085f53544100085f4849440d494e543334373200085f5549440a03085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534333085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a03085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC4</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>4</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534334085f53544100085f4849440d494e543334373200085f5549440a04085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534334085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a04085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="INT3472">
           <acpi_object>\_SB_.PC00.DSC5</acpi_object>
           <compatible_id>INT3472</compatible_id>
           <acpi_uid>5</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043303044534335085f53544100085f4849440d494e543334373200085f5549440a05085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242095c2f035f53425f5043303044534335085f53544100085f4849440d494e543334373200085f4349440d494e543334373200085f5549440a05085f41445200085f435253114c040a488c20000101010002000000000000170000190023000000b6005c5f53422e47504930008c20000101010002000000000000170000190023000000ab005c5f53422e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
         <device id="PWRC0000">
           <acpi_object>\_SB_.PC00.FLM0</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d30085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324331007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d30085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a5005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324331007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2652,7 +3004,7 @@
           <acpi_object>\_SB_.PC00.FLM1</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d31085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324332007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d31085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2667,7 +3019,7 @@
           <acpi_object>\_SB_.PC00.FLM2</acpi_object>
           <compatible_id>TXNW3643</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d32085f53544100085f4849440d54584e573336343300085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060063005c5f53422e504330302e49324332007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d32085f53544100085f4849440d54584e573336343300085f4349440d54584e573336343300085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000b2005c5f53422e47504930008e1e00010001020000010600801a060063005c5f53422e504330302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2682,7 +3034,7 @@
           <acpi_object>\_SB_.PC00.FLM3</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d33085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d33085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2697,7 +3049,7 @@
           <acpi_object>\_SB_.PC00.FLM4</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d34085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d34085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2712,7 +3064,7 @@
           <acpi_object>\_SB_.PC00.FLM5</acpi_object>
           <compatible_id>PWRC0000</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b8242085c2f035f53425f50433030464c4d35085f53544100085f4849440d505752433030303000085f55494400085f41445200085f435253114a040a468c2000010101000200000000000017000019002300000000005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
+          <aml_template>5b8241095c2f035f53425f50433030464c4d35085f53544100085f4849440d505752433030303000085f4349440d505752433030303000085f55494400085f41445200085f435253114a040a468c20000101010002000000000000170000190023000000a3005c5f53422e47504930008e1e00010001020000010600801a060067005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -2723,412 +3075,123 @@
           <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
           <dependency type="consumes resources from">\_SB_.GPI0</dependency>
         </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C0</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C1.UCM1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C3.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C0.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C1.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.TPL1</dependency>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C0.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433054504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C0.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433054504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C1</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C1.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433154504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C1.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433154504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="INT3515">
-            <acpi_object>\_SB_.PC00.I2C1.UCM1</acpi_object>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8247085c2f045f53425f504330304932433155434d31085f5354410a0f085f4849440d494e543335313500085f55494400085f4352531141050a4d8e1e00010001020000010600801a060021005c5f53422e504330302e49324330008e1e00010001020000010600801a060025005c5f53422e504330302e49324330008906000701000000007900</aml_template>
-            <status>
-              <present>y</present>
-              <enabled>y</enabled>
-              <functioning>y</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
-            <resource id="res2" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C2</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.PMIC</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C2.CAM0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.FLM1</dependency>
-          <device id="INT3471" address="0x0">
-            <acpi_object>\_SB_.PC00.I2C2.CAM0</acpi_object>
-            <compatible_id>INT3471</compatible_id>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8249105c2f045f53425f504330304932433243414d30085f53544100085f4849440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324332008e1e00010001020000010600801a06000e005c5f53422e504330302e49324332008e1e00010001020000010600801a060050005c5f53422e504330302e49324332008e1e00010001020000010600801a060051005c5f53422e504330302e49324332008e1e00010001020000010600801a060052005c5f53422e504330302e49324332008e1e00010001020000010600801a060053005c5f53422e504330302e49324332007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
-          </device>
-          <device id="INT3472">
-            <acpi_object>\_SB_.PC00.I2C2.PMIC</acpi_object>
-            <compatible_id>INT3472</compatible_id>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f5043303049324332504d4943085f53544100085f4849440d494e543334373200085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504330302e49324332007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
-          </device>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C2.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433254504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C2.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433254504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C3</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP2</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP3</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP0</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP1</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP4</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.FLM4</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.CLP5</dependency>
-          <device id="PNP0C50">
-            <acpi_object>\_SB_.PC00.I2C3.TPD0</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824e055c2f045f53425f504330304932433354504430085f53544100085f4849440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906001501000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-          <device id="XXXX0000">
-            <acpi_object>\_SB_.PC00.I2C3.TPL1</acpi_object>
-            <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504330304932433354504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504330302e49324330008906000101000000007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C0</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C4</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.I2C4.CAM1</dependency>
-          <device id="INT3474" address="0x0">
-            <acpi_object>\_SB_.PC00.I2C4.CAM1</acpi_object>
-            <compatible_id>INT3474</compatible_id>
-            <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f504330304932433443414d31085f53544100085f4849440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504330302e49324334007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C4</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C5</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA04</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA01</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA03</dependency>
-          <dependency type="provides resources to">\_SB_.PC00.I2C5.PA02</dependency>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA01</acpi_object>
-            <acpi_uid>1</acpi_uid>
-            <aml_template>5b824c055c2f045f53425f504330304932433550413031085f53544100085f4849440d4d4348503139333000085f55494401085f43525311260a238e1e00010001020000010600801a060018005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA02</acpi_object>
-            <acpi_uid>2</acpi_uid>
-            <aml_template>5b824d055c2f045f53425f504330304932433550413032085f53544100085f4849440d4d4348503139333000085f5549440a02085f43525311260a238e1e00010001020000010600801a060011005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA03</acpi_object>
-            <acpi_uid>3</acpi_uid>
-            <aml_template>5b824d055c2f045f53425f504330304932433550413033085f53544100085f4849440d4d4348503139333000085f5549440a03085f43525311260a238e1e00010001020000010600801a06001e005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-          <device id="MCHP1930">
-            <acpi_object>\_SB_.PC00.I2C5.PA04</acpi_object>
-            <acpi_uid>4</acpi_uid>
-            <aml_template>5b824d055c2f045f53425f504330304932433550413034085f53544100085f4849440d4d4348503139333000085f5549440a04085f43525311260a238e1e00010001020000010600801a060000005c5f53422e504330302e49324335007900</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <dependency type="consumes resources from">\_SB_.PC00.I2C5</dependency>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C6</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.I2C7</acpi_object>
-        </device>
         <device id="SONY362A">
           <acpi_object>\_SB_.PC00.LNK0</acpi_object>
           <compatible_id>SONY362A</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b30085f53544100085f4849440d534f4e593336324100085f55494400085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824f085c2f035f53425f504330304c4e4b30085f53544100085f4849440d534f4e593336324100085f4349440d534f4e593336324100085f55494400085f41445200085f4352531148040a448e1e00010001020000010600801a06001a005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="SONY488A">
           <acpi_object>\_SB_.PC00.LNK1</acpi_object>
           <compatible_id>SONY488A</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b31085f53544100085f4849440d534f4e593438384100085f55494401085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824d065c2f035f53425f504330304c4e4b31085f53544100085f4849440d534f4e593438384100085f4349440d534f4e593438384100085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060037005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="SONY362A">
           <acpi_object>\_SB_.PC00.LNK2</acpi_object>
           <compatible_id>SONY362A</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b823d5c2f035f53425f504330304c4e4b32085f53544100085f4849440d534f4e593336324100085f5549440a02085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824e065c2f035f53425f504330304c4e4b32085f53544100085f4849440d534f4e593336324100085f4349440d534f4e593336324100085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a06001a005c5f53422e504330302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C2</dependency>
         </device>
         <device id="INT33BE">
           <acpi_object>\_SB_.PC00.LNK3</acpi_object>
           <compatible_id>INT33BE</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b33085f53544100085f4849440d494e543333424500085f5549440a03085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242115c2f035f53425f504330304c4e4b33085f53544100085f4849440d494e543333424500085f4349440d494e543333424500085f5549440a03085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333008e1e00010001020000010600801a060050005c5f53422e504330302e49324333008e1e00010001020000010600801a060051005c5f53422e504330302e49324333008e1e00010001020000010600801a060052005c5f53422e504330302e49324333008e1e00010001020000010600801a060053005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="INT33BE">
           <acpi_object>\_SB_.PC00.LNK4</acpi_object>
           <compatible_id>INT33BE</compatible_id>
           <acpi_uid>4</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b34085f53544100085f4849440d494e543333424500085f5549440a04085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242115c2f035f53425f504330304c4e4b34085f53544100085f4849440d494e543333424500085f4349440d494e543333424500085f5549440a04085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333008e1e00010001020000010600801a060050005c5f53422e504330302e49324333008e1e00010001020000010600801a060051005c5f53422e504330302e49324333008e1e00010001020000010600801a060052005c5f53422e504330302e49324333008e1e00010001020000010600801a060053005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="INT33BE">
           <acpi_object>\_SB_.PC00.LNK5</acpi_object>
           <compatible_id>INT33BE</compatible_id>
           <acpi_uid>5</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504330304c4e4b35085f53544100085f4849440d494e543333424500085f5549440a05085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b8242115c2f035f53425f504330304c4e4b35085f53544100085f4849440d494e543333424500085f4349440d494e543333424500085f5549440a05085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504330302e49324333008e1e00010001020000010600801a06000c005c5f53422e504330302e49324333008e1e00010001020000010600801a060050005c5f53422e504330302e49324333008e1e00010001020000010600801a060051005c5f53422e504330302e49324333008e1e00010001020000010600801a060052005c5f53422e504330302e49324333008e1e00010001020000010600801a060053005c5f53422e504330302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res5"/>
+          <dependency type="consumes resources from">\_SB_.PC00.I2C3</dependency>
         </device>
         <device id="PNP0C02">
           <acpi_object>\_SB_.PC00.PDRC</acpi_object>
           <acpi_uid>1</acpi_uid>
           <aml_template>5b82205c2f035f53425f5043303050445243085f4849440c41d00c02085f55494401</aml_template>
-          <resource id="res0" type="memory" min="0x0" max="0x7fff" len="0x8000"/>
-          <resource id="res1" type="memory" min="0x0" max="0xfff" len="0x1000"/>
-          <resource id="res2" type="memory" min="0x0" max="0xfff" len="0x1000"/>
-          <resource id="res3" type="memory" min="0x0" max="0xfffffff" len="0x10000000"/>
-          <resource id="res8" type="memory" min="0x0" max="-0x1" len="0x0"/>
-          <resource id="res9" type="memory" min="0x0" max="-0x1" len="0x0"/>
+          <resource id="res8" type="memory" min="0x0" max="0x0" len="0x0"/>
+          <resource id="res9" type="memory" min="0x0" max="0x0" len="0x0"/>
+          <resource id="res3" type="memory" min="0xc0000000" max="0xcfffffff" len="0x10000000"/>
           <resource id="res4" type="memory" min="0xfed20000" max="0xfed7ffff" len="0x60000"/>
           <resource id="res6" type="memory" min="0xfed45000" max="0xfed8ffff" len="0x4b000"/>
           <resource id="res5" type="memory" min="0xfed90000" max="0xfed93fff" len="0x4000"/>
+          <resource id="res1" type="memory" min="0xfeda0000" max="0xfeda0fff" len="0x1000"/>
+          <resource id="res2" type="memory" min="0xfeda1000" max="0xfeda1fff" len="0x1000"/>
+          <resource id="res0" type="memory" min="0xfedc0000" max="0xfedc7fff" len="0x8000"/>
           <resource id="res7" type="memory" min="0xfee00000" max="0xfeefffff" len="0x100000"/>
         </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI0</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI1</acpi_object>
-          <dependency type="provides resources to">\_SB_.PC00.SPI1.SPFD</dependency>
-          <device id="DUMY0000">
-            <acpi_object>\_SB_.PC00.SPI1.FPNT</acpi_object>
-            <aml_template>5b82295c2f045f53425f504330305350493146504e54085f53544100085f4849440d44554d593030303000</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-          </device>
-          <device id="INTC1058">
-            <acpi_object>\_SB_.PC00.SPI1.SPFD</acpi_object>
-            <aml_template>5b82400e5c2f045f53425f504330305350493153504644085f4849440d494e54433130353800085f43525311460b0ab28c200001010100090000000000001700001900230000008f005c5f53422e47504930008c200001010100020000000000001700001900230000008d005c5f53422e47504930008c2000010101000200000000000017000019002300000065015c5f53422e47504930008c2000010001000b0000000000001700001900230000008f005c5f53422e47504930008e2100010002020000010900809fd50008010100005c5f53422e504330302e53504931007900</aml_template>
-            <resource type="LargeResourceItemGPIOConnection" id="res0"/>
-            <resource type="LargeResourceItemGPIOConnection" id="res1"/>
-            <resource type="LargeResourceItemGPIOConnection" id="res2"/>
-            <resource type="LargeResourceItemGPIOConnection" id="res3"/>
-            <resource type="LargeResourceItemGenericSerialBusConnection" id="res4"/>
-            <dependency type="consumes resources from">\_SB_.PC00.SPI1</dependency>
-            <dependency type="consumes resources from">\_SB_.GPI0</dependency>
-            <device id="INTC1059">
-              <acpi_object>\_SB_.PC00.SPI1.SPFD.CVFD</acpi_object>
-              <aml_template>5b82275c2f055f53425f50433030535049315350464443564644085f4849440d494e54433130353900</aml_template>
-            </device>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI2</acpi_object>
-          <device id="DUMY0000">
-            <acpi_object>\_SB_.PC00.SPI2.FPNT</acpi_object>
-            <aml_template>5b82295c2f045f53425f504330305350493246504e54085f53544100085f4849440d44554d593030303000</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-          </device>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI3</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI4</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI5</acpi_object>
-        </device>
-        <device>
-          <acpi_object>\_SB_.PC00.SPI6</acpi_object>
-        </device>
       </bus>
       <device id="ACPI000E">
         <acpi_object>\_SB_.AWAC</acpi_object>
-        <aml_template>5b82205c2e5f53425f41574143085f53544100085f4849440d414350493030304500</aml_template>
+        <aml_template>5b82215c2e5f53425f41574143085f5354410a0f085f4849440d414350493030304500</aml_template>
         <status>
-          <present>n</present>
-          <enabled>n</enabled>
-          <functioning>n</functioning>
+          <present>y</present>
+          <enabled>y</enabled>
+          <functioning>y</functioning>
         </status>
       </device>
       <device id="INT3519" description="CoExistence Manager">
@@ -3142,35 +3205,39 @@
       </device>
       <device id="INT0E0C" description="Enclave Page Cache 1.0">
         <acpi_object>\_SB_.EPC_</acpi_object>
-        <aml_template>5b824d085c2e5f53425f4550435f085f5354410a0f085f4849440c25d40e0c085f53545211310a2e45006e0063006c0061007600650020005000610067006500200043006100630068006500200031002e0030000000085f43525311330a308a2b0000010100000000000000000000000000000000ffffffffffffffff000000000000000000000000000000007900</aml_template>
+        <aml_template>5b824c085c2e5f53425f4550435f085f53544100085f4849440c25d40e0c085f53545211310a2e45006e0063006c0061007600650020005000610067006500200043006100630068006500200031002e0030000000085f43525311330a308a2b0000010100000000000000000000000000000000ffffffffffffffff000000000000000000000000000000007900</aml_template>
         <status>
-          <present>y</present>
-          <enabled>y</enabled>
-          <functioning>y</functioning>
+          <present>n</present>
+          <enabled>n</enabled>
+          <functioning>n</functioning>
         </status>
         <resource id="res0" type="memory" min="0x0" max="-0x1" len="0x0"/>
       </device>
       <device id="INT34C5">
         <acpi_object>\_SB_.GPI0</acpi_object>
-        <aml_template>5b8245065c2e5f53425f47504930085f5354410a0f085f4849440d494e543334433500085f435253113e0a3b8906000d010e0000008609000100000000000001008609000100000000000001008609000100000000000001008609000100000000000001007900</aml_template>
+        <aml_template>5b8245065c2e5f53425f47504930085f5354410a0f085f4849440d494e543334433500085f435253113e0a3b8906000d010e0000008609000100006efd000001008609000100006dfd000001008609000100006afd0000010086090001000069fd000001007900</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="14"/>
-        <resource id="res1" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <resource id="res2" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <resource id="res3" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <resource id="res4" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-        <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.UA00.BTH0</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.SPI1.SPFD</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
+        <resource id="res4" type="memory" min="0xfd690000" max="0xfd69ffff" len="0x10000"/>
+        <resource id="res3" type="memory" min="0xfd6a0000" max="0xfd6affff" len="0x10000"/>
+        <resource id="res2" type="memory" min="0xfd6d0000" max="0xfd6dffff" len="0x10000"/>
+        <resource id="res1" type="memory" min="0xfd6e0000" max="0xfd6effff" len="0x10000"/>
+        <dependency type="provides resources to">\_SB_.PC00.DSC5</dependency>
         <dependency type="provides resources to">\_SB_.PC00.FLM1</dependency>
-        <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC3</dependency>
         <dependency type="provides resources to">\_SB_.PC00.FLM4</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM3</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM5</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM0</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.FLM2</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC4</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC1</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.UA00.BTH0</dependency>
+        <dependency type="provides resources to">\_SB_.PC00.DSC2</dependency>
       </device>
       <device id="INTC1051">
         <acpi_object>\_SB_.HIDD</acpi_object>
@@ -3184,7 +3251,8 @@
       <device id="PNP0C02">
         <acpi_object>\_SB_.IOTR</acpi_object>
         <acpi_uid>IoTraps</acpi_uid>
-        <aml_template>5b822e5c2e5f53425f494f5452085f4849440c41d00c02085f5549440d496f547261707300085f43525311050a027900</aml_template>
+        <aml_template>5b82365c2e5f53425f494f5452085f4849440c41d00c02085f5549440d496f547261707300085f435253110d0a0a47010020002001ff7900</aml_template>
+        <resource id="res0" type="io_port" min="0x2000" max="0x2000" len="0xff"/>
       </device>
       <device id="PNP0C0D">
         <acpi_object>\_SB_.LID0</acpi_object>
@@ -3198,10 +3266,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKA</acpi_object>
         <acpi_uid>1</acpi_uid>
-        <aml_template>5b82315c2e5f53425f4c4e4b41085f5354410a0b085f4849440c41d00c0f085f55494401085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82315c2e5f53425f4c4e4b41085f5354410a09085f4849440c41d00c0f085f55494401085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3209,10 +3277,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKB</acpi_object>
         <acpi_uid>2</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b42085f5354410a0b085f4849440c41d00c0f085f5549440a02085f43525311090a06238a00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b42085f5354410a09085f4849440c41d00c0f085f5549440a02085f43525311090a06238a00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="1, 3, 7"/>
@@ -3220,10 +3288,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKC</acpi_object>
         <acpi_uid>3</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b43085f5354410a0b085f4849440c41d00c0f085f5549440a03085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b43085f5354410a09085f4849440c41d00c0f085f5549440a03085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3231,10 +3299,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKD</acpi_object>
         <acpi_uid>4</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b44085f5354410a0b085f4849440c41d00c0f085f5549440a04085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b44085f5354410a09085f4849440c41d00c0f085f5549440a04085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3242,10 +3310,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKE</acpi_object>
         <acpi_uid>5</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b45085f5354410a0b085f4849440c41d00c0f085f5549440a05085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b45085f5354410a09085f4849440c41d00c0f085f5549440a05085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3253,10 +3321,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKF</acpi_object>
         <acpi_uid>6</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b46085f5354410a0b085f4849440c41d00c0f085f5549440a06085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b46085f5354410a09085f4849440c41d00c0f085f5549440a06085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3264,10 +3332,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKG</acpi_object>
         <acpi_uid>7</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b47085f5354410a0b085f4849440c41d00c0f085f5549440a07085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b47085f5354410a09085f4849440c41d00c0f085f5549440a07085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3275,10 +3343,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKH</acpi_object>
         <acpi_uid>8</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b48085f5354410a0b085f4849440c41d00c0f085f5549440a08085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b48085f5354410a09085f4849440c41d00c0f085f5549440a08085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -3296,7 +3364,7 @@
         <acpi_object>\_SB_.PEPD</acpi_object>
         <compatible_id>PNP0D80</compatible_id>
         <acpi_uid>1</acpi_uid>
-        <aml_template>5b82265c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f55494401</aml_template>
+        <aml_template>5b82305c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f4349440c41d00d80085f55494401</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -3306,16 +3374,16 @@
       <device id="PNP0C02">
         <acpi_object>\_SB_.PRRE</acpi_object>
         <acpi_uid>PCHRESV</acpi_uid>
-        <aml_template>5b824b0a5c2e5f53425f50525245085f5354410a0b085f4849440c41d00c02085f5549440d5043485245535600085f435253114a070a7686090001000000fe000002008609000100c004fe0040000086090001000005fe000006008609000100000dfe0000030086090001000020fe0000600086090000000000ff0000000147010018001801ff86090001000000fd000069008609000100000000000002008609000100000000000000007900</aml_template>
+        <aml_template>5b824b0a5c2e5f53425f50525245085f5354410a0b085f4849440c41d00c02085f5549440d5043485245535600085f435253114a070a7686090001000000fe000002008609000100c004fe0040000086090001000005fe000006008609000100000dfe0000030086090001000020fe0000600086090000000000ff0000000147010018001801ff86090001000000fd000069008609000100006bfd000002008609000100006ffd000091007900</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res6" type="io_port" min="0x1800" max="0x1800" len="0xff"/>
-        <resource id="res8" type="memory" min="0x0" max="0x1ffff" len="0x20000"/>
-        <resource id="res9" type="memory" min="0x0" max="-0x1" len="0x0"/>
         <resource id="res7" type="memory" min="0xfd000000" max="0xfd68ffff" len="0x690000"/>
+        <resource id="res8" type="memory" min="0xfd6b0000" max="0xfd6cffff" len="0x20000"/>
+        <resource id="res9" type="memory" min="0xfd6f0000" max="0xfdffffff" len="0x910000"/>
         <resource id="res0" type="memory" min="0xfe000000" max="0xfe01ffff" len="0x20000"/>
         <resource id="res1" type="memory" min="0xfe04c000" max="0xfe04ffff" len="0x4000"/>
         <resource id="res2" type="memory" min="0xfe050000" max="0xfe0affff" len="0x60000"/>
@@ -3337,7 +3405,7 @@
       <device id="INT340E">
         <acpi_object>\_SB_.PTID</acpi_object>
         <compatible_id>PNP0C02</compatible_id>
-        <aml_template>5b821c5c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e</aml_template>
+        <aml_template>5b82265c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e085f4349440c41d00c02</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -3372,6 +3440,28 @@
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="memory" min="0xfed40000" max="0xfed44fff" len="0x5000"/>
+        <capability id="control_area">
+          <address_of_control_area>0xfed40040</address_of_control_area>
+        </capability>
+        <capability id="start_method">
+          <value>0x7</value>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+          <parameter>0x0</parameter>
+        </capability>
+        <capability id="log_area">
+          <log_area_minimum_length>0x10000</log_area_minimum_length>
+          <log_area_start_address>0x40ca7000</log_area_start_address>
+        </capability>
       </device>
       <device id="PNP0C02">
         <acpi_object>\_SB_.URSC</acpi_object>
diff --git a/misc/config_tools/data/whl-ipc-i5/whl-ipc-i5.xml b/misc/config_tools/data/whl-ipc-i5/whl-ipc-i5.xml
index 733692efc..23e94e50c 100644
--- a/misc/config_tools/data/whl-ipc-i5/whl-ipc-i5.xml
+++ b/misc/config_tools/data/whl-ipc-i5/whl-ipc-i5.xml
@@ -2,8 +2,8 @@
   <BIOS_INFO>
 	BIOS Information
 	Vendor: American Megatrends Inc.
-	Version: WL10R104
-	Release Date: 09/12/2019
+	Version: WL10R109
+	Release Date: 06/05/2020
 	BIOS Revision: 5.13
 	</BIOS_INFO>
   <BASE_BOARD_INFO>
@@ -13,8 +13,8 @@
 	Version: V1.0
 	</BASE_BOARD_INFO>
   <PCI_DEVICE>
-	00:00.0 Host bridge: Intel Corporation Device 3e34 (rev 0b)
-	00:02.0 VGA compatible controller: Intel Corporation Device 3ea0
+	00:00.0 Host bridge: Intel Corporation Device 3e34 (rev 0c)
+	00:02.0 VGA compatible controller: Intel Corporation Device 3ea0 (rev 02)
 	Region 0: Memory at a0000000 (64-bit, non-prefetchable) [size=16M]
 	Region 2: Memory at 90000000 (64-bit, prefetchable) [size=256M]
 	00:12.0 Signal processing controller: Intel Corporation Device 9df9 (rev 30)
@@ -54,8 +54,8 @@
 	Region 3: Memory at a1120000 (32-bit, non-prefetchable) [size=16K]
 	</PCI_DEVICE>
   <PCI_VID_PID>
-	00:00.0 0600: 8086:3e34 (rev 0b)
-	00:02.0 0300: 8086:3ea0
+	00:00.0 0600: 8086:3e34 (rev 0c)
+	00:02.0 0300: 8086:3ea0 (rev 02)
 	00:12.0 1180: 8086:9df9 (rev 30)
 	00:14.0 0c03: 8086:9ded (rev 30)
 	00:14.2 0500: 8086:9def (rev 30)
@@ -75,8 +75,8 @@
 	04:00.0 0200: 8086:157b (rev 03)
 	</PCI_VID_PID>
   <WAKE_VECTOR_INFO>
-	#define WAKE_VECTOR_32          0x8A8A808CUL
-	#define WAKE_VECTOR_64          0x8A8A8098UL
+	#define WAKE_VECTOR_32          0x8C93E08CUL
+	#define WAKE_VECTOR_64          0x8C93E098UL
 	</WAKE_VECTOR_INFO>
   <RESET_REGISTER_INFO>
 	#define RESET_REGISTER_ADDRESS  0xCF9UL
@@ -144,27 +144,10 @@
 	"Intel(R) Core(TM) i5-8265U CPU @ 1.60GHz"
 	</CPU_BRAND>
   <CX_INFO>
-	{{SPACE_FFixedHW, 0x00U, 0x00U, 0x00U, 0x00UL}, 0x01U, 0x01U, 0x00U},	/* C1 */
-	{{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1816UL}, 0x02U, 0x97U, 0x00U},	/* C2 */
-	{{SPACE_SYSTEM_IO, 0x08U, 0x00U, 0x00U, 0x1819UL}, 0x03U, 0x40AU, 0x00U},	/* C3 */
+	/* Cx data is not available */
 	</CX_INFO>
   <PX_INFO>
-	{0x709UL, 0x00UL, 0x0AUL, 0x0AUL, 0x002700UL, 0x002700UL},	/* P0 */
-	{0x708UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001200UL, 0x001200UL},	/* P1 */
-	{0x6A4UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001100UL, 0x001100UL},	/* P2 */
-	{0x640UL, 0x00UL, 0x0AUL, 0x0AUL, 0x001000UL, 0x001000UL},	/* P3 */
-	{0x5DCUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000F00UL, 0x000F00UL},	/* P4 */
-	{0x578UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000E00UL, 0x000E00UL},	/* P5 */
-	{0x514UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000D00UL, 0x000D00UL},	/* P6 */
-	{0x4B0UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000C00UL, 0x000C00UL},	/* P7 */
-	{0x44CUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000B00UL, 0x000B00UL},	/* P8 */
-	{0x3E8UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000A00UL, 0x000A00UL},	/* P9 */
-	{0x384UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000900UL, 0x000900UL},	/* P10 */
-	{0x320UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000800UL, 0x000800UL},	/* P11 */
-	{0x2BCUL, 0x00UL, 0x0AUL, 0x0AUL, 0x000700UL, 0x000700UL},	/* P12 */
-	{0x258UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000600UL, 0x000600UL},	/* P13 */
-	{0x1F4UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000500UL, 0x000500UL},	/* P14 */
-	{0x190UL, 0x00UL, 0x0AUL, 0x0AUL, 0x000400UL, 0x000400UL},	/* P15 */
+	/* Px data is not available */
 	</PX_INFO>
   <MMCFG_BASE_INFO>
 	/* PCI mmcfg base of MCFG */
@@ -187,26 +170,28 @@
 	00100000-3fffffff : System RAM
 	40000000-403fffff : Reserved
 	  40000000-403fffff : pnp 00:00
-	40400000-8229f017 : System RAM
-	8229f018-822af657 : System RAM
-	822af658-822b0017 : System RAM
-	822b0018-822c0057 : System RAM
-	822c0058-8352afff : System RAM
-	8352b000-8352bfff : ACPI Non-volatile Storage
-	8352c000-8352cfff : Reserved
-	8352d000-89f86fff : System RAM
-	89f87000-8a3f6fff : Reserved
-	8a3f7000-8a473fff : ACPI Tables
-	8a474000-8a8a8fff : ACPI Non-volatile Storage
-	8a8a9000-8aefefff : Reserved
-	8aeff000-8aefffff : System RAM
-	8af00000-8fffffff : Reserved
-	  8c000000-8fffffff : Graphics Stolen Memory
+	40400000-846a2017 : System RAM
+	846a2018-846b2657 : System RAM
+	846b2658-846b3017 : System RAM
+	846b3018-846c3057 : System RAM
+	846c3058-85cbcfff : System RAM
+	85cbd000-85cbdfff : ACPI Non-volatile Storage
+	85cbe000-85cbefff : Reserved
+	85cbf000-88b01fff : System RAM
+	88b02000-88b40fff : Reserved
+	88b41000-8c052fff : System RAM
+	8c053000-8c4b4fff : Reserved
+	8c4b5000-8c531fff : ACPI Tables
+	8c532000-8c93efff : ACPI Non-volatile Storage
+	8c93f000-8cffefff : Reserved
+	8cfff000-8cffffff : System RAM
+	8d000000-8fffffff : Reserved
+	  8e000000-8fffffff : Graphics Stolen Memory
 	90000000-dfffffff : PCI Bus 0000:00
 	  90000000-9fffffff : 0000:00:02.0
 	  a0000000-a0ffffff : 0000:00:02.0
 	  a1000000-a10fffff : 0000:00:1f.3
-	    a1000000-a10fffff : Audio DSP
+	    a1000000-a10fffff : ICH HD audio
 	  a1100000-a11fffff : PCI Bus 0000:04
 	    a1100000-a111ffff : 0000:04:00.0
 	      a1100000-a111ffff : igb
@@ -223,7 +208,7 @@
 	  a1400000-a140ffff : 0000:00:14.0
 	    a1400000-a140ffff : xhci-hcd
 	  a1410000-a1413fff : 0000:00:1f.3
-	    a1410000-a1413fff : Audio DSP
+	    a1410000-a1413fff : ICH HD audio
 	  a1414000-a1415fff : 0000:00:17.0
 	    a1414000-a1415fff : ahci
 	  a1416000-a1417fff : 0000:00:14.2
@@ -268,31 +253,28 @@
 	ff000000-ffffffff : Reserved
 	  ff000000-ffffffff : pnp 00:0e
 	100000000-26dffffff : System RAM
-	  234800000-2354010d6 : Kernel code
-	  235600000-235924fff : Kernel rodata
-	  235a00000-235ba09bf : Kernel data
-	  2360b0000-2361fffff : Kernel bss
+	  262c00000-263a00ea0 : Kernel code
+	  263a00ea1-26445363f : Kernel data
+	  26471d000-264bfffff : Kernel bss
 	26e000000-26fffffff : RAM buffer
 	</IOMEM_INFO>
   <BLOCK_DEVICE_INFO>
-	/dev/nvme0n1p2: TYPE="ext4"
-	/dev/sda3: TYPE="ext4"
-	/dev/sdb2: TYPE="ext4"
-	/dev/sdb3: TYPE="ext4"
-	/dev/sdc3: TYPE="ext4"
-	/dev/sdc4: TYPE="ext4"
+	/dev/nvme0n1p3: TYPE="ext4"
+	/dev/sda5: TYPE="ext4"
 	</BLOCK_DEVICE_INFO>
   <TTYS_INFO>
 	seri:/dev/ttyS0 type:portio base:0x3F8 irq:4
 	seri:/dev/ttyS1 type:portio base:0x2F8 irq:3
 	seri:/dev/ttyS2 type:portio base:0x3E8 irq:7
 	seri:/dev/ttyS3 type:portio base:0x2E8 irq:7
+	seri:/dev/ttyS4 type:portio base:0x2F0 irq:7
+	seri:/dev/ttyS5 type:portio base:0x2E0 irq:7
 	</TTYS_INFO>
   <AVAILABLE_IRQ_INFO>
-	5, 6, 10, 11, 13, 14, 15
+	6, 10, 11, 13, 14, 15
 	</AVAILABLE_IRQ_INFO>
   <TOTAL_MEM_INFO>
-	8019604 kB
+	8050404 kB
 	</TOTAL_MEM_INFO>
   <CPU_PROCESSOR_INFO>
 	0, 1, 2, 3
@@ -402,7 +384,7 @@
           <x2apic_id>0x0</x2apic_id>
           <family_id>0x6</family_id>
           <model_id>0x8e</model_id>
-          <stepping_id>0xb</stepping_id>
+          <stepping_id>0xc</stepping_id>
           <core_type></core_type>
           <native_model_id></native_model_id>
         </thread>
@@ -414,7 +396,7 @@
           <x2apic_id>0x2</x2apic_id>
           <family_id>0x6</family_id>
           <model_id>0x8e</model_id>
-          <stepping_id>0xb</stepping_id>
+          <stepping_id>0xc</stepping_id>
           <core_type></core_type>
           <native_model_id></native_model_id>
         </thread>
@@ -426,7 +408,7 @@
           <x2apic_id>0x4</x2apic_id>
           <family_id>0x6</family_id>
           <model_id>0x8e</model_id>
-          <stepping_id>0xb</stepping_id>
+          <stepping_id>0xc</stepping_id>
           <core_type></core_type>
           <native_model_id></native_model_id>
         </thread>
@@ -438,7 +420,7 @@
           <x2apic_id>0x6</x2apic_id>
           <family_id>0x6</family_id>
           <model_id>0x8e</model_id>
-          <stepping_id>0xb</stepping_id>
+          <stepping_id>0xc</stepping_id>
           <core_type></core_type>
           <native_model_id></native_model_id>
         </thread>
@@ -649,9 +631,9 @@
     <range start="0x0000000000000000" end="0x000000000005efff" size="389120"/>
     <range start="0x0000000000060000" end="0x000000000009ffff" size="262144"/>
     <range start="0x0000000000100000" end="0x000000003fffffff" size="1072693248"/>
-    <range start="0x0000000040400000" end="0x000000008352afff" size="1125298176"/>
-    <range start="0x000000008352d000" end="0x0000000089f86fff" size="111517696"/>
-    <range start="0x000000008aeff000" end="0x000000008aefffff" size="4096"/>
+    <range start="0x0000000040400000" end="0x0000000085cbcfff" size="1166790656"/>
+    <range start="0x0000000085cbf000" end="0x000000008c052fff" size="104415232"/>
+    <range start="0x000000008cfff000" end="0x000000008cffffff" size="4096"/>
     <range start="0x0000000100000000" end="0x000000026dffffff" size="6140461056"/>
   </memory>
   <devices>
@@ -694,11 +676,11 @@
         <acpi_object>\_SB_.PCI0</acpi_object>
         <compatible_id>PNP0A03</compatible_id>
         <acpi_uid>0</acpi_uid>
-        <resource id="res0" type="bus_number" min="0x0" max="0xfffe" len="0xffff"/>
+        <resource id="res0" type="bus_number" min="0x0" max="0xfe" len="0xff"/>
         <resource id="res1" type="io_port" min="0x0" max="0xcf7" len="0xcf8"/>
         <resource id="res2" type="io_port" min="0xcf8" max="0xcf8" len="0x8"/>
         <resource id="res3" type="io_port" min="0xd00" max="0xffff" len="0xf300"/>
-        <resource id="res19" type="memory" min="0x0" max="-0x1" len="0x0"/>
+        <resource id="res19" type="memory" min="0x10000" max="0xffff" len="0x0"/>
         <resource id="res4" type="memory" min="0xa0000" max="0xbffff" len="0x20000"/>
         <resource id="res5" type="memory" min="0xc0000" max="0xbffff" len="0x0"/>
         <resource id="res6" type="memory" min="0xc4000" max="0xc3fff" len="0x0"/>
@@ -811,7 +793,7 @@
           <acpi_object>\_SB_.PCI0.CLP0</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50434930434c5030085f53544100085f4849440d494e543334364600085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50434930434c5030085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494400085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -889,9 +871,61 @@
           <capability id="PASID"/>
           <capability id="ATS"/>
           <capability id="PRI"/>
-          <device address="0x0">
+          <device address="0x9">
+            <acpi_object>\_SB_.PCI0.GFX0.DD09</acpi_object>
+            <aml_template>5b821b5c2f045f53425f504349304746583044443039085f4144520a09</aml_template>
+          </device>
+          <device address="0xa">
+            <acpi_object>\_SB_.PCI0.GFX0.DD0A</acpi_object>
+            <aml_template>5b821b5c2f045f53425f504349304746583044443041085f4144520a0a</aml_template>
+          </device>
+          <device address="0xb">
+            <acpi_object>\_SB_.PCI0.GFX0.DD0B</acpi_object>
+            <aml_template>5b821b5c2f045f53425f504349304746583044443042085f4144520a0b</aml_template>
+          </device>
+          <device address="0xc">
+            <acpi_object>\_SB_.PCI0.GFX0.DD0C</acpi_object>
+            <aml_template>5b821b5c2f045f53425f504349304746583044443043085f4144520a0c</aml_template>
+          </device>
+          <device address="0xd">
+            <acpi_object>\_SB_.PCI0.GFX0.DD0D</acpi_object>
+            <aml_template>5b821b5c2f045f53425f504349304746583044443044085f4144520a0d</aml_template>
+          </device>
+          <device address="0xe">
+            <acpi_object>\_SB_.PCI0.GFX0.DD0E</acpi_object>
+            <aml_template>5b821b5c2f045f53425f504349304746583044443045085f4144520a0e</aml_template>
+          </device>
+          <device address="0xf">
+            <acpi_object>\_SB_.PCI0.GFX0.DD0F</acpi_object>
+            <aml_template>5b821b5c2f045f53425f504349304746583044443046085f4144520a0f</aml_template>
+          </device>
+          <device address="0x300">
             <acpi_object>\_SB_.PCI0.GFX0.DD01</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443031085f41445200</aml_template>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443031085f4144520b0003</aml_template>
+          </device>
+          <device address="0x301">
+            <acpi_object>\_SB_.PCI0.GFX0.DD02</acpi_object>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443032085f4144520b0103</aml_template>
+          </device>
+          <device address="0x302">
+            <acpi_object>\_SB_.PCI0.GFX0.DD03</acpi_object>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443033085f4144520b0203</aml_template>
+          </device>
+          <device address="0x303">
+            <acpi_object>\_SB_.PCI0.GFX0.DD06</acpi_object>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443036085f4144520b0303</aml_template>
+          </device>
+          <device address="0x304">
+            <acpi_object>\_SB_.PCI0.GFX0.DD07</acpi_object>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443037085f4144520b0403</aml_template>
+          </device>
+          <device address="0x305">
+            <acpi_object>\_SB_.PCI0.GFX0.DD08</acpi_object>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443038085f4144520b0503</aml_template>
+          </device>
+          <device address="0x400">
+            <acpi_object>\_SB_.PCI0.GFX0.DD1F</acpi_object>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443146085f4144520b0004</aml_template>
           </device>
           <device address="0x3480">
             <acpi_object>\_SB_.PCI0.GFX0.IPUA</acpi_object>
@@ -902,65 +936,13 @@
               <functioning>n</functioning>
             </status>
           </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD02</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443032085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD03</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443033085f41445200</aml_template>
-          </device>
           <device>
             <acpi_object>\_SB_.PCI0.GFX0.DD04</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443034085f41445200</aml_template>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443034085f4144520b0103</aml_template>
           </device>
           <device>
             <acpi_object>\_SB_.PCI0.GFX0.DD05</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443035085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD06</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443036085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD07</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443037085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD08</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443038085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD09</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443039085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD0A</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443041085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD0B</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443042085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD0C</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443043085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD0D</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443044085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD0E</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443045085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD0F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443046085f41445200</aml_template>
-          </device>
-          <device>
-            <acpi_object>\_SB_.PCI0.GFX0.DD1F</acpi_object>
-            <aml_template>5b821a5c2f045f53425f504349304746583044443146085f41445200</aml_template>
+            <aml_template>5b821c5c2f045f53425f504349304746583044443035085f4144520b0203</aml_template>
           </device>
         </device>
         <device address="0x40000">
@@ -1110,11 +1092,11 @@
         </device>
         <device address="0x140005">
           <acpi_object>\_SB_.PCI0.PSDC</acpi_object>
-          <aml_template>5b824e075c2f035f53425f5043493050534443085f5354410a0f085f4144520c05001400085f4352531146050a528c2500010001001d00030000102717000019002800000000005c5f53422e504349302e47504930008c2500010101000900000000000017000019002800000000005c5f53422e504349302e47504930007900</aml_template>
+          <aml_template>5b824d075c2f035f53425f5043493050534443085f53544100085f4144520c05001400085f4352531146050a528c2500010001001d000300001027170000190028000000e7005c5f53422e504349302e47504930008c25000101010009000000000000170000190028000000e7005c5f53422e504349302e47504930007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource type="LargeResourceItemGPIOConnection" id="res0"/>
           <resource type="LargeResourceItemGPIOConnection" id="res1"/>
@@ -1397,13 +1379,13 @@
           <device id="INT3F0D">
             <acpi_object>\_SB_.PCI0.LPCB.CWDT</acpi_object>
             <compatible_id>PNP0C02</compatible_id>
-            <aml_template>5b82385c2f045f53425f504349304c50434243574454085f5354410a0f085f4849440c25d43f0d085f435253110d0a0a47010000000004047900</aml_template>
+            <aml_template>5b8243045c2f045f53425f504349304c50434243574454085f5354410a0f085f4849440c25d43f0d085f4349440c41d00c02085f435253110d0a0a47015418541804047900</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
               <functioning>y</functioning>
             </status>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x4"/>
+            <resource id="res0" type="io_port" min="0x1854" max="0x1854" len="0x4"/>
           </device>
           <device id="PNP0C08">
             <acpi_object>\_SB_.PCI0.LPCB.HHMD</acpi_object>
@@ -1509,15 +1491,15 @@
             <acpi_object>\_SB_.PCI0.LPCB.LPTE</acpi_object>
             <compatible_id>PNP0400</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8244045c2f045f53425f504349304c5043424c505445085f53544100085f4849440c41d00401085f55494400085f43525311130a1047010000000001082200002a00007900</aml_template>
+            <aml_template>5b824e045c2f045f53425f504349304c5043424c505445085f53544100085f4849440c41d00401085f4349440c41d00400085f55494400085f43525311130a104701e002e00201082280002a00007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x2e0" max="0x2e0" len="0x8"/>
+            <resource id="res1" type="irq" int="7"/>
           </device>
           <device id="PNP0C04">
             <acpi_object>\_SB_.PCI0.LPCB.MATH</acpi_object>
@@ -1534,7 +1516,7 @@
             <acpi_object>\_SB_.PCI0.LPCB.PS2K</acpi_object>
             <compatible_id>PNP030B</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b824a045c2f045f53425f504349304c5043425053324b085f5354410a0f085f4849440c41d00303085f55494400085f43525311180a15470160006000000147016400640000012202007900</aml_template>
+            <aml_template>5b8244055c2f045f53425f504349304c5043425053324b085f5354410a0f085f4849440c41d00303085f4349440c41d0030b085f55494400085f43525311180a15470160006000000147016400640000012202007900</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -1548,7 +1530,7 @@
             <acpi_object>\_SB_.PCI0.LPCB.PS2M</acpi_object>
             <compatible_id>PNP0F13</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b82395c2f045f53425f504349304c5043425053324d085f5354410a0f085f4849440c41d00f03085f55494400085f43525311080a052200107900</aml_template>
+            <aml_template>5b8244045c2f045f53425f504349304c5043425053324d085f5354410a0f085f4849440c41d00f03085f4349440c41d00f13085f55494400085f43525311080a052200107900</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -1596,80 +1578,80 @@
           <device id="PNP0501">
             <acpi_object>\_SB_.PCI0.LPCB.UAR1</acpi_object>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8244045c2f045f53425f504349304c50434255415231085f53544100085f4849440c41d00501085f55494400085f43525311130a1047010000000001082200002a00007900</aml_template>
+            <aml_template>5b8245045c2f045f53425f504349304c50434255415231085f5354410a0f085f4849440c41d00501085f55494400085f43525311130a104701e002e00201082280002a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x2e0" max="0x2e0" len="0x8"/>
+            <resource id="res1" type="irq" int="7"/>
           </device>
           <device id="PNP0501">
             <acpi_object>\_SB_.PCI0.LPCB.UAR2</acpi_object>
             <acpi_uid>1</acpi_uid>
-            <aml_template>5b8244045c2f045f53425f504349304c50434255415232085f53544100085f4849440c41d00501085f55494401085f43525311130a1047010000000001082200002a00007900</aml_template>
+            <aml_template>5b8245045c2f045f53425f504349304c50434255415232085f5354410a0f085f4849440c41d00501085f55494401085f43525311130a104701e002e00201082280002a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x2e0" max="0x2e0" len="0x8"/>
+            <resource id="res1" type="irq" int="7"/>
           </device>
           <device id="PNP0501">
             <acpi_object>\_SB_.PCI0.LPCB.UAR3</acpi_object>
             <acpi_uid>2</acpi_uid>
-            <aml_template>5b8246045c2f045f53425f504349304c50434255415233085f53544100085f4849440c41d00501085f5549440a02085f43525311140a114701000000000108230000192a00007900</aml_template>
+            <aml_template>5b8247045c2f045f53425f504349304c50434255415233085f5354410a0f085f4849440c41d00501085f5549440a02085f43525311140a114701e002e0020108238000192a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x2e0" max="0x2e0" len="0x8"/>
+            <resource id="res1" type="irq" int="7"/>
           </device>
           <device id="PNP0501">
             <acpi_object>\_SB_.PCI0.LPCB.UAR4</acpi_object>
             <acpi_uid>3</acpi_uid>
-            <aml_template>5b8246045c2f045f53425f504349304c50434255415234085f53544100085f4849440c41d00501085f5549440a03085f43525311140a114701000000000108230000192a00007900</aml_template>
+            <aml_template>5b8247045c2f045f53425f504349304c50434255415234085f5354410a0f085f4849440c41d00501085f5549440a03085f43525311140a114701e002e0020108238000192a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x2e0" max="0x2e0" len="0x8"/>
+            <resource id="res1" type="irq" int="7"/>
           </device>
           <device id="PNP0501">
             <acpi_object>\_SB_.PCI0.LPCB.UAR5</acpi_object>
             <acpi_uid>4</acpi_uid>
-            <aml_template>5b8246045c2f045f53425f504349304c50434255415235085f53544100085f4849440c41d00501085f5549440a04085f43525311140a114701000000000108230000192a00007900</aml_template>
+            <aml_template>5b8247045c2f045f53425f504349304c50434255415235085f5354410a0f085f4849440c41d00501085f5549440a04085f43525311140a114701e002e0020108238000192a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x2e0" max="0x2e0" len="0x8"/>
+            <resource id="res1" type="irq" int="7"/>
           </device>
           <device id="PNP0501">
             <acpi_object>\_SB_.PCI0.LPCB.UAR6</acpi_object>
             <acpi_uid>5</acpi_uid>
-            <aml_template>5b8246045c2f045f53425f504349304c50434255415236085f53544100085f4849440c41d00501085f5549440a05085f43525311140a114701000000000108230000192a00007900</aml_template>
+            <aml_template>5b8247045c2f045f53425f504349304c50434255415236085f5354410a0f085f4849440c41d00501085f5549440a05085f43525311140a114701e002e0020108238000192a00007900</aml_template>
             <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
+              <present>y</present>
+              <enabled>y</enabled>
+              <functioning>y</functioning>
             </status>
             <resource type="SmallResourceItemDMA" id="res2"/>
-            <resource id="res0" type="io_port" min="0x0" max="0x0" len="0x8"/>
-            <resource id="res1" type="irq" int=""/>
+            <resource id="res0" type="io_port" min="0x2e0" max="0x2e0" len="0x8"/>
+            <resource id="res1" type="irq" int="7"/>
           </device>
         </device>
         <device address="0x1f0003" id="0x9dc8" description="Audio device: Intel Corporation">
@@ -1693,7 +1675,7 @@
             <acpi_object>\_SB_.PCI0.HDAS.SNDW</acpi_object>
             <compatible_id>PRP00001</compatible_id>
             <compatible_id>PNP0A05</compatible_id>
-            <aml_template>5b82255c2f045f53425f5043493048444153534e4457085f5354410a0b085f4144520c00000040</aml_template>
+            <aml_template>5b8241045c2f045f53425f5043493048444153534e4457085f5354410a0b085f4349441215020d5052503030303031000d504e503041303500085f4144520c00000040</aml_template>
             <status>
               <present>y</present>
               <enabled>y</enabled>
@@ -1753,15 +1735,11 @@
           <class>0x0c8000</class>
           <resource type="memory" min="0xfe010000" max="0xfe010fff" len="0x1000" id="bar0" width="32" prefetchable="0"/>
         </device>
-        <device address="0x1f0006">
-          <acpi_object>\_SB_.PCI0.GLAN</acpi_object>
-          <aml_template>5b821a5c2f035f53425f50434930474c414e085f4144520c06001f00</aml_template>
-        </device>
         <device id="INT346F">
           <acpi_object>\_SB_.PCI0.CLP1</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b824d055c2f035f53425f50434930434c5031085f53544100085f4849440d494e543334364600085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504349302e49324333007900</aml_template>
+          <aml_template>5b824b065c2f035f53425f50434930434c5031085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060049005c5f53422e504349302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1774,7 +1752,7 @@
           <acpi_object>\_SB_.PCI0.CLP2</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50434930434c5032085f53544100085f4849440d494e543334364600085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50434930434c5032085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1787,7 +1765,7 @@
           <acpi_object>\_SB_.PCI0.CLP3</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b824e055c2f035f53425f50434930434c5033085f53544100085f4849440d494e543334364600085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
+          <aml_template>5b824c065c2f035f53425f50434930434c5033085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a06004d005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1800,7 +1778,7 @@
           <acpi_object>\_SB_.PCI0.DOCK</acpi_object>
           <compatible_id>PNP0C15</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b822c5c2f035f53425f50434930444f434b085f53544100085f4849440d414243443030303000085f5549440a02</aml_template>
+          <aml_template>5b82365c2f035f53425f50434930444f434b085f53544100085f4849440d414243443030303000085f4349440c41d00c15085f5549440a02</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1811,7 +1789,7 @@
           <acpi_object>\_SB_.PCI0.DSC0</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b823b5c2f035f53425f5043493044534330085f53544100085f4849440d494e543334364600085f55494400085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824a045c2f035f53425f5043493044534330085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494400085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1822,18 +1800,21 @@
           <acpi_object>\_SB_.PCI0.DSC1</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b823b5c2f035f53425f5043493044534331085f53544100085f4849440d494e543334364600085f55494401085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824b095c2f035f53425f5043493044534331085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f55494401085f41445200085f4352531146050a528c25000101010002000000000000170000190028000000b6005c5f53422e504349302e47504930008c2500010101000200000000000017000019002800000010005c5f53422e504349302e47504930007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGPIOConnection" id="res0"/>
+          <resource type="LargeResourceItemGPIOConnection" id="res1"/>
+          <dependency type="consumes resources from">\_SB_.PCI0.GPI0</dependency>
         </device>
         <device id="INT346F">
           <acpi_object>\_SB_.PCI0.DSC2</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043493044534332085f53544100085f4849440d494e543334364600085f5549440a02085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824b045c2f035f53425f5043493044534332085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a02085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1844,7 +1825,7 @@
           <acpi_object>\_SB_.PCI0.DSC3</acpi_object>
           <compatible_id>INT346F</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f5043493044534333085f53544100085f4849440d494e543334364600085f5549440a03085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824b045c2f035f53425f5043493044534333085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440a03085f41445200085f43525311050a027900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
@@ -1853,37 +1834,53 @@
         </device>
         <device id="INT34BB">
           <acpi_object>\_SB_.PCI0.GPI0</acpi_object>
-          <aml_template>5b824d055c2f035f53425f5043493047504930085f53544100085f4849440d494e543334424200085f43525311320a2f8609000100000000000001008609000100000000000001008609000100000000000001008906000d010e0000007900</aml_template>
+          <aml_template>5b824d055c2f035f53425f5043493047504930085f53544100085f4849440d494e543334424200085f43525311320a2f8609000100006efd000001008609000100006dfd000001008609000100006afd000001008906000d010e0000007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
           <resource id="res3" type="irq" int="14"/>
-          <resource id="res0" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-          <resource id="res1" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-          <resource id="res2" type="memory" min="0x0" max="0xffff" len="0x10000"/>
+          <resource id="res2" type="memory" min="0xfd6a0000" max="0xfd6affff" len="0x10000"/>
+          <resource id="res1" type="memory" min="0xfd6d0000" max="0xfd6dffff" len="0x10000"/>
+          <resource id="res0" type="memory" min="0xfd6e0000" max="0xfd6effff" len="0x10000"/>
           <dependency type="provides resources to">\_SB_.PCI0.PSDC</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.DSC1</dependency>
         </device>
         <device id="INT34B2">
           <acpi_object>\_SB_.PCI0.I2C0</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493049324330085f5354410a0f085f4849440d494e543334423200085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493049324330085f53544100085f4849440d494e543334423200085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="16"/>
           <resource id="res0" type="memory" min="0xfe020000" max="0xfe020fff" len="0x1000"/>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C0.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C0.HDAC</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C0.PA01</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C0.TPL1</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C0.UCMX</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C0.TPD0</dependency>
+          <device id="INT0000">
+            <acpi_object>\_SB_.PCI0.I2C0.HDAC</acpi_object>
+            <compatible_id>INT0000</compatible_id>
+            <acpi_uid>1</acpi_uid>
+            <aml_template>5b8242075c2f045f53425f504349304932433048444143085f53544100085f4849440d494e543030303000085f4349440d494e543030303000085f55494401085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324330008906001101500000007900</aml_template>
+            <status>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
+            </status>
+            <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+            <resource id="res1" type="irq" int="80"/>
+            <dependency type="consumes resources from">\_SB_.PCI0.I2C0</dependency>
+          </device>
           <device id="MAX34407">
             <acpi_object>\_SB_.PCI0.I2C0.PA01</acpi_object>
             <compatible_id>MAX34407</compatible_id>
             <acpi_uid>1</acpi_uid>
-            <aml_template>5b824c055c2f045f53425f504349304932433050413031085f53544100085f4849440d4d4158333434303700085f55494401085f43525311260a238e1e00010001020000010600801a060010005c5f53422e504349302e49324330007900</aml_template>
+            <aml_template>5b824b065c2f045f53425f504349304932433050413031085f53544100085f4849440d4d4158333434303700085f4349440d4d4158333434303700085f55494401085f43525311260a238e1e00010001020000010600801a060010005c5f53422e504349302e49324330007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1895,33 +1892,33 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C0.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b8240065c2f045f53425f504349304932433054504430085f5354410a0f085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324330008906001501000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433054504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324330008906001501500000007900</aml_template>
             <status>
-              <present>y</present>
-              <enabled>y</enabled>
-              <functioning>y</functioning>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C0</dependency>
           </device>
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C0.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433054504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324330008906000101000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433054504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324330008906000101500000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C0</dependency>
           </device>
           <device id="INT3515">
             <acpi_object>\_SB_.PCI0.I2C0.UCMX</acpi_object>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b82430e5c2f045f53425f504349304932433055434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324330008e1e00010001020000010600801a06003f005c5f53422e504349302e49324330008e1e00010001020000010600801a060020005c5f53422e504349302e49324330008e1e00010001020000010600801a060027005c5f53422e504349302e49324330008906000501000000008906000501000000008906000501000000008906000501000000007900</aml_template>
+            <aml_template>5b82430e5c2f045f53425f504349304932433055434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324330008e1e00010001020000010600801a06003f005c5f53422e504349302e49324330008e1e00010001020000010600801a060020005c5f53422e504349302e49324330008e1e00010001020000010600801a060027005c5f53422e504349302e49324330008906000501500000008906000501500000008906000501500000008906000501000000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1931,56 +1928,56 @@
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
-            <resource id="res4" type="irq" int="0"/>
-            <resource id="res5" type="irq" int="0"/>
-            <resource id="res6" type="irq" int="0"/>
             <resource id="res7" type="irq" int="0"/>
+            <resource id="res4" type="irq" int="80"/>
+            <resource id="res5" type="irq" int="80"/>
+            <resource id="res6" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C0</dependency>
           </device>
         </device>
         <device id="INT34B3">
           <acpi_object>\_SB_.PCI0.I2C1</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493049324331085f5354410a0f085f4849440d494e543334423300085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493049324331085f53544100085f4849440d494e543334423300085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="17"/>
           <resource id="res0" type="memory" min="0xfe022000" max="0xfe022fff" len="0x1000"/>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C1.UCMX</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C1.TPD0</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C1.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C1.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C1.UCMX</dependency>
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C1.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433154504430085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324331008906001501000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433154504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324331008906001501500000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C1</dependency>
           </device>
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C1.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b8240065c2f045f53425f504349304932433154504c31085f5354410a0f085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324331008906000101000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433154504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324331008906000101500000007900</aml_template>
             <status>
-              <present>y</present>
-              <enabled>y</enabled>
-              <functioning>y</functioning>
+              <present>n</present>
+              <enabled>n</enabled>
+              <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C1</dependency>
           </device>
           <device id="INT3515">
             <acpi_object>\_SB_.PCI0.I2C1.UCMX</acpi_object>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b82430e5c2f045f53425f504349304932433155434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324331008e1e00010001020000010600801a06003f005c5f53422e504349302e49324331008e1e00010001020000010600801a060020005c5f53422e504349302e49324331008e1e00010001020000010600801a060027005c5f53422e504349302e49324331008906000501000000008906000501000000008906000501000000008906000501000000007900</aml_template>
+            <aml_template>5b82430e5c2f045f53425f504349304932433155434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324331008e1e00010001020000010600801a06003f005c5f53422e504349302e49324331008e1e00010001020000010600801a060020005c5f53422e504349302e49324331008e1e00010001020000010600801a060027005c5f53422e504349302e49324331008906000501500000008906000501500000008906000501500000008906000501000000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -1990,36 +1987,39 @@
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
-            <resource id="res4" type="irq" int="0"/>
-            <resource id="res5" type="irq" int="0"/>
-            <resource id="res6" type="irq" int="0"/>
             <resource id="res7" type="irq" int="0"/>
+            <resource id="res4" type="irq" int="80"/>
+            <resource id="res5" type="irq" int="80"/>
+            <resource id="res6" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C1</dependency>
           </device>
         </device>
         <device id="INT34B4">
           <acpi_object>\_SB_.PCI0.I2C2</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493049324332085f5354410a0f085f4849440d494e543334423400085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493049324332085f53544100085f4849440d494e543334423400085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="18"/>
           <resource id="res0" type="memory" min="0xfe024000" max="0xfe024fff" len="0x1000"/>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C2.CAM0</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.CLP0</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C2.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C2.PMIC</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.CLP2</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.CLP3</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C2.UCMX</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.LNK3</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C2.TPD0</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C2.CAM0</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.LNK0</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C2.PMIC</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C2.TPL1</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.CLP0</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C2.UCMX</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.CLP2</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.LNK1</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.CLP3</dependency>
           <device id="INT3471" address="0x0">
             <acpi_object>\_SB_.PCI0.I2C2.CAM0</acpi_object>
             <compatible_id>INT3471</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8249105c2f045f53425f504349304932433243414d30085f53544100085f4849440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504349302e49324332008e1e00010001020000010600801a06000e005c5f53422e504349302e49324332008e1e00010001020000010600801a060050005c5f53422e504349302e49324332008e1e00010001020000010600801a060051005c5f53422e504349302e49324332008e1e00010001020000010600801a060052005c5f53422e504349302e49324332008e1e00010001020000010600801a060053005c5f53422e504349302e49324332007900</aml_template>
+            <aml_template>5b8247115c2f045f53425f504349304932433243414d30085f53544100085f4849440d494e543334373100085f4349440d494e543334373100085f5549440d3000085f41445200085f435253114c0c0ac88e1e00010001020000010600801a060010005c5f53422e504349302e49324332008e1e00010001020000010600801a06000e005c5f53422e504349302e49324332008e1e00010001020000010600801a060050005c5f53422e504349302e49324332008e1e00010001020000010600801a060051005c5f53422e504349302e49324332008e1e00010001020000010600801a060052005c5f53422e504349302e49324332008e1e00010001020000010600801a060053005c5f53422e504349302e49324332007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2037,7 +2037,7 @@
             <acpi_object>\_SB_.PCI0.I2C2.PMIC</acpi_object>
             <compatible_id>INT346F</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f5043493049324332504d4943085f53544100085f4849440d494e543334364600085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504349302e49324332007900</aml_template>
+            <aml_template>5b8241075c2f045f53425f5043493049324332504d4943085f53544100085f4849440d494e543334364600085f4349440d494e543334364600085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a06004c005c5f53422e504349302e49324332007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2049,33 +2049,33 @@
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C2.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433254504430085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906001501000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433254504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906001501500000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C2</dependency>
           </device>
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C2.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433254504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906000101000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433254504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324332008906000101500000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C2</dependency>
           </device>
           <device id="INT3515">
             <acpi_object>\_SB_.PCI0.I2C2.UCMX</acpi_object>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b82430e5c2f045f53425f504349304932433255434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324332008e1e00010001020000010600801a06003f005c5f53422e504349302e49324332008e1e00010001020000010600801a060020005c5f53422e504349302e49324332008e1e00010001020000010600801a060027005c5f53422e504349302e49324332008906000501000000008906000501000000008906000501000000008906000501000000007900</aml_template>
+            <aml_template>5b82430e5c2f045f53425f504349304932433255434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324332008e1e00010001020000010600801a06003f005c5f53422e504349302e49324332008e1e00010001020000010600801a060020005c5f53422e504349302e49324332008e1e00010001020000010600801a060027005c5f53422e504349302e49324332008906000501500000008906000501500000008906000501500000008906000501000000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2085,57 +2085,58 @@
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
-            <resource id="res4" type="irq" int="0"/>
-            <resource id="res5" type="irq" int="0"/>
-            <resource id="res6" type="irq" int="0"/>
             <resource id="res7" type="irq" int="0"/>
+            <resource id="res4" type="irq" int="80"/>
+            <resource id="res5" type="irq" int="80"/>
+            <resource id="res6" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C2</dependency>
           </device>
         </device>
         <device id="INT34B5">
           <acpi_object>\_SB_.PCI0.I2C3</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493049324333085f5354410a0f085f4849440d494e543334423500085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493049324333085f53544100085f4849440d494e543334423500085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="19"/>
           <resource id="res0" type="memory" min="0xfe026000" max="0xfe026fff" len="0x1000"/>
+          <dependency type="provides resources to">\_SB_.PCI0.LNK2</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C3.UCMX</dependency>
+          <dependency type="provides resources to">\_SB_.PCI0.I2C3.TPL1</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.CLP1</dependency>
           <dependency type="provides resources to">\_SB_.PCI0.I2C3.TPD0</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C3.TPL1</dependency>
-          <dependency type="provides resources to">\_SB_.PCI0.I2C3.UCMX</dependency>
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C3.TPD0</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433354504430085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324333008906001501000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433354504430085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324333008906001501500000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C3</dependency>
           </device>
           <device id="XXXX0000">
             <acpi_object>\_SB_.PCI0.I2C3.TPL1</acpi_object>
             <compatible_id>PNP0C50</compatible_id>
-            <aml_template>5b824f055c2f045f53425f504349304932433354504c31085f53544100085f4849440d585858583030303000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324333008906000101000000007900</aml_template>
+            <aml_template>5b824d065c2f045f53425f504349304932433354504c31085f53544100085f4849440d585858583030303000085f4349440d504e503043353000085f435253112f0a2c8e1e00010001020000010600801a060000005c5f53422e504349302e49324333008906000101500000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
               <functioning>n</functioning>
             </status>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
-            <resource id="res1" type="irq" int="0"/>
+            <resource id="res1" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C3</dependency>
           </device>
           <device id="INT3515">
             <acpi_object>\_SB_.PCI0.I2C3.UCMX</acpi_object>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b82430e5c2f045f53425f504349304932433355434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324333008e1e00010001020000010600801a06003f005c5f53422e504349302e49324333008e1e00010001020000010600801a060020005c5f53422e504349302e49324333008e1e00010001020000010600801a060027005c5f53422e504349302e49324333008906000501000000008906000501000000008906000501000000008906000501000000007900</aml_template>
+            <aml_template>5b82430e5c2f045f53425f504349304932433355434d58085f53544100085f4849440d494e543335313500085f55494400085f435253114e0a0aaa8e1e00010001020000010600801a060038005c5f53422e504349302e49324333008e1e00010001020000010600801a06003f005c5f53422e504349302e49324333008e1e00010001020000010600801a060020005c5f53422e504349302e49324333008e1e00010001020000010600801a060027005c5f53422e504349302e49324333008906000501500000008906000501500000008906000501500000008906000501000000007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2145,20 +2146,20 @@
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
             <resource type="LargeResourceItemGenericSerialBusConnection" id="res3"/>
-            <resource id="res4" type="irq" int="0"/>
-            <resource id="res5" type="irq" int="0"/>
-            <resource id="res6" type="irq" int="0"/>
             <resource id="res7" type="irq" int="0"/>
+            <resource id="res4" type="irq" int="80"/>
+            <resource id="res5" type="irq" int="80"/>
+            <resource id="res6" type="irq" int="80"/>
             <dependency type="consumes resources from">\_SB_.PCI0.I2C3</dependency>
           </device>
         </device>
         <device id="INT34B6">
           <acpi_object>\_SB_.PCI0.I2C4</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493049324334085f5354410a0f085f4849440d494e543334423600085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493049324334085f53544100085f4849440d494e543334423600085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="32"/>
           <resource id="res0" type="memory" min="0xfe028000" max="0xfe028fff" len="0x1000"/>
@@ -2167,7 +2168,7 @@
             <acpi_object>\_SB_.PCI0.I2C4.CAM1</acpi_object>
             <compatible_id>INT3474</compatible_id>
             <acpi_uid>0</acpi_uid>
-            <aml_template>5b8243065c2f045f53425f504349304932433443414d31085f53544100085f4849440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324334007900</aml_template>
+            <aml_template>5b8241075c2f045f53425f504349304932433443414d31085f53544100085f4849440d494e543334373400085f4349440d494e543334373400085f5549440d3000085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324334007900</aml_template>
             <status>
               <present>n</present>
               <enabled>n</enabled>
@@ -2179,11 +2180,11 @@
         </device>
         <device id="INT34B7">
           <acpi_object>\_SB_.PCI0.I2C5</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493049324335085f5354410a0f085f4849440d494e543334423700085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493049324335085f53544100085f4849440d494e543334423700085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="33"/>
           <resource id="res0" type="memory" min="0xfe02a000" max="0xfe02afff" len="0x1000"/>
@@ -2191,62 +2192,73 @@
         <device id="PNP0C02">
           <acpi_object>\_SB_.PCI0.IOTR</acpi_object>
           <acpi_uid>IoTraps</acpi_uid>
-          <aml_template>5b82335c2f035f53425f50434930494f5452085f4849440c41d00c02085f5549440d496f547261707300085f43525311050a027900</aml_template>
+          <aml_template>5b823b5c2f035f53425f50434930494f5452085f4849440c41d00c02085f5549440d496f547261707300085f435253110d0a0a47010020002001ff7900</aml_template>
+          <resource id="res0" type="io_port" min="0x2000" max="0x2000" len="0xff"/>
         </device>
         <device id="OVTIF860">
           <acpi_object>\_SB_.PCI0.LNK0</acpi_object>
           <compatible_id>OVTIF860</compatible_id>
           <acpi_uid>0</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504349304c4e4b30085f53544100085f4849440d4f5654494638363000085f55494400085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b82400b5c2f035f53425f504349304c4e4b30085f53544100085f4849440d4f5654494638363000085f4349440d4f5654494638363000085f55494400085f41445200085f4352531149060a658e1e00010001020000010600801a060010005c5f53422e504349302e49324332008e1e00010001020000010600801a060072005c5f53422e504349302e49324332008e1e00010001020000010600801a060051005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res1"/>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res2"/>
+          <dependency type="consumes resources from">\_SB_.PCI0.I2C2</dependency>
         </device>
         <device id="OVTI9234">
           <acpi_object>\_SB_.PCI0.LNK1</acpi_object>
           <compatible_id>OVTI9234</compatible_id>
           <acpi_uid>1</acpi_uid>
-          <aml_template>5b823c5c2f035f53425f504349304c4e4b31085f53544100085f4849440d4f5654493932333400085f55494401085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824d065c2f035f53425f504349304c4e4b31085f53544100085f4849440d4f5654493932333400085f4349440d4f5654493932333400085f55494401085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <dependency type="consumes resources from">\_SB_.PCI0.I2C2</dependency>
         </device>
         <device id="OVTI8856">
           <acpi_object>\_SB_.PCI0.LNK2</acpi_object>
           <compatible_id>OVTI8856</compatible_id>
           <acpi_uid>2</acpi_uid>
-          <aml_template>5b823d5c2f035f53425f504349304c4e4b32085f53544100085f4849440d4f5654493838353600085f5549440a02085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824e065c2f035f53425f504349304c4e4b32085f53544100085f4849440d4f5654493838353600085f4349440d4f5654493838353600085f5549440a02085f41445200085f43525311260a238e1e00010001020000010600801a060010005c5f53422e504349302e49324333007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <dependency type="consumes resources from">\_SB_.PCI0.I2C3</dependency>
         </device>
         <device id="OVTI9234">
           <acpi_object>\_SB_.PCI0.LNK3</acpi_object>
           <compatible_id>OVTI9234</compatible_id>
           <acpi_uid>3</acpi_uid>
-          <aml_template>5b823d5c2f035f53425f504349304c4e4b33085f53544100085f4849440d4f5654493932333400085f5549440a03085f41445200085f43525311050a027900</aml_template>
+          <aml_template>5b824e065c2f035f53425f504349304c4e4b33085f53544100085f4849440d4f5654493932333400085f4349440d4f5654493932333400085f5549440a03085f41445200085f43525311260a238e1e00010001020000010600801a060036005c5f53422e504349302e49324332007900</aml_template>
           <status>
             <present>n</present>
             <enabled>n</enabled>
             <functioning>n</functioning>
           </status>
+          <resource type="LargeResourceItemGenericSerialBusConnection" id="res0"/>
+          <dependency type="consumes resources from">\_SB_.PCI0.I2C2</dependency>
         </device>
         <device id="PNP0C02">
           <acpi_object>\_SB_.PCI0.PDRC</acpi_object>
           <acpi_uid>1</acpi_uid>
           <aml_template>5b82205c2f035f53425f5043493050445243085f4849440c41d00c02085f55494401</aml_template>
-          <resource id="res0" type="memory" min="0x0" max="0x7fff" len="0x8000"/>
-          <resource id="res1" type="memory" min="0x0" max="0xfff" len="0x1000"/>
-          <resource id="res2" type="memory" min="0x0" max="0xfff" len="0x1000"/>
-          <resource id="res3" type="memory" min="0x0" max="-0x1" len="0x0"/>
-          <resource id="res8" type="memory" min="0x0" max="-0x1" len="0x0"/>
-          <resource id="res9" type="memory" min="0x0" max="-0x1" len="0x0"/>
+          <resource id="res8" type="memory" min="0x0" max="0x0" len="0x0"/>
+          <resource id="res9" type="memory" min="0x0" max="0x0" len="0x0"/>
+          <resource id="res3" type="memory" min="0xe0000000" max="0xefffffff" len="0x10000000"/>
+          <resource id="res0" type="memory" min="0xfed10000" max="0xfed17fff" len="0x8000"/>
+          <resource id="res1" type="memory" min="0xfed18000" max="0xfed18fff" len="0x1000"/>
+          <resource id="res2" type="memory" min="0xfed19000" max="0xfed19fff" len="0x1000"/>
           <resource id="res4" type="memory" min="0xfed20000" max="0xfed3ffff" len="0x20000"/>
           <resource id="res6" type="memory" min="0xfed45000" max="0xfed8ffff" len="0x4b000"/>
           <resource id="res5" type="memory" min="0xfed90000" max="0xfed93fff" len="0x4000"/>
@@ -2255,15 +2267,15 @@
         <device id="PNP0C02">
           <acpi_object>\_SB_.PCI0.PRRE</acpi_object>
           <acpi_uid>PCHRESV</acpi_uid>
-          <aml_template>5b824c085c2f035f53425f5043493050525245085f5354410a03085f4849440c41d00c02085f5549440d5043485245535600085f4352531146050a5286090001000000fd00006a008609000100000000000002008609000100006ffd0000910086090001000000fe0000020086090001000020fe0000600086090000000000ff0000000147010018001801ff7900</aml_template>
+          <aml_template>5b824c085c2f035f53425f5043493050525245085f5354410a03085f4849440c41d00c02085f5549440d5043485245535600085f4352531146050a5286090001000000fd00006a008609000100006bfd000002008609000100006ffd0000910086090001000000fe0000020086090001000020fe0000600086090000000000ff0000000147010018001801ff7900</aml_template>
           <status>
             <present>y</present>
             <enabled>y</enabled>
             <functioning>n</functioning>
           </status>
           <resource id="res6" type="io_port" min="0x1800" max="0x1800" len="0xff"/>
-          <resource id="res1" type="memory" min="0x0" max="0x1ffff" len="0x20000"/>
           <resource id="res0" type="memory" min="0xfd000000" max="0xfd69ffff" len="0x6a0000"/>
+          <resource id="res1" type="memory" min="0xfd6b0000" max="0xfd6cffff" len="0x20000"/>
           <resource id="res2" type="memory" min="0xfd6f0000" max="0xfdffffff" len="0x910000"/>
           <resource id="res3" type="memory" min="0xfe000000" max="0xfe01ffff" len="0x20000"/>
           <resource id="res4" type="memory" min="0xfe200000" max="0xfe7fffff" len="0x600000"/>
@@ -2331,6 +2343,10 @@
             <acpi_object>\_SB_.PCI0.RP09.PXSX</acpi_object>
             <aml_template>5b821a5c2f045f53425f504349305250303950585358085f41445200</aml_template>
           </device>
+          <device address="0xff">
+            <acpi_object>\_SB_.PCI0.RP09.SL09</acpi_object>
+            <aml_template>5b821b5c2f045f53425f5043493052503039534c3039085f4144520aff</aml_template>
+          </device>
         </device>
         <device>
           <acpi_object>\_SB_.PCI0.RP10</acpi_object>
@@ -2440,67 +2456,49 @@
         <device id="PNP0C02">
           <acpi_object>\_SB_.PCI0.SIRC</acpi_object>
           <acpi_uid>5</acpi_uid>
-          <aml_template>5b8241065c2f035f53425f5043493053495243085f5354410a03085f4849440c41d00c02085f5549440a05085f43525311320a2f8609000100000000000001008609000100000000000001008609000100000000000001008906000d010e0000007900</aml_template>
+          <aml_template>5b8241065c2f035f53425f5043493053495243085f5354410a03085f4849440c41d00c02085f5549440a05085f43525311320a2f8609000100006efd000001008609000100006dfd000001008609000100006afd000001008906000d010e0000007900</aml_template>
           <status>
             <present>y</present>
             <enabled>y</enabled>
             <functioning>n</functioning>
           </status>
           <resource id="res3" type="irq" int="14"/>
-          <resource id="res0" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-          <resource id="res1" type="memory" min="0x0" max="0xffff" len="0x10000"/>
-          <resource id="res2" type="memory" min="0x0" max="0xffff" len="0x10000"/>
+          <resource id="res2" type="memory" min="0xfd6a0000" max="0xfd6affff" len="0x10000"/>
+          <resource id="res1" type="memory" min="0xfd6d0000" max="0xfd6dffff" len="0x10000"/>
+          <resource id="res0" type="memory" min="0xfd6e0000" max="0xfd6effff" len="0x10000"/>
         </device>
         <device id="INT34B0">
           <acpi_object>\_SB_.PCI0.SPI0</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493053504930085f5354410a0f085f4849440d494e543334423000085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493053504930085f53544100085f4849440d494e543334423000085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="22"/>
           <resource id="res0" type="memory" min="0xfe02c000" max="0xfe02cfff" len="0x1000"/>
         </device>
         <device id="INT34B1">
           <acpi_object>\_SB_.PCI0.SPI1</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493053504931085f5354410a0f085f4849440d494e543334423100085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493053504931085f53544100085f4849440d494e543334423100085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="23"/>
           <resource id="res0" type="memory" min="0xfe02e000" max="0xfe02efff" len="0x1000"/>
-          <device id="FPNT_DIS">
-            <acpi_object>\_SB_.PCI0.SPI1.FPNT</acpi_object>
-            <aml_template>5b822a5c2f045f53425f504349305350493146504e54085f5354410a0f085f4849440d46504e545f44495300</aml_template>
-            <status>
-              <present>y</present>
-              <enabled>y</enabled>
-              <functioning>y</functioning>
-            </status>
-          </device>
         </device>
         <device id="INT34BC">
           <acpi_object>\_SB_.PCI0.SPI2</acpi_object>
-          <aml_template>5b8246045c2f035f53425f5043493053504932085f5354410a0f085f4849440d494e543334424300085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8245045c2f035f53425f5043493053504932085f53544100085f4849440d494e543334424300085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="24"/>
           <resource id="res0" type="memory" min="0xfe030000" max="0xfe030fff" len="0x1000"/>
-          <device id="FPNT_DIS">
-            <acpi_object>\_SB_.PCI0.SPI2.FPNT</acpi_object>
-            <aml_template>5b82295c2f045f53425f504349305350493246504e54085f53544100085f4849440d46504e545f44495300</aml_template>
-            <status>
-              <present>n</present>
-              <enabled>n</enabled>
-              <functioning>n</functioning>
-            </status>
-          </device>
         </device>
         <device id="PNP0C02">
           <acpi_object>\_SB_.PCI0.SRRE</acpi_object>
@@ -2517,11 +2515,11 @@
         <device id="INT34B8">
           <acpi_object>\_SB_.PCI0.UA00</acpi_object>
           <acpi_uid>SerialIoUart0</acpi_uid>
-          <aml_template>5b824a055c2f035f53425f5043493055413030085f5354410a0f085f4849440d494e543334423800085f5549440d53657269616c496f556172743000085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8249055c2f035f53425f5043493055413030085f53544100085f4849440d494e543334423800085f5549440d53657269616c496f556172743000085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="20"/>
           <resource id="res0" type="memory" min="0xfe032000" max="0xfe032fff" len="0x1000"/>
@@ -2529,11 +2527,11 @@
         <device id="INT34B9">
           <acpi_object>\_SB_.PCI0.UA01</acpi_object>
           <acpi_uid>SerialIoUart1</acpi_uid>
-          <aml_template>5b824a055c2f035f53425f5043493055413031085f5354410a0f085f4849440d494e543334423900085f5549440d53657269616c496f556172743100085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8249055c2f035f53425f5043493055413031085f53544100085f4849440d494e543334423900085f5549440d53657269616c496f556172743100085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="21"/>
           <resource id="res0" type="memory" min="0xfe034000" max="0xfe034fff" len="0x1000"/>
@@ -2541,11 +2539,11 @@
         <device id="INT34BA">
           <acpi_object>\_SB_.PCI0.UA02</acpi_object>
           <acpi_uid>SerialIoUart2</acpi_uid>
-          <aml_template>5b824a055c2f035f53425f5043493055413032085f5354410a0f085f4849440d494e543334424100085f5549440d53657269616c496f556172743200085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
+          <aml_template>5b8249055c2f035f53425f5043493055413032085f53544100085f4849440d494e543334424100085f5549440d53657269616c496f556172743200085f435253111a0a1786090001006003fe001000008906000d01220000007900</aml_template>
           <status>
-            <present>y</present>
-            <enabled>y</enabled>
-            <functioning>y</functioning>
+            <present>n</present>
+            <enabled>n</enabled>
+            <functioning>n</functioning>
           </status>
           <resource id="res1" type="irq" int="34"/>
           <resource id="res0" type="memory" min="0xfe036000" max="0xfe036fff" len="0x1000"/>
@@ -2553,11 +2551,11 @@
       </bus>
       <device id="ACPI000E">
         <acpi_object>\_SB_.AWAC</acpi_object>
-        <aml_template>5b82205c2e5f53425f41574143085f53544100085f4849440d414350493030304500</aml_template>
+        <aml_template>5b82215c2e5f53425f41574143085f5354410a0f085f4849440d414350493030304500</aml_template>
         <status>
-          <present>n</present>
-          <enabled>n</enabled>
-          <functioning>n</functioning>
+          <present>y</present>
+          <enabled>y</enabled>
+          <functioning>y</functioning>
         </status>
       </device>
       <device id="INT3519" description="CoExistence Manager">
@@ -2571,11 +2569,11 @@
       </device>
       <device id="INT0E0C" description="Enclave Page Cache 1.0">
         <acpi_object>\_SB_.EPC_</acpi_object>
-        <aml_template>5b824d085c2e5f53425f4550435f085f5354410a0f085f4849440c25d40e0c085f53545211310a2e45006e0063006c0061007600650020005000610067006500200043006100630068006500200031002e0030000000085f43525311330a308a2b0000010100000000000000000000000000000000ffffffffffffffff000000000000000001000000000000007900</aml_template>
+        <aml_template>5b824c085c2e5f53425f4550435f085f53544100085f4849440c25d40e0c085f53545211310a2e45006e0063006c0061007600650020005000610067006500200043006100630068006500200031002e0030000000085f43525311330a308a2b00000101000000000000000000000000000000000000000000000000000000000000000001000000000000007900</aml_template>
         <status>
-          <present>y</present>
-          <enabled>y</enabled>
-          <functioning>y</functioning>
+          <present>n</present>
+          <enabled>n</enabled>
+          <functioning>n</functioning>
         </status>
         <resource id="res0" type="memory" min="0x0" max="0x0" len="0x1"/>
       </device>
@@ -2591,10 +2589,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKA</acpi_object>
         <acpi_uid>1</acpi_uid>
-        <aml_template>5b82315c2e5f53425f4c4e4b41085f5354410a0b085f4849440c41d00c0f085f55494401085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82315c2e5f53425f4c4e4b41085f5354410a09085f4849440c41d00c0f085f55494401085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -2602,10 +2600,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKB</acpi_object>
         <acpi_uid>2</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b42085f5354410a0b085f4849440c41d00c0f085f5549440a02085f43525311090a06238a00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b42085f5354410a09085f4849440c41d00c0f085f5549440a02085f43525311090a06238a00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="1, 3, 7"/>
@@ -2613,10 +2611,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKC</acpi_object>
         <acpi_uid>3</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b43085f5354410a0b085f4849440c41d00c0f085f5549440a03085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b43085f5354410a09085f4849440c41d00c0f085f5549440a03085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -2624,10 +2622,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKD</acpi_object>
         <acpi_uid>4</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b44085f5354410a0b085f4849440c41d00c0f085f5549440a04085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b44085f5354410a09085f4849440c41d00c0f085f5549440a04085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -2635,10 +2633,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKE</acpi_object>
         <acpi_uid>5</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b45085f5354410a0b085f4849440c41d00c0f085f5549440a05085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b45085f5354410a09085f4849440c41d00c0f085f5549440a05085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -2646,10 +2644,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKF</acpi_object>
         <acpi_uid>6</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b46085f5354410a0b085f4849440c41d00c0f085f5549440a06085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b46085f5354410a09085f4849440c41d00c0f085f5549440a06085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -2657,10 +2655,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKG</acpi_object>
         <acpi_uid>7</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b47085f5354410a0b085f4849440c41d00c0f085f5549440a07085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b47085f5354410a09085f4849440c41d00c0f085f5549440a07085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -2668,10 +2666,10 @@
       <device id="PNP0C0F">
         <acpi_object>\_SB_.LNKH</acpi_object>
         <acpi_uid>8</acpi_uid>
-        <aml_template>5b82325c2e5f53425f4c4e4b48085f5354410a0b085f4849440c41d00c0f085f5549440a08085f43525311090a06238b00187900</aml_template>
+        <aml_template>5b82325c2e5f53425f4c4e4b48085f5354410a09085f4849440c41d00c0f085f5549440a08085f43525311090a06238b00187900</aml_template>
         <status>
           <present>y</present>
-          <enabled>y</enabled>
+          <enabled>n</enabled>
           <functioning>y</functioning>
         </status>
         <resource id="res0" type="irq" int="0, 1, 3, 7"/>
@@ -2689,7 +2687,7 @@
         <acpi_object>\_SB_.PEPD</acpi_object>
         <compatible_id>PNP0D80</compatible_id>
         <acpi_uid>1</acpi_uid>
-        <aml_template>5b82265c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f55494401</aml_template>
+        <aml_template>5b82305c2e5f53425f50455044085f5354410a0f085f4849440d494e543333413100085f4349440c41d00d80085f55494401</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -2699,7 +2697,7 @@
       <device id="INT340E">
         <acpi_object>\_SB_.PTID</acpi_object>
         <compatible_id>PNP0C02</compatible_id>
-        <aml_template>5b821c5c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e</aml_template>
+        <aml_template>5b82265c2e5f53425f50544944085f5354410a0f085f4849440c25d4340e085f4349440c41d00c02</aml_template>
         <status>
           <present>y</present>
           <enabled>y</enabled>
@@ -2739,13 +2737,13 @@
         <acpi_object>\_SB_.UBTC</acpi_object>
         <compatible_id>PNP0CA0</compatible_id>
         <acpi_uid>0</acpi_uid>
-        <aml_template>5b82385c2e5f53425f55425443085f4849440c5662c000085f55494400085f41445200085f43525311110a0e8609000100b0568a001000007900</aml_template>
+        <aml_template>5b8243045c2e5f53425f55425443085f4849440c5662c000085f4349440c41d00ca0085f55494400085f41445200085f43525311110a0e860900010010608c001000007900</aml_template>
         <status>
           <present>n</present>
           <enabled>n</enabled>
           <functioning>n</functioning>
         </status>
-        <resource id="res0" type="memory" min="0x8a56b000" max="0x8a56bfff" len="0x1000"/>
+        <resource id="res0" type="memory" min="0x8c601000" max="0x8c601fff" len="0x1000"/>
         <device address="0x0">
           <acpi_object>\_SB_.UBTC.CR01</acpi_object>
           <aml_template>5b82165c2f035f53425f5542544343523031085f41445200</aml_template>
@@ -2754,22 +2752,6 @@
           <acpi_object>\_SB_.UBTC.CR02</acpi_object>
           <aml_template>5b82165c2f035f53425f5542544343523032085f41445200</aml_template>
         </device>
-        <device>
-          <acpi_object>\_SB_.UBTC.CR03</acpi_object>
-          <aml_template>5b82165c2f035f53425f5542544343523033085f41445200</aml_template>
-        </device>
-        <device>
-          <acpi_object>\_SB_.UBTC.CR04</acpi_object>
-          <aml_template>5b82165c2f035f53425f5542544343523034085f41445200</aml_template>
-        </device>
-        <device>
-          <acpi_object>\_SB_.UBTC.CR05</acpi_object>
-          <aml_template>5b82165c2f035f53425f5542544343523035085f41445200</aml_template>
-        </device>
-        <device>
-          <acpi_object>\_SB_.UBTC.CR06</acpi_object>
-          <aml_template>5b82165c2f035f53425f5542544343523036085f41445200</aml_template>
-        </device>
       </device>
       <device id="PNP0C14">
         <acpi_object>\_SB_.WFDE</acpi_object>