Split the USB port power control into smart and dumb versions.

Also renaming to avoid confusion as to what's being charged.

BUG=chrome-os-partner:18825
BRANCH=slippy
TEST=manual

Build everything, Link still works.

Change-Id: I4205a1210c7dfe57cfbbdd740970ef57e6a011b8
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/49775
Reviewed-by: Randall Spangler <rspangler@chromium.org>

5 files changed, 208 insertions, 5 deletions

diff --git a/board/link/board.h b/board/link/board.h
index 0e68065c62..f923d45a46 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -37,7 +37,7 @@
 #define CONFIG_PWM_KBLIGHT
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TMP006
-#define CONFIG_USB_CHARGE
+#define CONFIG_USB_PORT_POWER_SMART
 
 #ifndef __ASSEMBLER__
 
diff --git a/board/slippy/board.h b/board/slippy/board.h
index 9246e8fd31..e18da49d0a 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -35,7 +35,7 @@
 #define CONFIG_PWM_FAN
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TMP006
-#define CONFIG_USB_CHARGE
+#define CONFIG_USB_PORT_POWER_DUMB
 
 #ifndef __ASSEMBLER__
 
diff --git a/common/build.mk b/common/build.mk
index 75968ba485..ae7ca4fd80 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -46,4 +46,5 @@ common-$(HAS_TASK_VBOOTHASH)+=sha256.o vboot_hash.o
 common-$(CONFIG_TEMP_SENSOR)+=temp_sensor.o
 common-$(CONFIG_TMP006)+=tmp006.o
 common-$(CONFIG_TSU6721)+=tsu6721.o
-common-$(CONFIG_USB_CHARGE)+=usb_charge.o
+common-$(CONFIG_USB_PORT_POWER_SMART)+=usb_port_power_smart.o
+common-$(CONFIG_USB_PORT_POWER_DUMB)+=usb_port_power_dumb.o
diff --git a/common/usb_charge.c b/common/usb_port_power_dumb.c
index f0136f0c9e..369179a6de 100644
--- a/common/usb_charge.c
+++ b/common/usb_port_power_dumb.c
@@ -181,9 +181,9 @@ static void usb_charge_init(void)
 	if (prev && version == USB_HOOK_VERSION && size == sizeof(*prev)) {
 		usb_charge_set_mode(0, prev->port_mode[0]);
 		usb_charge_set_mode(1, prev->port_mode[1]);
-	}
-	else
+	} else {
 		usb_charge_all_ports_off();
+	}
 }
 DECLARE_HOOK(HOOK_INIT, usb_charge_init, HOOK_PRIO_DEFAULT);
 
