From patchwork Mon Sep 20 13:37:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 1530112 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=FKlNx3Dd; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=JbPtDacF; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HClxm36bGz9sPf for ; Mon, 20 Sep 2021 23:38:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 69A0A80EC5; Mon, 20 Sep 2021 15:38:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.b="FKlNx3Dd"; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="JbPtDacF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E369C80735; Mon, 20 Sep 2021 15:38:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 250CA80EC5 for ; Mon, 20 Sep 2021 15:38:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matthias.schiffer@ew.tq-group.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145081; x=1663681081; h=from:to:cc:subject:date:message-id; bh=x5m8fptVBO97Yv2OAP8hYokiUdexaH12TulZzT3DEP0=; b=FKlNx3DdDBcnoWXMcSBQcuY9dllcouTquXCX0JpQfieVUg2OxWGJJ3cV 25xDraA2S8N/DCZpXGIrZQPpmmh8eN0W7oRVM/eFVT9hkq2nFj3RyIag4 p3jpWgBvvixLmUzaza4PZbrlD7VE1BtYZOCqllcIn53G210VsZ9UB7mxC XHfdtWl75APVMMTage4tB/x7UYedp+c0iKSfEAabZ9SREFoGIxoVwHrih ceRbDBcz+Q7QXaajqifEB2uydnUOxBwyfSfeQVRZ+BJGTRprjBAxbMOka WvsKLN4Xy60lcNYRlN75fQS8HSP08ykuFcsSImSfYnoUEgz5uxASI1/ig w==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602989" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 20 Sep 2021 15:38:00 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Mon, 20 Sep 2021 15:38:00 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Mon, 20 Sep 2021 15:38:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145080; x=1663681080; h=from:to:cc:subject:date:message-id; bh=x5m8fptVBO97Yv2OAP8hYokiUdexaH12TulZzT3DEP0=; b=JbPtDacFP9TTxxgCpJr8RhFZVnNri38GhQxUmUS5bQQjSlcA5V0aUGDL dwIQkRfALPQ0P1ILURi8Dyw79S5o0J1NXUcBz7kJR4ZIdiJPYdqSKGQor hDqQsrQlpn1DwdB37eFFBxNoS0xyX4dPSwz5z1bsStEDhilLeCUthJkAK UcNiQnVAUYhRQjEI4ucsJk9IISX2T7MExxlkqmGvFi/VmpreutBlUD289 f4J05WygvinAhk/GbvqavbR+QsB8rFkJehJE4qX2FzixQsWawioljn89C Hq2x7EZ9x9KshhT/te+jaSvCxvQG6Gbpc344UjH+aYczi/9MdJlc2rNB1 A==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602988" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 20 Sep 2021 15:38:00 +0200 Received: from schifferm-ubuntu4.tq-net.de (schifferm-ubuntu4.tq-net.de [10.121.48.12]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id 79868280070; Mon, 20 Sep 2021 15:38:00 +0200 (CEST) From: Matthias Schiffer To: u-boot@lists.denx.de Cc: Marek Vasut , uboot-imx@nxp.com, Matthias Schiffer Subject: [PATCH 1/4] usb: add support for ULPI/SERIAL/HSIC PHY modes Date: Mon, 20 Sep 2021 15:37:22 +0200 Message-Id: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Import usb_phy_interface enum values and DT match strings from the Linux kernel. Signed-off-by: Markus Niebel Signed-off-by: Matthias Schiffer --- drivers/usb/common/common.c | 3 +++ include/linux/usb/phy.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 2a47f40bbab..43564c9fbaf 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -80,6 +80,9 @@ static const char *const usbphy_modes[] = { [USBPHY_INTERFACE_MODE_UNKNOWN] = "", [USBPHY_INTERFACE_MODE_UTMI] = "utmi", [USBPHY_INTERFACE_MODE_UTMIW] = "utmi_wide", + [USBPHY_INTERFACE_MODE_ULPI] = "ulpi", + [USBPHY_INTERFACE_MODE_SERIAL] = "serial", + [USBPHY_INTERFACE_MODE_HSIC] = "hsic", }; enum usb_phy_interface usb_get_phy_mode(ofnode node) diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 1e1217a9583..14b2c7eb2e6 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -16,6 +16,9 @@ enum usb_phy_interface { USBPHY_INTERFACE_MODE_UNKNOWN, USBPHY_INTERFACE_MODE_UTMI, USBPHY_INTERFACE_MODE_UTMIW, + USBPHY_INTERFACE_MODE_ULPI, + USBPHY_INTERFACE_MODE_SERIAL, + USBPHY_INTERFACE_MODE_HSIC, }; #if CONFIG_IS_ENABLED(DM_USB) From patchwork Mon Sep 20 13:37:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 1530113 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=Gw0W1ec+; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=V0QCEUTO; 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 ozlabs.org (Postfix) with ESMTPS id 4HClxw4GPnz9sRN for ; Mon, 20 Sep 2021 23:38:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF92082BC4; Mon, 20 Sep 2021 15:38:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.b="Gw0W1ec+"; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="V0QCEUTO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2285A82A01; Mon, 20 Sep 2021 15:38:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 91C8D82A15 for ; Mon, 20 Sep 2021 15:38:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matthias.schiffer@ew.tq-group.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145081; x=1663681081; h=from:to:cc:subject:date:message-id; bh=1wGrTXpAgtYwQQkcK1J5C7WbHMLYzooKEb4XWtxz6UQ=; b=Gw0W1ec+dFGy//gKw03jUSG+U4AqJgzF1QFHg89/MCV0K0SunXmLRtaf 5JjG6T86F3O/vtU3m+7qOxbtoguQM/mqCxRDMTnd4MqAifO/o66WTX4bX cHpPP2BkMkUXL+wsBzaaCoexC/PDZLVi8NQ4i6Y56tHkOoctP2uwHv6NF BgRkByjo/q8Q79X98p5jsN982eatCZjMxKzFDf+qa3ZBKMfRtzX9eHORM cLV1whDy1REXcH9l7VRamP0snFwfVSjU8lZAqdWKY5KPONyAYWtE5J1aC IP0/o8RJb5eMRhTFsH9qUAegYjVZWyWAk2T1rNaKVwtpv3envmewrHwq4 Q==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602991" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 20 Sep 2021 15:38:00 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Mon, 20 Sep 2021 15:38:00 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Mon, 20 Sep 2021 15:38:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145080; x=1663681080; h=from:to:cc:subject:date:message-id; bh=1wGrTXpAgtYwQQkcK1J5C7WbHMLYzooKEb4XWtxz6UQ=; b=V0QCEUTOLfeG3DerirSEW9iGdUeuQ+VmhRatpJsJCjsG7MLiLVp8176f 0Yo1mJgliTTRCak7qYdLhUW3seOUbsetHylIvKH+SHA6fGId6NNBsUUud Qo+Dwf1iZj33yVEIcbhFHEPIY9kCRSnKhAXlYXb02uAKfAzyiI9fi8J/7 AQqVdx99rJLHzadNxn635ftuQ08+lCIb6FZ06T3DumDWADsNV5VjmcSCU q4WbCzxw0ds5TX+E4pvaopJK9w+6c+pS24M7DzflnovE4PK3OfadteUAF lVAIGhxzzJ1GzPT5VGEp86JndECR5GDrCkGK4Magqy+pwYI6ldcaL9gPJ g==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602990" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 20 Sep 2021 15:38:00 +0200 Received: from schifferm-ubuntu4.tq-net.de (schifferm-ubuntu4.tq-net.de [10.121.48.12]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id 9B2D9280075; Mon, 20 Sep 2021 15:38:00 +0200 (CEST) From: Matthias Schiffer To: u-boot@lists.denx.de Cc: Marek Vasut , uboot-imx@nxp.com, Matthias Schiffer Subject: [PATCH 2/4] include/configs: replace MXC_EHCI_MODE_SERIAL with PORT_PTS_SERIAL Date: Mon, 20 Sep 2021 15:37:23 +0200 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> References: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> In-Reply-To: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> References: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 MXC_EHCI_MODE_ definitions are redundant. Replace MXC_EHCI_MODE_SERIAL with the equivalent PORT_PTS_SERIAL. Only the zmx25 platform is affected. Signed-off-by: Markus Niebel Signed-off-by: Matthias Schiffer --- include/configs/zmx25.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 88a885463d4..8b571da021a 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -57,7 +57,7 @@ #define CONFIG_USB_EHCI_MXC #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC MXC_EHCI_MODE_SERIAL +#define CONFIG_MXC_USB_PORTSC PORT_PTS_SERIAL #define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN) #define CONFIG_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ From patchwork Mon Sep 20 13:37:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 1530115 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=P79+jPl1; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=Y0HMf/8i; 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 ozlabs.org (Postfix) with ESMTPS id 4HClyK3wB7z9sPf for ; Mon, 20 Sep 2021 23:38:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 35F888325E; Mon, 20 Sep 2021 15:38:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.b="P79+jPl1"; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="Y0HMf/8i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DEBC982A01; Mon, 20 Sep 2021 15:38:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2C1C78325E for ; Mon, 20 Sep 2021 15:38:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matthias.schiffer@ew.tq-group.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145082; x=1663681082; h=from:to:cc:subject:date:message-id; bh=7nE9LtPcCWoitEl/M8vorITUy0wUyepxX1ZaUvk4ZzY=; b=P79+jPl1OkrdYs7202zYZJL5zCfQ7UubuGtHZGW9FWVPdUFskaWzhoSn PiawijMwoq+mozQZCmRm6nrJFWHwGn6IrSN86bpOruKs+iNahlJFCu3Ci yf3GynxYw7bkb+/9hbO5SfcOOjYgAmseVajeAzkjLjkkwRnTH6X4feA5b 6eRTh74o4HG7P/O0ydGPQCywqGmatQPVtqZwowOZ7NEMfw4iQUF+HBNVS 8decJYoT0REKGYdmslSSNAIdPIo5ZNXRlb89bejnze370qpz7LMxZEM7Y stQ40DOtocUaWct6BIdhzIuLysZ1ObvURX4FNS9AALk5uHBmO2L4LmvwH Q==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602993" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 20 Sep 2021 15:38:00 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Mon, 20 Sep 2021 15:38:00 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Mon, 20 Sep 2021 15:38:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145080; x=1663681080; h=from:to:cc:subject:date:message-id; bh=7nE9LtPcCWoitEl/M8vorITUy0wUyepxX1ZaUvk4ZzY=; b=Y0HMf/8ia5WH2cav6qUalLLvf/Onh6uW4CFPFNhYVZrw68bkqPc9BtsH qH46tIN1hmPpe/v8yctSRMNN3oc/+f2ywxspo4l/hvUg0RnjZR+b1Yc1D MCBU4QxKWXLsV89dHC/eMz+O2hjZiwRZ43fznyP3Y777vLP8b16VQPGRe pmJ6wEhDqbN5I3z+juvl2S11rUOO8bW26m81j1diUKCON4J733DS0Mn9s P/CoRhMZBEuK66FjDN+arRY8zENWpvl8O9f3Pass1nw29Nrz5HHYxXcQN AhyamWDTwfDD4Tc0crc+aTvr7F/L+EfIRWUZdeFHhUMj3V8iIlkCQ+P7A A==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602992" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 20 Sep 2021 15:38:00 +0200 Received: from schifferm-ubuntu4.tq-net.de (schifferm-ubuntu4.tq-net.de [10.121.48.12]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id BD3E4280078; Mon, 20 Sep 2021 15:38:00 +0200 (CEST) From: Matthias Schiffer To: u-boot@lists.denx.de Cc: Marek Vasut , uboot-imx@nxp.com, Matthias Schiffer Subject: [PATCH 3/4] usb: ehci-ci: remove redundant PORTSC flag definitions Date: Mon, 20 Sep 2021 15:37:24 +0200 Message-Id: <744ae939bc3aa5fc4f9f6d26bf50a7ac6a8d3636.1632144459.git.matthias.schiffer@ew.tq-group.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> References: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> In-Reply-To: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> References: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 These definitions are unused, all boards that define portsc flags use the equivalent PORT_* definitions instead. Signed-off-by: Markus Niebel Signed-off-by: Matthias Schiffer --- include/usb/ehci-ci.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index efb2eec5ce7..bf5d26faa53 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -249,17 +249,6 @@ struct usb_ehci { * For MXC SOCs */ -/* values for portsc field */ -#define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23) -#define MXC_EHCI_FORCE_FS (1 << 24) -#define MXC_EHCI_UTMI_8BIT (0 << 28) -#define MXC_EHCI_UTMI_16BIT (1 << 28) -#define MXC_EHCI_SERIAL (1 << 29) -#define MXC_EHCI_MODE_UTMI (0 << 30) -#define MXC_EHCI_MODE_PHILIPS (1 << 30) -#define MXC_EHCI_MODE_ULPI (2 << 30) -#define MXC_EHCI_MODE_SERIAL (3 << 30) - /* values for flags field */ #define MXC_EHCI_INTERFACE_DIFF_UNI (0 << 0) #define MXC_EHCI_INTERFACE_DIFF_BI (1 << 0) From patchwork Mon Sep 20 13:37:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 1530114 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=RyYKua3t; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=kHerpXt+; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HClyB5tBpz9sPf for ; Mon, 20 Sep 2021 23:38:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F4CE8327E; Mon, 20 Sep 2021 15:38:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.b="RyYKua3t"; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="kHerpXt+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB73682BC4; Mon, 20 Sep 2021 15:38:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7DEE982D5B for ; Mon, 20 Sep 2021 15:38:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matthias.schiffer@ew.tq-group.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145082; x=1663681082; h=from:to:cc:subject:date:message-id; bh=oxjMgO5Nu55pXpZDCtj/PBprEQv8xnGttRdMKpBA91w=; b=RyYKua3tSUaPx81DVMrUzNOhsvCxOLNcOpUD6ftj7JQHbumgfQo8x4of bRYlMyEd906tSOqC/RUgW5xZKPOQTlkhGS72yrJKs78zNvWNpLPwaIdZE 2w05O1p8mLNixTwnywuXDSyd459tiIVFKKKy2kOrhdIqgQ/0pAPX70tkd 1Kq+6KlMSECJDnchk/IdZH3u3RHtVnnwUSfAGKmb3ZqnK+M0kCCIWgWLt ccoVPGSOBaxyDTzjXCwfhPR4r4TaIcfQCd/sc81fp4sWXAZU50+Qb2k9G l1JosC12ieDIIYrnmvjkhdljVaAx0olHOuMT43J9SMyaNlD2Bcs8YbfKG A==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602995" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 20 Sep 2021 15:38:01 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Mon, 20 Sep 2021 15:38:01 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Mon, 20 Sep 2021 15:38:01 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1632145081; x=1663681081; h=from:to:cc:subject:date:message-id; bh=oxjMgO5Nu55pXpZDCtj/PBprEQv8xnGttRdMKpBA91w=; b=kHerpXt+afaKitx8VdQz3g4uBfr1xtH/rG2LH8UW+h2MXSI34vzFfrHd k40cjhDhSIEwraXQOLqD4va4hNvb7kr1U7XbQ+luJk6exZP1N3c76dzRi k4qYu+VA5vpBLJ286Xey3CgI37oDbOvt8cfDvBFMn8n6ScU3+xIgd0DbR qegV9N34nP0ROBFhhd2C6lyS1W2WMcfUDzhLXCAMfN0MqdSCNLAcWwM3I J0/FFlrgEz/dUoeMZahO4Ofg5Yx0RNWWLYvyw0vt9bWeFqyKLnu3cYlFH R5uFasvIIxwfiveuYWXXCAT9nsFi0wHTQiW2ZFNqMRlKcponNrQLmbUMi A==; X-IronPort-AV: E=Sophos;i="5.85,308,1624312800"; d="scan'208";a="19602994" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 20 Sep 2021 15:38:00 +0200 Received: from schifferm-ubuntu4.tq-net.de (schifferm-ubuntu4.tq-net.de [10.121.48.12]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id DEF18280070; Mon, 20 Sep 2021 15:38:00 +0200 (CEST) From: Matthias Schiffer To: u-boot@lists.denx.de Cc: Marek Vasut , uboot-imx@nxp.com, Matthias Schiffer Subject: [PATCH 4/4] usb: ehci-mx6: use phy_type from device tree Date: Mon, 20 Sep 2021 15:37:25 +0200 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> References: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> In-Reply-To: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> References: <749d8078bfb257195293d582be16edc276526142.1632144459.git.matthias.schiffer@ew.tq-group.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Allow using different PHY interfaces for multiple USB controllers. When no value is set in DT, we fall back to CONFIG_MXC_USB_PORTSC for now to stay compatible with current board configurations. This also adds support for the HSIC mode of the i.MX7. Signed-off-by: Markus Niebel Signed-off-by: Matthias Schiffer --- drivers/usb/host/ehci-mx6.c | 25 +++++++++++++++++++++++-- include/usb/ehci-ci.h | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index c3e4170513e..1bd6147c76a 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "ehci.h" @@ -435,6 +436,7 @@ struct ehci_mx6_priv_data { struct clk clk; struct phy phy; enum usb_init_type init_type; + enum usb_phy_interface phy_type; #if !defined(CONFIG_PHY) int portnr; void __iomem *phy_addr; @@ -443,6 +445,24 @@ struct ehci_mx6_priv_data { #endif }; +static u32 mx6_portsc(enum usb_phy_interface phy_type) +{ + switch (phy_type) { + case USBPHY_INTERFACE_MODE_UTMI: + return PORT_PTS_UTMI; + case USBPHY_INTERFACE_MODE_UTMIW: + return PORT_PTS_UTMI | PORT_PTS_PTW; + case USBPHY_INTERFACE_MODE_ULPI: + return PORT_PTS_ULPI; + case USBPHY_INTERFACE_MODE_SERIAL: + return PORT_PTS_SERIAL; + case USBPHY_INTERFACE_MODE_HSIC: + return PORT_PTS_HSIC; + default: + return CONFIG_MXC_USB_PORTSC; + } +} + static int mx6_init_after_reset(struct ehci_ctrl *dev) { struct ehci_mx6_priv_data *priv = dev->priv; @@ -479,7 +499,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev) return 0; setbits_le32(&ehci->usbmode, CM_HOST); - writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); + writel(mx6_portsc(priv->phy_type), &ehci->portsc); setbits_le32(&ehci->portsc, USB_EN); mdelay(10); @@ -641,6 +661,7 @@ static int ehci_usb_probe(struct udevice *dev) priv->ehci = ehci; priv->init_type = type; + priv->phy_type = usb_get_phy_mode(dev_ofnode(dev)); #if CONFIG_IS_ENABLED(CLK) ret = clk_get_by_index(dev, 0, &priv->clk); @@ -690,7 +711,7 @@ static int ehci_usb_probe(struct udevice *dev) if (priv->init_type == USB_INIT_HOST) { setbits_le32(&ehci->usbmode, CM_HOST); - writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); + writel(mx6_portsc(priv->phy_type), &ehci->portsc); setbits_le32(&ehci->portsc, USB_EN); } diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index bf5d26faa53..2cdb3146e86 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -23,6 +23,7 @@ #define PORT_PTS_ULPI (2 << 30) #define PORT_PTS_SERIAL (3 << 30) #define PORT_PTS_PTW (1 << 28) +#define PORT_PTS_HSIC (1 << 25) #define PORT_PFSC (1 << 24) /* Defined on Page 39-44 of the mpc5151 ERM */ #define PORT_PTS_PHCD (1 << 23) #define PORT_PP (1 << 12)