From 9a125766550a1388b1dcded3907c96ca0e2d623b Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Sat, 16 Mar 2013 12:06:27 +0100
Subject: [PATCH 3/3] conroe-xfire-esata2: updated device tree (to make it
 build again)

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 .../asrock/conroexfire-esata2/devicetree.cb        | 126 ++++++++++++---------
 1 file changed, 72 insertions(+), 54 deletions(-)

diff --git a/src/mainboard/asrock/conroexfire-esata2/devicetree.cb b/src/mainboard/asrock/conroexfire-esata2/devicetree.cb
index a141358..781d4b3 100644
--- a/src/mainboard/asrock/conroexfire-esata2/devicetree.cb
+++ b/src/mainboard/asrock/conroexfire-esata2/devicetree.cb
@@ -1,12 +1,12 @@
 chip northbridge/intel/i945
 
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/intel/socket_LGA775
                         device lapic 0 on end
                 end
         end
 
-        device pci_domain 0 on
+        device domain 0 on
                 device pci 00.0 on end # host bridge
 		device pci 01.0 off end # i945 PCIe root port
 		device pci 02.0 on end # vga controller
@@ -49,58 +49,76 @@ chip northbridge/intel/i945
 			#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/w83627ehg	# Super I/O
-              device pnp 2e.0 on		# Floppy
-                io 0x60 = 0x3f0
-                irq 0x70 = 6
-                drq 0x74 = 2
-              end
-              device pnp 2e.1 on		# Parallel port
-                io 0x60 = 0x378
-                irq 0x70 = 7
-                drq 0x74 = 3
-              end
-              device pnp 2e.2 on		# Com1
-                io 0x60 = 0x3f8
-                irq 0x70 = 4
-              end
-              device pnp 2e.3 off		# Com2 (N/A on this board)
-                io 0x60 = 0x2f8
-                irq 0x70 = 3
-              end
-              device pnp 2e.5 off		# PS/2 keyboard & mouse (off)
-              end
-              device pnp 2e.106 off		# Serial flash interface (SFI)
-                io 0x60 = 0x100
-              end
-              device pnp 2e.007 off		# GPIO 1
-              end
-              device pnp 2e.107 on		# Game port
-                io 0x60 = 0x201
-              end
-              device pnp 2e.207 on		# MIDI
-                io 0x62 = 0x330
-                irq 0x70 = 0xa
-              end
-              device pnp 2e.307 off		# GPIO 6
-              end
-              device pnp 2e.8 off		# WDTO#, PLED
-              end
-              device pnp 2e.009 on		# GPIO 2
-              end
-              device pnp 2e.109 off		# GPIO 3
-              end
-              device pnp 2e.209 off		# GPIO 4
-              end
-              device pnp 2e.309 on		# GPIO 5
-              end
-              device pnp 2e.a off		# ACPI
-              end
-              device pnp 2e.b on		# Hardware monitor
-                io 0x60 = 0x290
-                irq 0x70 = 0
-              end
-            end
+				chip superio/winbond/w83627thg
+					device pnp 2e.0 off		# Floppy
+					end
+					device pnp 2e.1 on		# Parallel port
+						 io 0x60 = 0x378
+						irq 0x70 = 5
+					end
+                                        device pnp 2e.2 on
+                                                 io 0x60 = 0x3f8
+                                                irq 0x70 = 4
+                                        end
+                                        device pnp 2e.3 on
+                                                 io 0x60 = 0x2f8
+                                                irq 0x70 = 3
+						irq 0xf1 = 4 # set IRMODE 0 # XXX not an irq
+                                        end
+					device pnp 2e.5 on		# Keyboard+Mouse
+						 io 0x60 = 0x60
+						 io 0x62 = 0x64
+						irq 0x70 = 1
+						irq 0x72 = 12
+						irq 0xf0 = 0x82		# HW accel A20.
+					end
+					device pnp 2e.7 on		# GPIO1, GAME, MIDI
+						 io 0x62 = 0x330
+						irq 0x70 = 9
+					end
+					device pnp 2e.8 on		# GPIO2
+						# all default
+					end
+					device pnp 2e.9 on		# GPIO3/4
+						irq 0x30 = 0x03		# does this work?
+						irq 0xf0 = 0xfb		# set inputs/outputs
+						irq 0xf1 = 0x66
+					end
+					device pnp 2e.a off		# ACPI
+					end
+					device pnp 2e.b on		# HWM
+						 io 0x60 = 0xa00
+						irq 0x70 = 0
+					end
+
+                                end
+                                chip superio/winbond/w83627thg
+                                        device pnp 4e.0 off		# Floppy
+					end
+					device pnp 4e.1 off		# Parport
+					end
+                                        device pnp 4e.2 on		# COM3
+                                                 io 0x60 = 0x3e8
+                                                irq 0x70 = 11
+                                        end
+                                        device pnp 4e.3 on		# COM4
+                                                 io 0x60 = 0x2e8
+                                                irq 0x70 = 10
+						irq 0xf1 = 4 # set IRMODE 0 # XXX not an irq
+                                        end
+					device pnp 4e.5 off		# Keyboard
+					end
+					device pnp 4e.7 off		# GPIO1, GAME, MIDI
+					end
+					device pnp 4e.8 off		# GPIO2
+					end
+					device pnp 4e.9 off		# GPIO3/4
+					end
+					device pnp 4e.a off		# ACPI
+					end
+					device pnp 4e.b off		# HWM
+					end
+                                end
 
                         end
 			#device pci 1f.1 off end # IDE
-- 
2.8.0

