summaryrefslogtreecommitdiff
path: root/src/mainboard/asrock
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-11-09 14:19:04 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-12 18:22:57 +0000
commitfecf77770b8e68b9ef82021ca53c31db93736d93 (patch)
tree001fba539061f4075699fc98e02b3153259477e9 /src/mainboard/asrock
parent675cb9152e6704383cf402c55758ddea2c7a1e05 (diff)
sb/intel/i82801gx: Add common LPC decode code
Generic LPC decode ranges can now be set from the devicetree. Change-Id: I1065ec770ad3a743286859efa39dca09ccb733a1 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36700 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/mainboard/asrock')
-rw-r--r--src/mainboard/asrock/g41c-gs/romstage.c11
-rw-r--r--src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb2
-rw-r--r--src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb2
-rw-r--r--src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb2
-rw-r--r--src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb2
-rw-r--r--src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb2
6 files changed, 11 insertions, 10 deletions
diff --git a/src/mainboard/asrock/g41c-gs/romstage.c b/src/mainboard/asrock/g41c-gs/romstage.c
index 57d1ec2c2c..9de168c5e4 100644
--- a/src/mainboard/asrock/g41c-gs/romstage.c
+++ b/src/mainboard/asrock/g41c-gs/romstage.c
@@ -66,15 +66,6 @@ static void mb_lpc_setup(void)
ich7_setup_cir();
}
-static void ich7_enable_lpc(void)
-{
- pci_write_config8(PCI_DEV(0, 0x1f, 0), SERIRQ_CNTL, 0xd0);
- /* Decode range */
- pci_write_config16(PCI_DEV(0, 0x1f, 0), LPC_EN, CNF1_LPC_EN
- | KBC_LPC_EN | LPT_LPC_EN | COMA_LPC_EN);
- pci_write_config32(PCI_DEV(0, 0x1f, 0), GEN1_DEC, 0x000c0291);
-}
-
void mainboard_romstage_entry(void)
{
// ch0 ch1
@@ -83,7 +74,7 @@ void mainboard_romstage_entry(void)
u8 s3_resume;
/* Set southbridge and Super I/O GPIOs. */
- ich7_enable_lpc();
+ i82801gx_lpc_setup();
mb_lpc_setup();
console_init();
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 acb8ac6702..b68aaa9fa7 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
@@ -54,6 +54,8 @@ chip northbridge/intel/x4x # Northbridge
register "sata_ports_implemented" = "0x3"
register "gpe0_en" = "0x440"
+ register "gen1_dec" = "0x000c0291" # Superio HWM
+
device pci 1b.0 on # Audio
subsystemid 0x1849 0x3662
end
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb
index 805f2dac93..160d025ca7 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb
@@ -48,6 +48,8 @@ chip northbridge/intel/x4x # Northbridge
register "ide_enable_primary" = "0x1"
register "gpe0_en" = "0x440"
+ register "gen1_dec" = "0x000c0291" # Superio HWM
+
device pci 1b.0 on # Audio
subsystemid 0x1849 0x3662
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 f4d1dc4291..0a8f27546d 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
@@ -49,6 +49,8 @@ chip northbridge/intel/x4x # Northbridge
register "sata_ports_implemented" = "0x3"
register "gpe0_en" = "0x440"
+ register "gen1_dec" = "0x000c0291" # Superio HWM
+
device pci 1b.0 on # Audio
subsystemid 0x1849 0x3662
end
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
index 2fd6e4f649..8119ced94c 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
@@ -47,6 +47,8 @@ chip northbridge/intel/x4x # Northbridge
register "sata_ports_implemented" = "0x3"
register "gpe0_en" = "0x440"
+ register "gen1_dec" = "0x000c0291" # Superio HWM
+
device pci 1b.0 on # Audio
subsystemid 0x1849 0x3662
end
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb
index 5479faf3e9..e5e3cf9b90 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb
@@ -48,6 +48,8 @@ chip northbridge/intel/x4x # Northbridge
register "ide_enable_primary" = "0x1"
register "gpe0_en" = "0x440"
+ register "gen1_dec" = "0x000c0291" # Superio HWM
+
device pci 1b.0 on # Audio
subsystemid 0x1849 0x3662
end