update usb

drivers/usb/CMakeLists.txt

@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory_ifdef(CONFIG_USB device)
+zephyr_library_sources_ifdef(CONFIG_SHELL_CMDS_USB	usb_shell.c)

drivers/usb/Kconfig

@@ -8,4 +8,13 @@ menuconfig USB
 	help
 	  Enable USB drivers.
 
+if SHELL && USB
+
+config SHELL_CMDS_USB
+	bool "Enable USB shell commands"
+	help
+	  Enable usb shell commands to test driver.
+
+endif # SHELL && USB
+
 source "drivers/usb/device/Kconfig"

drivers/usb/usb_shell.c

@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2021 Aspeed Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <device.h>
+#include <drivers/uart.h>
+#include <shell/shell.h>
+#include <usb/usb_device.h>
+#include <stdlib.h>
+
+#define SHELL_HELP_USB_ENABLE	"Enable USB as CDC_ACM"
+#define SHELL_HELP_USB_CLEAR	"Clear USB env"
+#define SHELL_HELP_USB_PRINT	"Print USB data"
+#define SHELL_HELP_USB_WAIT	"Set/Clear wait during USB transfer"
+#define SHELL_HELP_SHELL	"Useful, not Unix-like shell commands."
+
+#define RX_BUFF_SIZE		64
+#define RING_BUF_SIZE		256
+
+RING_BUF_DECLARE(ringbuf, RING_BUF_SIZE);
+
+int total_len;
+int transfer_wait;
+int data_print;
+
+static void data_handle(void)
+{
+	uint8_t buff[RX_BUFF_SIZE];
+	int total = 0;
+	int rb_len;
+	int i;
+
+	while (!ring_buf_is_empty(&ringbuf)) {
+		rb_len = ring_buf_get(&ringbuf, buff, sizeof(buff));
+		if (data_print) {
+			printk("Print Data: ");
+			for (i = 0; i < rb_len; i++)
+				printk("0x%x ", buff[i]);
+			printk("\n");
+		}
+
+		total += rb_len;
+	}
+}
+
+static void interrupt_handler(const struct device *dev, void *user_data)
+{
+	uint8_t rx_buff[RX_BUFF_SIZE];
+	int recv_len, rb_len;
+
+	ARG_UNUSED(user_data);
+
+	while (uart_irq_is_pending(dev) && uart_irq_rx_ready(dev)) {
+		recv_len = uart_fifo_read(dev, rx_buff, sizeof(rx_buff));
+
+		total_len += recv_len;
+
+		if (recv_len) {
+			rb_len = ring_buf_put(&ringbuf, rx_buff, recv_len);
+			if (rb_len < recv_len) {
+				printk("Drop %u bytes\n", recv_len - rb_len);
+			}
+
+		} else {
+			break;
+		}
+
+		data_handle();
+
+		printk("total transfer len: 0x%x\n", total_len);
+
+		if (transfer_wait) {
+			printk("wait 1 sec...\n");
+			k_busy_wait(USEC_PER_SEC);
+		}
+	}
+}
+
+static int cmd_usb_enable(const struct shell *shell, size_t argc, char **argv)
+{
+	const struct device *dev;
+	int ret;
+
+	shell_print(shell, "enter %s...\n", __func__);
+
+	ret = usb_enable(NULL);
+	if (ret != 0) {
+		shell_print(shell, "Failed to enable USB");
+		return -1;
+	}
+
+	dev = device_get_binding("CDC_ACM_0");
+	if (dev) {
+		shell_print(shell, "This device supports USB CDC_ACM class.\n");
+
+		uart_irq_callback_set(dev, interrupt_handler);
+		/* Enable rx interrupts */
+		uart_irq_rx_enable(dev);
+	}
+
+	return 0;
+}
+
+static int cmd_usb_clear(const struct shell *shell, size_t argc, char **argv)
+{
+	total_len = 0;
+
+	return 0;
+}
+
+static int cmd_usb_print(const struct shell *shell, size_t argc, char **argv)
+{
+	data_print = strtol(argv[1], NULL, 10);
+	printk("data print: %s\n", data_print ? "true" : "false");
+
+	return 0;
+}
+
+static int cmd_usb_wait(const struct shell *shell, size_t argc, char **argv)
+{
+	transfer_wait = strtol(argv[1], NULL, 10);
+	printk("wait: %s\n", transfer_wait ? "true" : "false");
+
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(m_sub_usb,
+	SHELL_CMD(enable, NULL, SHELL_HELP_USB_ENABLE, cmd_usb_enable),
+	SHELL_CMD(clear, NULL, SHELL_HELP_USB_CLEAR, cmd_usb_clear),
+	SHELL_CMD_ARG(print, NULL, SHELL_HELP_USB_PRINT, cmd_usb_print, 2, 0),
+	SHELL_CMD_ARG(wait, NULL, SHELL_HELP_USB_WAIT, cmd_usb_wait, 2, 0),
+	SHELL_SUBCMD_SET_END
+);
+
+SHELL_CMD_REGISTER(usb, &m_sub_usb, SHELL_HELP_SHELL, NULL);

soc/arm/npcm4xx/npcm400f/sig_def_list.h

@@ -340,8 +340,8 @@ SIG_DEFINE(I3C6_SDA, B5, SIG_DESC_CLEAR(0x17, 4), SIG_DESC_CLEAR(0x15, 4), SIG_D
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(usbd0), okay) && CONFIG_USB_DC_NPCM4XX
 /* DEVALT2E */
-SIG_DEFINE(USBD_PHY_ICLK, A4, SIG_DESC_SET(0x2e, 4), SIG_DESC_CLEAR(0x2e, 5))
-SIG_DEFINE(USBD_PHY_XCLK, A4, SIG_DESC_SET(0x2e, 4), SIG_DESC_SET(0x2e, 5))
+SIG_DEFINE(USBD_PHY_ICLK, A4, SIG_DESC_SET(0x2e, 4), SIG_DESC_CLEAR(0x2e, 6))
+SIG_DEFINE(USBD_PHY_XCLK, A4, SIG_DESC_SET(0x2e, 4), SIG_DESC_SET(0x2e, 6))
 #endif