From patchwork Mon Nov 16 15:17:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 11909579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DDE7B15E6 for ; Mon, 16 Nov 2020 15:19:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6A362137B for ; Mon, 16 Nov 2020 15:19:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FRek7/5t" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730179AbgKPPTW (ORCPT ); Mon, 16 Nov 2020 10:19:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgKPPTV (ORCPT ); Mon, 16 Nov 2020 10:19:21 -0500 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2422C0613CF for ; Mon, 16 Nov 2020 07:19:21 -0800 (PST) Received: by mail-qk1-x72c.google.com with SMTP id d28so17037850qka.11 for ; Mon, 16 Nov 2020 07:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SfOqpctSUu1pHCgTELS9Ubj4JB3rNrdpFdF+X6duIF8=; b=FRek7/5tdw8CTF72ZdVn0iR4CAI19MTuZpreaUm1RgUId/Arhe5QFaScdSim0GGNjq X+wxhkNoQVTBTW+fxWDZyTCFpe0NLKwGrYmv4A7uBd+r5QA7TH8SErfToSjp8Suw123U 8z/BeYPhSFQhh6nJ0zY4l3KcsKZmQCv2i9AIr5JwTMApKXZXyUr20Gd+DihIFiMiu33V /cByBQGynOsGnS2+bZpVDOKvULKbsZnyXSuagL6gx8ngXtkg2L5x2kkWkOcwwuWN1IqZ lEeed/XfZPLogMtYTZ2AR0RmM1qh/u0pEuFP4UctMXSbbHyUpl1Ut5oQDM/0ZM63yCg7 aGSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SfOqpctSUu1pHCgTELS9Ubj4JB3rNrdpFdF+X6duIF8=; b=r7eMOszD//QRvk66+NVoORM7Juw53pbHg+tHrNntCo6CNYiI6gui0XvazX+fb5CNj2 PrVjuX2dBcgVaDap92MQxPjz6wigNahMra7aRYGDi3GUydtjd2CDCx/WAgaE7jP/sQRI nj5N/vPsdX0ZasVqcj+y/j0iEqsoT3Ia4AKtR9v4Ny1ooiyODWzXn+fgGieEHDff4R5/ EHh1XvX94YdeepWCABhmIw1qBTNCu81w8Q5XiAUgWn+Y7pVqyWDWrhVW2MkrnFZDwXNM ld5QVvAi9/Aip3IOWJ0cvhUguMrWFzYyRpkQDsmCFkEXzNmeH5bOCelKyjLZMHUmwREk AQGQ== X-Gm-Message-State: AOAM532MW8Pc8BzNnGX0YgvD1FDdyPRj6+6gnBnzK53SW263qSjFrAog /vStFWInVMqTmxmlzRCGfWw= X-Google-Smtp-Source: ABdhPJzEGY2K4o1wLh29Ket56r5s/duEPeDCz0Cl0ieWJYFQqjiIvdBnJQ0a/DI27ZX8Y4Ps6YrkHg== X-Received: by 2002:a37:9c84:: with SMTP id f126mr14511584qke.484.1605539960676; Mon, 16 Nov 2020 07:19:20 -0800 (PST) Received: from rockpro64.sparksnet ([2601:153:900:7730::20]) by smtp.gmail.com with ESMTPSA id p127sm12216818qkc.37.2020.11.16.07.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 07:19:20 -0800 (PST) From: Peter Geis To: Felipe Balbi , Greg Kroah-Hartman , Heiko Stuebner Cc: linux-usb@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, wulf@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, zyw@rock-chips.com, kever.yang@rock-chips.com, Peter Geis Subject: [PATCH 1/4] phy: rockchip: add rockchip usb3 innosilicon phy driver Date: Mon, 16 Nov 2020 15:17:33 +0000 Message-Id: <20201116151735.178737-2-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116151735.178737-1-pgwipeout@gmail.com> References: <20201116151735.178737-1-pgwipeout@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The innosilicon based usb3 phy used in rockchip devices such as the rk3328 is bugged, requiring special handling. The following erata have been observed: - usb3 device disconnect events are not detected by the controller - usb2 hubs with no devices attached do not trigger disconnect events when removed - interrupts are not reliable To work around these issue we implement polling of the usb2 and usb3 status. On usb3 disconnection we reset the usb3 phy which triggers the disconnect event. On usb2 disconnection we have to force reset the whole controller. This requires a handoff to a special dwc3 device driver. This has been tested on the rk3328-roc-cc board with the following devices: - usb2 only device - usb3 only device - usb2 only hub without devices - usb3 hub without devices - usb2 hub with devices - usb3 hub with devices Signed-off-by: Peter Geis --- drivers/phy/rockchip/Kconfig | 9 + drivers/phy/rockchip/Makefile | 1 + drivers/phy/rockchip/phy-rockchip-inno-usb3.c | 425 ++++++++++++++++++ 3 files changed, 435 insertions(+) create mode 100644 drivers/phy/rockchip/phy-rockchip-inno-usb3.c diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index c2f22f90736c..ce16e0877354 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -47,6 +47,15 @@ config PHY_ROCKCHIP_INNO_USB2 help Support for Rockchip USB2.0 PHY with Innosilicon IP block. +config PHY_ROCKCHIP_INNO_USB3 + tristate "Rockchip INNO USB3PHY Driver" + depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF + depends on COMMON_CLK + depends on USB_SUPPORT + select USB_COMMON + help + Support for Rockchip USB3.0 PHY with Innosilicon IP block. + config PHY_ROCKCHIP_INNO_DSIDPHY tristate "Rockchip Innosilicon MIPI/LVDS/TTL PHY driver" depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index c3cfc7f0af5c..738e3574a722 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_PHY_ROCKCHIP_EMMC) += phy-rockchip-emmc.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o +obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB3) += phy-rockchip-inno-usb3.o obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o obj-$(CONFIG_PHY_ROCKCHIP_TYPEC) += phy-rockchip-typec.o obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb3.c b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c new file mode 100644 index 000000000000..6e4aa2f0ba46 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c @@ -0,0 +1,425 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define USB3_STATUS_REG 0x284 +#define USB2_STATUS_REG 0x30 +#define USB3_CONN_BIT BIT(0) +#define USB2_CONN_BIT BIT(7) +#define USB2_STATE_SHIFT 6 +#define REG_WRITE_MASK GENMASK(31, 16) + +struct rockchip_usb3phy_port{ + struct device *dev; + struct regmap *regmap; + struct usb_phy phy; + struct rockchip_usb3phy *parent; + unsigned char type; +}; + +enum usb3phy_mode { + PHY_IDLE = 0, + PHY_USB3, + PHY_USB2, + PHY_COMBO +}; + +struct rockchip_usb3phy { + struct device *dev; + struct regmap *regmap; + struct clk *clk_pipe; + struct clk *clk_otg; + struct reset_control *u3por_rst; + struct reset_control *u2por_rst; + struct reset_control *pipe_rst; + struct reset_control *utmi_rst; + struct reset_control *pipe_apb_rst; + struct reset_control *utmi_apb_rst; + struct rockchip_usb3phy_port port_pipe; + struct rockchip_usb3phy_port port_utmi; + struct work_struct usb_phy_work; + struct notifier_block nb; + enum usb3phy_mode mode; + struct mutex lock; +}; + +static int rockchip_usb3phy_reset(struct rockchip_usb3phy *usb3phy, bool reset, enum usb3phy_mode mode) +{ + if (reset == true) { + if ((mode == PHY_USB2) | (mode == PHY_COMBO)){ + clk_disable_unprepare(usb3phy->clk_otg); + reset_control_assert(usb3phy->utmi_rst); + reset_control_assert(usb3phy->u2por_rst); + } + if ((mode == PHY_USB3) | (mode == PHY_COMBO)){ + clk_disable_unprepare(usb3phy->clk_pipe); + reset_control_assert(usb3phy->pipe_rst); + reset_control_assert(usb3phy->u3por_rst); + } + } + + if (reset == false) { + if ((mode == PHY_USB2) | (mode == PHY_COMBO)){ + reset_control_deassert(usb3phy->u2por_rst); + udelay(1000); + clk_prepare_enable(usb3phy->clk_otg); + udelay(500); + reset_control_deassert(usb3phy->utmi_rst); + } + if ((mode == PHY_USB3) | (mode == PHY_COMBO)){ + reset_control_deassert(usb3phy->u3por_rst); + udelay(500); + clk_prepare_enable(usb3phy->clk_pipe); + udelay(1000); + reset_control_deassert(usb3phy->pipe_rst); + } + } + + return 0; +} + +static void rockchip_usb3phy_work(struct work_struct *work) +{ + struct rockchip_usb3phy *usb3phy = container_of(work, struct rockchip_usb3phy, usb_phy_work); + struct rockchip_usb3phy_port *port_pipe = &usb3phy->port_pipe; + struct rockchip_usb3phy_port *port_utmi = &usb3phy->port_utmi; + int usb2, usb3, tmp, state; + + mutex_lock(&usb3phy->lock); + + regmap_read(port_pipe->regmap, USB3_STATUS_REG, &tmp); + usb3 = tmp & USB3_CONN_BIT; + regmap_read(usb3phy->regmap, USB2_STATUS_REG, &tmp); + usb2 = ((tmp & USB2_CONN_BIT) ^ USB2_CONN_BIT ) >> USB2_STATE_SHIFT; + state = (usb3 | usb2); + dev_dbg(usb3phy->dev, "mode %i, state %i\n", usb3phy->mode, state); + + if (usb3phy->mode == state) + /* not our device */ + goto out; + + if (usb2) { + usb3phy->mode = PHY_USB2; + dev_dbg(usb3phy->dev, "usb3phy utmi polling started\n"); + regmap_read_poll_timeout(usb3phy->regmap, USB2_STATUS_REG, tmp, (tmp & USB2_CONN_BIT), 2000, 0); + state = ((tmp & USB2_CONN_BIT) ^ USB2_CONN_BIT ) >> USB2_STATE_SHIFT; + dev_dbg(usb3phy->dev, "usb3phy utmi polling completed\n"); + + atomic_notifier_call_chain(&port_utmi->phy.notifier, 0, NULL); + goto out; + } + + if (usb3) { + dev_dbg(usb3phy->dev, "usb3phy pipe polling started\n"); + regmap_read_poll_timeout(port_pipe->regmap, USB3_STATUS_REG, tmp, !(tmp & USB3_CONN_BIT), 2000, 0); + dev_dbg(usb3phy->dev, "usb3phy pipe polling completed\n"); + + rockchip_usb3phy_reset(usb3phy, true, PHY_USB3); + udelay(500); + rockchip_usb3phy_reset(usb3phy, false, PHY_USB3); + udelay(500); + + goto out; + } + +out: + usb3phy->mode = PHY_IDLE; + mutex_unlock(&usb3phy->lock); + return; +} + +static int rockchip_usb3phy_parse_dt(struct rockchip_usb3phy *usb3phy, struct device *dev) +{ + usb3phy->clk_pipe = devm_clk_get(dev, "usb3phy-pipe"); + if (IS_ERR(usb3phy->clk_pipe)) { + dev_err(dev, "could not get usb3phy pipe clock\n"); + return PTR_ERR(usb3phy->clk_pipe); + } + + usb3phy->clk_otg = devm_clk_get(dev, "usb3phy-otg"); + if (IS_ERR(usb3phy->clk_otg)) { + dev_err(dev, "could not get usb3phy otg clock\n"); + return PTR_ERR(usb3phy->clk_otg); + } + + usb3phy->u2por_rst = devm_reset_control_get(dev, "usb3phy-u2-por"); + if (IS_ERR(usb3phy->u2por_rst)) { + dev_err(dev, "no usb3phy-u2-por reset control found\n"); + return PTR_ERR(usb3phy->u2por_rst); + } + + usb3phy->u3por_rst = devm_reset_control_get(dev, "usb3phy-u3-por"); + if (IS_ERR(usb3phy->u3por_rst)) { + dev_err(dev, "no usb3phy-u3-por reset control found\n"); + return PTR_ERR(usb3phy->u3por_rst); + } + + usb3phy->pipe_rst = devm_reset_control_get(dev, "usb3phy-pipe-mac"); + if (IS_ERR(usb3phy->pipe_rst)) { + dev_err(dev, "no usb3phy_pipe_mac reset control found\n"); + return PTR_ERR(usb3phy->pipe_rst); + } + + usb3phy->utmi_rst = devm_reset_control_get(dev, "usb3phy-utmi-mac"); + if (IS_ERR(usb3phy->utmi_rst)) { + dev_err(dev, "no usb3phy-utmi-mac reset control found\n"); + return PTR_ERR(usb3phy->utmi_rst); + } + + usb3phy->pipe_apb_rst = devm_reset_control_get(dev, "usb3phy-pipe-apb"); + if (IS_ERR(usb3phy->pipe_apb_rst)) { + dev_err(dev, "no usb3phy-pipe-apb reset control found\n"); + return PTR_ERR(usb3phy->pipe_apb_rst); + } + + usb3phy->utmi_apb_rst = devm_reset_control_get(dev, "usb3phy-utmi-apb"); + if (IS_ERR(usb3phy->utmi_apb_rst)) { + dev_err(dev, "no usb3phy-utmi-apb reset control found\n"); + return PTR_ERR(usb3phy->utmi_apb_rst); + } + + return 0; +} + +static int rockchip_usb3phy_notify(struct notifier_block *nb, unsigned long action, void *data) +{ + struct rockchip_usb3phy *usb3phy = container_of(nb, struct rockchip_usb3phy, nb); + switch (action) { + case USB_DEVICE_ADD: + dev_dbg(usb3phy->dev, "notified of device add\n"); + if (!(mutex_is_locked(&usb3phy->lock))) + schedule_work(&usb3phy->usb_phy_work); + return NOTIFY_OK; + } + return NOTIFY_DONE; +} + +static int rockchip_usb3phy_init(struct usb_phy *phy) +{ + struct rockchip_usb3phy_port *usb3phy_port = container_of(phy, struct rockchip_usb3phy_port, phy); + struct rockchip_usb3phy *usb3phy = usb3phy_port->parent; + + dev_warn(usb3phy->dev, "usb3phy_init %s\n", phy->label); + if (phy->type == USB_PHY_TYPE_USB3){ + rockchip_usb3phy_reset(usb3phy, false, PHY_USB3); + udelay(100); /* let it stabilize */ + usb3phy->nb.notifier_call = rockchip_usb3phy_notify; + usb_register_notify(&usb3phy->nb); + } + if (phy->type == USB_PHY_TYPE_USB2){ + rockchip_usb3phy_reset(usb3phy, false, PHY_USB2); + udelay(100); /* let it stabilize */ + } + + return 0; +} + +static void rockchip_usb3phy_shutdown(struct usb_phy *phy) +{ + struct rockchip_usb3phy_port *usb3phy_port = container_of(phy, struct rockchip_usb3phy_port, phy); + struct rockchip_usb3phy *usb3phy = usb3phy_port->parent; + + dev_dbg(usb3phy->dev, "usb3phy_shutdown\n"); + if (phy->type == USB_PHY_TYPE_USB3){ + rockchip_usb3phy_reset(usb3phy, false, PHY_USB3); + usb_unregister_notify(&usb3phy->nb); + } + if (phy->type == USB_PHY_TYPE_USB2){ + rockchip_usb3phy_reset(usb3phy, false, PHY_USB2); + } +} + +static const struct regmap_config rockchip_usb3phy_port_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .max_register = 0x1000, +}; + +static const struct regmap_config rockchip_usb3phy_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .max_register = 0x1000, + .write_flag_mask = REG_WRITE_MASK, +}; + +static int rockchip_usb3phy_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct rockchip_usb3phy *usb3phy; + struct rockchip_usb3phy_port *usb3phy_port; + struct regmap_config regmap_config = rockchip_usb3phy_regmap_config; + struct regmap_config regmap_port_config = rockchip_usb3phy_port_regmap_config; + const struct of_device_id *match; + void __iomem *base; + int ret; + + match = of_match_device(dev->driver->of_match_table, dev); + if (!match) { + dev_err(dev, "phy node not assigned\n"); + return -EINVAL; + } + + if (of_node_name_eq(np, "usb3-phy")) { + dev_dbg(dev, "Probe usb3phy main block\n"); + + usb3phy = devm_kzalloc(dev, sizeof(*usb3phy), GFP_KERNEL); + if (!usb3phy) + return -ENOMEM; + + ret = rockchip_usb3phy_parse_dt(usb3phy, dev); + if (ret) { + dev_err(dev, "parse dt failed %i\n", ret); + return ret; + } + + base = devm_of_iomap(dev, np, 0, NULL); + if (IS_ERR(base)) { + dev_err(dev, "failed port ioremap\n"); + return PTR_ERR(base); + } + + regmap_config.name = np->name; + + usb3phy->regmap = devm_regmap_init_mmio(dev, base, ®map_config); + if (IS_ERR(usb3phy->regmap)) { + dev_err(dev, "regmap init failed\n"); + return PTR_ERR(usb3phy->regmap); + } + + usb3phy->dev = dev; + platform_set_drvdata(pdev, usb3phy); + + /* place block in reset */ + reset_control_assert(usb3phy->pipe_rst); + reset_control_assert(usb3phy->utmi_rst); + reset_control_assert(usb3phy->u3por_rst); + reset_control_assert(usb3phy->u2por_rst); + reset_control_assert(usb3phy->pipe_apb_rst); + reset_control_assert(usb3phy->utmi_apb_rst); + + udelay(20); + + /* take apb interface out of reset */ + reset_control_deassert(usb3phy->utmi_apb_rst); + reset_control_deassert(usb3phy->pipe_apb_rst); + + usb3phy->mode = PHY_IDLE; + INIT_WORK(&usb3phy->usb_phy_work, rockchip_usb3phy_work); + dev_dbg(dev, "Completed usb3phy core probe \n"); + + return devm_of_platform_populate(&pdev->dev); + } + + /* probe the actual ports */ + usb3phy = platform_get_drvdata(of_find_device_by_node(np->parent)); + + if (of_node_name_eq(np, "utmi")) { + usb3phy_port = &usb3phy->port_utmi; + usb3phy_port->phy.label = "usb2-phy"; + usb3phy_port->phy.type = USB_PHY_TYPE_USB2; + } + else if (of_node_name_eq(np, "pipe")) { + usb3phy_port = &usb3phy->port_pipe; + usb3phy_port->phy.label = "usb3-phy"; + usb3phy_port->phy.type = USB_PHY_TYPE_USB3; + } + else { + dev_err(dev, "unknown child node port type %s\n", np->name); + return -EINVAL; + } + + usb3phy_port->dev = dev; + + base = devm_of_iomap(dev, np, 0, NULL); + if (IS_ERR(base)) { + dev_err(dev, "failed port ioremap\n"); + return PTR_ERR(base); + } + + regmap_port_config.name = np->name; + + usb3phy_port->regmap = devm_regmap_init_mmio(dev, base, ®map_port_config); + if (IS_ERR(usb3phy_port->regmap)) { + dev_err(dev, "regmap init failed\n"); + return PTR_ERR(usb3phy_port->regmap); + } + + usb3phy_port->phy.dev = dev; + usb3phy_port->phy.init = rockchip_usb3phy_init; + usb3phy_port->phy.shutdown = rockchip_usb3phy_shutdown; + usb3phy_port->parent = usb3phy; + + ret = usb_add_phy_dev(&usb3phy_port->phy); + if (ret) { + dev_err(dev, "add usb phy failed %i\n", ret); + return ret; + } + + mutex_init(&usb3phy->lock); + + dev_info(dev, "Completed usb3phy %s port init\n", usb3phy_port->phy.label); + return 0; +} + + +static int rockchip_usb3phy_remove(struct platform_device *pdev) +{ + struct rockchip_usb3phy *usb3phy = platform_get_drvdata(pdev); + struct rockchip_usb3phy_port *port_pipe = &usb3phy->port_pipe; + struct rockchip_usb3phy_port *port_utmi = &usb3phy->port_utmi; + + if (&port_pipe->phy.head) + usb_remove_phy(&port_pipe->phy); + if (&port_utmi->phy.head) + usb_remove_phy(&port_utmi->phy); + + reset_control_assert(usb3phy->pipe_apb_rst); + reset_control_assert(usb3phy->utmi_apb_rst); + + return 0; +} + +static const struct of_device_id rockchip_usb3phy_dt_ids[] = { + { .compatible = "rockchip,rk3328-usb3phy", }, + { .compatible = "rockchip,rk3328-usb3phy-utmi", }, + { .compatible = "rockchip,rk3328-usb3phy-pipe", }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(of, rockchip_usb3phy_dt_ids); + +static struct platform_driver rockchip_usb3phy_driver = { + .probe = rockchip_usb3phy_probe, + .remove = rockchip_usb3phy_remove, + .driver = { + .name = "rockchip-usb3-phy", + .of_match_table = rockchip_usb3phy_dt_ids, + }, +}; + +module_platform_driver(rockchip_usb3phy_driver); + +MODULE_AUTHOR("Peter Geis "); +MODULE_DESCRIPTION("Rockchip USB 3 PHY driver"); +MODULE_LICENSE("GPL v2"); From patchwork Mon Nov 16 15:17:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 11909581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 195E7175A for ; Mon, 16 Nov 2020 15:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EDF942137B for ; Mon, 16 Nov 2020 15:19:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Shq+sOAW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730349AbgKPPTW (ORCPT ); Mon, 16 Nov 2020 10:19:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgKPPTW (ORCPT ); Mon, 16 Nov 2020 10:19:22 -0500 Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AF02C0613CF for ; Mon, 16 Nov 2020 07:19:22 -0800 (PST) Received: by mail-qv1-xf41.google.com with SMTP id y11so8889169qvu.10 for ; Mon, 16 Nov 2020 07:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w34tgFsfoNSL9WZ/5ErfIg33MWZNf9bk46tXnv+A4zs=; b=Shq+sOAW4lgOPgBS5y9b0hdkqGvjhkRYMTvpIVckQyvqL4k6SOfTOZQGLiO6HIixU5 GtByhu2Wav9gcY1forc0KxdAdHkMC6xyNiFSH8EHH+MV9gmLLPCFOnfpJIpnA2bpL6c9 VbMoGQVzAdGpB0ER8/3/PR3g4LGAU0NeJq9tjqY/7PmFdcjb5EjpnsDg5kc13C8wZsE+ DOg7JUxRhYNN45OTnzcCmHoJ8WwSP5/83G4l5qUmV9c8c58S2tCGbrN27THnQyEEs8nt n8ePpL7qyB3nZvJxRCdVy+QXJYX6CGUrQO2/z6gAYnCvUi16a5gLRYj2qhvrjeJxpUR3 eyZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w34tgFsfoNSL9WZ/5ErfIg33MWZNf9bk46tXnv+A4zs=; b=NkWZ6KBN9V3rL/wgzHSo50KldNO9XU5U+pUdDB1YHftveJJ6w8OdZ3KlBdjtqveDZr GFapotMiuiNVBm0VhCeKgPqxMZCjAUpcgjsPi0K/x4hJwkerw2rbSsDfqXhAxUOpu6R/ c/USZKVHSv3N/z+qqFcZtlZQAgpVoD1KMF9PkYZEsF9m+R+wjQFmJGrbP/KOumW1bJ7q BSTmNkTmfzDcXSQdwXuQaIMn5uPlNQCn3q5VMpIh7yHHLXQTfY7fy+60sNLFUXBVe/Cy QLW6UBY1B9Um1R8qfhFz2w7FHwiYGwoaKrYHDFLrEXlxlovquu2sbt5KQ+CApycbVQ6A xPzg== X-Gm-Message-State: AOAM530nSvdaLCtmx2BhGptoXR2wg0cze2MQ7uGJGbkbh1Dib5xhvprn dPxiIdmn+KzkCr7zTODc4S0= X-Google-Smtp-Source: ABdhPJzR0XL0NJX31+OywaRPuQxtyQR1QdfhOmqO+/GGz2NIIr+GkJzf1aSvkVIcmho99HCQ8jH97w== X-Received: by 2002:ad4:47b0:: with SMTP id a16mr15565115qvz.22.1605539961774; Mon, 16 Nov 2020 07:19:21 -0800 (PST) Received: from rockpro64.sparksnet ([2601:153:900:7730::20]) by smtp.gmail.com with ESMTPSA id p127sm12216818qkc.37.2020.11.16.07.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 07:19:21 -0800 (PST) From: Peter Geis To: Felipe Balbi , Greg Kroah-Hartman , Heiko Stuebner Cc: linux-usb@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, wulf@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, zyw@rock-chips.com, kever.yang@rock-chips.com, Peter Geis Subject: [PATCH 2/4] usb: dwc3: add rockchip innosilicon usb3 glue layer Date: Mon, 16 Nov 2020 15:17:34 +0000 Message-Id: <20201116151735.178737-3-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116151735.178737-1-pgwipeout@gmail.com> References: <20201116151735.178737-1-pgwipeout@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org This adds the handler glue for the rockchip usb3 innosilicon phy driver. This driver attaches to the phy driver through the notification system. When a usb2 disconnect event occurs this driver tears down the hcd and rebuilds it manually. This is to work around the usb2 controller becoming wedged and not detecting any usb2 devices after a usb2 hub is removed. It is based off work originally done by rockchip. Signed-off-by: Peter Geis --- drivers/usb/dwc3/Kconfig | 10 + drivers/usb/dwc3/Makefile | 1 + drivers/usb/dwc3/dwc3-rockchip-inno.c | 271 ++++++++++++++++++++++++++ 3 files changed, 282 insertions(+) create mode 100644 drivers/usb/dwc3/dwc3-rockchip-inno.c diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 7a2304565a73..2e33a45f55ff 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -139,4 +139,14 @@ config USB_DWC3_QCOM for peripheral mode support. Say 'Y' or 'M' if you have one such device. +config USB_DWC3_ROCKCHIP_INNO + tristate "Rockchip Platforms with INNO PHY" + depends on OF && COMMON_CLK && ARCH_ROCKCHIP + depends on USB=y || USB=USB_DWC3 + default USB_DWC3 + help + Support of USB2/3 functionality in Rockchip platforms + with INNO USB 3.0 PHY IP inside. + say 'Y' or 'M' if you have one such device. + endif diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index ae86da0dc5bd..f5eb7de10128 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -51,3 +51,4 @@ obj-$(CONFIG_USB_DWC3_MESON_G12A) += dwc3-meson-g12a.o obj-$(CONFIG_USB_DWC3_OF_SIMPLE) += dwc3-of-simple.o obj-$(CONFIG_USB_DWC3_ST) += dwc3-st.o obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o +obj-$(CONFIG_USB_DWC3_ROCKCHIP_INNO) += dwc3-rockchip-inno.o diff --git a/drivers/usb/dwc3/dwc3-rockchip-inno.c b/drivers/usb/dwc3/dwc3-rockchip-inno.c new file mode 100644 index 000000000000..7007ddbcbdae --- /dev/null +++ b/drivers/usb/dwc3/dwc3-rockchip-inno.c @@ -0,0 +1,271 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dwc3-rockchip-inno.c - DWC3 glue layer for Rockchip devices with Innosilicon based PHY + * + * Based on dwc3-of-simple.c + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "core.h" +#include "../host/xhci.h" + + +struct dwc3_rk_inno { + struct device *dev; + struct clk_bulk_data *clks; + struct dwc3 *dwc; + struct usb_phy *phy; + struct notifier_block reset_nb; + struct work_struct reset_work; + struct mutex lock; + int num_clocks; + struct reset_control *resets; +}; + +static int dwc3_rk_inno_host_reset_notifier(struct notifier_block *nb, unsigned long event, void *data) +{ + struct dwc3_rk_inno *rk_inno = container_of(nb, struct dwc3_rk_inno, reset_nb); + + schedule_work(&rk_inno->reset_work); + + return NOTIFY_DONE; +} + +static void dwc3_rk_inno_host_reset_work(struct work_struct *work) +{ + struct dwc3_rk_inno *rk_inno = container_of(work, struct dwc3_rk_inno, reset_work); + struct usb_hcd *hcd = dev_get_drvdata(&rk_inno->dwc->xhci->dev); + struct usb_hcd *shared_hcd = hcd->shared_hcd; + struct xhci_hcd *xhci = hcd_to_xhci(hcd); + unsigned int count = 0; + + mutex_lock(&rk_inno->lock); + + if (hcd->state != HC_STATE_HALT) { + usb_remove_hcd(shared_hcd); + usb_remove_hcd(hcd); + } + + if (rk_inno->phy) + usb_phy_shutdown(rk_inno->phy); + + while (hcd->state != HC_STATE_HALT) { + if (++count > 1000) { + dev_err(rk_inno->dev, "wait for HCD remove 1s timeout!\n"); + break; + } + usleep_range(1000, 1100); + } + + if (hcd->state == HC_STATE_HALT) { + xhci->shared_hcd = shared_hcd; + usb_add_hcd(hcd, hcd->irq, IRQF_SHARED); + usb_add_hcd(shared_hcd, hcd->irq, IRQF_SHARED); + } + + if (rk_inno->phy) + usb_phy_init(rk_inno->phy); + + mutex_unlock(&rk_inno->lock); + dev_dbg(rk_inno->dev, "host reset complete\n"); +} + +static int dwc3_rk_inno_probe(struct platform_device *pdev) +{ + struct dwc3_rk_inno *rk_inno; + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node, *child, *node; + struct platform_device *child_pdev; + + int ret; + + rk_inno = devm_kzalloc(dev, sizeof(*rk_inno), GFP_KERNEL); + if (!rk_inno) + return -ENOMEM; + + platform_set_drvdata(pdev, rk_inno); + rk_inno->dev = dev; + + rk_inno->resets = of_reset_control_array_get(np, false, true, + true); + if (IS_ERR(rk_inno->resets)) { + ret = PTR_ERR(rk_inno->resets); + dev_err(dev, "failed to get device resets, err=%d\n", ret); + return ret; + } + + ret = reset_control_deassert(rk_inno->resets); + if (ret) + goto err_resetc_put; + + ret = clk_bulk_get_all(rk_inno->dev, &rk_inno->clks); + if (ret < 0) + goto err_resetc_assert; + + rk_inno->num_clocks = ret; + ret = clk_bulk_prepare_enable(rk_inno->num_clocks, rk_inno->clks); + if (ret) + goto err_resetc_assert; + + ret = of_platform_populate(np, NULL, NULL, dev); + if (ret) + goto err_clk_put; + + child = of_get_child_by_name(np, "dwc3"); + if (!child) { + dev_err(dev, "failed to find dwc3 core node\n"); + ret = -ENODEV; + goto err_plat_depopulate; + } + + child_pdev = of_find_device_by_node(child); + if (!child_pdev) { + dev_err(dev, "failed to get dwc3 core device\n"); + ret = -ENODEV; + goto err_plat_depopulate; + } + + rk_inno->dwc = platform_get_drvdata(child_pdev); + if (!rk_inno->dwc || !rk_inno->dwc->xhci) { + ret = -EPROBE_DEFER; + goto err_plat_depopulate; + } + + node = of_parse_phandle(child, "usb-phy", 0); + INIT_WORK(&rk_inno->reset_work, dwc3_rk_inno_host_reset_work); + rk_inno->reset_nb.notifier_call = dwc3_rk_inno_host_reset_notifier; + rk_inno->phy = devm_usb_get_phy_by_node(dev, node, &rk_inno->reset_nb); + of_node_put(node); + mutex_init(&rk_inno->lock); + + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + pm_runtime_get_sync(dev); + + return 0; + +err_plat_depopulate: + of_platform_depopulate(dev); + +err_clk_put: + clk_bulk_disable_unprepare(rk_inno->num_clocks, rk_inno->clks); + clk_bulk_put_all(rk_inno->num_clocks, rk_inno->clks); + +err_resetc_assert: + reset_control_assert(rk_inno->resets); + +err_resetc_put: + reset_control_put(rk_inno->resets); + return ret; +} + +static void __dwc3_rk_inno_teardown(struct dwc3_rk_inno *rk_inno) +{ + of_platform_depopulate(rk_inno->dev); + + clk_bulk_disable_unprepare(rk_inno->num_clocks, rk_inno->clks); + clk_bulk_put_all(rk_inno->num_clocks, rk_inno->clks); + rk_inno->num_clocks = 0; + + reset_control_assert(rk_inno->resets); + + reset_control_put(rk_inno->resets); + + pm_runtime_disable(rk_inno->dev); + pm_runtime_put_noidle(rk_inno->dev); + pm_runtime_set_suspended(rk_inno->dev); +} + +static int dwc3_rk_inno_remove(struct platform_device *pdev) +{ + struct dwc3_rk_inno *rk_inno = platform_get_drvdata(pdev); + + __dwc3_rk_inno_teardown(rk_inno); + + return 0; +} + +static void dwc3_rk_inno_shutdown(struct platform_device *pdev) +{ + struct dwc3_rk_inno *rk_inno = platform_get_drvdata(pdev); + + __dwc3_rk_inno_teardown(rk_inno); +} + +static int __maybe_unused dwc3_rk_inno_runtime_suspend(struct device *dev) +{ + struct dwc3_rk_inno *rk_inno = dev_get_drvdata(dev); + + clk_bulk_disable(rk_inno->num_clocks, rk_inno->clks); + + return 0; +} + +static int __maybe_unused dwc3_rk_inno_runtime_resume(struct device *dev) +{ + struct dwc3_rk_inno *rk_inno = dev_get_drvdata(dev); + + return clk_bulk_enable(rk_inno->num_clocks, rk_inno->clks); +} + +static int __maybe_unused dwc3_rk_inno_suspend(struct device *dev) +{ + struct dwc3_rk_inno *rk_inno = dev_get_drvdata(dev); + + reset_control_assert(rk_inno->resets); + + return 0; +} + +static int __maybe_unused dwc3_rk_inno_resume(struct device *dev) +{ + struct dwc3_rk_inno *rk_inno = dev_get_drvdata(dev); + + reset_control_deassert(rk_inno->resets); + + return 0; +} + +static const struct dev_pm_ops dwc3_rk_inno_dev_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(dwc3_rk_inno_suspend, dwc3_rk_inno_resume) + SET_RUNTIME_PM_OPS(dwc3_rk_inno_runtime_suspend, + dwc3_rk_inno_runtime_resume, NULL) +}; + +static const struct of_device_id of_dwc3_rk_inno_match[] = { + { .compatible = "rockchip,rk3328-dwc3" }, + { /* Sentinel */ } +}; +MODULE_DEVICE_TABLE(of, of_dwc3_rk_inno_match); + +static struct platform_driver dwc3_rk_inno_driver = { + .probe = dwc3_rk_inno_probe, + .remove = dwc3_rk_inno_remove, + .shutdown = dwc3_rk_inno_shutdown, + .driver = { + .name = "dwc3-rk-inno", + .of_match_table = of_dwc3_rk_inno_match, + .pm = &dwc3_rk_inno_dev_pm_ops, + }, +}; + +module_platform_driver(dwc3_rk_inno_driver); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 Rockchip Innosilicon Glue Layer"); +MODULE_AUTHOR("Peter Geis "); From patchwork Mon Nov 16 15:17:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 11909583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4BB39174A for ; Mon, 16 Nov 2020 15:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C98C2137B for ; Mon, 16 Nov 2020 15:19:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TQ6YksiZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730401AbgKPPTX (ORCPT ); Mon, 16 Nov 2020 10:19:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgKPPTX (ORCPT ); Mon, 16 Nov 2020 10:19:23 -0500 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F062C0613CF for ; Mon, 16 Nov 2020 07:19:23 -0800 (PST) Received: by mail-qt1-x844.google.com with SMTP id 3so13102382qtx.3 for ; Mon, 16 Nov 2020 07:19:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=96RQbd3xbCoXq8nQaSvV25c7fBVmlkmtbILb9lLEVCc=; b=TQ6YksiZV6nNmzn4KO6jK2ge1GzMrVa1svfsXapdp9thN3ZUITDdwUlTzSQ0dpPfYh geJEUW344+HQEFlZGBdjxMnMLhik6/mV6ADVcbT3dcFj5ZmuPJMqf99UPMdFtOQ5SRCu l0mpSd8SbWCQzEWYmoVQHhDJagRUKY6VJx2b/7PyNT0y3Sc1k3nXvUwRGgSI8ATwKsVg EgSP3JXy+7c/c97LZ3iuSAizuQdabqNXYl2n/CbhyjZcD1ynxklduF7zgxG8Cue0Ep// SLy5RtiE1RgsFHn4qvsJ1VXdbYByCqZPe6XeDMOLG93/5CWupms4iy90imhdFk1Moqze BWyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=96RQbd3xbCoXq8nQaSvV25c7fBVmlkmtbILb9lLEVCc=; b=rmIpvOxnRaX1wxA6/bqcjFziRvoi9njaaC7rIq1GIoW0YdKb4QlRtUZMgsTiChkr+H eK5X2v2a5AggXdlo2bQBpDhcWAbkELq2vSWLG8WYNf46idt8/hfNQI55w6x8ZihdG/p+ B4XGZcMq9EZGq0s//YhJaj00vM84zwItcws7FYNIhXN1DhBurYexbXZ6sLDzYGnxyzsN TxN9XWapCSuSKtGL0whFnakZvhUZQ09HSPqksGOhmsT4k5ddmH8HbDwgFl6L1IVy4PHG OblN6JdMVf1GExOn4n3OyHlnur08KpI8t8L/KbolzL/sx0GOGW96vQflpSMmrQluaodB XUFQ== X-Gm-Message-State: AOAM533l/aHyn+5QYImHSCyjrMe6EUJuVF4uDhLzy3wGmppXgp4URxYG 1nM56cOMaM6TxVEUgkWIt4U= X-Google-Smtp-Source: ABdhPJyyrcB8/QuxOXY/HwMuNFrHfoL262pDdTeD92yflaQrFlebYxfBUlull52uCQufmLKxtF3Dbw== X-Received: by 2002:ac8:5ccc:: with SMTP id s12mr14307478qta.309.1605539962795; Mon, 16 Nov 2020 07:19:22 -0800 (PST) Received: from rockpro64.sparksnet ([2601:153:900:7730::20]) by smtp.gmail.com with ESMTPSA id p127sm12216818qkc.37.2020.11.16.07.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 07:19:22 -0800 (PST) From: Peter Geis To: Felipe Balbi , Greg Kroah-Hartman , Heiko Stuebner Cc: linux-usb@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, wulf@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, zyw@rock-chips.com, kever.yang@rock-chips.com, Peter Geis Subject: [PATCH 3/4] arm64: dts: rockchip: add rk3328 usb3 and usb3phy nodes Date: Mon, 16 Nov 2020 15:17:35 +0000 Message-Id: <20201116151735.178737-4-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116151735.178737-1-pgwipeout@gmail.com> References: <20201116151735.178737-1-pgwipeout@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add the usb3 controller and usb3 phy nodes to the rk3328. Signed-off-by: Peter Geis --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 65 ++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index bbdb19a3e85d..9fea9203d114 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -853,6 +853,40 @@ u2phy_host: host-port { }; }; + usb3phy: usb3-phy@ff470000 { + compatible = "rockchip,rk3328-usb3phy"; + reg = <0x0 0xff460000 0x0 0x10000>; + clocks = <&cru PCLK_USB3PHY_OTG>, <&cru PCLK_USB3PHY_PIPE>; + clock-names = "usb3phy-otg", "usb3phy-pipe"; + resets = <&cru SRST_USB3PHY_U2>, + <&cru SRST_USB3PHY_U3>, + <&cru SRST_USB3PHY_PIPE>, + <&cru SRST_USB3OTG_UTMI>, + <&cru SRST_USB3PHY_OTG_P>, + <&cru SRST_USB3PHY_PIPE_P>; + reset-names = "usb3phy-u2-por", "usb3phy-u3-por", + "usb3phy-pipe-mac", "usb3phy-utmi-mac", + "usb3phy-utmi-apb", "usb3phy-pipe-apb"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + status = "disabled"; + + usb3phy_utmi: utmi@ff470000 { + compatible = "rockchip,rk3328-usb3phy-utmi"; + reg = <0x0 0xff470000 0x0 0x8000>; + #phy-cells = <0>; + status = "disabled"; + }; + + usb3phy_pipe: pipe@ff478000 { + compatible = "rockchip,rk3328-usb3phy-pipe"; + reg = <0x0 0xff478000 0x0 0x8000>; + #phy-cells = <0>; + status = "disabled"; + }; + }; + sdmmc: mmc@ff500000 { compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xff500000 0x0 0x4000>; @@ -983,6 +1017,37 @@ usb_host0_ohci: usb@ff5d0000 { status = "disabled"; }; + usbdrd3: usb@ff600000 { + compatible = "rockchip,rk3328-dwc3"; + clocks = <&cru SCLK_USB3OTG_REF>, <&cru ACLK_USB3OTG>, + <&cru SCLK_USB3OTG_SUSPEND>; + clock-names = "ref", "bus_early", "suspend"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + status = "disabled"; + + usbdrd_dwc3: dwc3@ff600000 { + compatible = "snps,dwc3"; + reg = <0x0 0xff600000 0x0 0x100000>; + interrupts = ; + clocks = <&cru SCLK_USB3OTG_REF>, <&cru ACLK_USB3OTG>, + <&cru SCLK_USB3OTG_SUSPEND>; + clock-names = "ref", "bus_early", "suspend"; + dr_mode = "host"; + usb-phy = <&usb3phy_utmi>, <&usb3phy_pipe>; + phy_type = "utmi_wide"; + snps,dis_enblslpm_quirk; + snps,dis-u2-freeclk-exists-quirk; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + snps,dis-del-phy-power-chg-quirk; + snps,dis-tx-ipgap-linecheck-quirk; + snps,xhci-trb-ent-quirk; + status = "disabled"; + }; + }; + gic: interrupt-controller@ff811000 { compatible = "arm,gic-400"; #interrupt-cells = <3>; From patchwork Mon Nov 16 15:17:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 11909585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C31E17D1 for ; Mon, 16 Nov 2020 15:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5C6B62137B for ; Mon, 16 Nov 2020 15:19:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UHuHKb1w" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730419AbgKPPTZ (ORCPT ); Mon, 16 Nov 2020 10:19:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgKPPTZ (ORCPT ); Mon, 16 Nov 2020 10:19:25 -0500 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0952EC0613CF for ; Mon, 16 Nov 2020 07:19:25 -0800 (PST) Received: by mail-qt1-x844.google.com with SMTP id j31so13051676qtb.8 for ; Mon, 16 Nov 2020 07:19:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eWtERLXExs4DoM6gWGaTUFy6iPC/nCVkimSM+qIDVKM=; b=UHuHKb1wyzJgScpQpTHI+khKWYoA0r+5oV4I4cL+EXw762BNPY6IkiLTLnw7WI6vXX XFRXGWlHjy3L/v6/t8qZGt/ACYNMjAXyVJXA2jP1QltuyhGKVzJe0xsM52OpnSRgzh5e azZNUKR0ppmLCIEr61/CjjMSwazJcDSjYNBkTOmfSgp2yZawPeHX/Ie0w2k8yY1yzUSs Rqnu/m/uLC4WLFZsjftlmMaMdRJfPoAlIKQs+yVyyzuhJXhfR755gLQ5h4VoNQDy/A4Z SGQwkxLqM6Jd5yX5mXQvG+QFggL6XzgC12DqJ2XMhvykSOYVz8KjgQ3lbpi2orB/fACo ztfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eWtERLXExs4DoM6gWGaTUFy6iPC/nCVkimSM+qIDVKM=; b=jVfSH11RcYgJqPq8vEePmipCMEw6XAjZh2UEll9a4l3gQj0SrVfPouZZHj2Y0sOMGi zvGjehppQ/7zadLgQw9T8NJxQukIytEIOhAy9VjY2Ge48haUreW+13U3OkM8VF8o3+Hm DHLZhgtWZsxG5/HUJvi2/Yj6ZhsKsbaU/kHq5AQgzpgVvJiqnolpV+p4cxM3mD3uLLNT wyCD47ohpQ1vlSIcMbyDL8bb9Ow1C1m2AxkuOyNvV7Zgs5ckG5HP6/KVzxuq1Imbtdz5 DyvV6doUBBLbN5haRAh2oflTV+1FcO08uR/e5QvrVqdV6uV37A4Kg4QPJ9z6gWKTBLTS r74g== X-Gm-Message-State: AOAM5307fZax6BVozMIvJM6dKjd3Y8OCLqOE2Znk69mQ8Bco/vDan5ZP wBH34vRK0+mwfu0ABl5deQE= X-Google-Smtp-Source: ABdhPJwYnI/O7MjyagGSH+7FQMKnfE01e57JG2POD/MrOpJLlI2if5o0NkVRHFEUiDoG5h7TqaOQmg== X-Received: by 2002:aed:3263:: with SMTP id y90mr14509217qtd.196.1605539964181; Mon, 16 Nov 2020 07:19:24 -0800 (PST) Received: from rockpro64.sparksnet ([2601:153:900:7730::20]) by smtp.gmail.com with ESMTPSA id p127sm12216818qkc.37.2020.11.16.07.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 07:19:23 -0800 (PST) From: Peter Geis To: Felipe Balbi , Greg Kroah-Hartman , Heiko Stuebner Cc: linux-usb@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, wulf@rock-chips.com, frank.wang@rock-chips.com, william.wu@rock-chips.com, zyw@rock-chips.com, kever.yang@rock-chips.com, Peter Geis Subject: [PATCH 4/4] arm64: dts: rockchip: enable usb3 on rk3328-roc-cc board Date: Mon, 16 Nov 2020 15:17:36 +0000 Message-Id: <20201116151735.178737-5-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116151735.178737-1-pgwipeout@gmail.com> References: <20201116151735.178737-1-pgwipeout@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Enable the usb3 controller and usb3 phy nodes on the rk3328-roc-cc board file. Signed-off-by: Peter Geis --- .../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts index b70ffb1c6a63..b060323830af 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -345,6 +345,27 @@ &usb_host0_ohci { status = "okay"; }; +&usbdrd3 { + status = "okay"; +}; + +&usbdrd_dwc3 { + dr_mode = "host"; + status = "okay"; +}; + +&usb3phy { + status = "okay"; +}; + +&usb3phy_utmi { + status = "okay"; +}; + +&usb3phy_pipe { + status = "okay"; +}; + &vop { status = "okay"; };