Some of the non-essential 5432 pads have a different purpose compared to 5430, so do not apply the 5430 non-essential pads configuration to 5432. Essential pad confs are common and can/shall be shared.

Signed-off-by: Sebastien Jan s-jan@ti.com --- board/ti/omap5_evm/evm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/board/ti/omap5_evm/evm.c b/board/ti/omap5_evm/evm.c index c8dfdf8..e488fa5 100644 --- a/board/ti/omap5_evm/evm.c +++ b/board/ti/omap5_evm/evm.c @@ -82,13 +82,19 @@ void set_muxconf_regs_essential(void)

void set_muxconf_regs_non_essential(void) { - do_set_mux(CONTROL_PADCONF_CORE, core_padconf_array_non_essential, - sizeof(core_padconf_array_non_essential) / - sizeof(struct pad_conf_entry)); + u32 omap_rev = omap_revision();

- do_set_mux(CONTROL_PADCONF_WKUP, wkup_padconf_array_non_essential, - sizeof(wkup_padconf_array_non_essential) / - sizeof(struct pad_conf_entry)); + if (omap_rev == OMAP5430_ES1_0) { + do_set_mux(CONTROL_PADCONF_CORE, + core_padconf_array_non_essential, + sizeof(core_padconf_array_non_essential) / + sizeof(struct pad_conf_entry)); + + do_set_mux(CONTROL_PADCONF_WKUP, + wkup_padconf_array_non_essential, + sizeof(wkup_padconf_array_non_essential) / + sizeof(struct pad_conf_entry)); + } }

#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)