diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:02 -0400 |
| commit | 7bb839d672ed3b28c7740429df4a307482868c5b (patch) | |
| tree | 0713c473994463c67c13cd80c6206886509b98d6 /arch/arm/mach-uniphier/include/mach/ddrphy-regs.h | |
| parent | ce50916ca1415da2f44931d93397d36ac0d208a2 (diff) | |
| parent | a4bb44b027705f8c05fc525180cabaa3769247bb (diff) | |
| download | u-boot-imx-7bb839d672ed3b28c7740429df4a307482868c5b.zip u-boot-imx-7bb839d672ed3b28c7740429df4a307482868c5b.tar.gz u-boot-imx-7bb839d672ed3b28c7740429df4a307482868c5b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/include/mach/ddrphy-regs.h')
| -rw-r--r-- | arch/arm/mach-uniphier/include/mach/ddrphy-regs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/include/mach/ddrphy-regs.h b/arch/arm/mach-uniphier/include/mach/ddrphy-regs.h index fce0c01..adcc972 100644 --- a/arch/arm/mach-uniphier/include/mach/ddrphy-regs.h +++ b/arch/arm/mach-uniphier/include/mach/ddrphy-regs.h @@ -156,7 +156,8 @@ struct ddrphy { /* SoC-specific parameters */ #define NR_DATX8_PER_DDRPHY 2 -#if defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8) +#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4) || \ + defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8) #define NR_DDRPHY_PER_CH 1 #else #define NR_DDRPHY_PER_CH 2 @@ -167,7 +168,9 @@ struct ddrphy { #define DDRPHY_BASE(ch, phy) (0x5bc01000 + 0x200000 * (ch) + 0x1000 * (phy)) #ifndef __ASSEMBLY__ -void ddrphy_init(struct ddrphy __iomem *phy, int freq, int size); +int ph1_ld4_ddrphy_init(struct ddrphy __iomem *phy, int freq, int size); +int ph1_pro4_ddrphy_init(struct ddrphy __iomem *phy, int freq, int size); +int ph1_sld8_ddrphy_init(struct ddrphy __iomem *phy, int freq, int size); void ddrphy_prepare_training(struct ddrphy __iomem *phy, int rank); int ddrphy_training(struct ddrphy __iomem *phy); #endif |