Re: [PATCH 3/3] treewide: use linux/time.h for time conversion defines

2023-11-17 Thread Tom Rini
On Thu, Nov 09, 2023 at 08:10:04PM +0300, Igor Prusov wrote:

> Now that we have time conversion defines from in time.h there is no need
> for each driver to define their own version.
> 
> Signed-off-by: Igor Prusov 
> Reviewed-by: Svyatoslav Ryhel  # tegra
> Reviewed-by: Eugen Hristev  #at91
> Reviewed-by: Caleb Connolly  #qcom geni
> Reviewed-by: Stefan Bosch  #nanopi2
> Reviewed-by: Patrice Chotard 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature


Re: [PATCH 3/3] treewide: use linux/time.h for time conversion defines

2023-11-13 Thread Patrice CHOTARD



On 11/9/23 18:10, Igor Prusov wrote:
> Now that we have time conversion defines from in time.h there is no need
> for each driver to define their own version.
> 
> Signed-off-by: Igor Prusov 
> ---
> 
>  board/friendlyarm/nanopi2/onewire.c  |  5 +
>  drivers/clk/at91/clk-main.c  |  2 +-
>  drivers/i2c/stm32f7_i2c.c| 11 +--
>  drivers/memory/stm32-fmc2-ebi.c  |  5 ++---
>  drivers/mmc/octeontx_hsmmc.h |  2 --
>  drivers/mtd/nand/raw/atmel/nand-controller.c |  3 +--
>  drivers/mtd/nand/raw/mxs_nand.c  |  3 +--
>  drivers/mtd/nand/raw/octeontx_nand.c |  2 +-
>  drivers/mtd/nand/raw/stm32_fmc2_nand.c   |  5 ++---
>  drivers/phy/meson-axg-mipi-dphy.c|  3 +--
>  drivers/phy/phy-core-mipi-dphy.c |  3 +--
>  drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c |  3 +--
>  drivers/pwm/pwm-aspeed.c |  3 +--
>  drivers/pwm/pwm-at91.c   |  2 +-
>  drivers/pwm/pwm-cadence-ttc.c|  3 +--
>  drivers/pwm/pwm-meson.c  |  3 +--
>  drivers/pwm/pwm-mtk.c|  3 +--
>  drivers/pwm/pwm-ti-ehrpwm.c  |  3 +--
>  drivers/serial/serial_msm_geni.c |  3 +--
>  drivers/spi/cadence_qspi.c   |  3 +--
>  drivers/spi/fsl_dspi.c   |  4 +---
>  drivers/ufs/cdns-platform.c  |  3 +--
>  drivers/usb/dwc3/core.c  |  3 +--
>  drivers/video/dw_mipi_dsi.c  |  3 +--
>  drivers/video/rockchip/dw_mipi_dsi_rockchip.c|  3 +--
>  drivers/video/tegra20/tegra-dsi.c|  4 +---
>  drivers/watchdog/sunxi_wdt.c |  3 +--
>  fs/ubifs/ubifs.h |  1 -
>  28 files changed, 32 insertions(+), 62 deletions(-)
> 
> diff --git a/board/friendlyarm/nanopi2/onewire.c 
> b/board/friendlyarm/nanopi2/onewire.c
> index 56f0f2dfce..4f0b1e33c2 100644
> --- a/board/friendlyarm/nanopi2/onewire.c
> +++ b/board/friendlyarm/nanopi2/onewire.c
> @@ -11,16 +11,13 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  #include 
>  
>  #include 
>  #include 
>  
> -#ifndef NSEC_PER_SEC
> -#define NSEC_PER_SEC 10L
> -#endif
> -
>  #define SAMPLE_BPS   9600
>  #define SAMPLE_IN_US 101 /* (100 / BPS) */
>  
> diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
> index b52d926f33..025c7a7aa2 100644
> --- a/drivers/clk/at91/clk-main.c
> +++ b/drivers/clk/at91/clk-main.c
> @@ -17,6 +17,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include "pmc.h"
>  
>  #define UBOOT_DM_CLK_AT91_MAIN_RC"at91-main-rc-clk"
> @@ -25,7 +26,6 @@
>  #define UBOOT_DM_CLK_AT91_SAM9X5_MAIN"at91-sam9x5-main-clk"
>  
>  #define MOR_KEY_MASK GENMASK(23, 16)
> -#define USEC_PER_SEC 100UL
>  #define SLOW_CLOCK_FREQ  32768
>  
>  #define clk_main_parent_select(s)(((s) & \
> diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
> index b6c71789ee..eaa1d69289 100644
> --- a/drivers/i2c/stm32f7_i2c.c
> +++ b/drivers/i2c/stm32f7_i2c.c
> @@ -20,6 +20,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  /* STM32 I2C registers */
>  struct stm32_i2c_regs {
> @@ -121,8 +122,6 @@ struct stm32_i2c_regs {
>  #define STM32_SCLH_MAX   BIT(8)
>  #define STM32_SCLL_MAX   BIT(8)
>  
> -#define STM32_NSEC_PER_SEC   10L
> -
>  /**
>   * struct stm32_i2c_spec - private i2c specification timing
>   * @rate: I2C bus speed (Hz)
> @@ -591,7 +590,7 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
>struct stm32_i2c_timings *s)
>  {
>   struct stm32_i2c_timings *v;
> - u32 i2cbus = DIV_ROUND_CLOSEST(STM32_NSEC_PER_SEC,
> + u32 i2cbus = DIV_ROUND_CLOSEST(NSEC_PER_SEC,
>  setup->speed_freq);
>   u32 clk_error_prev = i2cbus;
>   u32 clk_min, clk_max;
> @@ -607,8 +606,8 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
>   dnf_delay = setup->dnf * i2cclk;
>  
>   tsync = af_delay_min + dnf_delay + (2 * i2cclk);
> - clk_max = STM32_NSEC_PER_SEC / specs->rate_min;
> - clk_min = STM32_NSEC_PER_SEC / specs->rate_max;
> + clk_max = NSEC_PER_SEC / specs->rate_min;
> + clk_min = NSEC_PER_SEC / specs->rate_max;
>  
>   /*
>* Among Prescaler possibilities discovered above figures out SCL Low
> @@ -686,7 +685,7 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv 
> *i2c_priv,
>   const struct stm32_i2c_spec *specs;
>   struct stm32_i2c_timings *v, *_v;
>   struct list_head solutions;
> - u32 i2cclk = DIV_ROUND_CLOSEST(STM32_NSEC_PER_SEC, setup->clock_src);
> + u32 i2cclk = 

Re: [PATCH 3/3] treewide: use linux/time.h for time conversion defines

2023-11-10 Thread Stefan Bosch




On 09.11.23 18:10, Igor Prusov wrote:

Now that we have time conversion defines from in time.h there is no need
for each driver to define their own version.

Signed-off-by: Igor Prusov 
---

  board/friendlyarm/nanopi2/onewire.c  |  5 +
  drivers/clk/at91/clk-main.c  |  2 +-
  drivers/i2c/stm32f7_i2c.c| 11 +--
  drivers/memory/stm32-fmc2-ebi.c  |  5 ++---
  drivers/mmc/octeontx_hsmmc.h |  2 --
  drivers/mtd/nand/raw/atmel/nand-controller.c |  3 +--
  drivers/mtd/nand/raw/mxs_nand.c  |  3 +--
  drivers/mtd/nand/raw/octeontx_nand.c |  2 +-
  drivers/mtd/nand/raw/stm32_fmc2_nand.c   |  5 ++---
  drivers/phy/meson-axg-mipi-dphy.c|  3 +--
  drivers/phy/phy-core-mipi-dphy.c |  3 +--
  drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c |  3 +--
  drivers/pwm/pwm-aspeed.c |  3 +--
  drivers/pwm/pwm-at91.c   |  2 +-
  drivers/pwm/pwm-cadence-ttc.c|  3 +--
  drivers/pwm/pwm-meson.c  |  3 +--
  drivers/pwm/pwm-mtk.c|  3 +--
  drivers/pwm/pwm-ti-ehrpwm.c  |  3 +--
  drivers/serial/serial_msm_geni.c |  3 +--
  drivers/spi/cadence_qspi.c   |  3 +--
  drivers/spi/fsl_dspi.c   |  4 +---
  drivers/ufs/cdns-platform.c  |  3 +--
  drivers/usb/dwc3/core.c  |  3 +--
  drivers/video/dw_mipi_dsi.c  |  3 +--
  drivers/video/rockchip/dw_mipi_dsi_rockchip.c|  3 +--
  drivers/video/tegra20/tegra-dsi.c|  4 +---
  drivers/watchdog/sunxi_wdt.c |  3 +--
  fs/ubifs/ubifs.h |  1 -
  28 files changed, 32 insertions(+), 62 deletions(-)



Reviewed-by: Stefan Bosch  #nanopi2

Thanks,
Stefan


Re: [PATCH 3/3] treewide: use linux/time.h for time conversion defines

2023-11-10 Thread Caleb Connolly



On 09/11/2023 17:10, Igor Prusov wrote:
> Now that we have time conversion defines from in time.h there is no need
> for each driver to define their own version.
> 
> Signed-off-by: Igor Prusov 

Reviewed-by: Caleb Connolly  #qcom geni
> ---
> 
>  board/friendlyarm/nanopi2/onewire.c  |  5 +
>  drivers/clk/at91/clk-main.c  |  2 +-
>  drivers/i2c/stm32f7_i2c.c| 11 +--
>  drivers/memory/stm32-fmc2-ebi.c  |  5 ++---
>  drivers/mmc/octeontx_hsmmc.h |  2 --
>  drivers/mtd/nand/raw/atmel/nand-controller.c |  3 +--
>  drivers/mtd/nand/raw/mxs_nand.c  |  3 +--
>  drivers/mtd/nand/raw/octeontx_nand.c |  2 +-
>  drivers/mtd/nand/raw/stm32_fmc2_nand.c   |  5 ++---
>  drivers/phy/meson-axg-mipi-dphy.c|  3 +--
>  drivers/phy/phy-core-mipi-dphy.c |  3 +--
>  drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c |  3 +--
>  drivers/pwm/pwm-aspeed.c |  3 +--
>  drivers/pwm/pwm-at91.c   |  2 +-
>  drivers/pwm/pwm-cadence-ttc.c|  3 +--
>  drivers/pwm/pwm-meson.c  |  3 +--
>  drivers/pwm/pwm-mtk.c|  3 +--
>  drivers/pwm/pwm-ti-ehrpwm.c  |  3 +--
>  drivers/serial/serial_msm_geni.c |  3 +--
>  drivers/spi/cadence_qspi.c   |  3 +--
>  drivers/spi/fsl_dspi.c   |  4 +---
>  drivers/ufs/cdns-platform.c  |  3 +--
>  drivers/usb/dwc3/core.c  |  3 +--
>  drivers/video/dw_mipi_dsi.c  |  3 +--
>  drivers/video/rockchip/dw_mipi_dsi_rockchip.c|  3 +--
>  drivers/video/tegra20/tegra-dsi.c|  4 +---
>  drivers/watchdog/sunxi_wdt.c |  3 +--
>  fs/ubifs/ubifs.h |  1 -
>  28 files changed, 32 insertions(+), 62 deletions(-)
> 
> diff --git a/board/friendlyarm/nanopi2/onewire.c 
> b/board/friendlyarm/nanopi2/onewire.c
> index 56f0f2dfce..4f0b1e33c2 100644
> --- a/board/friendlyarm/nanopi2/onewire.c
> +++ b/board/friendlyarm/nanopi2/onewire.c
> @@ -11,16 +11,13 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  #include 
>  
>  #include 
>  #include 
>  
> -#ifndef NSEC_PER_SEC
> -#define NSEC_PER_SEC 10L
> -#endif
> -
>  #define SAMPLE_BPS   9600
>  #define SAMPLE_IN_US 101 /* (100 / BPS) */
>  
> diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
> index b52d926f33..025c7a7aa2 100644
> --- a/drivers/clk/at91/clk-main.c
> +++ b/drivers/clk/at91/clk-main.c
> @@ -17,6 +17,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include "pmc.h"
>  
>  #define UBOOT_DM_CLK_AT91_MAIN_RC"at91-main-rc-clk"
> @@ -25,7 +26,6 @@
>  #define UBOOT_DM_CLK_AT91_SAM9X5_MAIN"at91-sam9x5-main-clk"
>  
>  #define MOR_KEY_MASK GENMASK(23, 16)
> -#define USEC_PER_SEC 100UL
>  #define SLOW_CLOCK_FREQ  32768
>  
>  #define clk_main_parent_select(s)(((s) & \
> diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
> index b6c71789ee..eaa1d69289 100644
> --- a/drivers/i2c/stm32f7_i2c.c
> +++ b/drivers/i2c/stm32f7_i2c.c
> @@ -20,6 +20,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  /* STM32 I2C registers */
>  struct stm32_i2c_regs {
> @@ -121,8 +122,6 @@ struct stm32_i2c_regs {
>  #define STM32_SCLH_MAX   BIT(8)
>  #define STM32_SCLL_MAX   BIT(8)
>  
> -#define STM32_NSEC_PER_SEC   10L
> -
>  /**
>   * struct stm32_i2c_spec - private i2c specification timing
>   * @rate: I2C bus speed (Hz)
> @@ -591,7 +590,7 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
>struct stm32_i2c_timings *s)
>  {
>   struct stm32_i2c_timings *v;
> - u32 i2cbus = DIV_ROUND_CLOSEST(STM32_NSEC_PER_SEC,
> + u32 i2cbus = DIV_ROUND_CLOSEST(NSEC_PER_SEC,
>  setup->speed_freq);
>   u32 clk_error_prev = i2cbus;
>   u32 clk_min, clk_max;
> @@ -607,8 +606,8 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
>   dnf_delay = setup->dnf * i2cclk;
>  
>   tsync = af_delay_min + dnf_delay + (2 * i2cclk);
> - clk_max = STM32_NSEC_PER_SEC / specs->rate_min;
> - clk_min = STM32_NSEC_PER_SEC / specs->rate_max;
> + clk_max = NSEC_PER_SEC / specs->rate_min;
> + clk_min = NSEC_PER_SEC / specs->rate_max;
>  
>   /*
>* Among Prescaler possibilities discovered above figures out SCL Low
> @@ -686,7 +685,7 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv 
> *i2c_priv,
>   const struct stm32_i2c_spec *specs;
>   struct stm32_i2c_timings *v, *_v;
>   struct list_head solutions;
> - u32 i2cclk = 

Re: [PATCH 3/3] treewide: use linux/time.h for time conversion defines

2023-11-10 Thread Eugen Hristev

On 11/9/23 19:10, Igor Prusov wrote:

Now that we have time conversion defines from in time.h there is no need
for each driver to define their own version.

Signed-off-by: Igor Prusov 
---

  board/friendlyarm/nanopi2/onewire.c  |  5 +
  drivers/clk/at91/clk-main.c  |  2 +-
  drivers/i2c/stm32f7_i2c.c| 11 +--
  drivers/memory/stm32-fmc2-ebi.c  |  5 ++---
  drivers/mmc/octeontx_hsmmc.h |  2 --
  drivers/mtd/nand/raw/atmel/nand-controller.c |  3 +--
  drivers/mtd/nand/raw/mxs_nand.c  |  3 +--
  drivers/mtd/nand/raw/octeontx_nand.c |  2 +-
  drivers/mtd/nand/raw/stm32_fmc2_nand.c   |  5 ++---
  drivers/phy/meson-axg-mipi-dphy.c|  3 +--
  drivers/phy/phy-core-mipi-dphy.c |  3 +--
  drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c |  3 +--
  drivers/pwm/pwm-aspeed.c |  3 +--
  drivers/pwm/pwm-at91.c   |  2 +-
  drivers/pwm/pwm-cadence-ttc.c|  3 +--
  drivers/pwm/pwm-meson.c  |  3 +--
  drivers/pwm/pwm-mtk.c|  3 +--
  drivers/pwm/pwm-ti-ehrpwm.c  |  3 +--
  drivers/serial/serial_msm_geni.c |  3 +--
  drivers/spi/cadence_qspi.c   |  3 +--
  drivers/spi/fsl_dspi.c   |  4 +---
  drivers/ufs/cdns-platform.c  |  3 +--
  drivers/usb/dwc3/core.c  |  3 +--
  drivers/video/dw_mipi_dsi.c  |  3 +--
  drivers/video/rockchip/dw_mipi_dsi_rockchip.c|  3 +--
  drivers/video/tegra20/tegra-dsi.c|  4 +---
  drivers/watchdog/sunxi_wdt.c |  3 +--
  fs/ubifs/ubifs.h |  1 -
  28 files changed, 32 insertions(+), 62 deletions(-)



Reviewed-by: Eugen Hristev  #at91



Re: [PATCH 3/3] treewide: use linux/time.h for time conversion defines

2023-11-10 Thread Svyatoslav Ryhel
чт, 9 лист. 2023 р. о 19:10 Igor Prusov  пише:
>
> Now that we have time conversion defines from in time.h there is no need
> for each driver to define their own version.
>
> Signed-off-by: Igor Prusov 
> ---
>
>  board/friendlyarm/nanopi2/onewire.c  |  5 +
>  drivers/clk/at91/clk-main.c  |  2 +-
>  drivers/i2c/stm32f7_i2c.c| 11 +--
>  drivers/memory/stm32-fmc2-ebi.c  |  5 ++---
>  drivers/mmc/octeontx_hsmmc.h |  2 --
>  drivers/mtd/nand/raw/atmel/nand-controller.c |  3 +--
>  drivers/mtd/nand/raw/mxs_nand.c  |  3 +--
>  drivers/mtd/nand/raw/octeontx_nand.c |  2 +-
>  drivers/mtd/nand/raw/stm32_fmc2_nand.c   |  5 ++---
>  drivers/phy/meson-axg-mipi-dphy.c|  3 +--
>  drivers/phy/phy-core-mipi-dphy.c |  3 +--
>  drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c |  3 +--
>  drivers/pwm/pwm-aspeed.c |  3 +--
>  drivers/pwm/pwm-at91.c   |  2 +-
>  drivers/pwm/pwm-cadence-ttc.c|  3 +--
>  drivers/pwm/pwm-meson.c  |  3 +--
>  drivers/pwm/pwm-mtk.c|  3 +--
>  drivers/pwm/pwm-ti-ehrpwm.c  |  3 +--
>  drivers/serial/serial_msm_geni.c |  3 +--
>  drivers/spi/cadence_qspi.c   |  3 +--
>  drivers/spi/fsl_dspi.c   |  4 +---
>  drivers/ufs/cdns-platform.c  |  3 +--
>  drivers/usb/dwc3/core.c  |  3 +--
>  drivers/video/dw_mipi_dsi.c  |  3 +--
>  drivers/video/rockchip/dw_mipi_dsi_rockchip.c|  3 +--
>  drivers/video/tegra20/tegra-dsi.c|  4 +---
>  drivers/watchdog/sunxi_wdt.c |  3 +--
>  fs/ubifs/ubifs.h |  1 -
>  28 files changed, 32 insertions(+), 62 deletions(-)
>

Reviewed-by: Svyatoslav Ryhel  # tegra

> diff --git a/board/friendlyarm/nanopi2/onewire.c 
> b/board/friendlyarm/nanopi2/onewire.c
> index 56f0f2dfce..4f0b1e33c2 100644
> --- a/board/friendlyarm/nanopi2/onewire.c
> +++ b/board/friendlyarm/nanopi2/onewire.c
> @@ -11,16 +11,13 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include 
>
>  #include 
>  #include 
>
> -#ifndef NSEC_PER_SEC
> -#define NSEC_PER_SEC   10L
> -#endif
> -
>  #define SAMPLE_BPS 9600
>  #define SAMPLE_IN_US   101 /* (100 / BPS) */
>
> diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
> index b52d926f33..025c7a7aa2 100644
> --- a/drivers/clk/at91/clk-main.c
> +++ b/drivers/clk/at91/clk-main.c
> @@ -17,6 +17,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include "pmc.h"
>
>  #define UBOOT_DM_CLK_AT91_MAIN_RC  "at91-main-rc-clk"
> @@ -25,7 +26,6 @@
>  #define UBOOT_DM_CLK_AT91_SAM9X5_MAIN  "at91-sam9x5-main-clk"
>
>  #define MOR_KEY_MASK   GENMASK(23, 16)
> -#define USEC_PER_SEC   100UL
>  #define SLOW_CLOCK_FREQ32768
>
>  #define clk_main_parent_select(s)  (((s) & \
> diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
> index b6c71789ee..eaa1d69289 100644
> --- a/drivers/i2c/stm32f7_i2c.c
> +++ b/drivers/i2c/stm32f7_i2c.c
> @@ -20,6 +20,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  /* STM32 I2C registers */
>  struct stm32_i2c_regs {
> @@ -121,8 +122,6 @@ struct stm32_i2c_regs {
>  #define STM32_SCLH_MAX BIT(8)
>  #define STM32_SCLL_MAX BIT(8)
>
> -#define STM32_NSEC_PER_SEC 10L
> -
>  /**
>   * struct stm32_i2c_spec - private i2c specification timing
>   * @rate: I2C bus speed (Hz)
> @@ -591,7 +590,7 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
>  struct stm32_i2c_timings *s)
>  {
> struct stm32_i2c_timings *v;
> -   u32 i2cbus = DIV_ROUND_CLOSEST(STM32_NSEC_PER_SEC,
> +   u32 i2cbus = DIV_ROUND_CLOSEST(NSEC_PER_SEC,
>setup->speed_freq);
> u32 clk_error_prev = i2cbus;
> u32 clk_min, clk_max;
> @@ -607,8 +606,8 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
> dnf_delay = setup->dnf * i2cclk;
>
> tsync = af_delay_min + dnf_delay + (2 * i2cclk);
> -   clk_max = STM32_NSEC_PER_SEC / specs->rate_min;
> -   clk_min = STM32_NSEC_PER_SEC / specs->rate_max;
> +   clk_max = NSEC_PER_SEC / specs->rate_min;
> +   clk_min = NSEC_PER_SEC / specs->rate_max;
>
> /*
>  * Among Prescaler possibilities discovered above figures out SCL Low
> @@ -686,7 +685,7 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv 
> *i2c_priv,
> const struct stm32_i2c_spec *specs;
> struct stm32_i2c_timings *v, *_v;
> struct list_head solutions;
> -   u32 i2cclk = 

[PATCH 3/3] treewide: use linux/time.h for time conversion defines

2023-11-09 Thread Igor Prusov
Now that we have time conversion defines from in time.h there is no need
for each driver to define their own version.

Signed-off-by: Igor Prusov 
---

 board/friendlyarm/nanopi2/onewire.c  |  5 +
 drivers/clk/at91/clk-main.c  |  2 +-
 drivers/i2c/stm32f7_i2c.c| 11 +--
 drivers/memory/stm32-fmc2-ebi.c  |  5 ++---
 drivers/mmc/octeontx_hsmmc.h |  2 --
 drivers/mtd/nand/raw/atmel/nand-controller.c |  3 +--
 drivers/mtd/nand/raw/mxs_nand.c  |  3 +--
 drivers/mtd/nand/raw/octeontx_nand.c |  2 +-
 drivers/mtd/nand/raw/stm32_fmc2_nand.c   |  5 ++---
 drivers/phy/meson-axg-mipi-dphy.c|  3 +--
 drivers/phy/phy-core-mipi-dphy.c |  3 +--
 drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c |  3 +--
 drivers/pwm/pwm-aspeed.c |  3 +--
 drivers/pwm/pwm-at91.c   |  2 +-
 drivers/pwm/pwm-cadence-ttc.c|  3 +--
 drivers/pwm/pwm-meson.c  |  3 +--
 drivers/pwm/pwm-mtk.c|  3 +--
 drivers/pwm/pwm-ti-ehrpwm.c  |  3 +--
 drivers/serial/serial_msm_geni.c |  3 +--
 drivers/spi/cadence_qspi.c   |  3 +--
 drivers/spi/fsl_dspi.c   |  4 +---
 drivers/ufs/cdns-platform.c  |  3 +--
 drivers/usb/dwc3/core.c  |  3 +--
 drivers/video/dw_mipi_dsi.c  |  3 +--
 drivers/video/rockchip/dw_mipi_dsi_rockchip.c|  3 +--
 drivers/video/tegra20/tegra-dsi.c|  4 +---
 drivers/watchdog/sunxi_wdt.c |  3 +--
 fs/ubifs/ubifs.h |  1 -
 28 files changed, 32 insertions(+), 62 deletions(-)

diff --git a/board/friendlyarm/nanopi2/onewire.c 
b/board/friendlyarm/nanopi2/onewire.c
index 56f0f2dfce..4f0b1e33c2 100644
--- a/board/friendlyarm/nanopi2/onewire.c
+++ b/board/friendlyarm/nanopi2/onewire.c
@@ -11,16 +11,13 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
 #include 
 #include 
 
-#ifndef NSEC_PER_SEC
-#define NSEC_PER_SEC   10L
-#endif
-
 #define SAMPLE_BPS 9600
 #define SAMPLE_IN_US   101 /* (100 / BPS) */
 
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index b52d926f33..025c7a7aa2 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "pmc.h"
 
 #define UBOOT_DM_CLK_AT91_MAIN_RC  "at91-main-rc-clk"
@@ -25,7 +26,6 @@
 #define UBOOT_DM_CLK_AT91_SAM9X5_MAIN  "at91-sam9x5-main-clk"
 
 #define MOR_KEY_MASK   GENMASK(23, 16)
-#define USEC_PER_SEC   100UL
 #define SLOW_CLOCK_FREQ32768
 
 #define clk_main_parent_select(s)  (((s) & \
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index b6c71789ee..eaa1d69289 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /* STM32 I2C registers */
 struct stm32_i2c_regs {
@@ -121,8 +122,6 @@ struct stm32_i2c_regs {
 #define STM32_SCLH_MAX BIT(8)
 #define STM32_SCLL_MAX BIT(8)
 
-#define STM32_NSEC_PER_SEC 10L
-
 /**
  * struct stm32_i2c_spec - private i2c specification timing
  * @rate: I2C bus speed (Hz)
@@ -591,7 +590,7 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
 struct stm32_i2c_timings *s)
 {
struct stm32_i2c_timings *v;
-   u32 i2cbus = DIV_ROUND_CLOSEST(STM32_NSEC_PER_SEC,
+   u32 i2cbus = DIV_ROUND_CLOSEST(NSEC_PER_SEC,
   setup->speed_freq);
u32 clk_error_prev = i2cbus;
u32 clk_min, clk_max;
@@ -607,8 +606,8 @@ static int stm32_i2c_choose_solution(u32 i2cclk,
dnf_delay = setup->dnf * i2cclk;
 
tsync = af_delay_min + dnf_delay + (2 * i2cclk);
-   clk_max = STM32_NSEC_PER_SEC / specs->rate_min;
-   clk_min = STM32_NSEC_PER_SEC / specs->rate_max;
+   clk_max = NSEC_PER_SEC / specs->rate_min;
+   clk_min = NSEC_PER_SEC / specs->rate_max;
 
/*
 * Among Prescaler possibilities discovered above figures out SCL Low
@@ -686,7 +685,7 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv 
*i2c_priv,
const struct stm32_i2c_spec *specs;
struct stm32_i2c_timings *v, *_v;
struct list_head solutions;
-   u32 i2cclk = DIV_ROUND_CLOSEST(STM32_NSEC_PER_SEC, setup->clock_src);
+   u32 i2cclk = DIV_ROUND_CLOSEST(NSEC_PER_SEC, setup->clock_src);
int ret;
 
specs = get_specs(setup->speed_freq);
diff --git a/drivers/memory/stm32-fmc2-ebi.c b/drivers/memory/stm32-fmc2-ebi.c
index 212bb4f5dc..a722a3836f 100644
---