| Message ID | 20221120140829.3057894-65-trini@konsulko.com |
|---|---|
| State | RFC |
| Delegated to: | Tom Rini |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=H/0E9g0H; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFXdG5sSNz23mR for <incoming@patchwork.ozlabs.org>; Mon, 21 Nov 2022 01:16:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3FEB85427; Sun, 20 Nov 2022 15:10:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="H/0E9g0H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D2BEF852F7; Sun, 20 Nov 2022 15:09:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 52388852FA for <u-boot@lists.denx.de>; Sun, 20 Nov 2022 15:09:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x734.google.com with SMTP id s20so6541739qkg.5 for <u-boot@lists.denx.de>; Sun, 20 Nov 2022 06:09:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5BTRKrQZ73hMf83hO5kPsKrdC5Lzk0Gd5ZubPeT6Ifg=; b=H/0E9g0HDFp4axberVDk/ConiG1o38X1nOCl8tFffU23y8hFJBPwfSKlGdgROH4KaN vZDGbNzPRDRw1wK3AHy8FSHVWysQB5amasCQKdZgPbd/iU2wG6vialJPMR25ZbRLaGAS kqNmpjrrGdRy0Uz7lp2gP+e5peQBpO40Oe4JA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5BTRKrQZ73hMf83hO5kPsKrdC5Lzk0Gd5ZubPeT6Ifg=; b=KPyllGr1Ynicg2jDEhlZKZhDZx+rUA7DOTzIayo4I1kYAqBHLtv4FQjkeR1CboClQL S6YNKrN65TRDV9mccf2NGnH1KFYpTu6ADq+lsZgO/gQmjca55fN42t8R0U9JRgteORmV 0HSxLXQ/AqgLQnlBlO9a5x3q7h0ffr8xAjon+363z3RXOfhnvM2TjPTk1wJCKUrLsV6L RcNK9gYK50zYEWGcLtc25q+wjLZEZDZS5pg4DEXxcNZdlsCSiXnkKT1oNt+usrWmcbQB X6yRb4DkaJukqUCcyKCmYxsxxi1vBKzVWZ1d13cOeOI1I8LQItJ27xyI42bJOGeZZ6W/ NOIA== X-Gm-Message-State: ANoB5plDVr8eRc8X484XPnU2Bd60ksWt1+Ajq5yR9Iw+JFcsWYttmOJK hAWieMCXA4JDIQZjNLZFjZn3b1TMec/4Aw== X-Google-Smtp-Source: AA0mqf6MS4mpM8cuQoSEgMKekjIU4q+WEPp1E55Ae7U44NDXudI3Kl6EXeRw93dgpnn8/gX+Ag1EoA== X-Received: by 2002:a05:620a:2705:b0:6f9:26a0:5333 with SMTP id b5-20020a05620a270500b006f926a05333mr12964710qkp.2.1668953351361; Sun, 20 Nov 2022 06:09:11 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.09.10 for <u-boot@lists.denx.de> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:10 -0800 (PST) From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PoC 174/241] global: Migrate CONFIG_SC_TIMER_CLK to CFG Date: Sun, 20 Nov 2022 09:08:04 -0500 Message-Id: <20221120140829.3057894-65-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
| Series |
None
|
expand
|
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index df478a232637..129efac6fa69 100644 --- a/arch/arm/mach-imx/syscounter.c +++ b/arch/arm/mach-imx/syscounter.c @@ -65,7 +65,7 @@ int timer_init(void) struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR; unsigned long val, freq; - freq = CONFIG_SC_TIMER_CLK; + freq = CFG_SC_TIMER_CLK; asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq)); writel(freq, &sctr->cntfid0); diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 1e99cdc7df4d..8129be9e88ea 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -9,7 +9,7 @@ #include <linux/stringify.h> #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) -#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ +#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */ #else #ifndef CONFIG_SYS_L2CACHE_OFF #define CFG_SYS_PL310_BASE L2_PL310_BASE diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 3a5917fed4b8..dfba95b769cc 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -15,7 +15,7 @@ /* Timer settings */ #define CFG_MXC_GPT_HCLK -#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ +#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */ /* Miscellaneous configurable options */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 179d6918cd64..b45fcaa9432c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -183,7 +183,7 @@ CFG_SAR2_REG CFG_SAR_REG CFG_SCIF_A CFG_SCSI_DEV_LIST -CONFIG_SC_TIMER_CLK +CFG_SC_TIMER_CLK CONFIG_SERIAL_BOOT CONFIG_SERVERIP CONFIG_SETUP_INITRD_TAG
Signed-off-by: Tom Rini <trini@konsulko.com> --- arch/arm/mach-imx/syscounter.c | 2 +- include/configs/mx6_common.h | 2 +- include/configs/mx7_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)