[M] Change in coreboot[master]: mb/asrock/b75m-itx: Fix S3 suspend to RAM

[Fabian Groffen (Code Review)]

Fabian Groffen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/73357 )

Change subject: mb/asrock/b75m-itx: Fix S3 suspend to RAM
......................................................................

mb/asrock/b75m-itx: Fix S3 suspend to RAM

Signed-off-by: Fabian Groffen 
Change-Id: Ia6a6bb0002943a2697b35d3ae05a0d848df3fce6
---
M src/mainboard/asrock/b75m-itx/Kconfig
A src/mainboard/asrock/b75m-itx/cmos.default
A src/mainboard/asrock/b75m-itx/cmos.layout
M src/mainboard/asrock/b75m-itx/devicetree.cb
4 files changed, 117 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/73357/1

diff --git a/src/mainboard/asrock/b75m-itx/Kconfig b/src/mainboard/asrock/b75m-itx/Kconfig
index 80bb59e..8b0c6ff 100644
--- a/src/mainboard/asrock/b75m-itx/Kconfig
+++ b/src/mainboard/asrock/b75m-itx/Kconfig
@@ -15,6 +15,8 @@
    select SOUTHBRIDGE_INTEL_C216
    select USE_NATIVE_RAMINIT
    select MAINBOARD_HAS_LIBGFXINIT
+	select HAVE_OPTION_TABLE
+	select HAVE_CMOS_DEFAULT

config MAINBOARD_DIR
    default "asrock/b75m-itx"
diff --git a/src/mainboard/asrock/b75m-itx/cmos.default b/src/mainboard/asrock/b75m-itx/cmos.default
new file mode 100644
index 0000000..23386fb
--- /dev/null
+++ b/src/mainboard/asrock/b75m-itx/cmos.default
@@ -0,0 +1,7 @@
+boot_option=Fallback
+debug_level=Debug
+nmi=Disable
+power_on_after_fail=Disable
+sata_mode=AHCI
+gfx_uma_size=64M
+cpu_fan_tach_src=CPU_FAN1
diff --git a/src/mainboard/asrock/b75m-itx/cmos.layout b/src/mainboard/asrock/b75m-itx/cmos.layout
new file mode 100644
index 0000000..ac88ee9
--- /dev/null
+++ b/src/mainboard/asrock/b75m-itx/cmos.layout
@@ -0,0 +1,96 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+# -----------------------------------------------------------------
+entries
+
+# -----------------------------------------------------------------
+0	120	r	0	reserved_memory
+
+# -----------------------------------------------------------------
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384	1	e	2	boot_option
+388	4	h	0	reboot_counter
+
+# -----------------------------------------------------------------
+# coreboot config options: console
+395	4	e	3	debug_level
+
+# coreboot config options: southbridge
+408	1	e	1	nmi
+
+409	2	e	4	power_on_after_fail
+411	2	e	5	sata_mode
+
+# coreboot config options: northbridge
+416	5	e	6	gfx_uma_size
+
+# coreboot config options: mainboard-specific
+421	2	e	7	cpu_fan_tach_src
+
+# coreboot config options: check sums
+984	16	h	0	check_sum
+
+# -----------------------------------------------------------------
+
+enumerations
+#ID	value	text
+
+# Generic on/off enum
+1	0	Disable
+1	1	Enable
+
+# boot_option
+2	0	Fallback
+2	1	Normal
+
+# debug_level
+3	0	Emergency
+3	1	Alert
+3	2	Critical
+3	3	Error
+3	4	Warning
+3	5	Notice
+3	6	Info
+3	7	Debug
+3	8	Spew
+
+# power_on_after_fail
+4	0	Disable
+4	1	Enable
+4	2	Keep
+
+# sata_mode
+5	0	AHCI
+5	1	Compatible
+5	2	Legacy
+
+# gfx_uma_size (Intel IGP Video RAM size)
+6	0	32M
+6	1	64M
+6	2	96M
+6	3	128M
+6	4	160M
+6	5	192M
+6	6	224M
+6	7	256M
+6	8	288M
+6	9	320M
+6	10	352M
+6	11	384M
+6	12	416M
+6	13	448M
+6	14	480M
+6	15	512M
+6	16	1024M
+
+# cpu_fan_header (select which header provides the tachometer
+# signal to the Super I/O on its CPUFANIN input)
+7	0	None
+7	1	CPU_FAN1
+7	2	CPU_FAN2
+7	3	Both
+
+# -----------------------------------------------------------------
+checksums
+
+checksum 392 423 984
diff --git a/src/mainboard/asrock/b75m-itx/devicetree.cb b/src/mainboard/asrock/b75m-itx/devicetree.cb
index 756b5b6..c46b468 100644
--- a/src/mainboard/asrock/b75m-itx/devicetree.cb
+++ b/src/mainboard/asrock/b75m-itx/devicetree.cb
@@ -115,9 +115,10 @@
    				device pnp 2e.a on		# ACPI
    					irq 0xe0 = 0x01
    					irq 0xe3 = 0x14
+						irq 0xe4 = 0x10     # + enable 3VSBSW
    					irq 0xe6 = 0x4c
    					irq 0xe9 = 0x02
-						irq 0xf0 = 0x20
+						irq 0xf0 = 0x20     # + pin 70 = 3VSBSW
    				end
    				device pnp 2e.b off	end		# HWM, front panel LED
    				device pnp 2e.d on end		# VID