mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
Merge tag 'u-boot-imx-20191228' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.01 ----------------- - Fixes for Nitrogen6x - Fix corruption for mx51evk - colibri i.MX6: fix broken ESDHC conversion - mx6sxsabresd: fix broken mmcdev - imx6q_logic: cleanup boot sequence - update ATF for imx8mq_evk - pfuze: fix pmic_get() Travis CI: https://travis-ci.org/sbabic/u-boot-imx/builds/630007464
This commit is contained in:
@@ -24,7 +24,7 @@ void ddr_init(struct dram_timing_info *dram_timing)
|
||||
{
|
||||
unsigned int tmp, initial_drate, target_freq;
|
||||
|
||||
printf("DDRINFO: start DRAM init\n");
|
||||
debug("DDRINFO: start DRAM init\n");
|
||||
|
||||
/* Step1: Follow the power up procedure */
|
||||
if (is_imx8mq()) {
|
||||
@@ -109,7 +109,7 @@ void ddr_init(struct dram_timing_info *dram_timing)
|
||||
tmp = reg32_read(DDRPHY_CalBusy(0));
|
||||
} while ((tmp & 0x1));
|
||||
|
||||
printf("DDRINFO:ddrphy calibration done\n");
|
||||
debug("DDRINFO:ddrphy calibration done\n");
|
||||
|
||||
/* Step15: Set SWCTL.sw_done to 0 */
|
||||
reg32_write(DDRC_SWCTL(0), 0x00000000);
|
||||
@@ -161,7 +161,7 @@ void ddr_init(struct dram_timing_info *dram_timing)
|
||||
|
||||
/* enable port 0 */
|
||||
reg32_write(DDRC_PCTRL_0(0), 0x00000001);
|
||||
printf("DDRINFO: ddrmix config done\n");
|
||||
debug("DDRINFO: ddrmix config done\n");
|
||||
|
||||
/* save the dram timing config into memory */
|
||||
dram_config_save(dram_timing, CONFIG_SAVED_DRAM_TIMING_BASE);
|
||||
|
@@ -349,7 +349,7 @@ void rtc_init(void)
|
||||
|
||||
static int rx8010sj_probe(struct udevice *dev)
|
||||
{
|
||||
rx8010sj_rtc_init(&dev);
|
||||
rx8010sj_rtc_init(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -364,6 +364,7 @@ static const struct rtc_ops rx8010sj_rtc_ops = {
|
||||
|
||||
static const struct udevice_id rx8010sj_rtc_ids[] = {
|
||||
{ .compatible = "epson,rx8010sj-rtc" },
|
||||
{ .compatible = "epson,rx8010" },
|
||||
{ }
|
||||
};
|
||||
|
||||
|
@@ -350,6 +350,8 @@ static const struct rtc_ops s35392a_rtc_ops = {
|
||||
|
||||
static const struct udevice_id s35392a_rtc_ids[] = {
|
||||
{ .compatible = "sii,s35392a-rtc" },
|
||||
{ .compatible = "sii,s35392a" },
|
||||
{ .compatible = "s35392a" },
|
||||
{ }
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user