diff --git a/common/usb_port_power_smart.c b/common/usb_port_power_smart.c
new file mode 100644
index 0000000000..369179a6de
--- /dev/null
+++ b/common/usb_port_power_smart.c
@@ -0,0 +1,202 @@
+/* Copyright (c) 2012 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.
+ */
+
+/* USB charging control module for Chrome EC */
+
+#include "chipset.h"
+#include "common.h"
+#include "console.h"
+#include "gpio.h"
+#include "hooks.h"
+#include "host_command.h"
+#include "system.h"
+#include "usb_charge.h"
+#include "util.h"
+
+#define CPUTS(outstr) cputs(CC_USBCHARGE, outstr)
+#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
+
+#define USB_SYSJUMP_TAG 0x5550 /* "UP" - Usb Port */
+#define USB_HOOK_VERSION 1
+
+/* The previous USB port state before sys jump */
+struct usb_state {
+	uint8_t port_mode[USB_CHARGE_PORT_COUNT];
+	uint8_t pad[2]; /* Pad to 4 bytes for system_add_jump_tag(). */
+};
+
+static uint8_t charge_mode[USB_CHARGE_PORT_COUNT];
+
+static void usb_charge_set_control_mode(int port_id, int mode)
+{
+	if (port_id == 0) {
+		gpio_set_level(GPIO_USB1_CTL1, mode & 0x4);
+		gpio_set_level(GPIO_USB1_CTL2, mode & 0x2);
+		gpio_set_level(GPIO_USB1_CTL3, mode & 0x1);
+	} else {
+		gpio_set_level(GPIO_USB2_CTL1, mode & 0x4);
+		gpio_set_level(GPIO_USB2_CTL2, mode & 0x2);
+		gpio_set_level(GPIO_USB2_CTL3, mode & 0x1);
+	}
+}
+
+static void usb_charge_set_enabled(int port_id, int en)
+{
+	if (port_id == 0)
+		gpio_set_level(GPIO_USB1_ENABLE, en);
+	else
+		gpio_set_level(GPIO_USB2_ENABLE, en);
+}
+
+static void usb_charge_set_ilim(int port_id, int sel)
+{
+	if (port_id == 0)
+		gpio_set_level(GPIO_USB1_ILIM_SEL, sel);
+	else
+		gpio_set_level(GPIO_USB2_ILIM_SEL, sel);
+}
+
+static void usb_charge_all_ports_on(void)
+{
+	usb_charge_set_mode(0, USB_CHARGE_MODE_SDP2);
+	usb_charge_set_mode(1, USB_CHARGE_MODE_SDP2);
+}
+
+static void usb_charge_all_ports_off(void)
+{
+	usb_charge_set_mode(0, USB_CHARGE_MODE_DISABLED);
+	usb_charge_set_mode(1, USB_CHARGE_MODE_DISABLED);
+}
+
+int usb_charge_set_mode(int port_id, enum usb_charge_mode mode)
+{
+	CPRINTF("[%T USB charge p%d m%d]\n", port_id, mode);
+
+	if (port_id >= USB_CHARGE_PORT_COUNT)
+		return EC_ERROR_INVAL;
+
+	switch (mode) {
+	case USB_CHARGE_MODE_DISABLED:
+		usb_charge_set_enabled(port_id, 0);
+		break;
+	case USB_CHARGE_MODE_SDP2:
+		usb_charge_set_control_mode(port_id, 7);
+		usb_charge_set_ilim(port_id, 0);
+		usb_charge_set_enabled(port_id, 1);
+		break;
+	case USB_CHARGE_MODE_CDP:
+		usb_charge_set_control_mode(port_id, 7);
+		usb_charge_set_ilim(port_id, 1);
+		usb_charge_set_enabled(port_id, 1);
+		break;
+	case USB_CHARGE_MODE_DCP_SHORT:
+		usb_charge_set_control_mode(port_id, 4);
+		usb_charge_set_enabled(port_id, 1);
+		break;
+	default:
+		return EC_ERROR_UNKNOWN;
+	}
+
+	charge_mode[port_id] = mode;
+
+	return EC_SUCCESS;
+}
+
+/*****************************************************************************/
+/* Console commands */
+
+static int command_set_mode(int argc, char **argv)
+{
+	int port_id = -1;
+	int mode = -1;
+	char *e;
+
+	if (argc == 1) {
+		ccprintf("Port 0: %d\nPort 1: %d\n",
+			 charge_mode[0], charge_mode[1]);
+		return EC_SUCCESS;
+	}
+
+	if (argc != 3)
+		return EC_ERROR_PARAM_COUNT;
+
+	port_id = strtoi(argv[1], &e, 0);
+	if (*e || port_id < 0 || port_id >= USB_CHARGE_PORT_COUNT)
+		return EC_ERROR_PARAM1;
+
+	mode = strtoi(argv[2], &e, 0);
+	if (*e || mode < 0 || mode >= USB_CHARGE_MODE_COUNT)
+		return EC_ERROR_PARAM2;
+
+	return usb_charge_set_mode(port_id, mode);
+}
+DECLARE_CONSOLE_COMMAND(usbchargemode, command_set_mode,
+			"[<port> <0 | 1 | 2 | 3>]",
+			"Set USB charge mode",
+			"Modes: 0=Disabled.\n"
+			"       1=Standard downstream port.\n"
+			"	2=Charging downstream port, BC 1.2.\n"
+			"       3=Dedicated charging port, BC 1.2.\n");
+
+/*****************************************************************************/
+/* Host commands */
+
+static int usb_charge_command_set_mode(struct host_cmd_handler_args *args)
+{
+	const struct ec_params_usb_charge_set_mode *p = args->params;
+
+	if (usb_charge_set_mode(p->usb_port_id, p->mode) != EC_SUCCESS)
+		return EC_RES_ERROR;
+
+	return EC_RES_SUCCESS;
+}
+DECLARE_HOST_COMMAND(EC_CMD_USB_CHARGE_SET_MODE,
+		     usb_charge_command_set_mode,
+		     EC_VER_MASK(0));
+
+/*****************************************************************************/
+/* Hooks */
+
+static void usb_charge_preserve_state(void)
+{
+	struct usb_state state;
+
+	state.port_mode[0] = charge_mode[0];
+	state.port_mode[1] = charge_mode[1];
+
+	system_add_jump_tag(USB_SYSJUMP_TAG, USB_HOOK_VERSION,
+			    sizeof(state), &state);
+}
+DECLARE_HOOK(HOOK_SYSJUMP, usb_charge_preserve_state, HOOK_PRIO_DEFAULT);
+
+static void usb_charge_init(void)
+{
+	const struct usb_state *prev;
+	int version, size;
+
+	prev = (const struct usb_state *)system_get_jump_tag(USB_SYSJUMP_TAG,
+							     &version, &size);
+	if (prev && version == USB_HOOK_VERSION && size == sizeof(*prev)) {
+		usb_charge_set_mode(0, prev->port_mode[0]);
+		usb_charge_set_mode(1, prev->port_mode[1]);
+	} else {
+		usb_charge_all_ports_off();
+	}
+}
+DECLARE_HOOK(HOOK_INIT, usb_charge_init, HOOK_PRIO_DEFAULT);
+
+static void usb_charge_resume(void)
+{
+	/* Turn on USB ports on as we go into S0 from S3 or S5. */
+	usb_charge_all_ports_on();
+}
+DECLARE_HOOK(HOOK_CHIPSET_RESUME, usb_charge_resume, HOOK_PRIO_DEFAULT);
+
+static void usb_charge_shutdown(void)
+{
+	/* Turn on USB ports off as we go back to S5. */
+	usb_charge_all_ports_off();
+}
+DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, usb_charge_shutdown, HOOK_PRIO_DEFAULT);