ARM: k2g: Use board detection to wrap K2G GP specific calls

Certain peripherals used by K2G GP aren't used on K2G ICE evm. Or
configuration is slightly different. Therefore, use board detection to
deal with these variations.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index 3622312..9001255 100644 (file)
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -208,7 +208,9 @@ int board_mmc_init(bd_t *bis)
                return -1;
        }
 
-       omap_mmc_init(0, 0, 0, -1, -1);
+       if (board_is_k2g_gp())
+               omap_mmc_init(0, 0, 0, -1, -1);
+
        omap_mmc_init(1, 0, 0, -1, -1);
        return 0;
 }
@@ -278,11 +280,13 @@ int embedded_dtb_select(void)
 
        k2g_reset_mux_config();
 
-       /* deassert FLASH_HOLD */
-       clrbits_le32(K2G_GPIO1_BANK2_BASE + K2G_GPIO_DIR_OFFSET,
-                    BIT(9));
-       setbits_le32(K2G_GPIO1_BANK2_BASE + K2G_GPIO_SETDATA_OFFSET,
-                    BIT(9));
+       if (board_is_k2g_gp()) {
+               /* deassert FLASH_HOLD */
+               clrbits_le32(K2G_GPIO1_BANK2_BASE + K2G_GPIO_DIR_OFFSET,
+                            BIT(9));
+               setbits_le32(K2G_GPIO1_BANK2_BASE + K2G_GPIO_SETDATA_OFFSET,
+                            BIT(9));
+       }
 
        return 0;
 }