Merge remote-tracking branch cros/main into firmware-keeby-14119.B-mainfirmware-keeby-14119.B-main

Relevant changes:

git log --oneline c5bd23a4b..b44d10f8f -- baseboard/dedede board/cappy2
board/corori board/driblee board/gooey board/haboki board/lalala
board/waddledoo2 common/charge_state_v2.c common/mkbp_* common/ocpc.c
common/usbc/usb_tc_drp_acc_trysrc_sm.c common/usbc/usb_sm.c
common/usbc/*_pd_* common/usbc/dp_alt_mode.c common/usbc/usb_prl_sm.c
common/usbc/usb_pe_drp_sm.c common/usb_charger.c common/usb_common.c
common/usbc_ocp.c driver/charger/sm5803.* driver/charger/isl923x.*
driver/tcpm/raa489000.* driver/tcpm/it83* include/power/icelake.h
include/intel_x86.h power/icelake.c power/intel_x86.c util/getversion.sh

42d03a001 config: change temp_sensor_power from config to gpio
e296efb28 usb_common: Fix CONFIG_USB_PD_DISCHARGE_TCPC typo
c346481f4 atomic: cast to unsigned when shifting
9b972a0f2 driver/tcpm/it83xx, it8xxx2: ITE inactive port return from HOOK
a499d8fd4 driver/tcpm/it83xx, it8xxx2: set sleep mask for mixed TCPC case
ed62e2583 TCPMv2: don't set the sleep mask for TCPC embedded in EC
c962696e8 motion_sensor: Remove |int_signal| field
86b216794 ocpc: modify pre-charge target condition
6f8336eb4 dedede: Set MKBP event wake mask to 0
02d034df0 dedede: add stylus fw_config
4f7cd7509 atomic: use atomic_t where it is possible
e3ffa0519 mkbp: change the type fifo_entries to atomic_t
bb4c47af0 usb: use atomic_t where possible
c6e513ee2 power/icelake: Add SLP_S5 as a watched power signal
d89e49b20 power: Introduce S4 as a real power state
ba8a3c9c0 chgstv2: Use chipset_in_state instead of naming states
23a975d12 i2c: Use declared initializers for i2c_ports: boards a-l
35865dbec TCPMv2: Guard DATA_RESET using CONFIG_USB_PD_DATA_RESET_MSG
d4d8243ed i2c: Use declared initializers for i2c_ports: baseboards
eba8d0305 RAA489000: Fixed RAA489000 max charging current
e78b83e0f TCPMv2: Delay Data Reset until mode entry request
6230e60fc TCPMv2: Support Data Reset as DFP, initiator
412246836 intel_x86: Apply chipset resume init and suspend complete hooks
f2809b72c config: rename CONFIG_HOSTCMD_ESPI to CONFIG_HOST_INTERFACE_ESPI

BRANCH=None
BUG=b:202796060 b:207805856 b:167983049 b:208318528 b:181983966
BUG=b:207328258 b:195416058 b:205285137 b:199919093 b:207055975
BUG=b:129159505 b:204947672 b:141363146 b:207082842 b:205675485
TEST=`make -j buildall`

Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I980351977e11088a130e478df0701be4715f049b

1 files changed, 132 insertions, 0 deletions

diff --git a/driver/led/mp3385.c b/driver/led/mp3385.c
new file mode 100644
index 0000000000..278e333ae1
--- /dev/null
+++ b/driver/led/mp3385.c
@@ -0,0 +1,132 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * MPS MP3385 LED driver.
+ */
+
+#include "console.h"
+#include "gpio.h"
+#include "hooks.h"
+#include "i2c.h"
+#include "mp3385.h"
+#include "task.h"
+#include "timer.h"
+
+#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args)
+#define CPRINTF(format, args...) cprintf(CC_I2C, format, ## args)
+
+#define I2C_ADDR_MP3385_FLAGS	0x31
+
+struct mp3385_value {
+	uint8_t offset;
+	uint8_t data;
+};
+
+/*
+ * MP3385 asserts the interrupt when it's ready for writing settings, which
+ * are cleared when it's turned off. We enable the interrupt on HOOK_INIT and
+ * keep it enabled in S0/S3/S5.
+ *
+ * It's assumed the device doesn't have a lid and MP3385 is powered only in
+ * S0. For clamshell devices, different interrupt & power control scheme may be
+ * needed.
+ */
+
+/* This ordering is suggested by vendor. */
+static struct mp3385_value mp3385_conf[] = {
+	/*
+	 * Register 0x01: Operation frequency control
+	 * Frequency selection: 300(KHz)
+	 * Short circuit protection: 8(V)
+	 */
+	{.offset = 1, .data = 0x43},
+	/*
+	 * Register 0x02: LED current Full-Scale Register
+	 * ISET Resistor: 127(Kohm)
+	 * Maximum LED current: 20196/127 = 159(mA)
+	 * Setting LED current: 62(mA)
+	 */
+	{.offset = 2, .data = 0x65},
+
+	 /* Register 0x03: RO - ignored */
+
+	/*
+	 * Register 0x04: Internal LED Dimming Brightness Register
+	 * SMBus PWM function: None Use
+	 */
+	{.offset = 4, .data = 0x00},
+	/*
+	 * Register 0x05: OVP, OCP Threshold Register
+	 * Over Current Protection: 0.5(V)
+	 * Panel LED Voltage(Max): 47.8(V)
+	 * OVP setting: 54(V)
+	 */
+	{.offset = 5, .data = 0x97},
+	/*
+	 * Register 0x00: Dimming mode Register
+	 * String Selection: 4(Number)
+	 * Interface Selection: 1
+	 * Brightness mode: 3
+	 */
+	{.offset = 0, .data = 0xF2},
+};
+static const int mp3385_conf_size = ARRAY_SIZE(mp3385_conf);
+
+static void set_mp3385_reg(void)
+{
+	int i;
+
+	for (i = 0; i < mp3385_conf_size; ++i) {
+		int rv = i2c_write8(I2C_PORT_BACKLIGHT,
+				    I2C_ADDR_MP3385_FLAGS,
+				    mp3385_conf[i].offset, mp3385_conf[i].data);
+		if (rv) {
+			CPRINTS("Write MP3385 register %d "
+					"failed rv=%d", i, rv);
+			return;
+		}
+	}
+	CPRINTS("Wrote MP3385 settings");
+}
+
+static void mp3385_backlight_enable_deferred(void)
+{
+	if (gpio_get_level(GPIO_PANEL_BACKLIGHT_EN))
+		set_mp3385_reg();
+}
+DECLARE_DEFERRED(mp3385_backlight_enable_deferred);
+
+void mp3385_interrupt(enum gpio_signal signal)
+{
+	/*
+	 * 1. Spec says backlight should be turned on after 500ms
+	 *    after eDP signals are ready.
+	 *
+	 * 2. There's no way to get exact eDP ready time, therefore,
+	 *    give one second delay.
+	 *
+	 * power up  __/----------------
+	 * eDP       ______/------------
+	 * backlight _____________/-----
+	 *                 |- t1 -| : >=500 ms
+	 *             |-   t2   -| : 1 second is enough
+	 */
+	hook_call_deferred(&mp3385_backlight_enable_deferred_data,
+						MP3385_POWER_BACKLIGHT_DELAY);
+}
+
+int mp3385_set_config(int offset, int data)
+{
+	int i;
+
+	for (i = 0; i < mp3385_conf_size; i++) {
+		if (mp3385_conf[i].offset == offset) {
+			mp3385_conf[i].data = data;
+			return EC_SUCCESS;
+		}
+	}
+
+	CPRINTS("mp3385: offset %d not found", i);
+	return EC_ERROR_INVAL;
+}