From: "tip-bot2 for Andrea Merello" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Andrea Merello <andrea.merello@gmail.com>,
Patrice Chotard <patrice.chotard@st.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Michal Simek <michal.simek@xilinx.com>,
soren.brinkmann@xilinx.com,
Daniel Lezcano <daniel.lezcano@linaro.org>,
x86@kernel.org
Subject: [tip: timers/core] arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymore
Date: Fri, 18 Jun 2021 16:03:38 -0000 [thread overview]
Message-ID: <162403221865.19906.17203231411813786854.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210406130045.15491-3-andrea.merello@gmail.com>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 68e2215e9d5f5ec8e5ba0158683742932519cad9
Gitweb: https://git.kernel.org/tip/68e2215e9d5f5ec8e5ba0158683742932519cad9
Author: Andrea Merello <andrea.merello@gmail.com>
AuthorDate: Tue, 06 Apr 2021 15:00:45 +02:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Wed, 16 Jun 2021 17:33:04 +02:00
arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymore
Now ARM global timer driver could work even if it's source clock rate
changes, so we don't need to disable that driver when cpu frequency scaling
is in use.
This cause Zynq arch to get support for timer delay and get_cycles().
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210406130045.15491-3-andrea.merello@gmail.com
---
arch/arm/mach-zynq/Kconfig | 2 +-
drivers/clocksource/Kconfig | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 43fb941..a56748d 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -6,7 +6,7 @@ config ARCH_ZYNQ
select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA
select ARM_GIC
- select ARM_GLOBAL_TIMER if !CPU_FREQ
+ select ARM_GLOBAL_TIMER
select CADENCE_TTC_TIMER
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 19fc5f8..9fa2823 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -360,6 +360,7 @@ config ARM_GLOBAL_TIMER
config ARM_GT_INITIAL_PRESCALER_VAL
int "ARM global timer initial prescaler value"
+ default 2 if ARCH_ZYNQ
default 1
depends on ARM_GLOBAL_TIMER
help
next prev parent reply other threads:[~2021-06-18 16:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 13:00 [PATCH v2 0/2] Fix missing entropy on Zynq arch due to get_cycles() not supported Andrea Merello
2021-04-06 13:00 ` [PATCH v2 1/2] clocksource: arm_global_timer: implement rate compensation whenever source clock changes Andrea Merello
2021-06-10 13:01 ` Daniel Lezcano
2021-06-10 13:49 ` Patrice CHOTARD
2021-06-18 16:03 ` [tip: timers/core] clocksource/drivers/arm_global_timer: Implement " tip-bot2 for Andrea Merello
2022-10-17 8:03 ` [BUG] [PATCH v2 1/2] clocksource: arm_global_timer: implement " Johan Jonker
2022-10-27 13:37 ` Andrea Merello
2022-10-30 14:50 ` Johan Jonker
2022-10-30 15:09 ` Johan Jonker
2021-04-06 13:00 ` [PATCH v2 2/2] arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymore Andrea Merello
2021-06-18 16:03 ` tip-bot2 for Andrea Merello [this message]
2021-04-27 14:19 ` [PATCH v2 0/2] Fix missing entropy on Zynq arch due to get_cycles() not supported Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162403221865.19906.17203231411813786854.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=andrea.merello@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=patrice.chotard@st.com \
--cc=soren.brinkmann@xilinx.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).