From patchwork Thu Oct 21 04:55:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1544157 X-Patchwork-Delegate: andre.przywara@arm.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=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=SW6m8aIW; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm1 header.b=Vj5FhvQi; 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 4HZZwX4mqYz9sPf for ; Thu, 21 Oct 2021 15:57:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D017783548; Thu, 21 Oct 2021 06:57:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sholland.org 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=sholland.org header.i=@sholland.org header.b="SW6m8aIW"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Vj5FhvQi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B351383532; Thu, 21 Oct 2021 06:56:21 +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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1CB9A834B5 for ; Thu, 21 Oct 2021 06:55:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 4CEEA5812B7; Thu, 21 Oct 2021 00:55:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 21 Oct 2021 00:55:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=wBxd3KCDhywyD yZJuoNTztc2b+hMFs2vY2FUXRmtKhY=; b=SW6m8aIWpISsg77WQrBAdZKK4zPQf +px1Xk8HfGzFRgJ0x+D47sOO+E8tC27mQDKN2cS1abjJDg6Gj6LXXzz7s9t6haAz GvLCsYe5qwIA1jZzXjLnHLexlGvIQNULoZalkAlbfrp5GA5Gl+YEMnc+XwL3bQNz tkHpNFHpApAXjMTYrCsoD8+slmxtzj3GpaVd5rA+MOid75OS7KwEDY9oQYRrs1vu MFzg241e9IyOAPepAdGNfIVTH95FF/FvElUeD8gJG6h1kbXpC8m2+56k29CVxXML OK+kxcPLghM8K2A9+Sqpgj7VHoHFPxlCrDIlfvQ/yDoTRlxwbAq3blWXA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=wBxd3KCDhywyDyZJuoNTztc2b+hMFs2vY2FUXRmtKhY=; b=Vj5FhvQi YLJkdZJBVz+xmjDLFcWPrQc1iARknSu3yhEHgfsqekOpcj5mJ7VrZ5NDs51Nme1Z UeLjnvEsAjlslla2Djpa0FHdTOtplNHlmjYImhFsu5NoLU/Wt5/hmmT7jOY0bN5g r0IuzyIV8bjXwDcH9qR9oCQ8ux6eUPs50RPRCSsQRVxC7ax0odWOWe8ZtztFWfGb XS4Ev6eIiB4KI04gZD063JWql/R+B7JclMXJqkvg5D+X94+tcLGOPYZLx5/bhxth eWf3NXj9SyCkwc8DMYFXxnZMtWSMQLL8KuPl88aRUAFttKMw3S1bTu2JSbdWhurs cYQaOucqZgzi6A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvddvhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 21 Oct 2021 00:55:52 -0400 (EDT) From: Samuel Holland To: u-boot@lists.denx.de, Jagan Teki , Andre Przywara , Simon Glass Cc: Samuel Holland , Bharat Gooty , Heiko Schocher , Icenowy Zheng , Jernej Skrabec , Joe Hershberger , Pratyush Yadav , Ramon Fried , Rayagonda Kokatanur , Yuan Fang Subject: [RFC PATCH 06/23] sunxi: Skip non-DM UART pin setup when PINCTRL=y Date: Wed, 20 Oct 2021 23:55:23 -0500 Message-Id: <20211021045540.31578-7-samuel@sholland.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211021045540.31578-1-samuel@sholland.org> References: <20211021045540.31578-1-samuel@sholland.org> MIME-Version: 1.0 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 When a pinctrl driver is available, it will take care of setting up these pins. However, for now this code is still needed in SPL. Signed-off-by: Samuel Holland Reviewed-by: Simon Glass --- arch/arm/mach-sunxi/board.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index b4ba2a72c4..59febc3ac1 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -78,6 +78,7 @@ ulong board_get_usable_ram_top(ulong total_size) static int gpio_init(void) { __maybe_unused uint val; +#if !CONFIG_IS_ENABLED(PINCTRL) #if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F) #if defined(CONFIG_MACH_SUN4I) || \ defined(CONFIG_MACH_SUN7I) || \ @@ -160,6 +161,7 @@ static int gpio_init(void) #else #error Unsupported console port number. Please fix pin mux settings in board.c #endif +#endif #ifdef CONFIG_SUN50I_GEN_H6 /* Update PIO power bias configuration by copy hardware detected value */