diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-28 19:18:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-28 19:18:56 -0400 |
| commit | ba17871884c10f64082ddba2f0632ec44a3ae490 (patch) | |
| tree | 57a40015688fa395170307950c11cc528472b85e /drivers/memory/ti-aemif.c | |
| parent | 68545c1ac123520598eacc0e5078da2730a1916a (diff) | |
| parent | 4b62ba8fa297183e74049d7aca855000134bafc9 (diff) | |
Merge branch '2021-09-25-TI-platform-updates' into next
- Start moving some TI board docs to rST
- Assorted TI-specific Kconfig migrations and namespace cleanups. This
also allows for some code cleanups.
Diffstat (limited to 'drivers/memory/ti-aemif.c')
| -rw-r--r-- | drivers/memory/ti-aemif.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c index 6250e274e1..c4bc88c151 100644 --- a/drivers/memory/ti-aemif.c +++ b/drivers/memory/ti-aemif.c @@ -9,11 +9,10 @@ #include <common.h> #include <asm/ti-common/ti-aemif.h> -#define AEMIF_WAITCYCLE_CONFIG (CONFIG_AEMIF_CNTRL_BASE + 0x4) -#define AEMIF_NAND_CONTROL (CONFIG_AEMIF_CNTRL_BASE + 0x60) -#define AEMIF_ONENAND_CONTROL (CONFIG_AEMIF_CNTRL_BASE + 0x5c) -#define AEMIF_CONFIG(cs) (CONFIG_AEMIF_CNTRL_BASE + 0x10 \ - + (cs * 4)) +#define AEMIF_WAITCYCLE_CONFIG (KS2_AEMIF_CNTRL_BASE + 0x4) +#define AEMIF_NAND_CONTROL (KS2_AEMIF_CNTRL_BASE + 0x60) +#define AEMIF_ONENAND_CONTROL (KS2_AEMIF_CNTRL_BASE + 0x5c) +#define AEMIF_CONFIG(cs) (KS2_AEMIF_CNTRL_BASE + 0x10 + (cs * 4)) #define AEMIF_CFG_SELECT_STROBE(v) ((v) ? 1 << 31 : 0) #define AEMIF_CFG_EXTEND_WAIT(v) ((v) ? 1 << 30 : 0) |