diff options
| author | Tom Rini <[email protected]> | 2023-11-17 08:38:05 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-11-17 08:38:05 -0500 |
| commit | ae7ec8b0be41b59ef323f7531c0fe6745e8fef45 (patch) | |
| tree | d3b5bff2626d743a15533b8400985974817f1cc3 /drivers/memory | |
| parent | 6c1608b1ffb372d4dabf1b879e68428712353709 (diff) | |
| parent | b83fae673a9cd9795e531883936c1468e75510a5 (diff) | |
Merge branch '2023-11-16-assorted-updates' into next
- squashfs improvements, remove common.h in some places, assorted code
fixes, fix a few CONFIG symbol names in Kconfig files, bring in
linux's <linux/time.h> conversion functions, poplar updates, bcb
improvements.
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/stm32-fmc2-ebi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/memory/stm32-fmc2-ebi.c b/drivers/memory/stm32-fmc2-ebi.c index 212bb4f5dc0..a722a3836f7 100644 --- a/drivers/memory/stm32-fmc2-ebi.c +++ b/drivers/memory/stm32-fmc2-ebi.c @@ -14,6 +14,7 @@ #include <linux/err.h> #include <linux/iopoll.h> #include <linux/ioport.h> +#include <linux/time.h> /* FMC2 Controller Registers */ #define FMC2_BCR1 0x0 @@ -90,8 +91,6 @@ #define FMC2_BTR_DATLAT_MAX 0xf #define FMC2_PCSCNTR_CSCOUNT_MAX 0xff -#define FMC2_NSEC_PER_SEC 1000000000L - enum stm32_fmc2_ebi_bank { FMC2_EBI1 = 0, FMC2_EBI2, @@ -279,7 +278,7 @@ static u32 stm32_fmc2_ebi_ns_to_clock_cycles(struct stm32_fmc2_ebi *ebi, int cs, u32 setup) { unsigned long hclk = clk_get_rate(&ebi->clk); - unsigned long hclkp = FMC2_NSEC_PER_SEC / (hclk / 1000); + unsigned long hclkp = NSEC_PER_SEC / (hclk / 1000); return DIV_ROUND_UP(setup * 1000, hclkp); } |