Message ID | 20210411162901.7238-20-marex@denx.de |
---|---|
State | Accepted |
Commit | 1aae8a35a202d4400adbb7780e1b384aa7aada37 |
Delegated to: | Marek Vasut |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=<UNKNOWN>) Authentication-Results: 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=KvUbofgD; dkim-atps=neutral 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 4FJHWV6TNvz9rx6 for <incoming@patchwork.ozlabs.org>; Mon, 12 Apr 2021 02:34:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1B5E81578; Sun, 11 Apr 2021 18:32:50 +0200 (CEST) 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=1618158771; bh=6hjNST2ov/ARailCiRrLdEhlnmBUTPG389oA8Ax1wCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=KvUbofgDanjLHojjmChcBCjzzEkoesy+6PiqmaEVbfyaGvR1MelFT5ZEzOOX/Ua7H P7smdlKUnwOwWVfodsnQoIcUMF+Yjdg6F6mLNXKOJKgtfwhYBcrB46Vnh50RehRNdJ 0NEVFUll9tnMwozZJ8b8XyelS0hzP+gEAAb4CgbRdgfHfcssbzGJUiZvkIMhtvL/+r WLUf5ufMAM2hOsRBXcRuhDmM/d2uDvUQEXgGxPwhpKb94JL6O4nc9mIhgIP9tJy04E E4NA+CpV2C7nxRsxH835Kk5iUXbb6e59Yk0HnT87nZELuocvTmqHOLrtIbwB4poGWQ GB6KfDOXIQeKQ== Received: by phobos.denx.de (Postfix, from userid 109) id DF2EB8051F; Sun, 11 Apr 2021 18:30:31 +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=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [IPv6:2001:a60:0:28:0:1:25:1]) (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 020F580C66 for <u-boot@lists.denx.de>; Sun, 11 Apr 2021 18:29:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marex@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FJHQH4mYyz1s1VK; Sun, 11 Apr 2021 18:29:43 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FJHQH4Y6Gz1qqw9; Sun, 11 Apr 2021 18:29:43 +0200 (CEST) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id pFDICaVQ0KMG; Sun, 11 Apr 2021 18:29:42 +0200 (CEST) X-Auth-Info: kQmaqWa0Rx1127JhssOm6GDdiAirZ9lQ8PPMAZutPHE= Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Sun, 11 Apr 2021 18:29:42 +0200 (CEST) From: Marek Vasut <marex@denx.de> To: u-boot@lists.denx.de Cc: Marek Vasut <marex@denx.de>, Fabio Estevam <festevam@gmail.com>, Peng Fan <peng.fan@nxp.com>, Stefano Babic <sbabic@denx.de>, Ye Li <ye.li@nxp.com>, uboot-imx <uboot-imx@nxp.com> Subject: [PATCH V2 20/24] usb: ehci-mx6: Set default CONFIG_MXC_USB_PORTSC if not defined Date: Sun, 11 Apr 2021 18:28:57 +0200 Message-Id: <20210411162901.7238-20-marex@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210411162901.7238-1-marex@denx.de> References: <20210411162901.7238-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
[V2,01/24] phy: nop-phy: Add standard usb-nop-xceiv compat string
|
expand
|
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 8e20941855..d3308c60ee 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -68,6 +68,11 @@ DECLARE_GLOBAL_DATA_PTR; #define UCMD_RUN_STOP (1 << 0) /* controller run/stop */ #define UCMD_RESET (1 << 1) /* controller reset */ +/* If this is not defined, assume MX6/MX7/MX8M SoC default */ +#ifndef CONFIG_MXC_USB_PORTSC +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#endif + /* Base address for this IP block is 0x02184800 */ struct usbnc_regs { u32 ctrl[4]; /* otg/host1-3 */
There is now multiple copies of CONFIG_MXC_USB_PORTSC in configs set to PORT_PTS_UTMI | PORT_PTS_PTW, which is in fact the default register value for MX6, MX7 and MX7ULP. Define the default value of CONFIG_MXC_USB_PORTSC in the driver and use it in case CONFIG_MXC_USB_PORTSC is not defined in config, to reduce the duplication. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Ye Li <ye.li@nxp.com> Cc: uboot-imx <uboot-imx@nxp.com> --- V2: New patch --- drivers/usb/host/ehci-mx6.c | 5 +++++ 1 file changed, 5 insertions(+)