From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D5ADC433F5 for ; Wed, 30 Mar 2022 22:10:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6CB23841AD; Thu, 31 Mar 2022 00:08:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 6D4B784197; Thu, 31 Mar 2022 00:08:01 +0200 (CEST) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0AD648418F for ; Thu, 31 Mar 2022 00:07:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f173.google.com with SMTP id a11so19629693qtb.12 for ; Wed, 30 Mar 2022 15:07:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f8w7bGRJc2Xg5ju/tv7TnueCW/Sjam/vTqCOjSVZkts=; b=5H/yrBM6u++V6mj85lOEbCRaQi8EzlOaVTfkye1YzheTOiJD5Pp5V+Sq7kaspJDqrA j6dDlY1ikMOEqL3ObGdDAy5AO1VdPy/VhdPnkFn9WjZgMQqmd08+9VVPl+1h4qrNKMCO jFr1K9epKD+6EGr+eZlWZBl4JnobAFlAx1hwz+nXFiHSXyBKorPtv3bgtZ/gkqAolOUC rwpxkzrbZBqojh30LbZMlYRuKBdwGkhkshQ8dktd6So0vfwUc2vDFRWBwnJhG1kp3KH1 VDGosDzFW4Yc1Pn5+U7vZk8Zn5pkDpJUmaU9FdUQpDHXNvJaZYdxXBbk0zFzCi35Hiy/ cuJg== X-Gm-Message-State: AOAM532nLqWxnJzWC0s63eqDtay5COmVoCoIaPQyrmFHjOyFUtVXeOqJ YUGJ1gYcsjgHq5QAxQdo7QwYab7lWw== X-Google-Smtp-Source: ABdhPJzhR9bCPxT5sNT62QGRASPHmN2wPrOe1Kals5Eyh0TNxp6Zc9sqmcwcQN1pk2YnDmFeLYfvng== X-Received: by 2002:a05:622a:170b:b0:2e1:a659:8b4 with SMTP id h11-20020a05622a170b00b002e1a65908b4mr1659047qtk.107.1648678066680; Wed, 30 Mar 2022 15:07:46 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id h2-20020ac85842000000b002e1ec550506sm17749694qth.87.2022.03.30.15.07.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 15:07:46 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 12/25] Convert CONFIG_SH_SCIF_CLK_FREQ to Kconfig Date: Wed, 30 Mar 2022 18:07:22 -0400 Message-Id: <20220330220735.908616-12-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220330220735.908616-1-trini@konsulko.com> References: <20220330220735.908616-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_SH_SCIF_CLK_FREQ Signed-off-by: Tom Rini --- configs/stout_defconfig | 1 + drivers/serial/Kconfig | 5 +++++ include/configs/alt.h | 3 --- include/configs/armadillo-800eva.h | 3 --- include/configs/gose.h | 3 --- include/configs/koelsch.h | 3 --- include/configs/kzm9g.h | 1 - include/configs/lager.h | 3 --- include/configs/porter.h | 3 --- include/configs/rcar-gen3-common.h | 3 --- include/configs/silk.h | 3 --- include/configs/stout.h | 3 --- 12 files changed, 6 insertions(+), 28 deletions(-) diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 0502ae5d3067..ea07ceb8f373 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -88,6 +88,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SCIF_CLK_FREQ=52000000 CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_SH_QSPI=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index f52422504b03..b8d1fb849376 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -803,6 +803,11 @@ config CONS_SCIFA0 endchoice +config SH_SCIF_CLK_FREQ + int "SCIF console clock frequency" + depends on SCIF_CONSOLE && (!DM_SERIAL || (SPL && !SPL_DM_SERIAL)) + default 65000000 + config UNIPHIER_SERIAL bool "Support for UniPhier on-chip UART" depends on ARCH_UNIPHIER diff --git a/include/configs/alt.h b/include/configs/alt.h index 1656072ebb4d..090bee7d2d66 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -41,8 +41,5 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __ALT_H */ diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index f144302a71d2..acd140ee35ee 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -67,7 +67,4 @@ #define CONFIG_SH_ETHER_SH7734_MII (0x01) #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII -/* Board Clock */ -#define CONFIG_SH_SCIF_CLK_FREQ get_board_sys_clk() - #endif /* __ARMADILLO_800EVA_H */ diff --git a/include/configs/gose.h b/include/configs/gose.h index 9015cabc2d17..4ffa5bea8f83 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -36,8 +36,5 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __GOSE_H */ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 3fef4150b25c..c0997aa3ddd5 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -36,8 +36,5 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __KOELSCH_H */ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index f35549d95acb..7e99490e5271 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -66,7 +66,6 @@ /* Clock */ #define CONFIG_GLOBAL_TIMER #define CONFIG_SYS_CPU_CLK (1196000000) -#define CONFIG_SH_SCIF_CLK_FREQ get_board_sys_clk() #define TMU_CLK_DIVIDER (4) /* 4 (default), 16, 64, 256 or 1024 */ #endif /* __KZM9G_H */ diff --git a/include/configs/lager.h b/include/configs/lager.h index df3b4bbce072..a5abbaaeab1f 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -37,8 +37,5 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __LAGER_H */ diff --git a/include/configs/porter.h b/include/configs/porter.h index 964ce7def64b..bf380ddf05b0 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -41,8 +41,5 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __PORTER_H */ diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 5bb6bf3d7822..64743382eda1 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -59,8 +59,5 @@ #endif #define CONFIG_SPL_STACK 0xe6304000 #define CONFIG_SPL_MAX_SIZE 0x7000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __RCAR_GEN3_COMMON_H */ diff --git a/include/configs/silk.h b/include/configs/silk.h index ec8740b3826d..574ba228d8a1 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -41,8 +41,5 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __SILK_H */ diff --git a/include/configs/stout.h b/include/configs/stout.h index 4ddbea5b1d06..bcc6fcd36b30 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -45,8 +45,5 @@ /* SPL support */ #define CONFIG_SPL_STACK 0xe6340000 #define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 52000000 -#endif #endif /* __STOUT_H */ -- 2.25.1