diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-03-18 16:41:45 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-03-24 01:45:19 +0900 |
| commit | 1b1f2319ca2736dab14e1bd1d49558581763138a (patch) | |
| tree | 5c6d23326221e41e140af21e5273c179b725fdbe /arch/arm/mach-uniphier/dram/ddrphy-regs.h | |
| parent | 5d0607c58c02204c7ec02f0f4d6bd268929961ee (diff) | |
| download | talos-obmc-uboot-1b1f2319ca2736dab14e1bd1d49558581763138a.tar.gz talos-obmc-uboot-1b1f2319ca2736dab14e1bd1d49558581763138a.zip | |
ARM: uniphier: drop ifdef in ddrphy-regs.h
The ifdef conditionals in header files prevent us from multi-SoC
support in a single U-Boot image. Detect SoC specific parameters
run-time rather than define them statically with an ifdef in
ddrphy-regs.h.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/dram/ddrphy-regs.h')
| -rw-r--r-- | arch/arm/mach-uniphier/dram/ddrphy-regs.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-regs.h b/arch/arm/mach-uniphier/dram/ddrphy-regs.h index 2bcfc1e5fb..a1d51cedf3 100644 --- a/arch/arm/mach-uniphier/dram/ddrphy-regs.h +++ b/arch/arm/mach-uniphier/dram/ddrphy-regs.h @@ -158,16 +158,6 @@ struct ddrphy { /* SoC-specific parameters */ #define NR_DATX8_PER_DDRPHY 2 -#if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_SLD8) -#define NR_DDRPHY_PER_CH 1 -#else -#define NR_DDRPHY_PER_CH 2 -#endif - -#define NR_DDRCH 2 - -#define DDRPHY_BASE(ch, phy) (0x5bc01000 + 0x200000 * (ch) + 0x1000 * (phy)) - #ifndef __ASSEMBLY__ int ph1_ld4_ddrphy_init(struct ddrphy __iomem *phy, int freq, bool ddr3plus); void ddrphy_prepare_training(struct ddrphy __iomem *phy, int rank); |
