projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
[oweals/u-boot.git]
/
board
/
freescale
/
t208xrdb
/
t208xrdb.c
diff --git
a/board/freescale/t208xrdb/t208xrdb.c
b/board/freescale/t208xrdb/t208xrdb.c
index 341453bc74e8c6b9d434fd264edccd4b9e1e5ab6..24f0d0764cec3f113ef520d168a449c91715bcf3 100644
(file)
--- a/
board/freescale/t208xrdb/t208xrdb.c
+++ b/
board/freescale/t208xrdb/t208xrdb.c
@@
-1,12
+1,15
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2009-2013 Freescale Semiconductor, Inc.
/*
* Copyright 2009-2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <command.h>
*/
#include <common.h>
#include <command.h>
+#include <env.h>
+#include <fdt_support.h>
#include <i2c.h>
#include <i2c.h>
+#include <image.h>
+#include <init.h>
#include <netdev.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <netdev.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
@@
-14,11
+17,11
@@
#include <asm/immap_85xx.h>
#include <asm/fsl_law.h>
#include <asm/fsl_serdes.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_law.h>
#include <asm/fsl_serdes.h>
-#include <asm/fsl_portals.h>
#include <asm/fsl_liodn.h>
#include <fm_eth.h>
#include "t208xrdb.h"
#include "cpld.h"
#include <asm/fsl_liodn.h>
#include <fm_eth.h>
#include "t208xrdb.h"
#include "cpld.h"
+#include "../common/vid.h"
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-80,11
+83,12
@@
int board_early_init_r(void)
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, flash_esel, BOOKE_PAGESZ_256M, 1);
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, flash_esel, BOOKE_PAGESZ_256M, 1);
- set_liodns();
-#ifdef CONFIG_SYS_DPAA_QBMAN
- setup_portals();
-#endif
-
+ /*
+ * Adjust core voltage according to voltage ID
+ * This function changes I2C mux to channel 2.
+ */
+ if (adjust_vdd(0))
+ printf("Warning: Adjusting core voltage failed.\n");
return 0;
}
return 0;
}
@@
-100,6
+104,13
@@
unsigned long get_board_ddr_clk(void)
int misc_init_r(void)
{
int misc_init_r(void)
{
+ u8 reg;
+
+ /* Reset CS4315 PHY */
+ reg = CPLD_READ(reset_ctl);
+ reg |= CPLD_RSTCON_EDC_RST;
+ CPLD_WRITE(reset_ctl, reg);
+
return 0;
}
return 0;
}
@@
-110,8
+121,8
@@
int ft_board_setup(void *blob, bd_t *bd)
ft_cpu_setup(blob, bd);
ft_cpu_setup(blob, bd);
- base =
getenv
_bootm_low();
- size =
getenv
_bootm_size();
+ base =
env_get
_bootm_low();
+ size =
env_get
_bootm_size();
fdt_fixup_memory(blob, (u64)base, (u64)size);
fdt_fixup_memory(blob, (u64)base, (u64)size);
@@
-120,7
+131,7
@@
int ft_board_setup(void *blob, bd_t *bd)
#endif
fdt_fixup_liodn(blob);
#endif
fdt_fixup_liodn(blob);
- fdt_fixup_dr_usb(blob, bd);
+ f
sl_f
dt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob);
#ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob);