[2/2] ARM: omap3_logic: Remove hard-coded USB muxing

Message ID	20220226164948.712767-2-aford173@gmail.com
State	Accepted
Commit	735ec22375fb3c7e85e79c6c6a8a2b788af1e98c
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Adam Ford <aford173@gmail.com> To: u-boot@lists.denx.de Cc: trini@konsulko.com, aford@beaconembedded.com, Adam Ford <aford173@gmail.com> Subject: [PATCH 2/2] ARM: omap3_logic: Remove hard-coded USB muxing Date: Sat, 26 Feb 2022 10:49:48 -0600 Message-Id: <20220226164948.712767-2-aford173@gmail.com> In-Reply-To: <20220226164948.712767-1-aford173@gmail.com> References: <20220226164948.712767-1-aford173@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[1/2] ARM: dts: logicpd-som-lv: Resync DTS files with Linux 5.17-rc5 \| expand [1/2] ARM: dts: logicpd-som-lv: Resync DTS files with Linux 5.17-rc5 [2/2] ARM: omap3_logic: Remove hard-coded USB muxing

Message ID

20220226164948.712767-2-aford173@gmail.com

State

Accepted

Commit

735ec22375fb3c7e85e79c6c6a8a2b788af1e98c

Delegated to:

Tom Rini

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: bilbo.ozlabs.org;
	dkim=pass (2048-bit key;
 unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256
 header.s=20210112 header.b=D2T5ayZQ;
	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=<UNKNOWN>)
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 4K5Xh20cHBz9sGL
	for <incoming@patchwork.ozlabs.org>; Sun, 27 Feb 2022 03:50:26 +1100 (AEDT)
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
	by phobos.denx.de (Postfix) with ESMTP id 6C2FB83BF6;
	Sat, 26 Feb 2022 17:50:15 +0100 (CET)
Authentication-Results: phobos.denx.de;
 dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="D2T5ayZQ";
	dkim-atps=neutral
Received: by phobos.denx.de (Postfix, from userid 109)
 id 6B0A683B7C; Sat, 26 Feb 2022 17:50:06 +0100 (CET)
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,DKIM_SIGNED,
 DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,
 FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,
 UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2
Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com
 [IPv6:2607:f8b0:4864:20::d2b])
 (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
 (No client certificate requested)
 by phobos.denx.de (Postfix) with ESMTPS id 7A8FA839FB
 for <u-boot@lists.denx.de>; Sat, 26 Feb 2022 17:50:01 +0100 (CET)
Authentication-Results: phobos.denx.de;
 dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: phobos.denx.de;
 spf=pass smtp.mailfrom=aford173@gmail.com
Received: by mail-io1-xd2b.google.com with SMTP id 195so10226774iou.0
 for <u-boot@lists.denx.de>; Sat, 26 Feb 2022 08:50:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=cUTUVnJk0c5leK8HZTZYrmDM+bgi68KZYzvqPFhg/7E=;
 b=D2T5ayZQ6FlW6Egy2UVlTPtJWCllQqdHcHHdQwllc9mREkWP7dxM2T5b5EhNvLMp0B
 9wdsKKv9q7NoAWR6erT7qZHCTP/Sq+8f9jYrLE3V5A2WhsZmzzZnH+XWdRx974MXIlAT
 EhZ+NQ4/TAXp0XZ0w2/ymNFQ6+U1yrIGHt6D4HrjqWsjkmAW5sHEMn7l5Ciket07Cx9f
 bZRzr2jVbNaLZfCYoZgFvXahT5VOcH2H33rkbjIlxhhmSGRwZK/Ru82fSMVxgZkRpB3C
 7oXD8ohncpQmDUV+XB8+uhnjd+zFcghI5PEugFy6BZ5Xp0JSF83jvGCe3tUmql5lfbOL
 xypA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=cUTUVnJk0c5leK8HZTZYrmDM+bgi68KZYzvqPFhg/7E=;
 b=7kZu7mhS2R8bslSnlFL7J7NYE5ES/c9HHqdKU5hz+0l5Be3RdKE9Y2Aat/d1e426KS
 37cF3EyrhvNrgJBfk5VFZJDFBCSZ8hVldiKpptJXhLvI+TBjnYccru/eB3oJpQHy42yy
 l6NCYoI2D/WMgmTXIbhJCLWutn/w+k/6bg+RllxeRH9ji0BTdQvnjgD1V0iGYtKvoPh2
 qRalcxnJuUl8gAD7m3kTvQ1XleHPzuzMfKknUNjcfX2euJwm+miIQ1BJyDQR1EzCs4nc
 oeuaRMOTf8Mnw5LvB9qsvb0aSkwQnLfaYgxfZ8WEyJjOm/+20C4GlyEuq2uwjf4Y2EZM
 qp7Q==
X-Gm-Message-State: AOAM533KXwd8RxPBeUJ2gRAoIZGKGQPcX3aAHFrd+SqE0WpaE95r3FFA
 Tm9OnT6du+zjw9WJNCSgC+kzy4IB9UNaYw==
X-Google-Smtp-Source: 
 ABdhPJznOZ2tUf5Q7NwmSlf0m9y9jf35zyl2OCQObckyiL4f7IdLRybNEynYzoq681nugT9GsiZzIg==
X-Received: by 2002:a05:6638:346f:b0:30e:149c:4dbb with SMTP id
 q47-20020a056638346f00b0030e149c4dbbmr11033314jav.31.1645894199786;
 Sat, 26 Feb 2022 08:49:59 -0800 (PST)
Received: from aford-IdeaCentre-A730.lan
 ([2601:448:8400:9e8:beb5:da6a:8b8:5516])
 by smtp.gmail.com with ESMTPSA id
 r3-20020a056602234300b0064075bc3c8asm3162583iot.11.2022.02.26.08.49.58
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 26 Feb 2022 08:49:58 -0800 (PST)
From: Adam Ford <aford173@gmail.com>
To: u-boot@lists.denx.de
Cc: trini@konsulko.com, aford@beaconembedded.com,
 Adam Ford <aford173@gmail.com>
Subject: [PATCH 2/2] ARM: omap3_logic: Remove hard-coded USB muxing
Date: Sat, 26 Feb 2022 10:49:48 -0600
Message-Id: <20220226164948.712767-2-aford173@gmail.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20220226164948.712767-1-aford173@gmail.com>
References: <20220226164948.712767-1-aford173@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: u-boot@lists.denx.de
X-Mailman-Version: 2.1.39
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.103.5 at phobos.denx.de
X-Virus-Status: Clean

Series

[1/2] ARM: dts: logicpd-som-lv: Resync DTS files with Linux 5.17-rc5 | expand

Comments

Tom Rini March 14, 2022, 1:08 p.m. UTC | #1

On Sat, Feb 26, 2022 at 10:49:48AM -0600, Adam Ford wrote:

> With recent fixes to USB pinmuxing in the device trees, there
> is no need to hard-code the pinmuxing in this table.  It is
> all handled in DM now.
> 
> Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> diff --git a/board/logicpd/omap3som/omap3logic.h b/board/logicpd/omap3som/omap3logic.h
> index 3a6f6c1f4e..ba63aa04c3 100644

Applied to u-boot/next, thanks!

diff --git a/board/logicpd/omap3som/omap3logic.h b/board/logicpd/omap3som/omap3logic.h
index 3a6f6c1f4e..ba63aa04c3 100644
--- a/board/logicpd/omap3som/omap3logic.h
+++ b/board/logicpd/omap3som/omap3logic.h
@@ -233,23 +233,6 @@  void set_muxconf_regs(void)
 	MUX_VAL(CP(D2D_SREAD), (IEN  | PTD | DIS | M0)) /*d2d_sread*/
 	MUX_VAL(CP(D2D_MBUSFLAG), (IEN  | PTD | DIS | M0)) /*d2d_mbusflag*/
 	MUX_VAL(CP(D2D_SBUSFLAG), (IEN  | PTD | DIS | M0)) /*d2d_sbusflag*/
-
-#ifdef CONFIG_USB_EHCI_OMAP /* SOM-LV Uses EHCI-OMAP */
-	MUX_VAL(CP(ETK_D14_ES2), (IEN  | PTD | DIS | M3)) /*HSUSB2_DATA0*/
-	MUX_VAL(CP(ETK_D15_ES2), (IEN  | PTD | DIS | M3)) /*HSUSB2_DATA1*/
-	MUX_VAL(CP(MCSPI1_CS3), (IEN  | PTD | EN  | M0)) /*HSUSB2_DATA2*/
-	MUX_VAL(CP(MCSPI2_CS1), (IEN  | PTD | EN  | M0)) /*HSUSB2_DATA3*/
-	MUX_VAL(CP(MCSPI2_SIMO), (IEN  | PTD | DIS | M0)) /*HSUSB2_DATA4*/
-	MUX_VAL(CP(MCSPI2_SOMI), (IEN  | PTD | DIS | M0)) /*HSUSB2_DATA5*/
-	MUX_VAL(CP(MCSPI2_CS0), (IEN  | PTD | EN  | M0)) /*HSUSB2_DATA6*/
-	MUX_VAL(CP(MCSPI2_CLK), (IEN  | PTD | DIS | M0)) /*HSUSB2_DATA7*/
-	MUX_VAL(CP(SYS_BOOT2),	(IEN  | PTD | DIS | M4)) /* GPIO_4 */
-	MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTU | DIS | M3)) /*HSUSB2_CLK*/
-	MUX_VAL(CP(ETK_D11_ES2), (IDIS | PTU | DIS | M3)) /*HSUSB2_STP*/
-	MUX_VAL(CP(ETK_D12_ES2), (IEN  | PTU | DIS | M3)) /*HSUSB2_DIR*/
-	MUX_VAL(CP(ETK_D13_ES2), (IEN  | PTD | DIS | M3)) /*HSUSB2_NXT*/
-#endif
-
 }
 
 #endif

[2/2] ARM: omap3_logic: Remove hard-coded USB muxing

Commit Message

Comments

Patch