[coreboot-gerrit] Patch set updated for coreboot: adb3a22 ec/lenovo/h8: Allow control of low-battery beep.

[Vladimir Serbinenko (phcoder@gmail.com)]

Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4663

-gerrit

commit adb3a22c25622108012a0f80e91e998607c93761
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Sat Jan 11 20:58:20 2014 +0100

    ec/lenovo/h8: Allow control of low-battery beep.
    
    Change-Id: I2f422e83f2afcf0cc3f3ecbace01a8f4f39e87d4
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 src/ec/lenovo/h8/h8.c                  | 10 ++++++++++
 src/mainboard/lenovo/t60/cmos.layout   |  1 +
 src/mainboard/lenovo/x201/cmos.default |  1 +
 src/mainboard/lenovo/x201/cmos.layout  |  3 ++-
 src/mainboard/lenovo/x60/cmos.default  |  1 +
 src/mainboard/lenovo/x60/cmos.layout   |  1 +
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index aa11d73..4abe53b 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -178,6 +178,16 @@ static void h8_enable(device_t dev)
 		beepmask0 = 0x00;
 		beepmask1 = 0x00;
 	}
+
+	if (conf->has_power_management_beeps) {
+		if (get_option(&val, "low_battery_beep") != CB_SUCCESS)
+			val = 1;
+		if (val)
+			beepmask0 |= 2;
+		else
+			beepmask0 &= ~2;
+	}
+
 	ec_write(H8_SOUND_ENABLE0, beepmask0);
 	ec_write(H8_SOUND_ENABLE1, beepmask1);
 
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index fc8b395..8f0e2be 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -115,6 +115,7 @@ entries
 1074         1       e       1        fn_ctrl_swap
 1075         1       e       1        sticky_fn
 1076         1       e       1        power_management_beeps
+1077         1       e       1        low_battery_beep
 # -----------------------------------------------------------------
 
 enumerations
diff --git a/src/mainboard/lenovo/x201/cmos.default b/src/mainboard/lenovo/x201/cmos.default
index d1158e8..307ac7f 100644
--- a/src/mainboard/lenovo/x201/cmos.default
+++ b/src/mainboard/lenovo/x201/cmos.default
@@ -12,3 +12,4 @@ touchpad=Enable
 fn_ctrl_swap=Disable
 sticky_fn=Disable
 power_management_beeps=Enable
+low_battery_beep=Enable
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index 8597374..7838d38 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -93,7 +93,8 @@ entries
 417         1       e       1        fn_ctrl_swap
 418         1       e       1        sticky_fn
 419         1       e       1        power_management_beeps
-#420        564     r       0        unused
+420         1       e       1        low_battery_beep
+#421        563     r       0        unused
 
 # coreboot config options: check sums
 984         16       h       0        check_sum
diff --git a/src/mainboard/lenovo/x60/cmos.default b/src/mainboard/lenovo/x60/cmos.default
index 883bfd4..663fe5c 100644
--- a/src/mainboard/lenovo/x60/cmos.default
+++ b/src/mainboard/lenovo/x60/cmos.default
@@ -15,3 +15,4 @@ bluetooth=Enable
 fn_ctrl_swap=Disable
 sticky_fn=Disable
 power_management_beeps=Enable
+low_battery_beep=Enable
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index a2b45bd..4898180 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -115,6 +115,7 @@ entries
 1085         1       e       1        fn_ctrl_swap
 1086         1       e       1        sticky_fn
 1087         1       e       1        power_management_beeps
+1088         1       e       1        low_battery_beep
 # -----------------------------------------------------------------
 
 enumerations