colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi: H616: DRAM: rename Kconfig parameters to be more generic

Browse Source 
The H616 DRAM controller requires some board specific parameters, which
we declare in Kconfig, let each board specify in their defconfig, and
then use in the DRAM init code.

Other DRAM controllers now require a very similar, if not identical
parameter set, with so far the same parameter names used.

To help keep the Kconfig file at bay, rename the existing parameter
names to drop the H616_ part in there, to make them more naturally
reusable for other SoCs.

No functional change, just a rename.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
This commit is contained in:
Andre Przywara
2024-10-21 12:47:28 +01:00
parent b002ce88a9
commit 9d87d5082d
9 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
arch/arm/mach-sunxi/Kconfig
View File

@@ -52,78 +52,76 @@ config DRAM_SUN50I_H616
like H616. like H616.
if DRAM_SUN50I_H616 if DRAM_SUN50I_H616
config DRAM_SUN50I_H616_DX_ODT config DRAM_SUNXI_DX_ODT
hex "H616 DRAM DX ODT parameter" hex "DRAM DX ODT parameter"
help help
DX ODT value from vendor DRAM settings. DX ODT value from vendor DRAM settings.
config DRAM_SUN50I_H616_DX_DRI config DRAM_SUNXI_DX_DRI
hex "H616 DRAM DX DRI parameter" hex "DRAM DX DRI parameter"
help help
DX DRI value from vendor DRAM settings. DX DRI value from vendor DRAM settings.
config DRAM_SUN50I_H616_CA_DRI config DRAM_SUNXI_CA_DRI
hex "H616 DRAM CA DRI parameter" hex "DRAM CA DRI parameter"
help help
CA DRI value from vendor DRAM settings. CA DRI value from vendor DRAM settings.
config DRAM_SUN50I_H616_ODT_EN config DRAM_SUNXI_ODT_EN
hex "H616 DRAM ODT EN parameter" hex "DRAM ODT EN parameter"
default 0x1 default 0x1
help help
ODT EN value from vendor DRAM settings. ODT EN value from vendor DRAM settings.
config DRAM_SUN50I_H616_TPR0 config DRAM_SUNXI_TPR0
hex "H616 DRAM TPR0 parameter" hex "DRAM TPR0 parameter"
default 0x0 default 0x0
help help
TPR0 value from vendor DRAM settings. TPR0 value from vendor DRAM settings.
config DRAM_SUN50I_H616_TPR2 config DRAM_SUNXI_TPR2
hex "H616 DRAM TPR2 parameter" hex "DRAM TPR2 parameter"
default 0x0 default 0x0
help help
TPR2 value from vendor DRAM settings. TPR2 value from vendor DRAM settings.
config DRAM_SUN50I_H616_TPR6 config DRAM_SUNXI_TPR6
hex "H616 DRAM TPR6 parameter" hex "DRAM TPR6 parameter"
default 0x3300c080 default 0x3300c080
help help
TPR6 value from vendor DRAM settings. TPR6 value from vendor DRAM settings.
config DRAM_SUN50I_H616_TPR10 config DRAM_SUNXI_TPR10
hex "H616 DRAM TPR10 parameter" hex "DRAM TPR10 parameter"
help help
TPR10 value from vendor DRAM settings. It tells which features TPR10 value from vendor DRAM settings. It tells which features
should be configured, like write leveling, read calibration, etc. should be configured, like write leveling, read calibration, etc.
config DRAM_SUN50I_H616_TPR11 config DRAM_SUNXI_TPR11
hex "H616 DRAM TPR11 parameter" hex "DRAM TPR11 parameter"
default 0x0 default 0x0
help help
TPR11 value from vendor DRAM settings. TPR11 value from vendor DRAM settings.
config DRAM_SUN50I_H616_TPR12 config DRAM_SUNXI_TPR12
hex "H616 DRAM TPR12 parameter" hex "DRAM TPR12 parameter"
default 0x0 default 0x0
help help
TPR12 value from vendor DRAM settings. TPR12 value from vendor DRAM settings.
choice choice
prompt "H616 PHY pin mapping selection" prompt "DRAM PHY pin mapping selection"
default DRAM_SUN50I_H616_PHY_ADDR_MAP_0 default DRAM_SUNXI_PHY_ADDR_MAP_0
config DRAM_SUN50I_H616_PHY_ADDR_MAP_0 config DRAM_SUNXI_PHY_ADDR_MAP_0
bool "H313/H616/H618" bool "DRAM PHY address map 0"
help help
The pin mapping selection used by the H313, H616, H618, and This pin mapping selection should be used by the H313, H616, H618.
possibly other dies which use the H616 DRAM controller.
config DRAM_SUN50I_H616_PHY_ADDR_MAP_1 config DRAM_SUNXI_PHY_ADDR_MAP_1
bool "H700" bool "DRAM PHY address map 1"
help help
The pin mapping selection used by the H700 and possibly other This pin mapping selection should be used by the H700.
dies which use the H616 DRAM controller.
endchoice endchoice
endif endif

