From patchwork Fri Feb 15 22:20:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043244 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441Shc63T2z9s3l for ; Sat, 16 Feb 2019 09:33:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7A7E4C21FB5; Fri, 15 Feb 2019 22:25:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 57A26C22026; Fri, 15 Feb 2019 22:22:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A3B4EC21F98; Fri, 15 Feb 2019 22:21:52 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id C3C78C22047 for ; Fri, 15 Feb 2019 22:21:48 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LkhhS-1hT0kh3XwC-00aZ0x; Fri, 15 Feb 2019 23:21:40 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:35 +0100 Message-Id: <20190215222039.10005-20-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:fh9s/9ybRfTfB01cKP1fri7Ha2NftdwT07SWceNA7ZU+axGgLKw 9ecmSDZJxIXUPxi9V8OfAZCwnHRFclXn4ZUKrLzoha4rhP5Z+AzSI+8wBiUO7GSMYZlVIIF /qsB2T2t7fHwyUssMCqvi4uBS60RmYZu1FXdkN6ORZcBsgn2w4wd5RUUshS79VbzNTesvQf 9YMgLhDRR3Vw06NlNZpHQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:XhFOpPnzHZw=:feRVDNeTmYFJvVtMWiTW8W 34d+AgDYyvKcPuEZ2PYTPTO7kZBx1dOg4id+veBWQ8cUILYyZUh/RWd9a9HWQrCm2Qxy4DM61 hHpwah4AiBGXt3KZfyq9ErkWUbmLuaxDYUACSSh7fpM/yEUYqY+Pg3i1JM5EFxsCi33Rq49Nm nglkvO2SMx9uF63q8+aPZpTi1o6v/Ty+1TH99CMnFJyr55N7FKubWhHIggEw2kxq+p9t8mX2C RhM5BlNQBMiBr/cX/2itZ6x2R0AJ385n7g8AtdkScbDfXTa0zr++yUUKL3NBNCgu1HNJepQqA ItFYWLVNwL59AaCbDhzO5/lDJNBF5zg1HOXvASxcqAPFyPWpc4LS2StK9pssoEPNcnlgHQZZs KqjETiDk/srLXj7yBnqets1aCnJqeyzlHKvHMWuj/7kju2YFo3+mg7qQolEEVe7G56aUi+2VN 872+1iF8JIALcQRTnJe0u4VPJDLY3qcHRpiI3kA7FpL6qdPooCX63JbZitemnqYyCongkxbOz vy/dMPP014u1iw1I5VBKK1H5mu5iD+Xo11tQB+1nZzOtri5S4nm0RTJomv1OLo/CPEk8CTTpx AQKgi9fsmpp2rf/nOn0JEOTazTOAPiSEPT43eRprJWNvL8BcVHeKaAwZNJQ5bQSqEwHsn2qLp HRKQ0fQ4X7oQRLrTDysnZoNeedwIPMvW+8FYBs7s9gva8GCgSiPF41PEFB7x5uZ3KsWZSfK2C vtRoB9VmFZk75g+6sEVJDqYIOyV6svvvo4WyKQ== Cc: Tom Rini , Stefan Agner , Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v1 19/22] arm: vf610: add uart2 clock/pinmux support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Stefan Agner Add support for Vybrid's UART2 (Colibri UART_B). Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- arch/arm/include/asm/arch-vf610/crm_regs.h | 1 + arch/arm/include/asm/arch-vf610/iomux-vf610.h | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h index 9fce49ddc6..0c9ed52933 100644 --- a/arch/arm/include/asm/arch-vf610/crm_regs.h +++ b/arch/arm/include/asm/arch-vf610/crm_regs.h @@ -200,6 +200,7 @@ struct anadig_reg { #define CCM_REG_CTRL_MASK 0xffffffff #define CCM_CCGR0_UART0_CTRL_MASK (0x3 << 14) #define CCM_CCGR0_UART1_CTRL_MASK (0x3 << 16) +#define CCM_CCGR0_UART2_CTRL_MASK (0x3 << 18) #define CCM_CCGR0_DSPI0_CTRL_MASK (0x3 << 24) #define CCM_CCGR0_DSPI1_CTRL_MASK (0x3 << 26) #define CCM_CCGR1_USBC0_CTRL_MASK (0x3 << 8) diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h index 01bc2998b8..8ba03e5a17 100644 --- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h +++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h @@ -132,10 +132,14 @@ enum { VF610_PAD_PTD24__GPIO_70 = IOMUX_PAD(0x0118, 0x0118, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), VF610_PAD_PTD23__NF_IO7 = IOMUX_PAD(0x011c, 0x011c, 2, __NA_, 0, VF610_NFC_IO_PAD_CTRL), VF610_PAD_PTD0__QSPI0_A_QSCK = IOMUX_PAD(0x013c, 0x013c, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), + VF610_PAD_PTD0__UART2_TX = IOMUX_PAD(0x013c, 0x013c, 2, 0x38c, 2, VF610_UART_PAD_CTRL), VF610_PAD_PTD1__QSPI0_A_CS0 = IOMUX_PAD(0x0140, 0x0140, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), + VF610_PAD_PTD1__UART2_RX = IOMUX_PAD(0x0140, 0x0140, 2, 0x388, 2, VF610_UART_PAD_CTRL), VF610_PAD_PTD2__QSPI0_A_DATA3 = IOMUX_PAD(0x0144, 0x0144, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), + VF610_PAD_PTD2__GPIO_81 = IOMUX_PAD(0x0144, 0x0144, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), VF610_PAD_PTD3__QSPI0_A_DATA2 = IOMUX_PAD(0x0148, 0x0148, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), - VF610_PAD_PTD4__GPIO_83 = IOMUX_PAD(0x014C, 0x014C, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), + VF610_PAD_PTD3__GPIO_82 = IOMUX_PAD(0x0148, 0x0148, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), + VF610_PAD_PTD4__GPIO_83 = IOMUX_PAD(0x014C, 0x014C, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), VF610_PAD_PTD4__QSPI0_A_DATA1 = IOMUX_PAD(0x014c, 0x014c, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), VF610_PAD_PTD5__QSPI0_A_DATA0 = IOMUX_PAD(0x0150, 0x0150, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), VF610_PAD_PTD7__QSPI0_B_QSCK = IOMUX_PAD(0x0158, 0x0158, 1, __NA_, 0, VF610_QSPI_PAD_CTRL),