diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /arch/arm/include/asm/arch-rockchip/ddr_rk3288.h | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'arch/arm/include/asm/arch-rockchip/ddr_rk3288.h')
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/ddr_rk3288.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h index 979d5470e7a..43ccae10bdf 100644 --- a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h @@ -360,7 +360,7 @@ check_member(rk3288_msch, devtodev, 0x003c); #define PCTL_STAT_MSK 7 #define INIT_MEM 0 #define CONFIG 1 -#define CONFIG_REQ 2 +#define CFG_REQ 2 #define ACCESS 3 #define ACCESS_REQ 4 #define LOW_POWER 5 |