From patchwork Tue May 26 03:34:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wang X-Patchwork-Id: 1239 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oo1-f72.google.com (mail-oo1-f72.google.com [209.85.161.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id CB71F3F06D for ; Tue, 26 May 2020 05:35:16 +0200 (CEST) Received: by mail-oo1-f72.google.com with SMTP id p33sf10750750ooi.11 for ; Mon, 25 May 2020 20:35:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1590464116; cv=pass; d=google.com; s=arc-20160816; b=nsU32S3pDyKUd1266UyKFXo4Bj4bT5qvBR4oxXNM6bgaqDjMKRGagszdapPQF1g/Mh jR1C0zqixTBn7LAWgNNC6M0+XE8KL4sI2ECl4CpGiMK2TIaU1VeZdME/j0nznvcmn7bY LjqFF1sSsdjdz7V9LWfOSPI4GCkw9Bz+dK1Yy0sddzJJ98bak+/6aF/3vlNvlyQRTusx aN+ijjqz1rvsSLYDszZDJv4J8C0Ytxlgj32YwbGbosJUPurFzRsDVG49/IHijCSeOPiw e3xPfla+3De2Cyh2XNcywGLSXgZNSjqsmPQrMNtK+oTUVjaw0LgQJD1QCwwiiW+4k0kH dD7w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:sender:dkim-signature; bh=/KlbbAeuuXjRJDd4NugfcyxWPplk0GqIcNaW7IAzmec=; b=c3GG0Ir27MSuq7O0aE3B2y2eiJGPumyB6h2IFJvhmDKKCGUk8q6pkcY/z6DgBn2HTN Q5PK/q3unzhaOrkLou9rQuDGQMEsnpLP5lJBmTPLRX2qnlRSzyTgjb1J0DIbWvpveHeW I5u4RemtGh9Es71GCWBe2P7ekAZLmbtLerQ0Mff5FeO6oY05h6t3X5iOScd9B05FTr02 eVhQ1fF0dE1TjiTUOgbtQZ/9o94UjsG/K6FjxRTCHOZIbJL43BJpek0moERdlrpWWT9R SeIv5sdlOPBT3wvaZsITEiTi1ywnemM++7HA+WBhS5yDLhvUMmPoZTf/YkOwD/ocG1eJ nr5Q== ARC-Authentication-Results: i=2; mx.google.com; spf=pass (google.com: domain of frank.wang@rock-chips.com designates 211.157.147.135 as permitted sender) smtp.mailfrom=frank.wang@rock-chips.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=/KlbbAeuuXjRJDd4NugfcyxWPplk0GqIcNaW7IAzmec=; b=Jwiyli/zk9r+sTkKK38h3B2vm2tERfUe9mDJFTbZykuwcftjOg3hFeqVRJGSFF7MdJ hFraXm7ZVQeSjhbtJd0BrbjN1qE1RF2XmrG3JeSLGuESNmbDZrriOGYvaA6Z6vaynFe+ 4M1/v++bfq47mLyvKgm9bVidz8gc+yBU7yQHY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=/KlbbAeuuXjRJDd4NugfcyxWPplk0GqIcNaW7IAzmec=; b=lxb4lBSbZxF/fis6tQpEreCv6lbcw4lh2qtsWRuwmhj5XMBaoUzZ+xv9ueGvcp6e41 DOiDwDDPYibCyk6S8wgYje8dveiiOR+5j/cKlTuSGSietFjOqTI/ziAmVlitZG6sbhbm XalLviPus71JWwIHZwV4y3qvbhFtHL0yxfifJzpZHhl4cXcCIVfhXSx8nclCAGVoFQZk UUMBsTJXLX8ze2uz0u7A9WOADuDqPpcbV6KF2zdDCn5B5cTmj+XRLMDLih4DJERDHgeB 2kYWgD68r4/d8WfKx9V3PKotXowRYyI173JRsoGtSWNY0h3tKZ2KUjl2FlX/WL7bcJOc /Xfg== Sender: linux-amarula@amarulasolutions.com X-Gm-Message-State: AOAM532DwwhifcGYvyT9+4tw1qGq+I+Slv/STI87Dmc0c+peINKXpLjA cXZAWrrWU75QvnaaUVPOq+k2pKLZ X-Google-Smtp-Source: ABdhPJzrylpxir8ZyOXrfrKgNZg/J5P+QffypN5A3sieAwRNNg+Eh+ZaQOth64rFujKA17rILSmLfA== X-Received: by 2002:a9d:4e88:: with SMTP id v8mr21381379otk.276.1590464115846; Mon, 25 May 2020 20:35:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a4a:e907:: with SMTP id z7ls544673ood.8.gmail; Mon, 25 May 2020 20:35:14 -0700 (PDT) X-Received: by 2002:a4a:1443:: with SMTP id 64mr6630882ood.84.1590464114091; Mon, 25 May 2020 20:35:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590464114; cv=none; d=google.com; s=arc-20160816; b=NIvjdBlW1UjshgnLQQAYjKOGULmJQdunWLVZzIpW+qetjigUVlTTvFvzUNsxjOmC5O 8MpA+tM61VLyav/BDFD0m2Eb5LeDiCx7APCG27AEImDxBPGVxcMfwOBtARoE0hWkEm9n xU2IMoJ22XeVsQC1rEe1bmW4LJPy1pCmIIcEJQaBGxfmG2ggjMbMBhw92bQfM9e0khGX b9eWwim9R3yHNDvAeXfzrpKKjv1Nr7lLYLruA4ex9u5JwtKxOV4/inKqxlxRxveOjI88 o72UkhI4HEHNDa5Yj9+U3mjtN1At5wypeFCTA1muF6Ln1nU5tef9oigEsVBqJGIdOQBJ Ldog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=1x6UMjIlKKax6k1xycJxDnpjjdFphb4u0TzvDYoRCdY=; b=WWhE3tiAJZ5Ts5uD8FdzzBe7ao1TyWaYr8wDLpmZsW/QcG8FkH5y947Ts489PlDFr4 B9Xf0QnVEQ3Dhgxb/jgmal1YjVphS88ljVZy/hzx3h5VvPJo7e3+vby+a9bT3q13GQd6 wTqEzm5XqyjO4E95MUGbZh7d5NptFRsNJl0HnoNzJZq3mUfpPRtcHGH8PB8XjiFGbglg gYtS98xIyMYJwvi2kd9iZFh/4f9McdCy5xaLB2dUWvPZRdROyamOE7fp2dvPKsakgMyq nAg613fYUqzEK/q+oVQW9rvC9ceJjf2dUNWThKVd2F8fuQWarCJWSq7l/fz4Ag37ctr3 Tshw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of frank.wang@rock-chips.com designates 211.157.147.135 as permitted sender) smtp.mailfrom=frank.wang@rock-chips.com Received: from lucky1.263xmail.com (lucky1.263xmail.com. [211.157.147.135]) by mx.google.com with ESMTPS id l20si9231516otk.205.2020.05.25.20.35.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 May 2020 20:35:14 -0700 (PDT) Received-SPF: pass (google.com: domain of frank.wang@rock-chips.com designates 211.157.147.135 as permitted sender) client-ip=211.157.147.135; Received: from localhost (unknown [192.168.167.209]) by lucky1.263xmail.com (Postfix) with ESMTP id 406EF8FEE3; Tue, 26 May 2020 11:34:41 +0800 (CST) X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ADDR-CHECKED4: 1 X-ANTISPAM-LEVEL: 2 X-ABS-CHECKED: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (postfix) whith ESMTP id P10491T139788594689792S1590464077143166_; Tue, 26 May 2020 11:34:41 +0800 (CST) X-IP-DOMAINF: 1 X-UNIQUE-TAG: <55e397de601d2f631e51e9ceff11d101> X-RL-SENDER: frank.wang@rock-chips.com X-SENDER: wmc@rock-chips.com X-LOGIN-NAME: frank.wang@rock-chips.com X-FST-TO: heiko@sntech.de X-SENDER-IP: 58.22.7.114 X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 X-System-Flag: 0 From: Frank Wang To: heiko@sntech.de, marex@denx.de, bmeng.cn@gmail.com, philipp.tomsich@theobroma-systems.com, klaus.goger@theobroma-systems.com, jagan@amarulasolutions.com, sjg@chromium.org, kever.yang@rock-chips.com Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, marek.belisko@gmail.com, william.wu@rock-chips.com, jianing.ren@rock-chips.com, chenjh@rock-chips.com, wmc@rock-chips.com, Frank Wang Subject: [PATCH v6 13/16] driver: usb: drop legacy rockchip xhci driver Date: Tue, 26 May 2020 11:34:32 +0800 Message-Id: <20200526033435.20235-4-frank.wang@rock-chips.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200526033435.20235-1-frank.wang@rock-chips.com> References: <20200526033220.20047-1-frank.wang@rock-chips.com> <20200526033435.20235-1-frank.wang@rock-chips.com> X-Original-Sender: frank.wang@rock-chips.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of frank.wang@rock-chips.com designates 211.157.147.135 as permitted sender) smtp.mailfrom=frank.wang@rock-chips.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , We have changed to use dwc3 generic driver for usb3.0 host, so the legacy Rockchip's xHCI driver is not needed, and drop it. Signed-off-by: Frank Wang Reviewed-by: Jagan Teki Reviewed-by: Kever Yang --- drivers/usb/host/Kconfig | 9 -- drivers/usb/host/Makefile | 1 - drivers/usb/host/xhci-rockchip.c | 196 ------------------------------- 3 files changed, 206 deletions(-) delete mode 100644 drivers/usb/host/xhci-rockchip.c diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 2f381dc958..088931a6b9 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -53,15 +53,6 @@ config USB_XHCI_PCI help Enables support for the PCI-based xHCI controller. -config USB_XHCI_ROCKCHIP - bool "Support for Rockchip on-chip xHCI USB controller" - depends on ARCH_ROCKCHIP - depends on DM_REGULATOR - depends on DM_USB - default y - help - Enables support for the on-chip xHCI controller on Rockchip SoCs. - config USB_XHCI_RCAR bool "Renesas RCar USB 3.0 support" default y diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index e8e3b17e42..29d4f87e38 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -48,7 +48,6 @@ obj-$(CONFIG_USB_XHCI_BRCM) += xhci-brcm.o obj-$(CONFIG_USB_XHCI_HCD) += xhci.o xhci-mem.o xhci-ring.o obj-$(CONFIG_USB_XHCI_DWC3) += xhci-dwc3.o obj-$(CONFIG_USB_XHCI_DWC3_OF_SIMPLE) += dwc3-of-simple.o -obj-$(CONFIG_USB_XHCI_ROCKCHIP) += xhci-rockchip.o obj-$(CONFIG_USB_XHCI_EXYNOS) += xhci-exynos5.o obj-$(CONFIG_USB_XHCI_FSL) += xhci-fsl.o obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c deleted file mode 100644 index b67722fe45..0000000000 --- a/drivers/usb/host/xhci-rockchip.c +++ /dev/null @@ -1,196 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2016 Rockchip, Inc. - * Authors: Daniel Meng - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -struct rockchip_xhci_platdata { - fdt_addr_t hcd_base; - struct udevice *vbus_supply; -}; - -/* - * Contains pointers to register base addresses - * for the usb controller. - */ -struct rockchip_xhci { - struct usb_platdata usb_plat; - struct xhci_ctrl ctrl; - struct xhci_hccr *hcd; - struct dwc3 *dwc3_reg; -}; - -static int xhci_usb_ofdata_to_platdata(struct udevice *dev) -{ - struct rockchip_xhci_platdata *plat = dev_get_platdata(dev); - int ret = 0; - - /* - * Get the base address for XHCI controller from the device node - */ - plat->hcd_base = dev_read_addr(dev); - if (plat->hcd_base == FDT_ADDR_T_NONE) { - pr_err("Can't get the XHCI register base address\n"); - return -ENXIO; - } - - /* Vbus regulator */ - ret = device_get_supply_regulator(dev, "vbus-supply", - &plat->vbus_supply); - if (ret) - debug("Can't get VBus regulator!\n"); - - return 0; -} - -/* - * rockchip_dwc3_phy_setup() - Configure USB PHY Interface of DWC3 Core - * @dwc: Pointer to our controller context structure - * @dev: Pointer to ulcass device - */ -static void rockchip_dwc3_phy_setup(struct dwc3 *dwc3_reg, - struct udevice *dev) -{ - u32 reg; - u32 utmi_bits; - - /* Set dwc3 usb2 phy config */ - reg = readl(&dwc3_reg->g_usb2phycfg[0]); - - if (dev_read_bool(dev, "snps,dis-enblslpm-quirk")) - reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM; - - utmi_bits = dev_read_u32_default(dev, "snps,phyif-utmi-bits", -1); - if (utmi_bits == 16) { - reg |= DWC3_GUSB2PHYCFG_PHYIF; - reg &= ~DWC3_GUSB2PHYCFG_USBTRDTIM_MASK; - reg |= DWC3_GUSB2PHYCFG_USBTRDTIM_16BIT; - } else if (utmi_bits == 8) { - reg &= ~DWC3_GUSB2PHYCFG_PHYIF; - reg &= ~DWC3_GUSB2PHYCFG_USBTRDTIM_MASK; - reg |= DWC3_GUSB2PHYCFG_USBTRDTIM_8BIT; - } - - if (dev_read_bool(dev, "snps,dis-u2-freeclk-exists-quirk")) - reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS; - - if (dev_read_bool(dev, "snps,dis-u2-susphy-quirk")) - reg &= ~DWC3_GUSB2PHYCFG_SUSPHY; - - writel(reg, &dwc3_reg->g_usb2phycfg[0]); -} - -static int rockchip_xhci_core_init(struct rockchip_xhci *rkxhci, - struct udevice *dev) -{ - int ret; - - ret = dwc3_core_init(rkxhci->dwc3_reg); - if (ret) { - pr_err("failed to initialize core\n"); - return ret; - } - - rockchip_dwc3_phy_setup(rkxhci->dwc3_reg, dev); - - /* We are hard-coding DWC3 core to Host Mode */ - dwc3_set_mode(rkxhci->dwc3_reg, DWC3_GCTL_PRTCAP_HOST); - - return 0; -} - -static int rockchip_xhci_core_exit(struct rockchip_xhci *rkxhci) -{ - return 0; -} - -static int xhci_usb_probe(struct udevice *dev) -{ - struct rockchip_xhci_platdata *plat = dev_get_platdata(dev); - struct rockchip_xhci *ctx = dev_get_priv(dev); - struct xhci_hcor *hcor; - int ret; - - ctx->hcd = (struct xhci_hccr *)plat->hcd_base; - ctx->dwc3_reg = (struct dwc3 *)((char *)(ctx->hcd) + DWC3_REG_OFFSET); - hcor = (struct xhci_hcor *)((uint64_t)ctx->hcd + - HC_LENGTH(xhci_readl(&ctx->hcd->cr_capbase))); - - if (plat->vbus_supply) { - ret = regulator_set_enable(plat->vbus_supply, true); - if (ret) { - pr_err("XHCI: failed to set VBus supply\n"); - return ret; - } - } - - ret = rockchip_xhci_core_init(ctx, dev); - if (ret) { - pr_err("XHCI: failed to initialize controller\n"); - return ret; - } - - return xhci_register(dev, ctx->hcd, hcor); -} - -static int xhci_usb_remove(struct udevice *dev) -{ - struct rockchip_xhci_platdata *plat = dev_get_platdata(dev); - struct rockchip_xhci *ctx = dev_get_priv(dev); - int ret; - - ret = xhci_deregister(dev); - if (ret) - return ret; - ret = rockchip_xhci_core_exit(ctx); - if (ret) - return ret; - - if (plat->vbus_supply) { - ret = regulator_set_enable(plat->vbus_supply, false); - if (ret) - pr_err("XHCI: failed to set VBus supply\n"); - } - - return ret; -} - -static const struct udevice_id xhci_usb_ids[] = { - { .compatible = "rockchip,rk3328-xhci" }, - { } -}; - -U_BOOT_DRIVER(usb_xhci) = { - .name = "xhci_rockchip", - .id = UCLASS_USB, - .of_match = xhci_usb_ids, - .ofdata_to_platdata = xhci_usb_ofdata_to_platdata, - .probe = xhci_usb_probe, - .remove = xhci_usb_remove, - .ops = &xhci_usb_ops, - .bind = dm_scan_fdt_dev, - .platdata_auto_alloc_size = sizeof(struct rockchip_xhci_platdata), - .priv_auto_alloc_size = sizeof(struct rockchip_xhci), - .flags = DM_FLAG_ALLOC_PRIV_DMA, -}; - -static const struct udevice_id usb_phy_ids[] = { - { .compatible = "rockchip,rk3328-usb3-phy" }, - { } -}; - -U_BOOT_DRIVER(usb_phy) = { - .name = "usb_phy_rockchip", - .of_match = usb_phy_ids, -};