Change in coreboot[master]: ec/starlabs/merlin: Always store KLSC value

[Sean Rhodes (Code Review)]

Sean Rhodes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/62741 )

Change subject: ec/starlabs/merlin: Always store KLSC value
......................................................................

ec/starlabs/merlin: Always store KLSC value

The KLS (Keyboard Light State) will be changed when entering S3, S4 or S5, so
move the function that stores the current settings outside of logic that restricts
it to S4 or S5. This means the state isn't lost when enterting S3.

Signed-off-by: Sean Rhodes 
Change-Id: Ia007a8ad9c08a309489e9f64f1ed311858bfcd10
---
M src/ec/starlabs/merlin/acpi/suspend.asl
1 file changed, 14 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/62741/1

diff --git a/src/ec/starlabs/merlin/acpi/suspend.asl b/src/ec/starlabs/merlin/acpi/suspend.asl
index e8ca7c5..c0f92e5 100644
--- a/src/ec/starlabs/merlin/acpi/suspend.asl
+++ b/src/ec/starlabs/merlin/acpi/suspend.asl
@@ -2,6 +2,20 @@

Method (RPTS, 1, Serialized)
 {
+	Switch (ToInteger (_SB.PCI0.LPCB.EC.ECRD (RefOf (_SB.PCI0.LPCB.EC.KLSE))))
+	{
+		// 0x00 == Disabled == 0x00
+		// 0xdd == Enabled  == 0x01
+		Case (ToInteger (0x00))
+		{
+			_SB.PCI0.LPCB.KLSC = 0x00
+		}
+		Case (ToInteger (0xdd))
+		{
+			_SB.PCI0.LPCB.KLSC = 0x01
+		}
+	}
+
    If ((Arg0 == 0x04) || (Arg0 == 0x05))
    {
    	/* Store current EC settings in CMOS */
@@ -27,20 +41,6 @@
    	_SB.PCI0.LPCB.FLKC =
    		_SB.PCI0.LPCB.EC.ECRD (RefOf (_SB.PCI0.LPCB.EC.FLKE))

-		Switch (ToInteger (_SB.PCI0.LPCB.EC.ECRD (RefOf (_SB.PCI0.LPCB.EC.KLSE))))
-		{
-			// 0x00 == Disabled == 0x00
-			// 0xdd == Enabled  == 0x01
-			Case (ToInteger (0x00))
-			{
-				_SB.PCI0.LPCB.KLSC = 0x00
-			}
-			Case (ToInteger (0xdd))
-			{
-				_SB.PCI0.LPCB.KLSC = 0x01
-			}
-		}
-
    	Switch (ToInteger (_SB.PCI0.LPCB.EC.ECRD (RefOf (_SB.PCI0.LPCB.EC.KLBE))))
    	{
    		// 0xdd == On   == 0x00