From patchwork Tue Jan 12 23:15:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 12015463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97BE9C433E0 for ; Tue, 12 Jan 2021 23:18:08 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 557B42312F for ; Tue, 12 Jan 2021 23:18:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 557B42312F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mdwgWyqUiWP1TDnhQLtWCyQh7vaHuj5AWN+KjCYCWew=; b=hZ0o37iF8tnpXisGCv7Y9xtAO EHTox9GqREMj696ZSO/DN4AT5nkw0lmIrLHRpIdyIRf/YAX3q5XDZXPoruBBX3cJVQ2aqy9TVksvP lTt8Ixz9+1RuT2jcO+HYuHZ8kxZptwbMVskV0jTpxuGf996tjm8vVY9peYM74eUs8t/txRNrDoEo0 TK9amVS5MPkTZZtz0HqD7Ge1vq2ozrsC/tKNaPYsMCnVp+X4+Ix1p7kYPChFxP2gRVOFB1KSk8k5N WuNbKaUNr+HjEAPn8qfYfw5fv6xW+ywYaJ/T7xm3h7sEIB/WBr1FstcehSGtArBhQ5e+cocypaH3U B5dIcrpmw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzStf-0006F5-CV; Tue, 12 Jan 2021 23:16:19 +0000 Received: from mail.andi.de1.cc ([2a01:238:4321:8900:456f:ecd6:43e:202c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzStR-00068y-JY for linux-arm-kernel@lists.infradead.org; Tue, 12 Jan 2021 23:16:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=RhNq2q57JbNU0fXGCEhBrFWXwpyX1eviIXn1vfJHw2c=; b=WYf5hmp/f6OoGjGRiz0TrasVkN Meoe1oRfa9ytxanNCHB/XYvnXmXtsCJfGDnDC1CNp8pHv3+TrPNLjAaMu/D+xDYq6UUhNyim+619K UJJDATyAZKHFGDgtRHrs5ClYuQl+oSmB9c+r0eCBf951s7FYZiCZdAxDmr5sYsgXCxEY=; Received: from p200300ccff1586001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:cc:ff15:8600:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1kzStL-0005SR-Kt; Wed, 13 Jan 2021 00:15:59 +0100 Received: from andi by aktux with local (Exim 4.92) (envelope-from ) id 1kzStL-0007o3-CV; Wed, 13 Jan 2021 00:15:59 +0100 From: Andreas Kemnade To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, j.neuschaefer@gmx.net, letux-kernel@openphoenux.org Subject: [PATCH 1/4] ARM: dts: imx6sl-tolino-shine2hd: correct console uart pinmux Date: Wed, 13 Jan 2021 00:15:45 +0100 Message-Id: <20210112231549.29957-2-andreas@kemnade.info> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112231549.29957-1-andreas@kemnade.info> References: <20210112231549.29957-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210112_181605_981548_1E258A40 X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Kemnade Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Configuration was correct enough to work with the pre-configuration done by uboot. While at it, also document the location. Signed-off-by: Andreas Kemnade --- arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts b/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts index caa279608803..e17c75c360f2 100644 --- a/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts +++ b/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts @@ -396,7 +396,7 @@ pinctrl_uart1: uart1grp { fsl,pins = < MX6SL_PAD_UART1_TXD__UART1_TX_DATA 0x1b0b1 - MX6SL_PAD_UART1_RXD__UART1_TX_DATA 0x1b0b1 + MX6SL_PAD_UART1_RXD__UART1_RX_DATA 0x1b0b1 >; }; @@ -543,6 +543,7 @@ }; &uart1 { + /* J4, through-holes */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; status = "okay"; From patchwork Tue Jan 12 23:15:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 12015467 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BA04C433E0 for ; Tue, 12 Jan 2021 23:18:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 060902312F for ; Tue, 12 Jan 2021 23:18:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 060902312F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nLOurdaUnxKCkvCO+Grg4p9bxsSa/ooeokuJaELeGPI=; b=kcaKqXFZdpQJBnBl0l50tL+Ef 1uQ9i2FQ7qFEBc/V1SC//FRuPzU7AUVkqob7XX5G6i66ads66viWOEWzIWksFYj9Vy7HynZg0uPbM js5nkkKceqeU03/7e5GMA3QGTyZeky9k3+zQIN+TB7mtufJpBAvJK2A0lAGTTTI4v4Oh/bDPfSEIa m/PB7haS0DGLygRTGZmXP+D/hzrCJTMyvq6paXTCsgRQVwh0aIA+5RMcSFIbdCgHF++yJIkzCacS2 Uf91dscxP5fsLQrFbWAb4QtO76PCheuoFhDFi33F7bqhVmxU1fdAodULsmacxk8tTSZagvfWNIGwg 2+8O9kTeQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzStk-0006H6-5r; Tue, 12 Jan 2021 23:16:24 +0000 Received: from mail.andi.de1.cc ([2a01:238:4321:8900:456f:ecd6:43e:202c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzStR-00069g-JW for linux-arm-kernel@lists.infradead.org; Tue, 12 Jan 2021 23:16:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=SlTp6snUwgt9T9iYILfU25FJTOenOYbmfd0naHgcAoQ=; b=IM7XXlG7FMNXwVxkXNBszy6eCY Br2rm5EYUJ1SfcvQ7nN541bQnBOKWLr8fflCXWz45jwgoSONjvcjDcAw4ynHbcfeZvdPEfOBc88dw jXR8u8J69pM1zAEOt81JS14wAc7GKeG9/g5l5Hsp9fkIZSirm0Rwzs6xGsfgCQiChtok=; Received: from p200300ccff1586001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:cc:ff15:8600:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1kzStN-0005Si-BV; Wed, 13 Jan 2021 00:16:01 +0100 Received: from andi by aktux with local (Exim 4.92) (envelope-from ) id 1kzStN-0007o6-35; Wed, 13 Jan 2021 00:16:01 +0100 From: Andreas Kemnade To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, j.neuschaefer@gmx.net, letux-kernel@openphoenux.org Subject: [PATCH 2/4] ARM: dts: imx6sl-tolino-shine2hd: add second uart Date: Wed, 13 Jan 2021 00:15:46 +0100 Message-Id: <20210112231549.29957-3-andreas@kemnade.info> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112231549.29957-1-andreas@kemnade.info> References: <20210112231549.29957-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210112_181606_002059_386585E2 X-CRM114-Status: GOOD ( 12.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Kemnade Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is another uart next to the console uart used by vendor uboot and kernel, enable it and document its location. Signed-off-by: Andreas Kemnade --- arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts b/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts index e17c75c360f2..6ea5f918d059 100644 --- a/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts +++ b/arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts @@ -340,7 +340,6 @@ MX6SL_PAD_KEY_ROW7__GPIO4_IO07 0x79 MX6SL_PAD_ECSPI2_MOSI__GPIO4_IO13 0x79 MX6SL_PAD_KEY_COL5__GPIO4_IO02 0x79 - MX6SL_PAD_KEY_ROW6__GPIO4_IO05 0x79 >; }; @@ -400,6 +399,13 @@ >; }; + pinctrl_uart4: uart4grp { + fsl,pins = < + MX6SL_PAD_KEY_ROW6__UART4_TX_DATA 0x1b0b1 + MX6SL_PAD_KEY_COL6__UART4_RX_DATA 0x1b0b1 + >; + }; + pinctrl_usbotg1: usbotg1grp { fsl,pins = < MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID 0x17059 @@ -549,6 +555,13 @@ status = "okay"; }; +&uart4 { + /* TP198, next to J4, SMD pads */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4>; + status = "okay"; +}; + &usdhc2 { pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; pinctrl-0 = <&pinctrl_usdhc2>; From patchwork Tue Jan 12 23:15:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 12015461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78730C433E6 for ; Tue, 12 Jan 2021 23:18:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30E132312F for ; Tue, 12 Jan 2021 23:18:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30E132312F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CbVM41s3WXTQalVjPFepY41qLQOCch/8Hk70mPuVHlI=; b=GP5GVOCTX+wUp2r+h4wji5nrJ jCDMthJ8nU7WWOGzeb5Nsusj1w629Qbw/97p2txBh6ECXDRXlWq20V3gu1ZrGHzAaVsMea8uK/OSg 66ElRML5luW88+YaFDoVC+soi1C7EUL4g1VyaSa0ibZnJxapK0jIGoca4IxNWVi47Iu0YGwBHh8gK 7deqEwXhjO56iWibEc1W02SoZZBCxhghj2TbgZJVb350NEUNMmxHL/b8h5S3gj4vHygRiMwERVPl8 P0rPgDYD2DkH3ddXEVODq9NDHxUvKzI1w8UjCiNkH03GIhU62aCtgkMqF1Av2lFBus2qID53IKA/h MCEHmqfHQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzStp-0006Ic-M7; Tue, 12 Jan 2021 23:16:31 +0000 Received: from mail.andi.de1.cc ([2a01:238:4321:8900:456f:ecd6:43e:202c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzStT-0006Am-2I for linux-arm-kernel@lists.infradead.org; Tue, 12 Jan 2021 23:16:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=llurKzs4SLWbCLfqwzW/yVsJA8mBlupdF0jizP/V73s=; b=Nve+5T7Cd0fS7buNQSGMtYWwEp tusKd3TOS86LPIlKKdIewbTfCDRFBICovtoPjbv1H1MFTup6gctnhV3r69+8U5Gkhlha4/6+bNIVD qg79ELNKMYHjeI2AYZu91AWkHpTTwxZYmHbOPmNRuqZLA08/yEwy0xT8qWRRkMjxGM5Q=; Received: from p200300ccff1586001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:cc:ff15:8600:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1kzStO-0005T2-TC; Wed, 13 Jan 2021 00:16:03 +0100 Received: from andi by aktux with local (Exim 4.92) (envelope-from ) id 1kzStO-0007o9-LJ; Wed, 13 Jan 2021 00:16:02 +0100 From: Andreas Kemnade To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, j.neuschaefer@gmx.net, letux-kernel@openphoenux.org Subject: [PATCH 3/4] ARM: dts: imx6sl-tolino-shine2hd: correct console uart pinmux Date: Wed, 13 Jan 2021 00:15:47 +0100 Message-Id: <20210112231549.29957-4-andreas@kemnade.info> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112231549.29957-1-andreas@kemnade.info> References: <20210112231549.29957-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210112_181607_267827_1D1A58C3 X-CRM114-Status: GOOD ( 12.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Kemnade Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Configuration was correct enough to work with the pre-configuration done by uboot. While at it, also document the location. Signed-off-by: Andreas Kemnade --- arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6sl-tolino-shine3.dts b/arch/arm/boot/dts/imx6sl-tolino-shine3.dts index 27143ea0f0f1..62d2ebda04ff 100644 --- a/arch/arm/boot/dts/imx6sl-tolino-shine3.dts +++ b/arch/arm/boot/dts/imx6sl-tolino-shine3.dts @@ -156,7 +156,7 @@ pinctrl_uart1: uart1grp { fsl,pins = < MX6SL_PAD_UART1_TXD__UART1_TX_DATA 0x1b0b1 - MX6SL_PAD_UART1_RXD__UART1_TX_DATA 0x1b0b1 + MX6SL_PAD_UART1_RXD__UART1_RX_DATA 0x1b0b1 >; }; From patchwork Tue Jan 12 23:15:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 12015469 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01FA5C433E0 for ; Tue, 12 Jan 2021 23:18:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 920852312F for ; Tue, 12 Jan 2021 23:18:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 920852312F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uLOooVnEt4SaS2rcHWlmMTZU0AyYSUAAS+2MkytwQaU=; b=UZGFks38RlTNF/1KmTjsZFTvr nGxurF8kwizviY7aLQ6Ke01022WQFn6QXcxrk9IgALIks3eWg1wO+/ZcPD4+ElDuGSSWH/sr3wy4A O2L3n3CJbF2K8/7ehkSCMJS3d1bVXPxzopsXSPQLo7Ih7Zfgjo6c3z/mJQDzSSp09YLzaENR0NRWD Vshm/imFtuX/8nathPeZO4LMoDHmsOStDBfbeakZgQw7BFhBNX/3Dq+wPGCYUbhB/8TAHDFNtCCsW /LWFqsW9z1pUe1BlW9XSXCH2nfqDlgVdAk+CKI8Ayb0dLSizjpZXKxpsaF+7HToVrNlYuii4pY7jM ah0MVeOIQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzSu5-0006Qe-Of; Tue, 12 Jan 2021 23:16:45 +0000 Received: from mail.andi.de1.cc ([2a01:238:4321:8900:456f:ecd6:43e:202c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzStj-0006Gg-3S for linux-arm-kernel@lists.infradead.org; Tue, 12 Jan 2021 23:16:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20180802; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=scWPcaQPFYoop25JOTONGlOQdYVEvi//1NfKWBjr6uU=; b=OFXLk2tB0fOYU8BmkAkZ3fJj/P rWeSc6j7gp0pUt7Q/NurdyjQGkb+W/zzVmOUVv/aqh3PF0BsoOXqTHgEOmfDUIECv+zUbR7Yk+Hiw /7tqCCtHRGof+qTH3Vo5HntcakdkJczr8ALCCJVF8rfPqNO4eG8ipnQ+bA0MgHW/DA8Q=; Received: from p200300ccff1586001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:cc:ff15:8600:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1kzSte-0005Ts-O7; Wed, 13 Jan 2021 00:16:18 +0100 Received: from andi by aktux with local (Exim 4.92) (envelope-from ) id 1kzSte-0007oG-G9; Wed, 13 Jan 2021 00:16:18 +0100 From: Andreas Kemnade To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, j.neuschaefer@gmx.net, letux-kernel@openphoenux.org Subject: [PATCH 4/4] ARM: dts: imx: e60k02: add second uart Date: Wed, 13 Jan 2021 00:15:49 +0100 Message-Id: <20210112231549.29957-6-andreas@kemnade.info> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112231549.29957-1-andreas@kemnade.info> References: <20210112231549.29957-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210112_181623_307836_0BAE2C38 X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Kemnade Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is another uart next to the console uart used by vendor uboot and kernel, enable it and document its location. Signed-off-by: Andreas Kemnade --- arch/arm/boot/dts/e60k02.dtsi | 6 ++++++ arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 13 ++++++++++++- arch/arm/boot/dts/imx6sll-kobo-clarahd.dts | 13 ++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/e60k02.dtsi b/arch/arm/boot/dts/e60k02.dtsi index 3af1ab4458ef..cfb239d5186a 100644 --- a/arch/arm/boot/dts/e60k02.dtsi +++ b/arch/arm/boot/dts/e60k02.dtsi @@ -278,6 +278,12 @@ }; &uart1 { + /* J4, through-hole */ + status = "okay"; +}; + +&uart4 { + /* TP198, next to J4, SMD pads */ status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6sl-tolino-shine3.dts b/arch/arm/boot/dts/imx6sl-tolino-shine3.dts index 62d2ebda04ff..e3f1e8d79528 100644 --- a/arch/arm/boot/dts/imx6sl-tolino-shine3.dts +++ b/arch/arm/boot/dts/imx6sl-tolino-shine3.dts @@ -94,7 +94,6 @@ MX6SL_PAD_KEY_ROW7__GPIO4_IO07 0x79 MX6SL_PAD_ECSPI2_MOSI__GPIO4_IO13 0x79 MX6SL_PAD_KEY_COL5__GPIO4_IO02 0x79 - MX6SL_PAD_KEY_ROW6__GPIO4_IO05 0x79 >; }; @@ -160,6 +159,13 @@ >; }; + pinctrl_uart4: uart4grp { + fsl,pins = < + MX6SL_PAD_KEY_ROW6__UART4_TX_DATA 0x1b0b1 + MX6SL_PAD_KEY_COL6__UART4_RX_DATA 0x1b0b1 + >; + }; + pinctrl_usbotg1: usbotg1grp { fsl,pins = < MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID 0x17059 @@ -300,6 +306,11 @@ pinctrl-0 = <&pinctrl_uart1>; }; +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4>; +}; + &usdhc2 { pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; pinctrl-0 = <&pinctrl_usdhc2>; diff --git a/arch/arm/boot/dts/imx6sll-kobo-clarahd.dts b/arch/arm/boot/dts/imx6sll-kobo-clarahd.dts index 7214d1c98249..90b32f5eb529 100644 --- a/arch/arm/boot/dts/imx6sll-kobo-clarahd.dts +++ b/arch/arm/boot/dts/imx6sll-kobo-clarahd.dts @@ -104,7 +104,6 @@ MX6SLL_PAD_KEY_ROW7__GPIO4_IO07 0x79 MX6SLL_PAD_ECSPI2_MOSI__GPIO4_IO13 0x79 MX6SLL_PAD_KEY_COL5__GPIO4_IO02 0x79 - MX6SLL_PAD_KEY_ROW6__GPIO4_IO05 0x79 >; }; @@ -170,6 +169,13 @@ >; }; + pinctrl_uart4: uart4grp { + fsl,pins = < + MX6SLL_PAD_KEY_ROW6__UART4_DCE_TX 0x1b0b1 + MX6SLL_PAD_KEY_COL6__UART4_DCE_RX 0x1b0b1 + >; + }; + pinctrl_usbotg1: usbotg1grp { fsl,pins = < MX6SLL_PAD_EPDC_PWR_COM__USB_OTG1_ID 0x17059 @@ -302,6 +308,11 @@ pinctrl-0 = <&pinctrl_uart1>; }; +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4>; +}; + &usdhc2 { pinctrl-names = "default", "state_100mhz", "state_200mhz","sleep"; pinctrl-0 = <&pinctrl_usdhc2>;