From patchwork Wed Dec 22 09:55:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1572113 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=azodGsur; dkim=fail reason="signature verification failed" (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=vfCtDO11; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJpc86rfKz9s1l for ; Wed, 22 Dec 2021 20:55:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0BA6B8304F; Wed, 22 Dec 2021 10:55:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166946; bh=dpgEQGZwNz5buLacjSiRCPlwh4gKipVNkfy+gSU7e5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=azodGsurgJSNYPbdahiT+NL1WNy6QPiRCXO9N3L21ybqaqINcVg2km+io6H0ojWoL 0HoRgTDdHlPX7WdMn1zLRpRZvGkCiMZsxWrdPSsCAvvH/u9h9A6hpcaIKZYwqN0Efv jd+XgMTTcoSGodeNWV5MbFijZFWqh917PMxxsy6/xaT1HvcIu/p2aTggwWHLWdPB5S hP8t5X6UXOdt8Y3WDGzdLM1BVq9F+LbCazr5m8X9HeqbfOjmV1E5xtmwX1gfIi+lY2 fWnIKzNYGWUsawVAUJtawEYxKFnoWPWO0LPNEbFa35cEDj9Hd3C+Acf4uNdDIP26al DYsWz2uWWuHsQ== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 12F4682FB5; Wed, 22 Dec 2021 10:55:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166934; bh=dpgEQGZwNz5buLacjSiRCPlwh4gKipVNkfy+gSU7e5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vfCtDO116KyHnOiQ8nItIXTOFofBXK9/3q5NWEv/LZ0RK+JlSqXjJhSlQSJCqD8u0 WXp2zto7TSPUVATvQemTC0L0+3KwYjuYfGbAakTudNc8AZ/euUFNouBlKqx2G0wnHX zUXhHwvWuwd/jN+lNEHDt+CeGKKeIb3/IzHO1vebh1yqy6VChz+MvnhJIOwbTq0Rhf dWnmv3i51hsqeo8wIQK9d71+hSQS9srGA3AiQ2oWKeToHZeogPYOwTdfTHWgT0/CHd yN2hRBpzOkrLe+N1VU7nvhtI9gfTXymsiV6xqRtyNPaSaa7Occ8lmtrIb9qSOSvFvt XsoXgve5lVkQw== From: Lukasz Majewski To: u-boot@lists.denx.de, Stefano Babic , Marek Vasut Cc: Lukasz Majewski , "WARNING:Unknown"@denx.de, setting@denx.de, ignore_warnings@denx.de, Giulio Benetti , =?utf-8?q?Marek_Beh?= =?utf-8?q?=C3=BAn?= , Michal Simek Subject: [PATCH v1 1/4] usb: Modify Kconfig of the USB_EHCI_MXS to use this driver with imx28 Date: Wed, 22 Dec 2021 10:55:06 +0100 Message-Id: <20211222095509.30071-2-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211222095509.30071-1-lukma@denx.de> References: <20211222095509.30071-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean The ehci-mxs driver can be also used with imx28 SoC, not only imx23. Signed-off-by: Lukasz Majewski --- drivers/usb/host/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index ccecb5a3b08..7743c962cfa 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -180,12 +180,13 @@ config USB_EHCI_MX7 Enables support for the on-chip EHCI controller on i.MX7 SoCs. config USB_EHCI_MXS - bool "Support for i.MX23 EHCI USB controller" - depends on ARCH_MX23 + bool "Support for i.MX23/i.MX28 EHCI USB controller" + depends on ARCH_MX23 || ARCH_MX28 default y select USB_EHCI_IS_TDI help - Enables support for the on-chip EHCI controller on i.MX23 SoCs. + Enables support for the on-chip EHCI controller on i.MX23 and + i.MX28 SoCs. config USB_EHCI_OMAP bool "Support for OMAP3+ on-chip EHCI USB controller" From patchwork Wed Dec 22 09:55:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1572114 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=oAIPtqiH; dkim=fail reason="signature verification failed" (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=Fb2Fbc8k; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJpcK5cfDz9s1l for ; Wed, 22 Dec 2021 20:56:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B9F92831D7; Wed, 22 Dec 2021 10:55:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166950; bh=Kw95fpL9CP/OUCiRlfCVBF2iQlj50EbKzwEGbpsd0wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=oAIPtqiHGTniRxV2buQ26NrtZrH5dAitns0GNGFZ1oAKZgOFcgOZtZZmZqKhQfh9E 8LUVNLCBvs5tLV11yZwC2+FTlLDnPqIfmo2T8IfwEkkeK4onDG/P5Sw/GzhynbinYO ECy5kMB7sAWQ4csBqgdKnzQLYHnbt3PcEcZt3WAjXAuRKFz6voXcEMgOb/UPDnwvJs eOSoZjl7GLsz8+hc2JVdKiS10oyLwP3RFbLMI7dO7doyjcCQPTKb1MTM8LKbBzH7qO UcnFf2uWZFoSbojF4KZcXh2v2QUhhx/UZQRzIekRSZGssstBXFwfWFAty2MCakLmk/ 8pxXgZuRhO4vw== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 884F683027; Wed, 22 Dec 2021 10:55:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166934; bh=Kw95fpL9CP/OUCiRlfCVBF2iQlj50EbKzwEGbpsd0wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fb2Fbc8kLwrbP9SobXj9gvgj9/bGJ/BNCWkhcajw3xFpDcH2GDcg5bd8RsbUn1r0i pRaChHDk5BcoJLoDHiNfOOkKbtl0vqbdk2FnC62QRooZhLmCa9NzvkUTeN4bInXazO dlHwCKVQqopstiH8t3ZrYMtJFfQRAsWcRtJ1fHA0kLsLb3Il5486NCFk7HnteoJreC PoLu4TmeSPQdycOc2uJTCQK/W8pPK/a/w3uxCyHsPJIdKM7TY25RflxNLJzevdmyji 5KPIv681fYGu+eFtA+YRSsW9nVCKs3BlfX7ogYlTLBlquPUzZ+COqUMAKJWEs2CAiG kjbilhZCc7lgw== From: Lukasz Majewski To: u-boot@lists.denx.de, Stefano Babic , Marek Vasut Cc: Lukasz Majewski , "WARNING:Unknown"@denx.de, setting@denx.de, ignore_warnings@denx.de Subject: [PATCH v1 2/4] usb: ehci: Refactor the ehci_mxs_toggle_clock function to be reused with DM Date: Wed, 22 Dec 2021 10:55:07 +0100 Message-Id: <20211222095509.30071-3-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211222095509.30071-1-lukma@denx.de> References: <20211222095509.30071-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean This function is going to be reused with the CONFIG_DM_USB enabled in the imx28 mxs USB ehci driver. No functional changes introduced. Signed-off-by: Lukasz Majewski --- drivers/usb/host/ehci-mxs.c | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index 824c620e638..a9d5d58970a 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -29,6 +29,27 @@ struct ehci_mxs_port { uint32_t gate_bits; }; +static int ehci_mxs_toggle_clock(const struct ehci_mxs_port *port, int enable) +{ + struct mxs_register_32 *digctl_ctrl = + (struct mxs_register_32 *)HW_DIGCTL_CTRL; + int pll_offset, dig_offset; + + if (enable) { + pll_offset = offsetof(struct mxs_register_32, reg_set); + dig_offset = offsetof(struct mxs_register_32, reg_clr); + writel(port->gate_bits, (u32)&digctl_ctrl->reg + dig_offset); + writel(port->pll_en_bits, (u32)port->pll + pll_offset); + } else { + pll_offset = offsetof(struct mxs_register_32, reg_clr); + dig_offset = offsetof(struct mxs_register_32, reg_set); + writel(port->pll_dis_bits, (u32)port->pll + pll_offset); + writel(port->gate_bits, (u32)&digctl_ctrl->reg + dig_offset); + } + + return 0; +} + static const struct ehci_mxs_port mxs_port[] = { #ifdef CONFIG_EHCI_MXS_PORT0 { @@ -56,27 +77,6 @@ static const struct ehci_mxs_port mxs_port[] = { #endif }; -static int ehci_mxs_toggle_clock(const struct ehci_mxs_port *port, int enable) -{ - struct mxs_register_32 *digctl_ctrl = - (struct mxs_register_32 *)HW_DIGCTL_CTRL; - int pll_offset, dig_offset; - - if (enable) { - pll_offset = offsetof(struct mxs_register_32, reg_set); - dig_offset = offsetof(struct mxs_register_32, reg_clr); - writel(port->gate_bits, (u32)&digctl_ctrl->reg + dig_offset); - writel(port->pll_en_bits, (u32)port->pll + pll_offset); - } else { - pll_offset = offsetof(struct mxs_register_32, reg_clr); - dig_offset = offsetof(struct mxs_register_32, reg_set); - writel(port->pll_dis_bits, (u32)port->pll + pll_offset); - writel(port->gate_bits, (u32)&digctl_ctrl->reg + dig_offset); - } - - return 0; -} - int __weak board_ehci_hcd_init(int port) { return 0; From patchwork Wed Dec 22 09:55:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1572115 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=KyggDQZR; dkim=fail reason="signature verification failed" (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=zHQ4e33U; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJpcW48GWz9s1l for ; Wed, 22 Dec 2021 20:56:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D12838331E; Wed, 22 Dec 2021 10:55:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166955; bh=OyCVCIjHMNIkPvQpnQ7WASXAsCWQnx9J5YP4eabMX9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=KyggDQZR4CUaeJAnXS9lJMmZ3t4Tb0Lwm9hDKjcWZggJje0KIs3GIsWomdxImcrhF y31qdLwZdA15dY7bC3Myy/4esfP0LeqOIhHRcq02PVcP7rqboPeP14lUJheJ189UVX qpaMyq+5DK+eli3l5/1kGjIVn/DtN++L9v2RgkGUIZS/sys2f0JGj0ehyPofazXxQs MxJ4po1o2QWQPTtOpsPpqNvzTgIhqW3t6F5AmNHssS7iXwo+9mWKQJfNeIr/eek8QM AkJ2zizftPi8UzghUh6Scth4734J+EgKd1j8nFN6xOWCDTVtmz/OZZ/45AqPW3EdDT tmf1VbgU2N/wA== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id F2FC98302A; Wed, 22 Dec 2021 10:55:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166935; bh=OyCVCIjHMNIkPvQpnQ7WASXAsCWQnx9J5YP4eabMX9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zHQ4e33UhDsVITba+vGfIxqhrQAzQ/rMvElSxj9eMeGt0onTUYZHuGVOppe0yoqCs Zp2CVfbqwcBXWi0y5bruwmO9f7mYqMzaEwkl8EmDU/8jGxKYVOOBf8gR6upgihC7u1 W7dxDoyqrims1o6mDn3/NJiVSlcOnD4dW1q7sx0h0BN74JxZUrOuqkxEnrA0AP/WoA kF2LB3M4GVPEQCoUID/jfmz/3l4rcUCXhsKFfgpFTSkCsHLy82rY28t/fvw+n+A5YA M+pln+GVriTO273xlFJanw6tR625ZjEBtrMKu+T7Epzjkxse8nUDiwNPVMeqvRu3Cw qqN+gI0Lyv7OQ== From: Lukasz Majewski To: u-boot@lists.denx.de, Stefano Babic , Marek Vasut Cc: Lukasz Majewski , "WARNING:Unknown"@denx.de, setting@denx.de, ignore_warnings@denx.de Subject: [PATCH v1 3/4] usb: ehci: Move common mxs code to separate functions (ehci_hcd_{stop|start}) Date: Wed, 22 Dec 2021 10:55:08 +0100 Message-Id: <20211222095509.30071-4-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211222095509.30071-1-lukma@denx.de> References: <20211222095509.30071-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Those functions will be re-used when the ehci MXS driver (for imx28) will be converted to also support CONFIG_DM_USB. No functional changes introduced - only cosmetic changes (u32 type) and alignment to pass checkpatch. Signed-off-by: Lukasz Majewski --- drivers/usb/host/ehci-mxs.c | 112 ++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index a9d5d58970a..aa32af1f3aa 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -50,6 +50,66 @@ static int ehci_mxs_toggle_clock(const struct ehci_mxs_port *port, int enable) return 0; } +static int __ehci_hcd_init(struct ehci_mxs_port *port, enum usb_init_type init, + struct ehci_hccr **hccr, struct ehci_hcor **hcor) +{ + u32 usb_base, cap_base; + int ret; + + /* Reset the PHY block */ + writel(USBPHY_CTRL_SFTRST, &port->phy_regs->hw_usbphy_ctrl_set); + udelay(10); + writel(USBPHY_CTRL_SFTRST | USBPHY_CTRL_CLKGATE, + &port->phy_regs->hw_usbphy_ctrl_clr); + + /* Enable USB clock */ + ret = ehci_mxs_toggle_clock(port, 1); + if (ret) + return ret; + + /* Start USB PHY */ + writel(0, &port->phy_regs->hw_usbphy_pwd); + + /* Enable UTMI+ Level 2 and Level 3 compatibility */ + writel(USBPHY_CTRL_ENUTMILEVEL3 | USBPHY_CTRL_ENUTMILEVEL2 | 1, + &port->phy_regs->hw_usbphy_ctrl_set); + + usb_base = port->usb_regs + 0x100; + *hccr = (struct ehci_hccr *)usb_base; + + cap_base = ehci_readl(&(*hccr)->cr_capbase); + *hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base)); + + return 0; +} + +static int __ehci_hcd_stop(struct ehci_mxs_port *port) +{ + u32 usb_base, cap_base, tmp; + struct ehci_hccr *hccr; + struct ehci_hcor *hcor; + + /* Stop the USB port */ + usb_base = port->usb_regs + 0x100; + hccr = (struct ehci_hccr *)usb_base; + cap_base = ehci_readl(&hccr->cr_capbase); + hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base)); + + tmp = ehci_readl(&hcor->or_usbcmd); + tmp &= ~CMD_RUN; + ehci_writel(&hcor->or_usbcmd, tmp); + + /* Disable the PHY */ + tmp = USBPHY_PWD_RXPWDRX | USBPHY_PWD_RXPWDDIFF | + USBPHY_PWD_RXPWD1PT1 | USBPHY_PWD_RXPWDENV | + USBPHY_PWD_TXPWDV2I | USBPHY_PWD_TXPWDIBIAS | + USBPHY_PWD_TXPWDFS; + writel(tmp, &port->phy_regs->hw_usbphy_pwd); + + /* Disable USB clock */ + return ehci_mxs_toggle_clock(port, 0); +} + static const struct ehci_mxs_port mxs_port[] = { #ifdef CONFIG_EHCI_MXS_PORT0 { @@ -92,7 +152,6 @@ int ehci_hcd_init(int index, enum usb_init_type init, { int ret; - uint32_t usb_base, cap_base; const struct ehci_mxs_port *port; if ((index < 0) || (index >= ARRAY_SIZE(mxs_port))) { @@ -105,40 +164,12 @@ int ehci_hcd_init(int index, enum usb_init_type init, return ret; port = &mxs_port[index]; - - /* Reset the PHY block */ - writel(USBPHY_CTRL_SFTRST, &port->phy_regs->hw_usbphy_ctrl_set); - udelay(10); - writel(USBPHY_CTRL_SFTRST | USBPHY_CTRL_CLKGATE, - &port->phy_regs->hw_usbphy_ctrl_clr); - - /* Enable USB clock */ - ret = ehci_mxs_toggle_clock(port, 1); - if (ret) - return ret; - - /* Start USB PHY */ - writel(0, &port->phy_regs->hw_usbphy_pwd); - - /* Enable UTMI+ Level 2 and Level 3 compatibility */ - writel(USBPHY_CTRL_ENUTMILEVEL3 | USBPHY_CTRL_ENUTMILEVEL2 | 1, - &port->phy_regs->hw_usbphy_ctrl_set); - - usb_base = port->usb_regs + 0x100; - *hccr = (struct ehci_hccr *)usb_base; - - cap_base = ehci_readl(&(*hccr)->cr_capbase); - *hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base)); - - return 0; + return __ehci_hcd_init(port, init, hccr, hcor); } int ehci_hcd_stop(int index) { int ret; - uint32_t usb_base, cap_base, tmp; - struct ehci_hccr *hccr; - struct ehci_hcor *hcor; const struct ehci_mxs_port *port; if ((index < 0) || (index >= ARRAY_SIZE(mxs_port))) { @@ -148,26 +179,7 @@ int ehci_hcd_stop(int index) port = &mxs_port[index]; - /* Stop the USB port */ - usb_base = port->usb_regs + 0x100; - hccr = (struct ehci_hccr *)usb_base; - cap_base = ehci_readl(&hccr->cr_capbase); - hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base)); - - tmp = ehci_readl(&hcor->or_usbcmd); - tmp &= ~CMD_RUN; - ehci_writel(&hcor->or_usbcmd, tmp); - - /* Disable the PHY */ - tmp = USBPHY_PWD_RXPWDRX | USBPHY_PWD_RXPWDDIFF | - USBPHY_PWD_RXPWD1PT1 | USBPHY_PWD_RXPWDENV | - USBPHY_PWD_TXPWDV2I | USBPHY_PWD_TXPWDIBIAS | - USBPHY_PWD_TXPWDFS; - writel(tmp, &port->phy_regs->hw_usbphy_pwd); - - /* Disable USB clock */ - ret = ehci_mxs_toggle_clock(port, 0); - + ret = __ehci_hcd_stop(port); board_ehci_hcd_exit(index); return ret; From patchwork Wed Dec 22 09:55:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1572116 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=hT4rCMwW; dkim=fail reason="signature verification failed" (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=ZOiXK6HI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJpcj1KScz9s1l for ; Wed, 22 Dec 2021 20:56:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA316830F5; Wed, 22 Dec 2021 10:55:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166959; bh=+etAEooUBedzEdBPOCaTEw//Y843hcMeGD5rngcMl9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=hT4rCMwW8VccpZaT5s0zL9X244kzLMOpn1kf5mbgv/IFiBHv+PKQvukuCtPDqQGM+ xPjVP9ytJHtJY1pos49iRXY5n0e91s7MVhB88jfgk+5g5/6O0sOB3hZVCki7M7Eifu hlNZT+oPpX8eQBLjEaqgHiwzPkHArif6WRle55eFc9Uxw1FJ1iGcC+aAtezmyvZiRf g/EgW3OODMKtj4Nw3zHGypKHF6gsxH/Rbhydc29FTjAF+/ie4KgTkaZGv1adZkv+yH NwoajtULP5zXfRkQ2eeHadI8I5TyyiH2AjdcSEgxsaCbq2PlketQ6wTV8U3000Tju8 EVS1dXguNUIBQ== Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 6DD938303A; Wed, 22 Dec 2021 10:55:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1640166935; bh=+etAEooUBedzEdBPOCaTEw//Y843hcMeGD5rngcMl9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZOiXK6HIBdJrmzpP27OY8HikjZy6CRjQmwHoyWjxhsArWYBrQwUN7RX/35FETypLa 6JFxv7f+bk8502llfe8SCgifCZ/Gp8mTDn3l8hpifocRTtSChSljbmPzmpMKXwcTOZ iERtOuF7FLpKrdAZn6DZuGbpmiAJ7/hCSvCfDxZDkspPwfHdlCcFh0gF2DXRpL1yez xN+EMkyp52PAUf5XBR2jLQc1Pxpk/RjOZ+tIgdOPN28m1uR7CcSrIjfOHufi/vTkCG XESCwVe5kjA1Z3Fjuxo0OepHPcCZWthvwTSFVdvA+hsrXBVqutfRX/9IWGuo3A2DVN qUpFxU26NPjrg== From: Lukasz Majewski To: u-boot@lists.denx.de, Stefano Babic , Marek Vasut Cc: Lukasz Majewski , "WARNING:Unknown"@denx.de, setting@denx.de, ignore_warnings@denx.de, Simon Glass Subject: [PATCH v1 4/4] usb: ehci: dm: Convert i.MX28 ehci code to driver model Date: Wed, 22 Dec 2021 10:55:09 +0100 Message-Id: <20211222095509.30071-5-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211222095509.30071-1-lukma@denx.de> References: <20211222095509.30071-1-lukma@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean This commit converts i.MX28's EHCI USB host driver to driver model (DM_USB). It is a straightforward conversion (to reuse as much code as possible), based on ehci-mx5.c code. Signed-off-by: Lukasz Majewski --- drivers/usb/host/ehci-mxs.c | 184 ++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index aa32af1f3aa..9a614955fc1 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include "ehci.h" @@ -110,6 +112,7 @@ static int __ehci_hcd_stop(struct ehci_mxs_port *port) return ehci_mxs_toggle_clock(port, 0); } +#if !CONFIG_IS_ENABLED(DM_USB) static const struct ehci_mxs_port mxs_port[] = { #ifdef CONFIG_EHCI_MXS_PORT0 { @@ -184,3 +187,184 @@ int ehci_hcd_stop(int index) return ret; } +#else /* CONFIG_IS_ENABLED(DM_USB) */ +struct ehci_mxs_priv_data { + struct ehci_ctrl ctrl; + struct usb_ehci *ehci; + struct udevice *vbus_supply; + struct ehci_mxs_port port; + enum usb_init_type init_type; +}; + +/* + * Below defines correspond to imx28 clk Linux (v5.15.y) + * clock driver to provide proper offset for PHY[01] + * devices. + */ +#define CLK_USB_PHY0 62 +#define CLK_USB_PHY1 63 +#define PLL0CTRL0(base) ((base) + 0x0000) +#define PLL1CTRL0(base) ((base) + 0x0020) + +static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +{ + struct ehci_mxs_priv_data *priv = dev_get_priv(dev); + struct usb_plat *plat = dev_get_plat(dev); + struct ehci_mxs_port *port = &priv->port; + u32 phandle, phy_reg, clk_reg, clk_id; + ofnode phy_node, clk_node; + const char *mode; + int ret; + + mode = ofnode_read_string(dev->node_, "dr_mode"); + if (mode) { + if (strcmp(mode, "peripheral") == 0) + plat->init_type = USB_INIT_DEVICE; + else if (strcmp(mode, "host") == 0) + plat->init_type = USB_INIT_HOST; + else + return -EINVAL; + } + + /* Read base address of the USB IP block */ + ret = ofnode_read_u32(dev->node_, "reg", &port->usb_regs); + if (ret) + return ret; + + /* Read base address of the USB PHY IP block */ + ret = ofnode_read_u32(dev->node_, "fsl,usbphy", &phandle); + if (ret) + return ret; + + phy_node = ofnode_get_by_phandle(phandle); + if (!ofnode_valid(phy_node)) + return -ENODEV; + + ret = ofnode_read_u32(phy_node, "reg", &phy_reg); + if (ret) + return ret; + + port->phy_regs = (struct mxs_usbphy_regs *)phy_reg; + + /* Read base address of the CLK IP block and proper ID */ + ret = ofnode_read_u32_index(phy_node, "clocks", 0, &phandle); + if (ret) + return ret; + + ret = ofnode_read_u32_index(phy_node, "clocks", 1, &clk_id); + if (ret) + return ret; + + clk_node = ofnode_get_by_phandle(phandle); + if (!ofnode_valid(clk_node)) + return -ENODEV; + + ret = ofnode_read_u32(clk_node, "reg", &clk_reg); + if (ret) + return ret; + + port->pll = (struct mxs_register_32 *)clk_reg; + + /* Provide proper offset for USB PHY clocks */ + if (clk_id == CLK_USB_PHY0) + port->pll = PLL0CTRL0(port->pll); + + if (clk_id == CLK_USB_PHY1) + port->pll = PLL1CTRL0(port->pll); + + debug("%s: pll_reg: 0x%p clk_id: %d\n", __func__, port->pll, clk_id); + /* + * On the imx28 the values provided by CLKCTRL_PLL0* defines to are the + * same as ones for CLKCTRL_PLL1*. As a result the former can be used + * for both ports - i.e. (usb[01]). + */ + port->pll_en_bits = CLKCTRL_PLL0CTRL0_EN_USB_CLKS | + CLKCTRL_PLL0CTRL0_POWER; + port->pll_dis_bits = CLKCTRL_PLL0CTRL0_EN_USB_CLKS; + port->gate_bits = HW_DIGCTL_CTRL_USB0_CLKGATE; + + return 0; +} + +static int ehci_usb_probe(struct udevice *dev) +{ + struct usb_plat *plat = dev_get_plat(dev); + struct usb_ehci *ehci = dev_read_addr_ptr(dev); + struct ehci_mxs_priv_data *priv = dev_get_priv(dev); + struct ehci_mxs_port *port = &priv->port; + enum usb_init_type type = plat->init_type; + struct ehci_hccr *hccr; + struct ehci_hcor *hcor; + int ret; + + priv->ehci = ehci; + priv->init_type = type; + + debug("%s: USB type: %s reg: 0x%x phy_reg 0x%p\n", __func__, + type == USB_INIT_HOST ? "HOST" : "DEVICE", port->usb_regs, + (uint32_t *)port->phy_regs); + +#if CONFIG_IS_ENABLED(DM_REGULATOR) + ret = device_get_supply_regulator(dev, "vbus-supply", + &priv->vbus_supply); + if (ret) + debug("%s: No vbus supply\n", dev->name); + + if (!ret && priv->vbus_supply) { + ret = regulator_set_enable(priv->vbus_supply, + (type == USB_INIT_DEVICE) ? + false : true); + if (ret) { + puts("Error enabling VBUS supply\n"); + return ret; + } + } +#endif + ret = __ehci_hcd_init(port, type, &hccr, &hcor); + if (ret) + return ret; + + mdelay(10); + return ehci_register(dev, hccr, hcor, NULL, 0, priv->init_type); +} + +static int ehci_usb_remove(struct udevice *dev) +{ + struct ehci_mxs_priv_data *priv = dev_get_priv(dev); + struct ehci_mxs_port *port = &priv->port; + int ret; + + ret = ehci_deregister(dev); + if (ret) + return ret; + +#if CONFIG_IS_ENABLED(DM_REGULATOR) + if (priv->vbus_supply) { + ret = regulator_set_enable(priv->vbus_supply, false); + if (ret) { + puts("Error disabling VBUS supply\n"); + return ret; + } + } +#endif + return __ehci_hcd_stop(port); +} + +static const struct udevice_id mxs_usb_ids[] = { + { .compatible = "fsl,imx28-usb" }, + { } +}; + +U_BOOT_DRIVER(usb_mxs) = { + .name = "ehci_mxs", + .id = UCLASS_USB, + .of_match = mxs_usb_ids, + .of_to_plat = ehci_usb_ofdata_to_platdata, + .probe = ehci_usb_probe, + .remove = ehci_usb_remove, + .ops = &ehci_usb_ops, + .plat_auto = sizeof(struct usb_plat), + .priv_auto = sizeof(struct ehci_mxs_priv_data), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +}; +#endif /* !CONFIG_IS_ENABLED(DM_USB) */