diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
| commit | d38de7cb03adf88e18c05d840c2528b7a5af2f9b (patch) | |
| tree | 35be69932e53e4c58260af58ae841a3d1a2523b6 /arch/arm/mach-uniphier/init.h | |
| parent | b24cf8540a85a9bf97975aadd6a7542f166c78a3 (diff) | |
| parent | bc647958047cd03193e19cd8c08a6771fea828b7 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Fix regressions caused by the previous reworks
- Add pin configuration support
- Re-work SPL code
- Update DRAM and PLL setup code
- Enable needed configs, disable unneeded configs
Diffstat (limited to 'arch/arm/mach-uniphier/init.h')
| -rw-r--r-- | arch/arm/mach-uniphier/init.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h index 453e68a43e..5c45f2d31b 100644 --- a/arch/arm/mach-uniphier/init.h +++ b/arch/arm/mach-uniphier/init.h @@ -13,18 +13,17 @@ #define UNIPHIER_MAX_NR_DRAM_CH 3 struct uniphier_dram_ch { - unsigned long base; unsigned long size; unsigned int width; }; struct uniphier_board_data { unsigned int dram_freq; - unsigned int dram_nr_ch; struct uniphier_dram_ch dram_ch[UNIPHIER_MAX_NR_DRAM_CH]; unsigned int flags; -#define UNIPHIER_BD_DDR3PLUS BIT(2) +#define UNIPHIER_BD_DRAM_SPARSE BIT(9) +#define UNIPHIER_BD_DDR3PLUS BIT(8) #define UNIPHIER_BD_BOARD_GET_TYPE(f) ((f) & 0x7) #define UNIPHIER_BD_BOARD_LD20_REF 0 /* LD20 reference */ @@ -119,12 +118,16 @@ void uniphier_pro4_clk_init(void); void uniphier_pro5_clk_init(void); void uniphier_pxs2_clk_init(void); void uniphier_ld11_clk_init(void); +void uniphier_ld20_clk_init(void); +unsigned int uniphier_boot_device_raw(void); int uniphier_pin_init(const char *pinconfig_name); void uniphier_smp_kick_all_cpus(void); void cci500_init(int nr_slaves); +#undef pr_warn #define pr_warn(fmt, args...) printf(fmt, ##args) +#undef pr_err #define pr_err(fmt, args...) printf(fmt, ##args) #endif /* __MACH_INIT_H */ |