summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/asrock/939a785gmh/devicetree.cb2
-rw-r--r--src/mainboard/asrock/939a785gmh/romstage.c3
-rw-r--r--src/mainboard/asus/a8v-e_deluxe/devicetree.cb10
-rw-r--r--src/mainboard/asus/a8v-e_deluxe/romstage.c2
-rw-r--r--src/mainboard/asus/a8v-e_se/devicetree.cb10
-rw-r--r--src/mainboard/asus/a8v-e_se/romstage.c2
-rw-r--r--src/mainboard/ibase/mb899/devicetree.cb25
-rw-r--r--src/mainboard/ibase/mb899/romstage.c3
-rw-r--r--src/mainboard/kontron/kt690/devicetree.cb10
-rw-r--r--src/mainboard/msi/ms7260/devicetree.cb23
-rw-r--r--src/mainboard/msi/ms9282/devicetree.cb23
-rw-r--r--src/mainboard/msi/ms9652_fam10/devicetree.cb35
-rw-r--r--src/mainboard/nvidia/l1_2pvv/devicetree.cb26
13 files changed, 118 insertions, 56 deletions
diff --git a/src/mainboard/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb
index 945c396544..76f61b02c8 100644
--- a/src/mainboard/asrock/939a785gmh/devicetree.cb
+++ b/src/mainboard/asrock/939a785gmh/devicetree.cb
@@ -85,7 +85,7 @@ chip northbridge/amd/amdk8/root_complex
io 0x60 = 0x2f8
irq 0x70 = 3
end
- device pnp 2e.5 on # Keyboard
+ device pnp 2e.5 on # PS/2 keyboard & mouse
io 0x60 = 0x60
io 0x62 = 0x64
irq 0x70 = 1
diff --git a/src/mainboard/asrock/939a785gmh/romstage.c b/src/mainboard/asrock/939a785gmh/romstage.c
index c62f1c4f0b..fcbda3ff89 100644
--- a/src/mainboard/asrock/939a785gmh/romstage.c
+++ b/src/mainboard/asrock/939a785gmh/romstage.c
@@ -49,8 +49,7 @@
#include "northbridge/amd/amdk8/debug.c" /* After sb700_early_setup.c! */
#define SERIAL_DEV PNP_DEV(0x2e, W83627DHG_SP1)
-#define GPIO6_DEV PNP_DEV(0x2e, W83627DHG_GPIO6)
-#define GPIO2345_DEV PNP_DEV(0x2e, W83627DHG_GPIO2345)
+#define GPIO2345_DEV PNP_DEV(0x2e, W83627DHG_GPIO2345_V)
static void memreset(int controllers, const struct mem_controller *ctrl) { }
static void activate_spd_rom(const struct mem_controller *ctrl) { }
diff --git a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
index b99ebfeb26..cd803929c8 100644
--- a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
@@ -49,9 +49,9 @@ chip northbridge/amd/amdk8/root_complex # Root complex
io 0x60 = 0x2f8
irq 0x70 = 3
end
- device pnp 2e.5 off # PS/2 keyboard (off)
+ device pnp 2e.5 off # PS/2 keyboard & mouse (off)
end
- device pnp 2e.106 off # Serial flash
+ device pnp 2e.106 off # Serial flash interface (SFI)
io 0x60 = 0x100
end
device pnp 2e.007 off # GPIO 1
@@ -65,15 +65,15 @@ chip northbridge/amd/amdk8/root_complex # Root complex
end
device pnp 2e.307 off # GPIO 6
end
- device pnp 2e.8 off # WDTO_PLED
+ device pnp 2e.8 off # WDTO#, PLED
end
- device pnp 2e.009 on # GPIO 2 on LDN 9 is in sio_setup
+ 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 # GPIO5
+ device pnp 2e.309 on # GPIO 5
end
device pnp 2e.a off # ACPI
end
diff --git a/src/mainboard/asus/a8v-e_deluxe/romstage.c b/src/mainboard/asus/a8v-e_deluxe/romstage.c
index 1167832c6a..1f3c088858 100644
--- a/src/mainboard/asus/a8v-e_deluxe/romstage.c
+++ b/src/mainboard/asus/a8v-e_deluxe/romstage.c
@@ -49,7 +49,7 @@ unsigned int get_sbdn(unsigned bus);
#include <spd.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83627EHG_SP1)
-#define GPIO_DEV PNP_DEV(0x2e, W83627EHG_GPIO_SUSLED)
+#define GPIO_DEV PNP_DEV(0x2e, W83627EHG_GPIO_SUSLED_V)
#define ACPI_DEV PNP_DEV(0x2e, W83627EHG_ACPI)
static void memreset(int controllers, const struct mem_controller *ctrl) { }
diff --git a/src/mainboard/asus/a8v-e_se/devicetree.cb b/src/mainboard/asus/a8v-e_se/devicetree.cb
index b99ebfeb26..cd803929c8 100644
--- a/src/mainboard/asus/a8v-e_se/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_se/devicetree.cb
@@ -49,9 +49,9 @@ chip northbridge/amd/amdk8/root_complex # Root complex
io 0x60 = 0x2f8
irq 0x70 = 3
end
- device pnp 2e.5 off # PS/2 keyboard (off)
+ device pnp 2e.5 off # PS/2 keyboard & mouse (off)
end
- device pnp 2e.106 off # Serial flash
+ device pnp 2e.106 off # Serial flash interface (SFI)
io 0x60 = 0x100
end
device pnp 2e.007 off # GPIO 1
@@ -65,15 +65,15 @@ chip northbridge/amd/amdk8/root_complex # Root complex
end
device pnp 2e.307 off # GPIO 6
end
- device pnp 2e.8 off # WDTO_PLED
+ device pnp 2e.8 off # WDTO#, PLED
end
- device pnp 2e.009 on # GPIO 2 on LDN 9 is in sio_setup
+ 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 # GPIO5
+ device pnp 2e.309 on # GPIO 5
end
device pnp 2e.a off # ACPI
end
diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c
index 1167832c6a..1f3c088858 100644
--- a/src/mainboard/asus/a8v-e_se/romstage.c
+++ b/src/mainboard/asus/a8v-e_se/romstage.c
@@ -49,7 +49,7 @@ unsigned int get_sbdn(unsigned bus);
#include <spd.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83627EHG_SP1)
-#define GPIO_DEV PNP_DEV(0x2e, W83627EHG_GPIO_SUSLED)
+#define GPIO_DEV PNP_DEV(0x2e, W83627EHG_GPIO_SUSLED_V)
#define ACPI_DEV PNP_DEV(0x2e, W83627EHG_ACPI)
static void memreset(int controllers, const struct mem_controller *ctrl) { }
diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb
index e9c21a4255..3fbe86314c 100644
--- a/src/mainboard/ibase/mb899/devicetree.cb
+++ b/src/mainboard/ibase/mb899/devicetree.cb
@@ -63,29 +63,38 @@ chip northbridge/intel/i945
irq 0x70 = 3
irq 0xf1 = 4 # set IRMODE 0 # XXX not an irq
end
- device pnp 4e.5 on # Keyboard+Mouse
+ device pnp 4e.5 on # PS/2 keyboard & mouse
io 0x60 = 0x60
io 0x62 = 0x64
irq 0x70 = 1
irq 0x72 = 12
irq 0xf0 = 0x82 # HW accel A20.
end
- device pnp 4e.7 on # GPIO1, GAME, MIDI
- io 0x62 = 0x330
+ device pnp 4e.106 off end # Serial flash interface (SFI)
+ device pnp 4e.007 off end # GPIO 1
+ device pnp 4e.107 off end # Game port
+ device pnp 4e.207 on # MIDI
+ io 0x62 = 0x330
irq 0x70 = 9
end
- device pnp 4e.8 on # GPIO2
- # all default
+ device pnp 4e.307 off end # GPIO 6
+ device pnp 4e.8 off end # WDTO#, PLED
+ device pnp 4e.009 on # GPIO 2
+ # All default
end
- device pnp 4e.9 on # GPIO3/4
- irq 0x30 = 0x03 # does this work?
+ device pnp 4e.109 on # GPIO 3
irq 0xf0 = 0xfb # set inputs/outputs
irq 0xf1 = 0x66
end
+ device pnp 4e.209 on # GPIO 4
+ end
+ device pnp 4e.309 off # GPIO 5
+ end
device pnp 4e.a on # ACPI
+ # TODO: IRQ
end
device pnp 4e.b on # HWM
- io 0x60 = 0x290
+ io 0x60 = 0x290
irq 0x70 = 0
end
diff --git a/src/mainboard/ibase/mb899/romstage.c b/src/mainboard/ibase/mb899/romstage.c
index b9d2f99f62..9902630122 100644
--- a/src/mainboard/ibase/mb899/romstage.c
+++ b/src/mainboard/ibase/mb899/romstage.c
@@ -38,6 +38,7 @@
#include "southbridge/intel/i82801gx/i82801gx.h"
#define SERIAL_DEV PNP_DEV(0x4e, W83627EHG_SP1)
+#define DUMMY_DEV PNP_DEV(0x4e, 0)
void enable_smbus(void);
@@ -79,7 +80,7 @@ static void early_superio_config_w83627ehg(void)
{
device_t dev;
- dev=PNP_DEV(0x4e, W83627EHG_SP1);
+ dev = DUMMY_DEV;
pnp_enter_ext_func_mode(dev);
pnp_write_config(dev, 0x24, 0xc4); // PNPCSV
diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb
index 85df3ae7bf..d509050189 100644
--- a/src/mainboard/kontron/kt690/devicetree.cb
+++ b/src/mainboard/kontron/kt690/devicetree.cb
@@ -83,11 +83,17 @@ chip northbridge/amd/amdk8/root_complex
end
#device pnp 2e.6 off # SPI
#end
- device pnp 2e.7 off # GPIO
+ device pnp 2e.307 off # GPIO 1
end
device pnp 2e.8 on # WDTO#, PLED
end
- device pnp 2e.9 off # GPIO
+ device pnp 2e.009 off # GPIO2
+ end
+ device pnp 2e.109 off # GPIO3
+ end
+ device pnp 2e.209 off # GPIO4
+ end
+ device pnp 2e.309 off # GPIO5
end
device pnp 2e.a off # ACPI
end
diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb
index 6029371003..552224d2c3 100644
--- a/src/mainboard/msi/ms7260/devicetree.cb
+++ b/src/mainboard/msi/ms7260/devicetree.cb
@@ -28,28 +28,41 @@ chip northbridge/amd/amdk8/root_complex # Root complex
io 0x60 = 0x2f8
irq 0x70 = 3
end
- device pnp 4e.5 on # PS/2 keyboard
+ device pnp 4e.5 on # PS/2 keyboard & mouse
io 0x60 = 0x60
io 0x62 = 0x64
irq 0x70 = 1 # PS/2 keyboard IRQ
irq 0x72 = 12 # PS/2 mouse IRQ
end
- device pnp 4e.6 off # Serial flash interface
+ device pnp 4e.106 off # Serial flash interface (SFI)
# io 0x62 = 0x100
end
- device pnp 4e.7 off # GPIO1/6, game port, MIDI port
+ device pnp 4e.007 off # GPIO 1
+ end
+ device pnp 4e.107 off # Game port
# io 0x60 = 0x220 # Datasheet: 0x201
+ end
+ device pnp 4e.207 off # MIDI
# io 0x62 = 0x300 # Datasheet: 0x330
# irq 0x70 = 9
end
+ device pnp 4e.307 off # GPIO 6
+ end
device pnp 4e.8 off # WDTO#, PLED
end
- device pnp 4e.9 off # GPIO2/3/4/5, SUSLED
+ device pnp 4e.009 off # GPIO 2
+ end
+ device pnp 4e.109 off # GPIO 3
+ end
+ device pnp 4e.209 off # GPIO 4
+ end
+ device pnp 4e.309 off # GPIO 5
end
device pnp 4e.a off # ACPI
end
- device pnp 4e.b on # HWM (for lm-sensors)
+ device pnp 4e.b on # Hardware monitor
io 0x60 = 0xa10
+ # TODO: IRQ?
end
end
end
diff --git a/src/mainboard/msi/ms9282/devicetree.cb b/src/mainboard/msi/ms9282/devicetree.cb
index a4a4f6563c..74ea1832ee 100644
--- a/src/mainboard/msi/ms9282/devicetree.cb
+++ b/src/mainboard/msi/ms9282/devicetree.cb
@@ -28,22 +28,35 @@ chip northbridge/amd/amdk8/root_complex # Root complex
io 0x60 = 0x2f8
irq 0x70 = 3
end
- device pnp 2e.5 on # PS/2 keyboard
+ device pnp 2e.5 on # PS/2 keyboard & mouse
io 0x60 = 0x60
io 0x62 = 0x64
irq 0x70 = 1
irq 0x72 = 12
end
- device pnp 2e.6 off # Serial flash
+ device pnp 2e.106 off # Serial flash interface (SFI)
io 0x60 = 0x100
end
- device pnp 2e.7 off # Game port, MIDI, GPIO1
+ device pnp 2e.007 off # GPIO 1
+ end
+ device pnp 2e.107 off # Game port
io 0x60 = 0x220
+ end
+ device pnp 2e.207 off # MIDI
io 0x62 = 0x300
irq 0x70 = 9
end
- device pnp 2e.8 off end # WDTO PLED
- device pnp 2e.9 off end # GPIO2, GPIO3, GPIO4, GPIO5
+ device pnp 2e.307 off # GPIO 6
+ end
+ device pnp 2e.8 off end # WDTO#, PLED
+ device pnp 2e.009 off # GPIO 2
+ end
+ device pnp 2e.109 off # GPIO 3
+ end
+ device pnp 2e.209 off # GPIO 4
+ end
+ device pnp 2e.309 off # GPIO 5
+ end
device pnp 2e.a off end # ACPI
device pnp 2e.b on # Hardware monitor
io 0x60 = 0x290
diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb
index 29756f1dcd..c3e4e4f16d 100644
--- a/src/mainboard/msi/ms9652_fam10/devicetree.cb
+++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb
@@ -51,34 +51,41 @@ chip northbridge/amd/amdfam10/root_complex # Root complex
io 0x60 = 0x2f8
irq 0x70 = 3
end
- device pnp 2e.5 on # PS/2 keyboard
+ device pnp 2e.5 on # PS/2 keyboard & mouse
io 0x60 = 0x60
io 0x62 = 0x64
irq 0x70 = 1
irq 0x72 = 12
end
- device pnp 2e.6 off # Serial flash
+ device pnp 2e.106 off # Serial flash interface (SFI)
io 0x60 = 0x100
end
- device pnp 2e.7 off # Game port, MIDI, GPIO1
+ device pnp 2e.007 off # GPIO 1
+ end
+ device pnp 2e.107 on # Game port
io 0x60 = 0x220
- io 0x62 = 0x300
- irq 0x70 = 9
end
- device pnp 2e.8 off end # WDTO PLED
- device pnp 2e.9 off end # GPIO2, GPIO3, GPIO4, GPIO5
+ 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 off # GPIO 2
+ end
+ device pnp 2e.109 off # GPIO 3
+ end
+ device pnp 2e.209 off # GPIO 4
+ end
+ device pnp 2e.309 off # GPIO 5
+ end
device pnp 2e.a off end # ACPI
device pnp 2e.b on # Hardware monitor
io 0x60 = 0x290
irq 0x70 = 5
end
- device pnp 2e.106 off # Serial flash
- io 0x60 = 0x100
- end
- device pnp 2e.207 on # MIDI
- io 0x62 = 0x330
- irq 0x70 = 0xa
- end
end
end
device pci 1.1 on # SM 0
diff --git a/src/mainboard/nvidia/l1_2pvv/devicetree.cb b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
index 6d7c8468d4..1340cb38f7 100644
--- a/src/mainboard/nvidia/l1_2pvv/devicetree.cb
+++ b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
@@ -28,22 +28,36 @@ chip northbridge/amd/amdk8/root_complex # Root complex
io 0x60 = 0x2f8
irq 0x70 = 3
end
- device pnp 2e.5 on # PS/2 keyboard
+ device pnp 2e.5 on # PS/2 keyboard & mouse
io 0x60 = 0x60
io 0x62 = 0x64
irq 0x70 = 1
irq 0x72 = 12
end
- device pnp 2e.6 off # SFI
- io 0x62 = 0x100
+ device pnp 2e.106 off # Serial flash interface (SFI)
+ io 0x60 = 0x100
end
- device pnp 2e.7 off # GPIO, Game port, MIDI
+ device pnp 2e.007 off # GPIO 1
+ end
+ device pnp 2e.107 off # Game port
io 0x60 = 0x220
+ end
+ device pnp 2e.207 off # MIDI
io 0x62 = 0x300
irq 0x70 = 9
end
- device pnp 2e.8 off end # WDTO PLED
- device pnp 2e.9 off end # GPIO SUSLED
+ device pnp 2e.307 off # GPIO 6
+ end
+ device pnp 2e.8 off # WDTO#, PLED
+ end
+ device pnp 2e.009 off # GPIO 2
+ end
+ device pnp 2e.109 off # GPIO 3
+ end
+ device pnp 2e.209 off # GPIO 4
+ end
+ device pnp 2e.309 off # GPIO 5
+ end
device pnp 2e.a off end # ACPI
device pnp 2e.b on # Hardware monitor
io 0x60 = 0x290
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 05:44:07 +0000