[S] Change in coreboot[main]: mb/asus/p8z77-m: Move SIO ACPI device config to bootblock

[Keith Hui (Code Review)]

Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86636?usp=email )

Change subject: mb/asus/p8z77-m: Move SIO ACPI device config to bootblock
......................................................................

mb/asus/p8z77-m: Move SIO ACPI device config to bootblock

ACPI S3 suspend has been failing on this mainboard for about 5 months
as of this writing. This move fixes the regression. The removal of
these three settings from devicetree also realized a small image
size reduction.

TEST=Now again able to enter S3 suspend and return to where I was.

Change-Id: I35189b7977c83b3a2666dded8267b9021f0ea3f3
Signed-off-by: Keith Hui 
---
M src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
M src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
2 files changed, 7 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/86636/1

diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
index 76eba43..7e4647c 100644
--- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
+++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
@@ -12,6 +12,7 @@

#define SERIAL_DEV PNP_DEV(CONFIG_SUPERIO_PNP_BASE, NCT6779D_SP1)
 #define GPIO0_DEV  PNP_DEV(CONFIG_SUPERIO_PNP_BASE, NCT6779D_WDT1_GPIO01_V)
+#define ACPI_DEV   PNP_DEV(CONFIG_SUPERIO_PNP_BASE, NCT6779D_ACPI)

void bootblock_mainboard_early_init(void)
 {
@@ -26,6 +27,11 @@
    pnp_write_config(GPIO0_DEV, 0xe0, 0x7f);
    pnp_write_config(GPIO0_DEV, 0xe1, 0x00);

+	pnp_set_logical_device(ACPI_DEV);
+	pnp_write_config(ACPI_DEV, 0xe4, 0x10); /* Enable 3VSBSW#, needed for S3 suspend */
+	pnp_write_config(ACPI_DEV, 0xe7, 0x11); /* HWM reset by LRESET#, 0.5s S3 delay */
+	pnp_write_config(ACPI_DEV, 0xf2, 0x5d); /* Enable RSTOUT[0-2]# and PME */
+
    nuvoton_pnp_exit_conf_state(GPIO0_DEV);

/*
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
index e84125b..058ce76 100644
--- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
+++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
@@ -56,11 +56,7 @@
    				device pnp 2e.108 on		# GPIO 0
    					drq 0xe1 = 0x80		# GP07 high turns DRAM_LED off
    				end
-					device pnp 2e.a on		# ACPI
-						drq 0xe4 = 0x10 	# Enable 3VSBSW#, needed for S3 suspend
-						drq 0xe7 = 0x11		# HWM reset by LRESET#, 0.5s S3 delay for compatibility
-						drq 0xf2 = 0x5d		# Enable RSTOUT[0-2]# and PME
-					end
+					device pnp 2e.a on end		# ACPI
    				device pnp 2e.b on		# HWM, front panel LED
    					io 0x60 = 0x290		# HWM address
    					io 0x62 = 0		# SB-TSI address (not used)