Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp520314pxb; Thu, 9 Sep 2021 06:20:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQCDTG6CuaCP8PcgaKjNg2WSsy+gx5OoK/6Zlz4U2BSUNV7paj5VqEQ4DpN5pMR5ZyU01v X-Received: by 2002:a17:906:6943:: with SMTP id c3mr3377552ejs.550.1631193608288; Thu, 09 Sep 2021 06:20:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631193608; cv=none; d=google.com; s=arc-20160816; b=sZnPJIEAM6+GyeMeChFNDvfzhK1Gp1yynre9X6xSUVC2cfcbhrEx/VLJyqRFZIw/OV DsW/2EAMaLTAzDqluZV2QhCPfykqEB7yOYLwe5GBHhJwvfPWdUsvtD5zPfcThrkE5yC+ thT90d57fB1plfnQaD36i0S6IBDtezfl4W+zNhgHEKi8MA70xOo0Q9zcbkj6dhzQ+eH+ YcSec0+ZuEmolCIh8J1ShrDXuROBVDgjp4aWkI/8fjP/sax21UFP8HTRELf10KZjo6X9 nNd6uFPQE+tMJC1K4JMA5fBsE+POPVHVnXZO2SinvziIa9BpAproQGWPcZNZOTVaVcH3 reDw== 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=M1cjlylZaywH+IPi4ud/xhSk4JxkLOYvoTe/lVE+TP8=; b=i10zYgLNZi33DKJne4oHggqbr8Y8InDxtYdnwkKsqv3FDy6c6ZkY7ZvmP63J8go8zK RKa1mwIsYIsB5Zsna5CuRTvUtZlC/Hy6CH1K1panSQw9qTdlu/lWz+k0OWpBySsttlPq VSq5j5W57UqD7HjNP3dUklExC3ikRNmo/tj77mS8gwEWBVjHB3oYybkpFBmi2+rETVEn 4NdeBom9F5Pb8XbL+Bp8J9vzmmaFrDaZey2FxLUKnfyK06BW558o1qsF8hdXrOizb4qK fbyFqDphHwkM9qDD8fkU019mxn0J6tfBry9dTw/Vbdp3s5r5srRTbcHgXxknLVtN6nhZ WeVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Ivq/RDgD"; 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 hr1si2309816ejc.424.2021.09.09.06.19.41; Thu, 09 Sep 2021 06:20:08 -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="Ivq/RDgD"; 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 S1356136AbhIINNq (ORCPT + 99 others); Thu, 9 Sep 2021 09:13:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:42434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357665AbhIINDP (ORCPT ); Thu, 9 Sep 2021 09:03:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D773F63298; Thu, 9 Sep 2021 11:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188787; bh=Bi3WETzN51HufuWv6N46T1KgUw5xB/9dbiMDTx5rleY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ivq/RDgDc3jPKr6h2+vl1DZMiIG/N1bglqONB2NYbtkH/7QpbHaPMAln/K5XAlSvh 2Q3zn5V/XGn+55lV4Xnuoe2LNxIbL+E7QiiamA98lG2e1J8ZqsboNenYj7S3GwhU5K to5FJnd1+4OHnwkV0xEPMsX3AZjVo1BCpQAUu+KwUvUkdPiKmqd2zNQiYGmWp5VaWT xo3FkLfgyddC+OmGqTIkx/1hgtV45sbMqOxL/A7XjALLxHwZ27raMIHpM05DRKwOkV 8lZBAmVQjHjg7s9/t/DfA6E1WNH9oNerDioeCUsnqeHKnLk0RXIQLGquoCpfvTeAFi AEc53AiNsYACw== 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 4.14 37/59] ARM: tegra: tamonten: Fix UART pad setting Date: Thu, 9 Sep 2021 07:58:38 -0400 Message-Id: <20210909115900.149795-37-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115900.149795-1-sashal@kernel.org> References: <20210909115900.149795-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 872046d48709..4d69d67792d1 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