From patchwork Wed Jan 26 14:13:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 537550 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF74EC28CF5 for ; Wed, 26 Jan 2022 14:13:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242000AbiAZONz (ORCPT ); Wed, 26 Jan 2022 09:13:55 -0500 Received: from mx1.tq-group.com ([93.104.207.81]:61266 "EHLO mx1.tq-group.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241979AbiAZONy (ORCPT ); Wed, 26 Jan 2022 09:13:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206434; x=1674742434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6DdLsqqroNMKr6Xyes2xsy1sE+X7bKTqbAbUFZzzPF8=; b=TnU33xOP1qx+6ukl4I8Azuzdo0t40esMVBhmPPAZQdHoxoqJ05k49fF+ 3oqP9uRIsrkPnXyyiAhO67Y8S4aneEAUk0TrGoNLXHqqjSG6Ff/hAUE0i JZuBGosvWr1lNPiIV/Evtod7V3TOCte+sw8M5z5+ofX9tyBKqyoMheMgm IXgjAh4dExmjfYw9HSZqa4RmEARRJMSlAUBPGoNjMfiMtTubYdsyT9lnH Xk8Yt4ar2QTOb3hLjju9KU0PT/jU7ivU8RluVpQrXITDMvqK7KxOlr4+u qi/mTLe+2r8GvhjeTxSyWHkngGzMms6JqRVYVlLqbMRhFZMxAM5vbOBJ5 A==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725568" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Wed, 26 Jan 2022 15:13:51 +0100 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Wed, 26 Jan 2022 15:13:51 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206431; x=1674742431; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6DdLsqqroNMKr6Xyes2xsy1sE+X7bKTqbAbUFZzzPF8=; b=iXRd2SPNodDerQ0RSu+4O2IrceJFqtcoaj5XIJHMzq45Uo3GYpCOe4gi Q5ijvJadMXuRa2PTpZDWsajnJzVzQRMxUNMeSjRq32IJ+H4JpBJTFYlo1 L+lrELoXO1J/OEj+FHlSwJFozUQnUR1uEOsUE7odxpxOY1IeZosu0xvEt 8vHOD/wJmcQoRsmjUarwZS8UUdLIy16xi+avlL30qvsyn+49wlEfveViw YyFYnYoW4AZZSVcyLK4d+DNiQr1/9wtNR8sIzicW+gE644QaDQYl3g788 CdBetaXzwI0py65zX/6vj6XfaEc/Vb8I4I2NxzE9F4CoXnQ0RHGqrq5Y1 w==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725564" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from steina-w.tq-net.de (unknown [10.123.49.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 00C4A280065; Wed, 26 Jan 2022 15:13:50 +0100 (CET) From: Alexander Stein To: Greg Kroah-Hartman , Rob Herring , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , NXP Linux Team , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Li Jun Subject: [PATCH v4 1/4] usb: dwc3: imx8mp: rename iomem base pointer Date: Wed, 26 Jan 2022 15:13:37 +0100 Message-Id: <20220126141340.234125-2-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> References: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Until now the iomem used is not USB glue as the name suggests, but HSIO BLK_CTL. Rename the struct member accordingly. This is a preparing patch for when USB glue is actually used. Signed-off-by: Alexander Stein Reviewed-by: Li Jun --- drivers/usb/dwc3/dwc3-imx8mp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-imx8mp.c b/drivers/usb/dwc3/dwc3-imx8mp.c index d328d20abfbc..1c8fe657b3a9 100644 --- a/drivers/usb/dwc3/dwc3-imx8mp.c +++ b/drivers/usb/dwc3/dwc3-imx8mp.c @@ -39,7 +39,7 @@ struct dwc3_imx8mp { struct device *dev; struct platform_device *dwc3; - void __iomem *glue_base; + void __iomem *hsio_blk_base; struct clk *hsio_clk; struct clk *suspend_clk; int irq; @@ -55,7 +55,7 @@ static void dwc3_imx8mp_wakeup_enable(struct dwc3_imx8mp *dwc3_imx) if (!dwc3) return; - val = readl(dwc3_imx->glue_base + USB_WAKEUP_CTRL); + val = readl(dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); if ((dwc3->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc3->xhci) val |= USB_WAKEUP_EN | USB_WAKEUP_SS_CONN | @@ -64,16 +64,16 @@ static void dwc3_imx8mp_wakeup_enable(struct dwc3_imx8mp *dwc3_imx) val |= USB_WAKEUP_EN | USB_WAKEUP_VBUS_EN | USB_WAKEUP_VBUS_SRC_SESS_VAL; - writel(val, dwc3_imx->glue_base + USB_WAKEUP_CTRL); + writel(val, dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); } static void dwc3_imx8mp_wakeup_disable(struct dwc3_imx8mp *dwc3_imx) { u32 val; - val = readl(dwc3_imx->glue_base + USB_WAKEUP_CTRL); + val = readl(dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); val &= ~(USB_WAKEUP_EN | USB_WAKEUP_EN_MASK); - writel(val, dwc3_imx->glue_base + USB_WAKEUP_CTRL); + writel(val, dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); } static irqreturn_t dwc3_imx8mp_interrupt(int irq, void *_dwc3_imx) @@ -115,9 +115,9 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) dwc3_imx->dev = dev; - dwc3_imx->glue_base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(dwc3_imx->glue_base)) - return PTR_ERR(dwc3_imx->glue_base); + dwc3_imx->hsio_blk_base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(dwc3_imx->hsio_blk_base)) + return PTR_ERR(dwc3_imx->hsio_blk_base); dwc3_imx->hsio_clk = devm_clk_get(dev, "hsio"); if (IS_ERR(dwc3_imx->hsio_clk)) { From patchwork Wed Jan 26 14:13:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 537074 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F777C3526D for ; Wed, 26 Jan 2022 14:13:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242001AbiAZON4 (ORCPT ); Wed, 26 Jan 2022 09:13:56 -0500 Received: from mx1.tq-group.com ([93.104.207.81]:61280 "EHLO mx1.tq-group.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241975AbiAZONz (ORCPT ); Wed, 26 Jan 2022 09:13:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206434; x=1674742434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l1nUXsM59Ui0doiVm12hhhwuohicemAjdr43H7R6YUg=; b=LLz8wQaUiFsszVteAWL/EintRBQkVe+z9UqK3kVsWMdohM9YWNm9Tc+5 B0DOiYo2/g0QmXMryuQazO+8S32N3Mn3D6ygrZ46fWMB6NSzhr/Bpi2bK 7eyHob8rjDfn6bLd2xY0Kjs3v7H8oJZ53s8VGEGflaApTDOK8nDtU0njj 9cr1BsfbsvAquE8seVJ8E6uMNVNLQz75KwYqpyrpp0j+AQIOMYEQ+oyAI ZaK1tSLUOut75QIc2L6D5CADSdWXDMJmIp9PctTvKh+IEMaNCvmartsxx 6wuVJyx4Leh+Ay5eno81cL/p6/z9mJauZ9M4yaacKEUFY2/I9yAEQYYC3 g==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725569" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Wed, 26 Jan 2022 15:13:51 +0100 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Wed, 26 Jan 2022 15:13:51 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206431; x=1674742431; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l1nUXsM59Ui0doiVm12hhhwuohicemAjdr43H7R6YUg=; b=KKU+55Z4pD+fDkoFvrY6v7ry80/FFmV6RHiIttpB1AVSMNp/3V/3mLKS DbVAjh3U6+RRHOipFr0meGWDB0p52DIrBeKwQMR+v+cRsz/U+sa52Zz8D FQiVueRKEfJlgwNlYrdC0tmwlxRkaUTaBglMnhw8D0TeQ2NvsE6qDyR5t nDdWmQNBCBkSPPWeiwofdCTGHQ/ZKf0G6Aj5psVlzfohzwBrYswPyDxgf 6ysYnfnWxEsPLiqeUdB5ZTSXqlKBazmSnoahbOyfHTOZA8/YqzLF2nOaJ cvQUCF99bo9RX39HV5wDL0IUddds/tLeGfc8Z/MgAiDzIDAjAuEkZmAj/ A==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725565" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from steina-w.tq-net.de (unknown [10.123.49.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 3299F280078; Wed, 26 Jan 2022 15:13:51 +0100 (CET) From: Alexander Stein To: Greg Kroah-Hartman , Rob Herring , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , NXP Linux Team , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Li Jun Subject: [PATCH v4 2/4] dt-bindings: usb: dwc3-imx8mp: Add imx8mp specific flags Date: Wed, 26 Jan 2022 15:13:38 +0100 Message-Id: <20220126141340.234125-3-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> References: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org This adds bindings for features in the USB glue block. They allow setting polarity of PWR and OC as well as disabling port power control. Also permanently attached can be annotated as well. Additional IO address and clock are needed. Signed-off-by: Alexander Stein Reviewed-by: Rob Herring --- .../bindings/usb/fsl,imx8mp-dwc3.yaml | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml b/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml index 974032b1fda0..01ab0f922ae8 100644 --- a/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml +++ b/Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml @@ -15,9 +15,9 @@ properties: const: fsl,imx8mp-dwc3 reg: - maxItems: 1 - description: Address and length of the register set for the wrapper of - dwc3 core on the SOC. + items: + - description: Address and length of the register set for HSIO Block Control + - description: Address and length of the register set for the wrapper of dwc3 core on the SOC. "#address-cells": enum: [ 1, 2 ] @@ -49,6 +49,28 @@ properties: - const: hsio - const: suspend + fsl,permanently-attached: + type: boolean + description: + Indicates if the device atached to a downstream port is + permanently attached. + + fsl,disable-port-power-control: + type: boolean + description: + Indicates whether the host controller implementation includes port + power control. Defines Bit 3 in capability register (HCCPARAMS). + + fsl,over-current-active-low: + type: boolean + description: + Over current signal polarity is active low. + + fsl,power-active-low: + type: boolean + description: + Power pad (PWR) polarity is active low. + # Required child node: patternProperties: @@ -74,7 +96,8 @@ examples: #include usb3_0: usb@32f10100 { compatible = "fsl,imx8mp-dwc3"; - reg = <0x32f10100 0x8>; + reg = <0x32f10100 0x8>, + <0x381f0000 0x20>; clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, <&clk IMX8MP_CLK_USB_ROOT>; clock-names = "hsio", "suspend"; From patchwork Wed Jan 26 14:13:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 537549 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5CCBC28CF5 for ; Wed, 26 Jan 2022 14:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241992AbiAZON5 (ORCPT ); Wed, 26 Jan 2022 09:13:57 -0500 Received: from mx1.tq-group.com ([93.104.207.81]:61266 "EHLO mx1.tq-group.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241986AbiAZONz (ORCPT ); Wed, 26 Jan 2022 09:13:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206435; x=1674742435; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RV/5YeOGDAQg1u/U4sZSFk88Iu6qh0WQ/KjyJuEePj8=; b=DPSl8976WXI9KiA6uncpfXianTTtK3j6YEKhUNIMWJaMsgwxUNiAJoDM UCmPbECNGlUkaqegJq+HLjjdzXsiGgIRlGzRYU8Zt+EcCfNns1GD1AOmj OAWzelZOzH9SZznN66ejOgxuL9PFYkf8pBJLV/wVfgkGRXluWXFRujggC dCNNhT6doABZo0wEKEhUCLx34FOvWOaxR37BwTDXitPKp7a3mOrlGk4P0 ofOXBb1Q9pA96lTHBPL1LK7AsfyGZgzLfuLf8xAH+oHMy/jHeukLaDTYg nYrTZqbkT1XPXSYwaAbPOlyPIBBPMwcBUXm6bQ6Vx7ixZ9kT8N8Pi0kpE Q==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725571" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Wed, 26 Jan 2022 15:13:51 +0100 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Wed, 26 Jan 2022 15:13:51 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206431; x=1674742431; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RV/5YeOGDAQg1u/U4sZSFk88Iu6qh0WQ/KjyJuEePj8=; b=DhiV6f5zZ0jymbJ/Q7zPtgnFR34msObm3eGrQo5klhhAGNTS4XbT4Ld9 x376rWtUvnddsQ1IzshuMcMqNIQCbAUJO9Hw4seZNxMVXbzY4rPLY2aRo pzYVC7Dya3wt7zzrF8rTmArJuid9DtG4C4JaXKVPP/5ws7006R498AO6q 0mmQkBbUDy0SgOt1f5YnwUjD9gRSUwlLLV3c1hOM4B/OV6+aW1spHa/7t xez5XH0W6dWlDSOcK6I15B4DWuLW3q3noVm/VuxRoAg3HwBCB5cA33eCt u93UBy2Rk2kF2X8yxCJtJvqWOkk6iQLwqrUXm7MNA6qa3Fyr+zGU94lz+ g==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725567" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from steina-w.tq-net.de (unknown [10.123.49.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 6C3AE28007C; Wed, 26 Jan 2022 15:13:51 +0100 (CET) From: Alexander Stein To: Greg Kroah-Hartman , Rob Herring , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , NXP Linux Team , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Li Jun Subject: [PATCH v4 3/4] usb: dwc3: imx8mp: Add support for setting SOC specific flags Date: Wed, 26 Jan 2022 15:13:39 +0100 Message-Id: <20220126141340.234125-4-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> References: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The i.MX8MP glue layer has support for the following flags: * over-current polarity * PWR pad polarity * controlling PPC flag in HCCPARAMS register * permanent port attach for usb2 & usb3 port Allow setting these flags by supporting specific flags in the glue node. In order to get this to work an additional IORESOURCE_MEM and clock is necessary. For backward compatibility this is purely optional. Signed-off-by: Alexander Stein --- drivers/usb/dwc3/dwc3-imx8mp.c | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/drivers/usb/dwc3/dwc3-imx8mp.c b/drivers/usb/dwc3/dwc3-imx8mp.c index 1c8fe657b3a9..5a96b66bf237 100644 --- a/drivers/usb/dwc3/dwc3-imx8mp.c +++ b/drivers/usb/dwc3/dwc3-imx8mp.c @@ -36,10 +36,22 @@ #define USB_WAKEUP_EN_MASK GENMASK(5, 0) +/* USB glue registers */ +#define USB_CTRL0 0x00 +#define USB_CTRL1 0x04 + +#define USB_CTRL0_PORTPWR_EN BIT(12) /* 1 - PPC enabled (default) */ +#define USB_CTRL0_USB3_FIXED BIT(22) /* 1 - USB3 permanent attached */ +#define USB_CTRL0_USB2_FIXED BIT(23) /* 1 - USB2 permanent attached */ + +#define USB_CTRL1_OC_POLARITY BIT(16) /* 0 - HIGH / 1 - LOW */ +#define USB_CTRL1_PWR_POLARITY BIT(17) /* 0 - HIGH / 1 - LOW */ + struct dwc3_imx8mp { struct device *dev; struct platform_device *dwc3; void __iomem *hsio_blk_base; + void __iomem *glue_base; struct clk *hsio_clk; struct clk *suspend_clk; int irq; @@ -47,6 +59,42 @@ struct dwc3_imx8mp { bool wakeup_pending; }; +static void imx8mp_configure_glue(struct dwc3_imx8mp *dwc3_imx) +{ + struct device *dev = dwc3_imx->dev; + u32 value; + + if (!dwc3_imx->glue_base) + return; + + value = readl(dwc3_imx->glue_base + USB_CTRL0); + + if (device_property_read_bool(dev, "fsl,permanently-attached")) + value |= (USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED); + else + value &= ~(USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED); + + if (device_property_read_bool(dev, "fsl,disable-port-power-control")) + value &= ~(USB_CTRL0_PORTPWR_EN); + else + value |= USB_CTRL0_PORTPWR_EN; + + writel(value, dwc3_imx->glue_base + USB_CTRL0); + + value = readl(dwc3_imx->glue_base + USB_CTRL1); + if (device_property_read_bool(dev, "fsl,over-current-active-low")) + value |= USB_CTRL1_OC_POLARITY; + else + value &= ~USB_CTRL1_OC_POLARITY; + + if (device_property_read_bool(dev, "fsl,power-active-low")) + value |= USB_CTRL1_PWR_POLARITY; + else + value &= ~USB_CTRL1_PWR_POLARITY; + + writel(value, dwc3_imx->glue_base + USB_CTRL1); +} + static void dwc3_imx8mp_wakeup_enable(struct dwc3_imx8mp *dwc3_imx) { struct dwc3 *dwc3 = platform_get_drvdata(dwc3_imx->dwc3); @@ -100,6 +148,7 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *dwc3_np, *node = dev->of_node; struct dwc3_imx8mp *dwc3_imx; + struct resource *res; int err, irq; if (!node) { @@ -119,6 +168,15 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) if (IS_ERR(dwc3_imx->hsio_blk_base)) return PTR_ERR(dwc3_imx->hsio_blk_base); + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (!res) { + dev_warn(dev, "Base address for glue layer missing. Continuing without, some features are missing though."); + } else { + dwc3_imx->glue_base = devm_ioremap_resource(dev, res); + if (IS_ERR(dwc3_imx->glue_base)) + return PTR_ERR(dwc3_imx->glue_base); + } + dwc3_imx->hsio_clk = devm_clk_get(dev, "hsio"); if (IS_ERR(dwc3_imx->hsio_clk)) { err = PTR_ERR(dwc3_imx->hsio_clk); @@ -152,6 +210,8 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) } dwc3_imx->irq = irq; + imx8mp_configure_glue(dwc3_imx); + pm_runtime_set_active(dev); pm_runtime_enable(dev); err = pm_runtime_get_sync(dev); @@ -252,6 +312,8 @@ static int __maybe_unused dwc3_imx8mp_resume(struct dwc3_imx8mp *dwc3_imx, dwc3_imx8mp_wakeup_disable(dwc3_imx); dwc3_imx->pm_suspended = false; + imx8mp_configure_glue(dwc3_imx); + if (dwc3_imx->wakeup_pending) { dwc3_imx->wakeup_pending = false; if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE) { From patchwork Wed Jan 26 14:13:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 537073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88A00C63684 for ; Wed, 26 Jan 2022 14:13:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241998AbiAZON6 (ORCPT ); Wed, 26 Jan 2022 09:13:58 -0500 Received: from mx1.tq-group.com ([93.104.207.81]:61280 "EHLO mx1.tq-group.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242003AbiAZON4 (ORCPT ); Wed, 26 Jan 2022 09:13:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206436; x=1674742436; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WWiIdXtyw56Rqfds2qB4Yd2Fj1coCEHLkEHNeGkzWGg=; b=IBHw6C6plVEfso3f4lLlK8OIOBY8kbI8eawOUZslES8xdTGM6nrAvHpz WinpFisKj/V92Ts5kYS72QZJzx9qIDfcSc9Mdqo9/UXx1Jlrm20oAWn6y jbiH/1h2DTtvm2YV7dLfg/rs5zxGHKdAQ6C/a6OtJcXMgYpq/MhL7Vz3G YlqwTqTMG4vlo3osA7h73nOr5fLgzHAOWxTX1Ttpy6hosqVILLnED8rJS QDKNce47sK8M3b3reZ5arBwQdOStBoYBTGDzG/nJXx3qjGUjz52RD8tZe QzXFGZviXpmnioyJRr9qSoeaefkwZTc9BcLQ99EZyVFDek/SxoBHFArxy g==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725572" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Wed, 26 Jan 2022 15:13:51 +0100 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Wed, 26 Jan 2022 15:13:51 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1643206431; x=1674742431; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WWiIdXtyw56Rqfds2qB4Yd2Fj1coCEHLkEHNeGkzWGg=; b=AHSU8Gu7R6pE3wBOrrAKkpr+EJFy68F25TJSemeRgQfMgqG37EGotUWv e5kwPpcEefUGoTx6k/4tj71iHuzNY/3TBDUg4uUyK4i8NYWtZmFs9vlA5 QepEkKJub7k60Chkaqfpxwpu7czdZH8uhynJ+arfWNAf6fKOBwFrT3RKX eAeNRwMFienJit2vJ4NN+nFYSJVOl0UfaxswUQDpZ4jrQ/kTfuLBwJknK vf+alctqwECV/CrvxLS1S/9uJP3fIEHR+kKzrCJVkndskZYNaNnApznVq GjOVGDIxvjgU+ZDhWSGsZ7JCfCDpAaesJgMTcOGH5CUJni6aaErEbE8cj g==; X-IronPort-AV: E=Sophos;i="5.88,318,1635199200"; d="scan'208";a="21725570" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 26 Jan 2022 15:13:51 +0100 Received: from steina-w.tq-net.de (unknown [10.123.49.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 9ACE0280065; Wed, 26 Jan 2022 15:13:51 +0100 (CET) From: Alexander Stein To: Greg Kroah-Hartman , Rob Herring , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , NXP Linux Team , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Li Jun Subject: [PATCH v4 4/4] arm64: dts: imx8mp: Add memory for USB3 glue layer to usb3 nodes Date: Wed, 26 Jan 2022 15:13:40 +0100 Message-Id: <20220126141340.234125-5-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> References: <20220126141340.234125-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The USB3 glue layer has 2 areas in the register set, see RM Rev.1 section 11.2.5.2.1 GLUE_usb3 memory map: * USB3 control/status * PHY control/status Provide the memory area to the usb3 nodes for accessing the features in the USB3 control area. Signed-off-by: Alexander Stein Reviewed-by: Li Jun --- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index e61ac5f136ad..d4aadb434d36 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -1030,7 +1030,8 @@ usb3_phy0: usb-phy@381f0040 { usb3_0: usb@32f10100 { compatible = "fsl,imx8mp-dwc3"; - reg = <0x32f10100 0x8>; + reg = <0x32f10100 0x8>, + <0x381f0000 0x20>; clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, <&clk IMX8MP_CLK_USB_ROOT>; clock-names = "hsio", "suspend"; @@ -1070,7 +1071,8 @@ usb3_phy1: usb-phy@382f0040 { usb3_1: usb@32f10108 { compatible = "fsl,imx8mp-dwc3"; - reg = <0x32f10108 0x8>; + reg = <0x32f10108 0x8>, + <0x382f0000 0x20>; clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, <&clk IMX8MP_CLK_USB_ROOT>; clock-names = "hsio", "suspend";