aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLCPD Auto Merger2017-10-09 21:13:32 -0500
committerLCPD Auto Merger2017-10-09 21:13:32 -0500
commit340c262b4bed7adac127e572f857e6f931ef18b2 (patch)
treeb30dca072994300c8cda495b7b64366d52d810b9
parent299ebd66e11c2481a29ddcbfe65e196f6c9e0b41 (diff)
parentb8ed28f9d8d3dfb0b73466b3d8b3d1a92447d87d (diff)
downloadu-boot-340c262b4bed7adac127e572f857e6f931ef18b2.tar.gz
u-boot-340c262b4bed7adac127e572f857e6f931ef18b2.tar.xz
u-boot-340c262b4bed7adac127e572f857e6f931ef18b2.zip
Merge branch 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot into ti-u-boot-2016.05
TI-Feature: maint-uboot-2016 TI-Tree: git@git.ti.com:ti-u-boot/maint-ti-u-boot.git TI-Branch: maint-ti-u-boot-2016.05 * 'maint-ti-u-boot-2016.05' of git.ti.com:ti-u-boot/maint-ti-u-boot: board: ti: dra7xx: Fix iodelay execution sequence board: ti: dra7xx: Select MCAN instead of DCAN on DRA76 EVM Signed-off-by: LCPD Auto Merger <lcpd_integration@list.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 9c1f53190a..aa5e13dea0 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -800,6 +800,7 @@ void recalibrate_iodelay(void)
800 RGMII1_ID_MODE_N_MASK); 800 RGMII1_ID_MODE_N_MASK);
801 break; 801 break;
802 } 802 }
803
803 /* Setup I/O isolation */ 804 /* Setup I/O isolation */
804 ret = __recalibrate_iodelay_start(); 805 ret = __recalibrate_iodelay_start();
805 if (ret) 806 if (ret)
@@ -813,6 +814,11 @@ void recalibrate_iodelay(void)
813 do_set_mux32((*ctrl)->control_padconf_core_base, 814 do_set_mux32((*ctrl)->control_padconf_core_base,
814 delta_pads, delta_npads); 815 delta_pads, delta_npads);
815 816
817 if (is_dra76x())
818 /* Set mux for MCAN instead of DCAN1 */
819 clrsetbits_le32((*ctrl)->control_core_control_spare_rw,
820 MCAN_SEL_ALT_MASK, MCAN_SEL);
821
816 /* Setup IOdelay configuration */ 822 /* Setup IOdelay configuration */
817 ret = do_set_iodelay((*ctrl)->iodelay_config_base, iodelay, niodelays); 823 ret = do_set_iodelay((*ctrl)->iodelay_config_base, iodelay, niodelays);
818err: 824err: