mb/*/*: Harmonise FD and devicetree on boards featuring ICH7

On some boards the devicetree and Function Disable register did not
match. In this case the FD values are put in the devicetree as these
were the values that were actually used in practice.

A complete devicetree will make it easier to automatically disable
devices in ramstage.

Change-Id: I1692ca5f490ea84e2fc520d3f66044ad7514f76e
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/27122
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

18 files changed, 93 insertions, 65 deletions

diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb
index b6e61eb9e1..898aae437b 100644
--- a/src/mainboard/apple/macbook21/devicetree.cb
+++ b/src/mainboard/apple/macbook21/devicetree.cb
@@ -83,6 +83,11 @@ chip northbridge/intel/i945
 			end
 			device pci 1c.0 on end # Ethernet
 			device pci 1c.1 on end # Atheros WLAN
+			device pci 1c.2 off end # PCIe #3
+			device pci 1c.3 off end # PCIe #4
+			device pci 1c.4 off end # PCIe #5
+			device pci 1c.5 off end # PCIe #6
+
 			device pci 1d.0 on # USB UHCI
 				subsystemid 0x8086 0x7270
 			end
@@ -98,6 +103,9 @@ chip northbridge/intel/i945
 			device pci 1d.7 on # USB2 EHCI
 				subsystemid 0x8086 0x7270
 			end
+			device pci 1e.0 on end # PCI bridge
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 			device pci 1f.0 on # PCI-LPC bridge
 				subsystemid 0x8086 0x7270
 			end
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb
index dba3a69cb1..833ea00ad7 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb
@@ -151,9 +151,6 @@ chip northbridge/intel/x4x		# Northbridge
 				device i2c 69 on end
 				end
 			end
-			device pci 1f.4 off end
-			device pci 1f.5 off end
-			device pci 1f.6 off end
 		end
 	end
 end
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
index d4708c6059..63bcbc8d39 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
@@ -131,9 +131,6 @@ chip northbridge/intel/x4x		# Northbridge
 			device pci 1f.3 on		# SMbus
 				subsystemid 0x1849 0x27da
 			end
-			device pci 1f.4 off end
-			device pci 1f.5 off end
-			device pci 1f.6 off end
 		end
 	end
 end
diff --git a/src/mainboard/asus/p5gc-mx/devicetree.cb b/src/mainboard/asus/p5gc-mx/devicetree.cb
index cefa7117fe..642f1ee009 100644
--- a/src/mainboard/asus/p5gc-mx/devicetree.cb
+++ b/src/mainboard/asus/p5gc-mx/devicetree.cb
@@ -62,10 +62,10 @@ chip northbridge/intel/i945
 			end
 			device pci 1c.0 on end # PCIe
 			device pci 1c.1 on end # PCIe
-			#device pci 1c.2 off end # PCIe port 3
-			#device pci 1c.3 off end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
+			device pci 1c.2 off end # PCIe port 3
+			device pci 1c.3 off end # PCIe port 4
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
 			device pci 1d.0 on # USB UHCI
 				ioapic_irq 2 INTA 0x10
 			end
@@ -82,6 +82,8 @@ chip northbridge/intel/i945
 				ioapic_irq 2 INTA 0x10
 			end
 			device pci 1e.0 on end # PCI bridge
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 
 			device pci 1f.0 on # LPC bridge
 				ioapic_irq 2 INTA 0x10
diff --git a/src/mainboard/foxconn/d41s/devicetree.cb b/src/mainboard/foxconn/d41s/devicetree.cb
index e03a596916..0fd9e29cc9 100644
--- a/src/mainboard/foxconn/d41s/devicetree.cb
+++ b/src/mainboard/foxconn/d41s/devicetree.cb
@@ -48,12 +48,15 @@ chip northbridge/intel/pineview		# Northbridge
       device pci 1c.1 on end		# PCIe 2 (NIC)
       device pci 1c.2 off end		# PCIe 3
       device pci 1c.3 off end		# PCIe 4
+      # (PCIe 5 and 6 not on nm10?)
       device pci 1d.0 on end		# USB
       device pci 1d.1 on end		# USB
       device pci 1d.2 on end		# USB
       device pci 1d.3 on end		# USB
       device pci 1d.7 on end		# USB
       device pci 1e.0 on end		# PCI bridge
+      #device pci 1e.2 off end		# AC'97 Audio (not on nm10?)
+      #device pci 1e.3 off end		# AC'97 Modem (not on nm10?)
       device pci 1f.0 on		# ISA bridge
         chip superio/ite/it8721f	# Super I/O
           device pnp 2e.0 off end	# Floppy
@@ -90,7 +93,7 @@ chip northbridge/intel/pineview		# Northbridge
           end
         end
       end
-      device pci 1f.1 off end
+      device pci 1f.1 off end		# PATA
       device pci 1f.2 on end		# SATA
       device pci 1f.3 on				# SMbus
         chip drivers/i2c/ck505
@@ -101,9 +104,6 @@ chip northbridge/intel/pineview		# Northbridge
           device i2c 69 on end
         end
       end
-      device pci 1f.4 off end
-      device pci 1f.5 off end
-      device pci 1f.6 off end
     end
   end
 end
diff --git a/src/mainboard/foxconn/g41s-k/devicetree.cb b/src/mainboard/foxconn/g41s-k/devicetree.cb
index e57436ae7c..a63845760c 100644
--- a/src/mainboard/foxconn/g41s-k/devicetree.cb
+++ b/src/mainboard/foxconn/g41s-k/devicetree.cb
@@ -66,6 +66,8 @@ chip northbridge/intel/x4x		# Northbridge
 			end
 			device pci 1c.2 off end		# PCIe 3
 			device pci 1c.3 off end		# PCIe 4
+			device pci 1c.4 off end		# PCIe 5
+			device pci 1c.5 off end		# PCIe 6
 			device pci 1d.0 on		# USB
 				subsystemid 0x105b 0x0dda
 			end
@@ -82,6 +84,8 @@ chip northbridge/intel/x4x		# Northbridge
 				subsystemid 0x105b 0x0dda
 			end
 			device pci 1e.0 on end		# PCI bridge
+			device pci 1e.2 off end		# AC'97 Audio
+			device pci 1e.3 off end		# AC'97 Modem
 			device pci 1f.0 on		# ISA bridge
 				subsystemid 0x105b 0x0dda
 				chip superio/ite/it8720f	# Super I/O
@@ -181,9 +185,6 @@ chip northbridge/intel/x4x		# Northbridge
 			device pci 1f.3 on		# SMbus
 				subsystemid 0x105b 0x0dda
 			end
-			device pci 1f.4 off end
-			device pci 1f.5 off end
-			device pci 1f.6 off end
 		end
 	end
 end
diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb
index ad3b625a76..a81ef3ac09 100644
--- a/src/mainboard/getac/p470/devicetree.cb
+++ b/src/mainboard/getac/p470/devicetree.cb
@@ -68,8 +68,8 @@ chip northbridge/intel/i945
 			device pci 1c.1 on end # PCIe port 2
 			device pci 1c.2 on end # PCIe port 3
 			device pci 1c.3 on end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
 			device pci 1d.0 on end # USB UHCI
 			device pci 1d.1 on end # USB UHCI
 			device pci 1d.2 on end # USB UHCI
@@ -80,8 +80,8 @@ chip northbridge/intel/i945
 
 				end
 			end # PCI bridge
-			#device pci 1e.2 off end # AC'97 Audio
-			#device pci 1e.3 off end # AC'97 Modem
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
                         device pci 1f.0 on # LPC bridge
                                 chip superio/smsc/fdc37n972
 					device pnp 2e.0 off		# Floppy
@@ -143,7 +143,7 @@ chip northbridge/intel/i945
                                 end
 
                         end
-			device pci 1f.1 on end  # IDE
+			device pci 1f.1 off end  # IDE
                         device pci 1f.2 on end  # SATA
                         device pci 1f.3 on end  # SMBus
                 end
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb b/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb
index 6bdc134b9a..7ed4d199aa 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb
@@ -86,10 +86,10 @@ chip northbridge/intel/i945
 			end
 			device pci 1c.0 on end # PCIe
 			device pci 1c.1 on end # PCIe
-			#device pci 1c.2 off end # PCIe port 3
-			#device pci 1c.3 off end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
+			device pci 1c.2 off end # PCIe port 3
+			device pci 1c.3 off end # PCIe port 4
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
 			device pci 1d.0 on # USB UHCI
 				ioapic_irq 2 INTA 0x10
 			end
@@ -106,6 +106,8 @@ chip northbridge/intel/i945
 				ioapic_irq 2 INTA 0x10
 			end
 			device pci 1e.0 on end # PCI bridge
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 
 			device pci 1f.0 on # LPC bridge
 				ioapic_irq 2 INTA 0x10
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index 4768885a5e..6ed5b2f740 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
@@ -85,7 +85,8 @@ static void rcba_config(void)
 	RCBA8(OIC) = 0x03;
 
 	/* Disable unused devices */
-	RCBA32(FD) = 0x003c0061;
+	RCBA32(FD) = FD_PCIE6 | FD_PCIE5 | FD_PCIE4 | FD_PCIE3
+		| FD_ACMOD | FD_ACAUD | 1;
 
 	/* Enable PCIe Root Port Clock Gate */
 	RCBA32(CG) = 0x00000001;
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb b/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb
index d9483980d8..9f92d2adf5 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb
@@ -62,7 +62,9 @@ chip northbridge/intel/x4x		# Northbridge
         end
       end
       device pci 1c.2 on end		# PCIe 3
-      device pci 1c.3 on end		# PCIe 4
+      device pci 1c.3 off end		# PCIe 4
+      device pci 1c.4 off end		# PCIe 5
+      device pci 1c.5 off end		# PCIe 6
       device pci 1d.0 on		# USB
         subsystemid 0x1458 0x5004
       end
@@ -79,6 +81,8 @@ chip northbridge/intel/x4x		# Northbridge
         subsystemid 0x1458 0x5006
       end
       device pci 1e.0 on end		# PCI bridge
+      device pci 1e.2 off end           # AC'97 Audio
+      device pci 1e.3 off end           # AC'97 Modem
       device pci 1f.0 on		# ISA bridge
         subsystemid 0x1458 0x5001
         chip superio/ite/it8718f	# Super I/O
@@ -164,9 +168,6 @@ chip northbridge/intel/x4x		# Northbridge
       device pci 1f.3 on		# SMbus
         subsystemid 0x1458 0x5001
       end
-      device pci 1f.4 off end
-      device pci 1f.5 off end
-      device pci 1f.6 off end
     end
   end
 end
diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb
index c63e5d645f..3544c96739 100644
--- a/src/mainboard/ibase/mb899/devicetree.cb
+++ b/src/mainboard/ibase/mb899/devicetree.cb
@@ -45,17 +45,17 @@ chip northbridge/intel/i945
 			device pci 1c.0 on end # PCIe
 			device pci 1c.1 on end # PCIe
 			device pci 1c.2 on end # PCIe
-			#device pci 1c.3 off end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
+			device pci 1c.3 on end # PCIe port 4
+			device pci 1c.4 on end # PCIe port 5
+			device pci 1c.5 on end # PCIe port 6
 			device pci 1d.0 on end # USB UHCI
 			device pci 1d.1 on end # USB UHCI
 			device pci 1d.2 on end # USB UHCI
 			device pci 1d.3 on end # USB UHCI
 			device pci 1d.7 on end # USB2 EHCI
 			device pci 1e.0 on end # PCI bridge
-			#device pci 1e.2 off end # AC'97 Audio
-			#device pci 1e.3 off end # AC'97 Modem
+			device pci 1e.2 on end # AC'97 Audio
+			device pci 1e.3 on end # AC'97 Modem
 			device pci 1f.0 on # LPC bridge
 				chip superio/winbond/w83627ehg
 					device pnp 4e.0 off end	# Floppy
@@ -108,7 +108,6 @@ chip northbridge/intel/i945
 			device pci 1f.1 on end  # IDE
 			device pci 1f.2 on end  # SATA
 			device pci 1f.3 on end  # SMBus
-			# device pci 1f.4 off end # Realtek ID Codec
 		end # chip southbridge/intel/i82801gx
 
 	end # device domain0
diff --git a/src/mainboard/intel/d510mo/devicetree.cb b/src/mainboard/intel/d510mo/devicetree.cb
index 473303842e..a80180a32e 100644
--- a/src/mainboard/intel/d510mo/devicetree.cb
+++ b/src/mainboard/intel/d510mo/devicetree.cb
@@ -49,12 +49,15 @@ chip northbridge/intel/pineview		# Northbridge
       device pci 1c.1 on end		# PCIe 2
       device pci 1c.2 on end		# PCIe 3
       device pci 1c.3 on end		# PCIe 4
+      # (PCIe 5 and 6 not on nm10?)
       device pci 1d.0 on end		# USB
       device pci 1d.1 on end		# USB
       device pci 1d.2 on end		# USB
       device pci 1d.3 on end		# USB
       device pci 1d.7 on end		# USB
       device pci 1e.0 on end		# PCI bridge
+      #device pci 1e.2 off end		# AC'97 Audio (not on nm10?)
+      #device pci 1e.3 off end		# AC'97 Modem (not on nm10?)
       device pci 1f.0 on		# ISA bridge
         chip superio/winbond/w83627thg	# Super I/O
           device pnp 4e.0 off end	# Floppy
@@ -90,7 +93,7 @@ chip northbridge/intel/pineview		# Northbridge
           end
         end
       end
-      device pci 1f.1 off end
+      device pci 1f.1 off end		# PATA
       device pci 1f.2 on end		# SATA
       device pci 1f.3 on		# SMbus
         chip drivers/i2c/ck505		# ICS9EPRS525
diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb
index d9eda6ba02..eaa26ef4f1 100644
--- a/src/mainboard/intel/d945gclf/devicetree.cb
+++ b/src/mainboard/intel/d945gclf/devicetree.cb
@@ -55,20 +55,20 @@ chip northbridge/intel/i945
 			register "p_cnt_throttling_supported" = "0"
 
 			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 on end # PCIe
-			device pci 1c.1 on end # PCIe
-			device pci 1c.2 on end # PCIe
-			#device pci 1c.3 off end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
+			device pci 1c.0 on end # PCIe port 1
+			device pci 1c.1 off end # PCIe port 2
+			device pci 1c.2 on end # PCIe port 3
+			device pci 1c.3 on end # PCIe port 4
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
 			device pci 1d.0 on end # USB UHCI
 			device pci 1d.1 on end # USB UHCI
 			device pci 1d.2 on end # USB UHCI
 			device pci 1d.3 on end # USB UHCI
 			device pci 1d.7 on end # USB2 EHCI
 			device pci 1e.0 on end # PCI bridge
-			#device pci 1e.2 off end # AC'97 Audio
-			#device pci 1e.3 off end # AC'97 Modem
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
                         device pci 1f.0 on # LPC bridge
                                 chip superio/smsc/lpc47m15x
 					device pnp 2e.0 off		# Floppy
@@ -100,10 +100,9 @@ chip northbridge/intel/i945
 					end
                                 end
                         end
-			#device pci 1f.1 off end # IDE
+			device pci 1f.1 off end # IDE
                         device pci 1f.2 on end  # SATA
                         device pci 1f.3 on end  # SMBus
-			#device pci 1f.4 off end # Realtek ID Codec
                 end
         end
 end
diff --git a/src/mainboard/kontron/986lcd-m/devicetree.cb b/src/mainboard/kontron/986lcd-m/devicetree.cb
index c768b64f4c..06f29e09f6 100644
--- a/src/mainboard/kontron/986lcd-m/devicetree.cb
+++ b/src/mainboard/kontron/986lcd-m/devicetree.cb
@@ -44,17 +44,17 @@ chip northbridge/intel/i945
 			device pci 1c.0 on end # PCIe
 			device pci 1c.1 on end # PCIe
 			device pci 1c.2 on end # PCIe
-			#device pci 1c.3 off end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
+			device pci 1c.3 off end # PCIe port 4
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
 			device pci 1d.0 on end # USB UHCI
 			device pci 1d.1 on end # USB UHCI
 			device pci 1d.2 on end # USB UHCI
 			device pci 1d.3 on end # USB UHCI
 			device pci 1d.7 on end # USB2 EHCI
 			device pci 1e.0 on end # PCI bridge
-			#device pci 1e.2 off end # AC'97 Audio
-			#device pci 1e.3 off end # AC'97 Modem
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 			device pci 1f.0 on # LPC bridge
 				chip superio/winbond/w83627thg
 					device pnp 2e.0 off		# Floppy
@@ -128,10 +128,9 @@ chip northbridge/intel/i945
 				end
 
 			end
-			#device pci 1f.1 off end # IDE
+			device pci 1f.1 off end # IDE
 			device pci 1f.2 on end  # SATA
 			device pci 1f.3 on end  # SMBus
-			#device pci 1f.4 off end # Realtek ID Codec
 		end
 	end
 end
diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index 053b9d30cb..7b1721e563 100644
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -90,6 +90,11 @@ chip northbridge/intel/i945
 				subsystemid 0x17aa 0x2001
 			end
 			device pci 1c.1 on end # WLAN
+			device pci 1c.2 on end # PCIe port 3
+			device pci 1c.3 on end # PCIe port 4
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
+
 			device pci 1d.0 on # USB UHCI
 				subsystemid 0x17aa 0x200a
 			end
@@ -115,6 +120,8 @@ chip northbridge/intel/i945
 
 				end
 			end
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 			device pci 1f.0 on # PCI-LPC bridge
 				subsystemid 0x17aa 0x2009
 				chip ec/lenovo/pmh7
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index da9bff7e41..2a60b87b87 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -82,6 +82,11 @@ chip northbridge/intel/i945
 			end
 			device pci 1c.0 on end # Ethernet
 			device pci 1c.1 on end # Atheros WLAN
+			device pci 1c.2 on end # PCIe port 3
+			device pci 1c.3 on end # PCIe port 4
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
+
 			device pci 1d.0 on # USB UHCI
 				subsystemid 0x17aa 0x200a
 			end
@@ -97,6 +102,9 @@ chip northbridge/intel/i945
 			device pci 1d.7 on # USB2 EHCI
 				subsystemid 0x17aa 0x200b
 			end
+			device pci 1e.0 on end # PCI Bridge
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 			device pci 1f.0 on # PCI-LPC bridge
 				subsystemid 0x17aa 0x2009
 				chip ec/lenovo/pmh7
diff --git a/src/mainboard/lenovo/z61t/devicetree.cb b/src/mainboard/lenovo/z61t/devicetree.cb
index 1c60e6bf6b..92bf3cec85 100644
--- a/src/mainboard/lenovo/z61t/devicetree.cb
+++ b/src/mainboard/lenovo/z61t/devicetree.cb
@@ -97,6 +97,9 @@ chip northbridge/intel/i945
 			device pci 1c.3 on # PCI Express Port 4
 				subsystemid 0x17aa 0x2011
 			end
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
+
 			device pci 1d.0 on # USB UHCI
 				subsystemid 0x17aa 0x200a
 			end
@@ -122,6 +125,8 @@ chip northbridge/intel/i945
 
 				end
 			end
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 			device pci 1f.0 on # PCI-LPC bridge
 				subsystemid 0x17aa 0x2009
 				chip ec/lenovo/pmh7
diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb
index bb057f15c3..e3bcc5b8a0 100644
--- a/src/mainboard/roda/rk886ex/devicetree.cb
+++ b/src/mainboard/roda/rk886ex/devicetree.cb
@@ -64,12 +64,12 @@ chip northbridge/intel/i945
 			register "sata_ahci" = "0x0"
 
 			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 on end # PCIe
-			device pci 1c.1 on end # PCIe
-			device pci 1c.2 on end # PCIe
-			#device pci 1c.3 off end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
+			device pci 1c.0 on end # PCIe port 1
+			device pci 1c.1 off end # PCIe port 2
+			device pci 1c.2 off end # PCIe port 3
+			device pci 1c.3 on end # PCIe port 4
+			device pci 1c.4 off end # PCIe port 5
+			device pci 1c.5 off end # PCIe port 6
 			device pci 1d.0 on end # USB UHCI
 			device pci 1d.1 on end # USB UHCI
 			device pci 1d.2 on end # USB UHCI
@@ -84,8 +84,8 @@ chip northbridge/intel/i945
 					device pci 3.3 off end  # smartcard
 				end
 			end # PCI bridge
-			#device pci 1e.2 off end # AC'97 Audio
-			#device pci 1e.3 off end # AC'97 Modem
+			device pci 1e.2 off end # AC'97 Audio
+			device pci 1e.3 off end # AC'97 Modem
 			device pci 1f.0 on # LPC bridge
 				chip superio/smsc/lpc47n227
 					device pnp 2e.1 on # Parallel port
@@ -115,10 +115,9 @@ chip northbridge/intel/i945
 				end
 
 			end
-			#device pci 1f.1 off end # IDE
+			device pci 1f.1 off end # IDE
 			device pci 1f.2 on end  # SATA
 			device pci 1f.3 on end  # SMBus
-			#device pci 1f.4 off end # Realtek ID Codec
 		end
 	end
 end