aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Huang2017-10-10 05:07:26 -0500
committerDavid Huang2017-10-10 05:07:26 -0500
commit7031c46d3b141eb310001a0600bcfcf7a75725c2 (patch)
treea75e669fc99d339cfbe32886292c0d32406ec5b6
parent1e93748762e10d5a993e94ed2a2a89d6476148f5 (diff)
parent340c262b4bed7adac127e572f857e6f931ef18b2 (diff)
downloadu-boot-7031c46d3b141eb310001a0600bcfcf7a75725c2.tar.gz
u-boot-7031c46d3b141eb310001a0600bcfcf7a75725c2.tar.xz
u-boot-7031c46d3b141eb310001a0600bcfcf7a75725c2.zip
Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05
Auto Merge of: TI-Feature: 2016.05 TI-Tree: git://git.ti.com/ti-u-boot/ti-u-boot.git TI-Branch: ti-u-boot-2016.05 * 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot: board: ti: dra7xx: Fix iodelay execution sequence board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM Signed-off-by: David Huang <d-huang@ti.com>
-rw-r--r--arch/arm/include/asm/arch-omap5/mux_dra7xx.h3
-rw-r--r--board/ti/dra7xx/evm.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-omap5/mux_dra7xx.h b/arch/arm/include/asm/arch-omap5/mux_dra7xx.h
index 5eed98ca27..e539b008b0 100644
--- a/arch/arm/include/asm/arch-omap5/mux_dra7xx.h
+++ b/arch/arm/include/asm/arch-omap5/mux_dra7xx.h
@@ -365,4 +365,7 @@
365#define NMIN_DSP 0x460 365#define NMIN_DSP 0x460
366#define RSTOUTN 0x464 366#define RSTOUTN 0x464
367 367
368#define MCAN_SEL_ALT_MASK 0x6000
369#define MCAN_SEL 0x2000
370
368#endif /* _MUX_DRA7XX_H_ */ 371#endif /* _MUX_DRA7XX_H_ */
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 145f044f88..685edf07c8 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -815,6 +815,7 @@ void recalibrate_iodelay(void)
815 RGMII1_ID_MODE_N_MASK); 815 RGMII1_ID_MODE_N_MASK);
816 break; 816 break;
817 } 817 }
818
818 /* Setup I/O isolation */ 819 /* Setup I/O isolation */
819 ret = __recalibrate_iodelay_start(); 820 ret = __recalibrate_iodelay_start();
820 if (ret) 821 if (ret)
@@ -828,6 +829,11 @@ void recalibrate_iodelay(void)
828 do_set_mux32((*ctrl)->control_padconf_core_base, 829 do_set_mux32((*ctrl)->control_padconf_core_base,
829 delta_pads, delta_npads); 830 delta_pads, delta_npads);
830 831
832 if (is_dra76x())
833 /* Set mux for MCAN instead of DCAN1 */
834 clrsetbits_le32((*ctrl)->control_core_control_spare_rw,
835 MCAN_SEL_ALT_MASK, MCAN_SEL);
836
831 /* Setup IOdelay configuration */ 837 /* Setup IOdelay configuration */
832 ret = do_set_iodelay((*ctrl)->iodelay_config_base, iodelay, niodelays); 838 ret = do_set_iodelay((*ctrl)->iodelay_config_base, iodelay, niodelays);
833err: 839err: