[coreboot-gerrit] Change in coreboot[master]: ec/lenovo/h8: Add BDC detection support

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded a new change for review. ( https://review.coreboot.org/19809 )

Change subject: ec/lenovo/h8: Add BDC detection support
......................................................................

ec/lenovo/h8: Add BDC detection support

Add support for detecting BDC.
Allows to turn off power to BDC if no card is installed.
Should fix Bluetooth indicator always on.

Add the following devicetree values:
* has_bdc_detection
 Set to one to indicate that the following register are sane.
* bdc_gpio_num
 SB GPIO num to read.
* bdc_gpio_lvl
 SB GPIO level for card to be present (usually zero).

Don't enable BDC power if no card is detected.
As there are no devicetree values yet, the new code doesn't
have any effect.

Change-Id: I506de2eca4b820e6d82de6b2c48a5440462e1db5
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
M src/ec/lenovo/h8/Makefile.inc
A src/ec/lenovo/h8/bluetooth.c
M src/ec/lenovo/h8/chip.h
M src/ec/lenovo/h8/h8.c
M src/ec/lenovo/h8/h8.h
5 files changed, 80 insertions(+), 10 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/19809/1

diff --git a/src/ec/lenovo/h8/Makefile.inc b/src/ec/lenovo/h8/Makefile.inc
index da9cee1..e989dee 100644
--- a/src/ec/lenovo/h8/Makefile.inc
+++ b/src/ec/lenovo/h8/Makefile.inc
@@ -1,6 +1,7 @@
 ifeq ($(CONFIG_EC_LENOVO_H8),y)
 
 ramstage-y += h8.c
+ramstage-y += bluetooth.c
 smm-y += smm.c
 
 endif
diff --git a/src/ec/lenovo/h8/bluetooth.c b/src/ec/lenovo/h8/bluetooth.c
new file mode 100644
index 0000000..3e7b1c1
--- /dev/null
+++ b/src/ec/lenovo/h8/bluetooth.c
@@ -0,0 +1,69 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2017 Patrick Rudolph <siro at das-labor.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <southbridge/intel/common/gpio.h>
+#include <console/console.h>
+#include <device/device.h>
+#include <ec/acpi/ec.h>
+#include <option.h>
+
+#include "h8.h"
+#include "chip.h"
+
+/*
+ * Controls BDC (Bluetooth dauther card) power.
+ */
+void h8_bluetooth_enable(int on)
+{
+	if (on)
+		ec_set_bit(0x3a, 4);
+	else
+		ec_clr_bit(0x3a, 4);
+}
+
+/*
+ * Detect BDC on supported MBs.
+ */
+bool h8_has_bdc(struct device *dev)
+{
+	struct ec_lenovo_h8_config *conf = dev->chip_info;
+
+	if (!conf->has_bdc_detection) {
+		printk(BIOS_INFO, "H8: BDC detection not implemented. "
+				  "Assuming BDC installed.\n");
+		return 1;
+	}
+
+	if (get_gpio(conf->bdc_gpio_num) == conf->bdc_gpio_lvl) {
+		printk(BIOS_INFO, "H8: BDC installed.\n");
+		return 1;
+	}
+
+	printk(BIOS_INFO, "H8: BDC not installed.\n");
+	return 0;
+}
+
+/*
+ * Return BDC NVRAM setting.
+ */
+bool h8_bluetooth_nv_disable(void)
+{
+	u8 val;
+
+	if (get_option(&val, "bluetooth") != CB_SUCCESS)
+		return 0;
+
+	return !val;
+}
diff --git a/src/ec/lenovo/h8/chip.h b/src/ec/lenovo/h8/chip.h
index bb6eb05..d62312d 100644
--- a/src/ec/lenovo/h8/chip.h
+++ b/src/ec/lenovo/h8/chip.h
@@ -46,6 +46,10 @@
 	u8 has_keyboard_backlight;
 	u8 has_power_management_beeps;
 	u8 has_uwb;
+	u8 has_bdc_detection;
+
+	u8 bdc_gpio_num;
+	u8 bdc_gpio_lvl;
 };
 
 #endif /* EC_LENOVO_H8EC_CHIP_H */
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index b259d9a..bc0afb8 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -28,14 +28,6 @@
 #include "h8.h"
 #include "chip.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,
@@ -284,8 +276,7 @@
 	if (get_option(&val, "volume") == CB_SUCCESS && !acpi_is_wakeup_s3())
 		ec_write(H8_VOLUME_CONTROL, val);
 
-	if (get_option(&val, "bluetooth") != CB_SUCCESS)
-		val = 1;
+	val = h8_has_bdc(dev) && !h8_bluetooth_nv_disable();
 	h8_bluetooth_enable(val);
 
 	if (get_option(&val, "wwan") != CB_SUCCESS)
diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h
index 42d279f..6ecc9bc 100644
--- a/src/ec/lenovo/h8/h8.h
+++ b/src/ec/lenovo/h8/h8.h
@@ -17,6 +17,7 @@
 #define EC_LENOVO_H8_H
 
 #include <stdint.h>
+#include <device/device.h>
 
 void h8_trackpoint_enable(int on);
 void h8_wlan_enable(int on);
@@ -30,6 +31,10 @@
 
 void h8_mainboard_init_dock (void);
 
+void h8_bluetooth_enable(int on);
+bool h8_bluetooth_nv_disable(void);
+bool h8_has_bdc(struct device *dev);
+
 /* EC registers */
 #define H8_CONFIG0 0x00
 #define H8_CONFIG0_EVENTS_ENABLE	0x02

-- 
To view, visit https://review.coreboot.org/19809
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I506de2eca4b820e6d82de6b2c48a5440462e1db5
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>