Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp452581pxb; Thu, 9 Sep 2021 04:56:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjgVhWZAPjmHSVLKP9lxMSk71Wc4BdoYYN2xzscNREshqVaVPYZSl310WV48vbpB3yEGOp X-Received: by 2002:a5e:a813:: with SMTP id c19mr2349322ioa.199.1631188619746; Thu, 09 Sep 2021 04:56:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188619; cv=none; d=google.com; s=arc-20160816; b=VC8bmNvypfioGNZ7rA8HG3VuSbZgGYQ+d3HVHJN9kP7whD/6G7S/lZpnVbXWXCBbcb 5L/HdOysgI6mEjdrpI6pUpeWJARzHrK2Wnrm+WuV0fmQkbIiQ+NJ7Jw0e8vaLDDb4Sjp gAQqb5TPKC6506FNTF0t//tGO1DJhatJJiXSqcvPWeaBePSXVWdHscSvxat+PWrQqo4v ue6kD3wa6f7SqwQ2u3Ghtc1BWU8Gi4wMu5Cs6sCwLBTA1agR+B43nZAZaWIqR3cCutGu nuZZeijEv3LHxMFRxxfJH1wnStL5Ed9drPyintkisXgWsfv7Ds8aBxSdCT/u7l/E5wf2 PNyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+jct3FJ7QQscm7ITrySlPDrn9wG8beYcUIfGZy58R7U=; b=crYKjY0htahfZvSmOr/FNYMpM5JyTgPADFlSRJ0XcDrj2Ut4AtgNINlXI1MXaB4yhS epoFl2rmclGbl8RjdOJP5v7sBf/LnZek61LQO5SYvhZ58zRslI0EWKLYDf/+DAiKLD30 0lhL/Y+3NBJSHrKO0x9yzD2BtxYJZ1KY2+qJlNQhY+K06TxSMYIE9zngOZVRR1CjfQIE UiklCZujjd10gVoVm2uu7oZfaR2dK8iuBu4d5x5ouEPORwJ53eIk82gtGfxZzLiM9+6N u32Vrrve23fvemZsr2Yq8XH+ORPGmG+FFfcfIq0LUuos4T+7Z7bK1G0q6RtoNkyobj8Q WUhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nU9ooLTk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y6si1370947ion.66.2021.09.09.04.56.48; Thu, 09 Sep 2021 04:56:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nU9ooLTk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243800AbhIIL5K (ORCPT + 99 others); Thu, 9 Sep 2021 07:57:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:54974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241279AbhIILwr (ORCPT ); Thu, 9 Sep 2021 07:52:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 766A261360; Thu, 9 Sep 2021 11:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187864; bh=eH78ZO8br28WU6kJd750zNC7axdeaw4weOlZh2QrV2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nU9ooLTkqwqRC7wkI1oALc6EQsAnx5IIyYSnCIS+wp7eQG32P1rF8yQRIyuIlo809 XpEMVkr0amBFLD8nRTzfufj136K8pBD/gIFPACByPF+QjYYcN8a8pmnvc/paFB5pAL iU3W3aUagWFxiyVjyQlmHhQeQYshTlRobrc75E35pZOrm+MnWs6N9N8oS1bxGToIVZ KfnciRWcIz+ZpBpOZ1u+ogPIvjTPoczqHka7b9aViKsQERrZKpFtSRcFi1vOTWCiJD XnpaGVJHePWoNgUp5yHMuqhbWDRqzJVDpZFfbpZLDtcj1zw63T7DUZ64cJfPFMKo7b wcdNbxLEI71dg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Obergschwandtner , Thierry Reding , Sasha Levin , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 151/252] ARM: tegra: tamonten: Fix UART pad setting Date: Thu, 9 Sep 2021 07:39:25 -0400 Message-Id: <20210909114106.141462-151-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andreas Obergschwandtner [ Upstream commit 2270ad2f4e123336af685ecedd1618701cb4ca1e ] This patch fixes the tristate and pullup configuration for UART 1 to 3 on the Tamonten SOM. Signed-off-by: Andreas Obergschwandtner Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- arch/arm/boot/dts/tegra20-tamonten.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi index 95e6bccdb4f6..dd4d506683de 100644 --- a/arch/arm/boot/dts/tegra20-tamonten.dtsi +++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi @@ -185,8 +185,9 @@ conf_ata { nvidia,pins = "ata", "atb", "atc", "atd", "ate", "cdev1", "cdev2", "dap1", "dtb", "gma", "gmb", "gmc", "gmd", "gme", "gpu7", - "gpv", "i2cp", "pta", "rm", "slxa", - "slxk", "spia", "spib", "uac"; + "gpv", "i2cp", "irrx", "irtx", "pta", + "rm", "slxa", "slxk", "spia", "spib", + "uac"; nvidia,pull = ; nvidia,tristate = ; }; @@ -211,7 +212,7 @@ conf_crtp { conf_ddc { nvidia,pins = "ddc", "dta", "dtd", "kbca", "kbcb", "kbcc", "kbcd", "kbce", "kbcf", - "sdc"; + "sdc", "uad", "uca"; nvidia,pull = ; nvidia,tristate = ; }; @@ -221,10 +222,9 @@ conf_hdint { "lvp0", "owc", "sdb"; nvidia,tristate = ; }; - conf_irrx { - nvidia,pins = "irrx", "irtx", "sdd", "spic", - "spie", "spih", "uaa", "uab", "uad", - "uca", "ucb"; + conf_sdd { + nvidia,pins = "sdd", "spic", "spie", "spih", + "uaa", "uab", "ucb"; nvidia,pull = ; nvidia,tristate = ; }; -- 2.30.2