Merge branch 'master' of git://git.denx.de/u-boot-mips

[u-boot] / board / ti / am335x / mux.c

diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
index 187468e24e17fd102e169ee056b5534bce9c7f38..b2bfda5ea9f60a8214ee93e88ae3a842d944cae0 100644 (file)
--- a/board/ti/am335x/mux.c
+++ b/board/ti/am335x/mux.c
@@ -190,7 +190,7 @@ static struct module_pin_mux nand_pin_mux[] = {
        {-1},
 };
 
-#if defined(CONFIG_NOR)
+#if defined(CONFIG_NOR) && !defined(CONFIG_NOR_BOOT)
 static struct module_pin_mux bone_norcape_pin_mux[] = {
        {OFFSET(lcd_data0), MODE(1) | PULLUDEN | RXACTIVE},     /* NOR_A0 */
        {OFFSET(lcd_data1), MODE(1) | PULLUDEN | RXACTIVE},     /* NOR_A1 */
@@ -239,6 +239,25 @@ static struct module_pin_mux bone_norcape_pin_mux[] = {
 };
 #endif
 
+#if defined(CONFIG_NOR_BOOT)
+static struct module_pin_mux norboot_pin_mux[] = {
+       {OFFSET(lcd_data1), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data2), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data3), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data4), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data5), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data6), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data7), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data8), MODE(1) | PULLUDDIS},
+       {OFFSET(lcd_data9), MODE(1) | PULLUDDIS},
+       {-1},
+};
+
+void enable_norboot_pin_mux(void)
+{
+       configure_module_pin_mux(norboot_pin_mux);
+}
+#endif
 
 void enable_uart0_pin_mux(void)
 {
@@ -317,8 +336,10 @@ 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);
+#ifndef CONFIG_NOR
                configure_module_pin_mux(mmc1_pin_mux);
-#if defined(CONFIG_NOR)
+#endif
+#if defined(CONFIG_NOR) && !defined(CONFIG_NOR_BOOT)
                configure_module_pin_mux(bone_norcape_pin_mux);
 #endif
        } else if (board_is_gp_evm(header)) {