summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2012-01-31 17:41:12 +0100
committerSven Schnelle <svens@stackframe.org>2012-01-31 18:03:40 +0100
commitbba0346ef5406b085d15226ec43db4bbeee0ef92 (patch)
treeaeb66aba4f97c86845594c37bc807207be6cdea7
parent483ec41e6f3947b8e11ed67f7efcfdc3ef035612 (diff)
downloadcoreboot-bba0346ef5406b085d15226ec43db4bbeee0ef92.tar.xz
X60/T60: Add option to enable/disable bluetooth
Change-Id: I9761a8a9a7cc708fe95169cb8b79b413b97ee523 Signed-off-by: Sven Schnelle <svens@stackframe.org> Reviewed-on: http://review.coreboot.org/598 Tested-by: build bot (Jenkins)
-rw-r--r--src/ec/lenovo/h8/h8.c11
-rw-r--r--src/mainboard/lenovo/t60/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x60/cmos.layout1
3 files changed, 13 insertions, 0 deletions
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index f20cd389dc..ecd34b2fe7 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -27,6 +27,14 @@
#include "chip.h"
#include <pc80/mc146818rtc.h>
+static void h8_bluetooth_enable(int on)
+{
+ if (on)
+ ec_set_bit(0x3a, 4);
+ else
+ ec_clr_bit(0x3a, 4);
+}
+
void h8_trackpoint_enable(int on)
{
ec_write(H8_TRACKPOINT_CTRL,
@@ -143,6 +151,9 @@ static void h8_enable(device_t dev)
ec_write(H8_VOLUME_CONTROL, val);
+ if (!get_option(&val, "bluetooth"))
+ h8_bluetooth_enable(val);
+
if (!get_option(&val, "first_battery")) {
tmp = ec_read(H8_CONFIG3);
tmp &= ~(1 << 4);
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 8d9dce49bb..7539b606d8 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -108,6 +108,7 @@ entries
1052 4 r 0 C1DRT1
1060 1 e 1 touchpad
+1061 1 e 1 bluetooth
1064 8 h 0 volume
1072 1 e 9 first_battery
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index cae70cb91e..ab51a84aa4 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -110,6 +110,7 @@ entries
1064 8 h 0 volume
1072 8 h 0 tft_brightness
1080 1 e 9 first_battery
+1081 1 e 1 bluetooth
# -----------------------------------------------------------------
enumerations