| Message ID | 1412802627-23174-1-git-send-email-trini@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Oct 08, 2014 at 05:10:27PM -0400, Tom Rini wrote: > In the case of Beaglebone Black we only want to set the NAND or NOR cape > pinmux when the config has been specifically modified by the user for > this non-default case. Make the default be to set the MMC1 (eMMC) > pinmux. We don't need similar changes for Beaglebone White as there is > nothing on MMC1 by default there. > > Signed-off-by: Tom Rini <trini@ti.com> Applied to u-boot-ti/master, thanks!
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 2a18ccb..54e8678 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -364,9 +364,9 @@ void enable_board_pin_mux(struct am335x_baseboard_id *header) configure_module_pin_mux(i2c1_pin_mux); configure_module_pin_mux(mii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); -#if defined(CONFIG_NAND) +#if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT) configure_module_pin_mux(nand_pin_mux); -#elif defined(CONFIG_NOR) +#elif defined(CONFIG_NOR) && defined(CONFIG_EMMC_BOOT) configure_module_pin_mux(bone_norcape_pin_mux); #else configure_module_pin_mux(mmc1_pin_mux);
In the case of Beaglebone Black we only want to set the NAND or NOR cape pinmux when the config has been specifically modified by the user for this non-default case. Make the default be to set the MMC1 (eMMC) pinmux. We don't need similar changes for Beaglebone White as there is nothing on MMC1 by default there. Signed-off-by: Tom Rini <trini@ti.com> --- board/ti/am335x/mux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)