From: "Heiko Stübner" <heiko@sntech.de>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Vladimir Oltean <vladimir.oltean@nxp.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
UNGLinuxDriver@microchip.com,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Kishon Vijay Abraham I <kishon@ti.com>,
Vinod Koul <vkoul@kernel.org>, Andy Lutomirski <luto@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Yangbo Lu <yangbo.lu@nxp.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Gwendal Grignou <gwendal@chromium.org>,
linux-iio <linux-iio@vger.kernel.org>
Subject: Re: [PATCH v1 1/1] time64.h: Consolidated PSEC_PER_SEC definition
Date: Tue, 12 Jan 2021 16:41:18 +0100 [thread overview]
Message-ID: <2525970.q0ZmV6gNhb@diego> (raw)
In-Reply-To: <20210112153709.1074-1-andriy.shevchenko@linux.intel.com>
Am Dienstag, 12. Januar 2021, 16:37:09 CET schrieb Andy Shevchenko:
> 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>
> ---
> 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 ++++----
for the Rockchip-part:
Acked-by: Heiko Stuebner <heiko@sntech.de>
though not sure if that reordering of other includes should be in there
or separate. Don't have a hard opinion, and will let others decide ;-)
Heiko
> 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 */
>
next prev parent reply other threads:[~2021-01-12 15:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 15:37 [PATCH v1 1/1] time64.h: Consolidated PSEC_PER_SEC definition Andy Shevchenko
2021-01-12 15:41 ` Heiko Stübner [this message]
2021-01-14 3:39 ` Jakub Kicinski
[not found] ` <CAHp75VeeRRjm=bnyXGgf3j=bKB2wH-v=aDzH3OrQ0dO3BMTrDA@mail.gmail.com>
2021-01-14 8:09 ` Vinod Koul
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=2525970.q0ZmV6gNhb@diego \
--to=heiko@sntech.de \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=gwendal@chromium.org \
--cc=kishon@ti.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=luto@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=vkoul@kernel.org \
--cc=vladimir.oltean@nxp.com \
--cc=yangbo.lu@nxp.com \
/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).