From patchwork Fri Apr 20 04:40:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 901644 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ILDAx516"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40S3GX0HZyz9s27 for ; Fri, 20 Apr 2018 14:46:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ADA67C2202F; Fri, 20 Apr 2018 04:42:23 +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=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 6F997C21FAE; Fri, 20 Apr 2018 04:41:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5476EC21FCC; Fri, 20 Apr 2018 04:41:38 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id E047DC22026 for ; Fri, 20 Apr 2018 04:41:34 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id l27so3688139pfk.12 for ; Thu, 19 Apr 2018 21:41:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=RW8BwrVRhN92wAf+5ueo29HarwvfrQ7aM0AI7/dyXOg=; b=ILDAx516lGDBbnQ4Csp6MHQpMjB+kVN6gPc0NmkdeE/i0QIc52cbsclnUw7XDHDBhG UlugCMeXDWH7zgGe4AMXvUc7XjlcuwbKK503elIo89oe9dkEIi73OaHR9bB3reETBK5m cijSHfm7NYUymmh2IOc4zHd0UYNq/Ahqr+6gvdS3r08bZvVv4VZl8WqEqfeQ51u8eIYt cpDUHGrd7OVDbwKDKsPk+fIMDWEvwW8qBprCblYb4B/nmTpyHCO7Rax2bdOUjMbv660v 6kroePcPauN49hyfPHPzSaVjarZFQlX2lYZKH6fJw1hBYJqxWzJn2Agd648+5QkYjZvW R5yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=RW8BwrVRhN92wAf+5ueo29HarwvfrQ7aM0AI7/dyXOg=; b=NnSH0WDfoUw7H16hFZHFkUQ+POgNSpgrgKSUQG3AgwmLWo1X6vzlkd7nEeYhrFhyqx qf1ZSworz/AkLk7E5C9QA6hPkrc1CugCxrIA8KJb3dsWEWwnv7WW/nh+da5mLh63v4Sh s+jN84DDtllkdbVpXYb7gCR++GZcYR2K/tXRisL/t3sAY2Gj47Sqi/aCVu2N4QZvd3mQ pKii/iILiDpMD2IpP2RUpF+z3hU/WcpoZEM7UM7Nuh5vo/PcUasEungGjkj2LlzPQveY oOfl0JL2Zx+A83oGqgTAcgOmv8BxrZJ3zmVRB8uexwXYnKTuD7OfmaC0Qmt0jr9X/JWC 5MPA== X-Gm-Message-State: ALQs6tDRxe04uFBliAhV3nVzPUPpc5UO5EUfYI7VWG278q3I7PMZE5qJ kaKxUZYH0C8kNUGHuTMDeN/tfA== X-Google-Smtp-Source: AIpwx4/6djj45PR7blA58goDjGKjHkfONaDqBGls+hylVlrIllmoJAX2Pg6bpdxDAO8EWEBEQFMWrA== X-Received: by 10.99.56.8 with SMTP id f8mr7361052pga.374.1524199293213; Thu, 19 Apr 2018 21:41:33 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id v23sm8058675pfm.59.2018.04.19.21.41.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Apr 2018 21:41:32 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Fri, 20 Apr 2018 12:40:52 +0800 Message-Id: <1524199258-14611-5-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1524199258-14611-1-git-send-email-kever.yang@rock-chips.com> References: <1524199258-14611-1-git-send-email-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH 04/10] rockchip: rk3188: add board_debug_uart_init() 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use board_debug_uart_init() for UART iomux init instead of do it in board_init_f, and move the function to soc file so that we can find all the soc/board setting in soc file and use a common board file. Signed-off-by: Kever Yang Reviewed-by: Philipp Tomsich Acked-by: Philipp Tomsich --- arch/arm/mach-rockchip/rk3188-board-spl.c | 12 +--------- arch/arm/mach-rockchip/rk3188/Makefile | 1 + arch/arm/mach-rockchip/rk3188/rk3188.c | 37 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 arch/arm/mach-rockchip/rk3188/rk3188.c diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c index 3ccc4f1..56ff77b 100644 --- a/arch/arm/mach-rockchip/rk3188-board-spl.c +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c @@ -99,17 +99,7 @@ void board_init_f(ulong dummy) int ret; /* Example code showing how to enable the debug UART on RK3188 */ -#ifdef EARLY_UART -#include - /* Enable early UART on the RK3188 */ -#define GRF_BASE 0x20008000 - struct rk3188_grf * const grf = (void *)GRF_BASE; - - rk_clrsetreg(&grf->gpio1b_iomux, - GPIO1B1_MASK << GPIO1B1_SHIFT | - GPIO1B0_MASK << GPIO1B0_SHIFT, - GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT | - GPIO1B0_UART2_SIN << GPIO1B0_SHIFT); +#ifdef CONFIG_DEBUG_UART /* * Debug UART can be used from here if required: * diff --git a/arch/arm/mach-rockchip/rk3188/Makefile b/arch/arm/mach-rockchip/rk3188/Makefile index 7fa0104..7dc123a 100644 --- a/arch/arm/mach-rockchip/rk3188/Makefile +++ b/arch/arm/mach-rockchip/rk3188/Makefile @@ -6,5 +6,6 @@ ifndef CONFIG_TPL_BUILD obj-y += clk_rk3188.o +obj-y += rk3188.o obj-y += syscon_rk3188.o endif diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c new file mode 100644 index 0000000..f2adcc9 --- /dev/null +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -0,0 +1,37 @@ +/* + * (C) Copyright 2018 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include +#include +#include +#include + +#ifdef CONFIG_DEBUG_UART_BOARD_INIT +void board_debug_uart_init(void) +{ + /* Enable early UART on the RK3188 */ +#define GRF_BASE 0x20008000 + struct rk3188_grf * const grf = (void *)GRF_BASE; + enum { + GPIO1B1_SHIFT = 2, + GPIO1B1_MASK = 3, + GPIO1B1_GPIO = 0, + GPIO1B1_UART2_SOUT, + GPIO1B1_JTAG_TDO, + + GPIO1B0_SHIFT = 0, + GPIO1B0_MASK = 3, + GPIO1B0_GPIO = 0, + GPIO1B0_UART2_SIN, + GPIO1B0_JTAG_TDI, + }; + + rk_clrsetreg(&grf->gpio1b_iomux, + GPIO1B1_MASK << GPIO1B1_SHIFT | + GPIO1B0_MASK << GPIO1B0_SHIFT, + GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT | + GPIO1B0_UART2_SIN << GPIO1B0_SHIFT); +} +#endif