* [PATCH v2 1/1] time64.h: Consolidated PSEC_PER_SEC definition
@ 2021-04-06 10:22 Andy Shevchenko
2021-04-07 0:20 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2021-04-06 10:22 UTC (permalink / raw)
To: David S. Miller, Yangbo Lu, Vladimir Oltean, Heiko Stuebner,
Andy Shevchenko, netdev, linux-kernel, linux-phy,
linux-arm-kernel, linux-rockchip
Cc: Claudiu Manoil, Alexandre Belloni, UNGLinuxDriver,
Jakub Kicinski, Kishon Vijay Abraham I, Vinod Koul,
Andy Lutomirski, Thomas Gleixner, Vincenzo Frascino
We have currently three users of the PSEC_PER_SEC each of them defining it
individually. Instead, move it to time64.h to be available for everyone.
There is a new user coming with the same constant in use. It will also
make its life easier.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
---
v2: added tag (Heiko), rebased on top of newest rc
Since it touches PHY stuff, I assume that the PHY tree is the best
to suck this.
drivers/net/ethernet/mscc/ocelot_ptp.c | 2 ++
drivers/phy/phy-core-mipi-dphy.c | 2 --
drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 8 ++++----
include/soc/mscc/ocelot_ptp.h | 2 --
include/vdso/time64.h | 1 +
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot_ptp.c b/drivers/net/ethernet/mscc/ocelot_ptp.c
index a33ab315cc6b..87ad2137ba06 100644
--- a/drivers/net/ethernet/mscc/ocelot_ptp.c
+++ b/drivers/net/ethernet/mscc/ocelot_ptp.c
@@ -4,6 +4,8 @@
* Copyright (c) 2017 Microsemi Corporation
* Copyright 2020 NXP
*/
+#include <linux/time64.h>
+
#include <soc/mscc/ocelot_ptp.h>
#include <soc/mscc/ocelot_sys.h>
#include <soc/mscc/ocelot.h>
diff --git a/drivers/phy/phy-core-mipi-dphy.c b/drivers/phy/phy-core-mipi-dphy.c
index 14e0551cd319..77fe65367ce5 100644
--- a/drivers/phy/phy-core-mipi-dphy.c
+++ b/drivers/phy/phy-core-mipi-dphy.c
@@ -12,8 +12,6 @@
#include <linux/phy/phy.h>
#include <linux/phy/phy-mipi-dphy.h>
-#define PSEC_PER_SEC 1000000000000LL
-
/*
* Minimum D-PHY timings based on MIPI D-PHY specification. Derived
* from the valid ranges specified in Section 6.9, Table 14, Page 41
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
index 8af8c6c5cc02..347dc79a18c1 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
@@ -11,16 +11,16 @@
#include <linux/clk-provider.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/reset.h>
+#include <linux/time64.h>
+
#include <linux/phy/phy.h>
#include <linux/phy/phy-mipi-dphy.h>
-#include <linux/pm_runtime.h>
-#include <linux/mfd/syscon.h>
-
-#define PSEC_PER_SEC 1000000000000LL
#define UPDATE(x, h, l) (((x) << (l)) & GENMASK((h), (l)))
diff --git a/include/soc/mscc/ocelot_ptp.h b/include/soc/mscc/ocelot_ptp.h
index 6a7388fa7cc5..ded497d72bdb 100644
--- a/include/soc/mscc/ocelot_ptp.h
+++ b/include/soc/mscc/ocelot_ptp.h
@@ -37,8 +37,6 @@ enum {
#define PTP_CFG_MISC_PTP_EN BIT(2)
-#define PSEC_PER_SEC 1000000000000LL
-
#define PTP_CFG_CLK_ADJ_CFG_ENA BIT(0)
#define PTP_CFG_CLK_ADJ_CFG_DIR BIT(1)
diff --git a/include/vdso/time64.h b/include/vdso/time64.h
index 9d43c3f5e89d..b40cfa2aa33c 100644
--- a/include/vdso/time64.h
+++ b/include/vdso/time64.h
@@ -9,6 +9,7 @@
#define NSEC_PER_MSEC 1000000L
#define USEC_PER_SEC 1000000L
#define NSEC_PER_SEC 1000000000L
+#define PSEC_PER_SEC 1000000000000LL
#define FSEC_PER_SEC 1000000000000000LL
#endif /* __VDSO_TIME64_H */
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 1/1] time64.h: Consolidated PSEC_PER_SEC definition
2021-04-06 10:22 [PATCH v2 1/1] time64.h: Consolidated PSEC_PER_SEC definition Andy Shevchenko
@ 2021-04-07 0:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-04-07 0:20 UTC (permalink / raw)
To: Andy Shevchenko
Cc: davem, yangbo.lu, vladimir.oltean, heiko, netdev, linux-kernel,
linux-phy, linux-arm-kernel, linux-rockchip, claudiu.manoil,
alexandre.belloni, UNGLinuxDriver, kuba, kishon, vkoul, luto,
tglx, vincenzo.frascino
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Tue, 6 Apr 2021 13:22:51 +0300 you wrote:
> We have currently three users of the PSEC_PER_SEC each of them defining it
> individually. Instead, move it to time64.h to be available for everyone.
>
> There is a new user coming with the same constant in use. It will also
> make its life easier.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Acked-by: Heiko Stuebner <heiko@sntech.de>
>
> [...]
Here is the summary with links:
- [v2,1/1] time64.h: Consolidated PSEC_PER_SEC definition
https://git.kernel.org/netdev/net-next/c/a460513ed4b6
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-07 0:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-06 10:22 [PATCH v2 1/1] time64.h: Consolidated PSEC_PER_SEC definition Andy Shevchenko
2021-04-07 0:20 ` patchwork-bot+netdevbpf
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).