From patchwork Wed Apr 24 03:59:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089881 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OQV/h+tw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmvl0vN8z9s3q for ; Wed, 24 Apr 2019 14:06:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 98C8BC21E13; Wed, 24 Apr 2019 04:05:27 +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_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 1313CC21DD7; Wed, 24 Apr 2019 04:05:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A0CF5C21E02; Wed, 24 Apr 2019 04:00:22 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id A867BC21E0D for ; Wed, 24 Apr 2019 04:00:22 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t17so22945045wrw.13 for ; Tue, 23 Apr 2019 21:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V7Xx9rAdsAJtBVgm2n+4hoe9P6aerO6tv2Zuugy3Yso=; b=OQV/h+twSZN6g1iNbA4avlnEa3vkMcncdxFrCJLSLdJqCWxAMMGUFkoOtlp2RJD/Pt oqZCkkHG7p73Kb/CX4FhbLbPU9OuyuKWQPC7cy+KgDxG8LV9QEnsw35WyjQGj1X00bzK ntmCz6A2dNHw8+G4+/8VbSLznMrWJopmlgkWUJiVULod6H75CE196wxYVhntJkrAHWd+ EIabfekApeuH1dS4bOMrlS+Vgr/5eDK1PUbyaOD058W7vgWlbPmLUwMAkeymStxZd8ZT tMkTLV5Q699UGDLyuf/tMUzQnhh/ra0kqZe98MQW8g15UoxGTbAhfKSZLtWRMdb0p4C+ Vd4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V7Xx9rAdsAJtBVgm2n+4hoe9P6aerO6tv2Zuugy3Yso=; b=S1CTcGDap6CtftGv+Fiq4xCQMyDAE/rInklpMEdnaShyXWBvW1Ijn2p6tRajXSkvpT IEgsyi9qGLBWyQppMAjaev8Vy3YTFpcLtwIEoOyMTBXUCvYsGbUAPdBQQ8/9zKamN9VM 0uS4FmxaUhtm+LXoWT1RAZ3nWVuii88TOQNb66uFDrVZE616WHs2r3tJa+HuiRERMtfJ qpp81dnxR79hmyer2uyOSFrTDZAP1sa9z6kZeevR6jxhs4MEa0/epKG0iSMvv3uTqAwN Nki+/Fe932KUepA/UxeCEM2h7cgjXbP8SEO+gYF9Nhzb76QVV0FBbahMV2c1JgK6AMrg yrfA== X-Gm-Message-State: APjAAAW8+g17bqGAv0acj/So7RPlbPt79S+JK2Zf2T8BFwdRXoDoPWa8 nKrLmGeEbKuPhJzLWVHv8ns4Rg== X-Google-Smtp-Source: APXvYqyieHuQtYndmEBFbZ6+zXU47u7IFUSSBMMM0tTii6nGGjfq+AXaTOeWRT1zGX6jbWgo872VTA== X-Received: by 2002:a5d:6646:: with SMTP id f6mr5736366wrw.68.1556078422345; Tue, 23 Apr 2019 21:00:22 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:21 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:27 +0800 Message-Id: <1556078372-26851-5-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 4/9] pico-imx7d: Correct uart clock root 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" Correct uart clock root ID. Incorrect ID may result the clock is gated because rate value 0 is returned in imx_get_uartclk() Signed-off-by: Jun Nie --- arch/arm/include/asm/arch-mx7/clock.h | 18 ++++++++++++++++++ arch/arm/mach-imx/Kconfig | 7 +++++++ arch/arm/mach-imx/mx7/clock.c | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h index f56564e..dc91111 100644 --- a/arch/arm/include/asm/arch-mx7/clock.h +++ b/arch/arm/include/asm/arch-mx7/clock.h @@ -175,6 +175,24 @@ enum clk_root_index { CLK_ROOT_MAX, }; +#if (CONFIG_IMX_CONSOLE_UART_ID == 1) +#define UART_CLK_ROOT UART1_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 2) +#define UART_CLK_ROOT UART2_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 3) +#define UART_CLK_ROOT UART3_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 4) +#define UART_CLK_ROOT UART4_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 5) +#define UART_CLK_ROOT UART5_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 6) +#define UART_CLK_ROOT UART6_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 7) +#define UART_CLK_ROOT UART7_CLK_ROOT +#else +#error "Invalid IMX UART ID for serial console is defined" +#endif + struct clk_root_setting { enum clk_root_index root; u32 setting; diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ec09ef2..7c5db30 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -27,6 +27,13 @@ config IMX_BOOTAUX help bootaux [addr] to boot auxiliary core. +config IMX_CONSOLE_UART_ID + int "UART ID for console" + default 1 + depends on ARCH_MX7 + help + Specify the UART ID that's for serial console. + config USE_IMXIMG_PLUGIN bool "Use imximage plugin code" depends on ARCH_MX7 || ARCH_MX6 diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c index 8cda71c..e364b16 100644 --- a/arch/arm/mach-imx/mx7/clock.c +++ b/arch/arm/mach-imx/mx7/clock.c @@ -53,7 +53,7 @@ static u32 get_ipg_clk(void) u32 imx_get_uartclk(void) { - return get_root_clk(UART1_CLK_ROOT); + return get_root_clk(UART_CLK_ROOT); } u32 imx_get_fecclk(void)