26
arch/arm/mach-sunxi/dram_sun50i_h616.c
View File

@@ -226,7 +226,7 @@ static void mctl_set_addrmap(const struct dram_config *config)
mctl_ctl->addrmap[8] = 0x3F3F; mctl_ctl->addrmap[8] = 0x3F3F;
} }
#ifdef CONFIG_DRAM_SUN50I_H616_PHY_ADDR_MAP_1 #ifdef CONFIG_DRAM_SUNXI_PHY_ADDR_MAP_1
static const u8 phy_init[] = { static const u8 phy_init[] = {
#ifdef CONFIG_SUNXI_DRAM_H616_DDR3_1333 #ifdef CONFIG_SUNXI_DRAM_H616_DDR3_1333
0x08, 0x02, 0x12, 0x05, 0x15, 0x17, 0x18, 0x0b, 0x08, 0x02, 0x12, 0x05, 0x15, 0x17, 0x18, 0x0b,
@@ -245,7 +245,7 @@ static const u8 phy_init[] = {
0x18, 0x04, 0x1a 0x18, 0x04, 0x1a
#endif #endif
}; };
#else /* CONFIG_DRAM_SUN50I_H616_PHY_ADDR_MAP_0 */ #else /* CONFIG_DRAM_SUNXI_PHY_ADDR_MAP_0 */
static const u8 phy_init[] = { static const u8 phy_init[] = {
#ifdef CONFIG_SUNXI_DRAM_H616_DDR3_1333 #ifdef CONFIG_SUNXI_DRAM_H616_DDR3_1333
0x07, 0x0b, 0x02, 0x16, 0x0d, 0x0e, 0x14, 0x19, 0x07, 0x0b, 0x02, 0x16, 0x0d, 0x0e, 0x14, 0x19,
@@ -264,7 +264,7 @@ static const u8 phy_init[] = {
0x18, 0x03, 0x1a 0x18, 0x03, 0x1a
#endif #endif
}; };
#endif /* CONFIG_DRAM_SUN50I_H616_PHY_ADDR_MAP_0 */ #endif /* CONFIG_DRAM_SUNXI_PHY_ADDR_MAP_0 */
#define MASK_BYTE(reg, nr) (((reg) >> ((nr) * 8)) & 0x1f) #define MASK_BYTE(reg, nr) (((reg) >> ((nr) * 8)) & 0x1f)
static void mctl_phy_configure_odt(const struct dram_para *para) static void mctl_phy_configure_odt(const struct dram_para *para)
{ {
@@ -1409,16 +1409,16 @@ static const struct dram_para para = {
#elif defined(CONFIG_SUNXI_DRAM_H616_LPDDR4) #elif defined(CONFIG_SUNXI_DRAM_H616_LPDDR4)
.type = SUNXI_DRAM_TYPE_LPDDR4, .type = SUNXI_DRAM_TYPE_LPDDR4,
#endif #endif
.dx_odt = CONFIG_DRAM_SUN50I_H616_DX_ODT, .dx_odt = CONFIG_DRAM_SUNXI_DX_ODT,
.dx_dri = CONFIG_DRAM_SUN50I_H616_DX_DRI, .dx_dri = CONFIG_DRAM_SUNXI_DX_DRI,
.ca_dri = CONFIG_DRAM_SUN50I_H616_CA_DRI, .ca_dri = CONFIG_DRAM_SUNXI_CA_DRI,
.odt_en = CONFIG_DRAM_SUN50I_H616_ODT_EN, .odt_en = CONFIG_DRAM_SUNXI_ODT_EN,
.tpr0 = CONFIG_DRAM_SUN50I_H616_TPR0, .tpr0 = CONFIG_DRAM_SUNXI_TPR0,
.tpr2 = CONFIG_DRAM_SUN50I_H616_TPR2, .tpr2 = CONFIG_DRAM_SUNXI_TPR2,
.tpr6 = CONFIG_DRAM_SUN50I_H616_TPR6, .tpr6 = CONFIG_DRAM_SUNXI_TPR6,
.tpr10 = CONFIG_DRAM_SUN50I_H616_TPR10, .tpr10 = CONFIG_DRAM_SUNXI_TPR10,
.tpr11 = CONFIG_DRAM_SUN50I_H616_TPR11, .tpr11 = CONFIG_DRAM_SUNXI_TPR11,
.tpr12 = CONFIG_DRAM_SUN50I_H616_TPR12, .tpr12 = CONFIG_DRAM_SUNXI_TPR12,
}; };
unsigned long sunxi_dram_init(void) unsigned long sunxi_dram_init(void)

20
configs/anbernic_rg35xx_h700_defconfig
View File

@@ -2,16 +2,16 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h700-anbernic-rg35xx-2024" CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h700-anbernic-rg35xx-2024"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_DRAM_SUN50I_H616_DX_ODT=0x08080808 CONFIG_DRAM_SUNXI_DX_ODT=0x08080808
CONFIG_DRAM_SUN50I_H616_DX_DRI=0x0e0e0e0e CONFIG_DRAM_SUNXI_DX_DRI=0x0e0e0e0e
CONFIG_DRAM_SUN50I_H616_CA_DRI=0x0e0e CONFIG_DRAM_SUNXI_CA_DRI=0x0e0e
CONFIG_DRAM_SUN50I_H616_ODT_EN=0x7887bbbb CONFIG_DRAM_SUNXI_ODT_EN=0x7887bbbb
CONFIG_DRAM_SUN50I_H616_TPR2=0x1 CONFIG_DRAM_SUNXI_TPR2=0x1
CONFIG_DRAM_SUN50I_H616_TPR6=0x40808080 CONFIG_DRAM_SUNXI_TPR6=0x40808080
CONFIG_DRAM_SUN50I_H616_TPR10=0x402f6633 CONFIG_DRAM_SUNXI_TPR10=0x402f6633
CONFIG_DRAM_SUN50I_H616_TPR11=0x1b1f1e1c CONFIG_DRAM_SUNXI_TPR11=0x1b1f1e1c
CONFIG_DRAM_SUN50I_H616_TPR12=0x06060606 CONFIG_DRAM_SUNXI_TPR12=0x06060606
CONFIG_DRAM_SUN50I_H616_PHY_ADDR_MAP_1=y CONFIG_DRAM_SUNXI_PHY_ADDR_MAP_1=y
CONFIG_MACH_SUN50I_H616=y CONFIG_MACH_SUN50I_H616=y
CONFIG_SUNXI_DRAM_H616_LPDDR4=y CONFIG_SUNXI_DRAM_H616_LPDDR4=y
CONFIG_DRAM_CLK=672 CONFIG_DRAM_CLK=672

8
configs/orangepi_zero2_defconfig
View File

@@ -2,10 +2,10 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h616-orangepi-zero2" CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h616-orangepi-zero2"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_DRAM_SUN50I_H616_DX_ODT=0x08080808 CONFIG_DRAM_SUNXI_DX_ODT=0x08080808
CONFIG_DRAM_SUN50I_H616_DX_DRI=0x0e0e0e0e CONFIG_DRAM_SUNXI_DX_DRI=0x0e0e0e0e
CONFIG_DRAM_SUN50I_H616_CA_DRI=0x0e0e CONFIG_DRAM_SUNXI_CA_DRI=0x0e0e
CONFIG_DRAM_SUN50I_H616_TPR10=0xf83438 CONFIG_DRAM_SUNXI_TPR10=0xf83438
CONFIG_MACH_SUN50I_H616=y CONFIG_MACH_SUN50I_H616=y
CONFIG_SUNXI_DRAM_H616_DDR3_1333=y CONFIG_SUNXI_DRAM_H616_DDR3_1333=y
CONFIG_USB1_VBUS_PIN="PC16" CONFIG_USB1_VBUS_PIN="PC16"

16
configs/orangepi_zero2w_defconfig
View File

@@ -2,14 +2,14 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-orangepi-zero2w" CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-orangepi-zero2w"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_DRAM_SUN50I_H616_DX_ODT=0x07070707 CONFIG_DRAM_SUNXI_DX_ODT=0x07070707
CONFIG_DRAM_SUN50I_H616_DX_DRI=0x0e0e0e0e CONFIG_DRAM_SUNXI_DX_DRI=0x0e0e0e0e
CONFIG_DRAM_SUN50I_H616_CA_DRI=0x0e0e CONFIG_DRAM_SUNXI_CA_DRI=0x0e0e
CONFIG_DRAM_SUN50I_H616_ODT_EN=0xaaaaeeee CONFIG_DRAM_SUNXI_ODT_EN=0xaaaaeeee
CONFIG_DRAM_SUN50I_H616_TPR6=0x48808080 CONFIG_DRAM_SUNXI_TPR6=0x48808080
CONFIG_DRAM_SUN50I_H616_TPR10=0x402f6663 CONFIG_DRAM_SUNXI_TPR10=0x402f6663
CONFIG_DRAM_SUN50I_H616_TPR11=0x26262524 CONFIG_DRAM_SUNXI_TPR11=0x26262524
CONFIG_DRAM_SUN50I_H616_TPR12=0x100f100f CONFIG_DRAM_SUNXI_TPR12=0x100f100f
CONFIG_MACH_SUN50I_H616=y CONFIG_MACH_SUN50I_H616=y
CONFIG_SUNXI_DRAM_H616_LPDDR4=y CONFIG_SUNXI_DRAM_H616_LPDDR4=y
CONFIG_DRAM_CLK=792 CONFIG_DRAM_CLK=792

16
configs/orangepi_zero3_defconfig
View File

@@ -2,14 +2,14 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-orangepi-zero3" CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-orangepi-zero3"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_DRAM_SUN50I_H616_DX_ODT=0x07070707 CONFIG_DRAM_SUNXI_DX_ODT=0x07070707
CONFIG_DRAM_SUN50I_H616_DX_DRI=0x0e0e0e0e CONFIG_DRAM_SUNXI_DX_DRI=0x0e0e0e0e
CONFIG_DRAM_SUN50I_H616_CA_DRI=0x0e0e CONFIG_DRAM_SUNXI_CA_DRI=0x0e0e
CONFIG_DRAM_SUN50I_H616_ODT_EN=0xaaaaeeee CONFIG_DRAM_SUNXI_ODT_EN=0xaaaaeeee
CONFIG_DRAM_SUN50I_H616_TPR6=0x44000000 CONFIG_DRAM_SUNXI_TPR6=0x44000000
CONFIG_DRAM_SUN50I_H616_TPR10=0x402f6663 CONFIG_DRAM_SUNXI_TPR10=0x402f6663
CONFIG_DRAM_SUN50I_H616_TPR11=0x24242624 CONFIG_DRAM_SUNXI_TPR11=0x24242624
CONFIG_DRAM_SUN50I_H616_TPR12=0x0f0f100f CONFIG_DRAM_SUNXI_TPR12=0x0f0f100f
CONFIG_MACH_SUN50I_H616=y CONFIG_MACH_SUN50I_H616=y
CONFIG_SUNXI_DRAM_H616_LPDDR4=y CONFIG_SUNXI_DRAM_H616_LPDDR4=y
CONFIG_DRAM_CLK=792 CONFIG_DRAM_CLK=792

16
configs/tanix_tx1_defconfig
View File

@@ -2,14 +2,14 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h313-tanix-tx1" CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h313-tanix-tx1"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_DRAM_SUN50I_H616_DX_ODT=0x06060606 CONFIG_DRAM_SUNXI_DX_ODT=0x06060606
CONFIG_DRAM_SUN50I_H616_DX_DRI=0x0d0d0d0d CONFIG_DRAM_SUNXI_DX_DRI=0x0d0d0d0d
CONFIG_DRAM_SUN50I_H616_CA_DRI=0x1919 CONFIG_DRAM_SUNXI_CA_DRI=0x1919
CONFIG_DRAM_SUN50I_H616_ODT_EN=0x9988eeee CONFIG_DRAM_SUNXI_ODT_EN=0x9988eeee
CONFIG_DRAM_SUN50I_H616_TPR6=0x2fb08080 CONFIG_DRAM_SUNXI_TPR6=0x2fb08080
CONFIG_DRAM_SUN50I_H616_TPR10=0x402f4469 CONFIG_DRAM_SUNXI_TPR10=0x402f4469
CONFIG_DRAM_SUN50I_H616_TPR11=0x0e0f0d0d CONFIG_DRAM_SUNXI_TPR11=0x0e0f0d0d
CONFIG_DRAM_SUN50I_H616_TPR12=0x11131213 CONFIG_DRAM_SUNXI_TPR12=0x11131213
CONFIG_MACH_SUN50I_H616=y CONFIG_MACH_SUN50I_H616=y
CONFIG_SUNXI_DRAM_H616_LPDDR3=y CONFIG_SUNXI_DRAM_H616_LPDDR3=y
CONFIG_R_I2C_ENABLE=y CONFIG_R_I2C_ENABLE=y

14
configs/transpeed-8k618-t_defconfig
View File

@@ -2,13 +2,13 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-transpeed-8k618-t" CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-transpeed-8k618-t"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_DRAM_SUN50I_H616_DX_ODT=0x03030303 CONFIG_DRAM_SUNXI_DX_ODT=0x03030303
CONFIG_DRAM_SUN50I_H616_DX_DRI=0x0e0e0e0e CONFIG_DRAM_SUNXI_DX_DRI=0x0e0e0e0e
CONFIG_DRAM_SUN50I_H616_CA_DRI=0x1f12 CONFIG_DRAM_SUNXI_CA_DRI=0x1f12
CONFIG_DRAM_SUN50I_H616_TPR0=0xc0001002 CONFIG_DRAM_SUNXI_TPR0=0xc0001002
CONFIG_DRAM_SUN50I_H616_TPR10=0x2f1107 CONFIG_DRAM_SUNXI_TPR10=0x2f1107
CONFIG_DRAM_SUN50I_H616_TPR11=0xddddcccc CONFIG_DRAM_SUNXI_TPR11=0xddddcccc
CONFIG_DRAM_SUN50I_H616_TPR12=0xeddc7665 CONFIG_DRAM_SUNXI_TPR12=0xeddc7665
CONFIG_MACH_SUN50I_H616=y CONFIG_MACH_SUN50I_H616=y
CONFIG_SUNXI_DRAM_H616_DDR3_1333=y CONFIG_SUNXI_DRAM_H616_DDR3_1333=y
CONFIG_DRAM_CLK=648 CONFIG_DRAM_CLK=648

14
configs/x96_mate_defconfig
View File

@@ -2,13 +2,13 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h616-x96-mate" CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h616-x96-mate"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_DRAM_SUN50I_H616_DX_ODT=0x03030303 CONFIG_DRAM_SUNXI_DX_ODT=0x03030303
CONFIG_DRAM_SUN50I_H616_DX_DRI=0x0e0e0e0e CONFIG_DRAM_SUNXI_DX_DRI=0x0e0e0e0e
CONFIG_DRAM_SUN50I_H616_CA_DRI=0x1c12 CONFIG_DRAM_SUNXI_CA_DRI=0x1c12
CONFIG_DRAM_SUN50I_H616_TPR0=0xc0000c05 CONFIG_DRAM_SUNXI_TPR0=0xc0000c05
CONFIG_DRAM_SUN50I_H616_TPR10=0x2f0007 CONFIG_DRAM_SUNXI_TPR10=0x2f0007
CONFIG_DRAM_SUN50I_H616_TPR11=0xffffdddd CONFIG_DRAM_SUNXI_TPR11=0xffffdddd
CONFIG_DRAM_SUN50I_H616_TPR12=0xfedf7557 CONFIG_DRAM_SUNXI_TPR12=0xfedf7557
CONFIG_MACH_SUN50I_H616=y CONFIG_MACH_SUN50I_H616=y
CONFIG_SUNXI_DRAM_H616_DDR3_1333=y CONFIG_SUNXI_DRAM_H616_DDR3_1333=y
CONFIG_R_I2C_ENABLE=y CONFIG_R_I2C_ENABLE=y