karo: tx6ul: enable soft_i2c for PMIC access

[karo-tx-uboot.git] / board / karo / tx6 / tx6ul.c

diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c
index 045605d94e5d624b9ed518374f5a479e5559b18f..3395a026dde25c9f233d4d9794df48fc71398912 100644 (file)
--- a/board/karo/tx6/tx6ul.c
+++ b/board/karo/tx6/tx6ul.c
@@ -40,8 +40,8 @@
 #define TX6UL_LCD_RST_GPIO             IMX_GPIO_NR(3, 4)
 #define TX6UL_LCD_BACKLIGHT_GPIO       IMX_GPIO_NR(4, 16)
 
-#define TX6UL_I2C1_SCL_GPIO            IMX_GPIO_NR(5, 0)
-#define TX6UL_I2C1_SDA_GPIO            IMX_GPIO_NR(5, 1)
+#define TX6UL_I2C1_SCL_GPIO            CONFIG_SOFT_I2C_GPIO_SCL
+#define TX6UL_I2C1_SDA_GPIO            CONFIG_SOFT_I2C_GPIO_SDA
 
 #define TX6UL_SD1_CD_GPIO              IMX_GPIO_NR(4, 14)
 
@@ -428,12 +428,13 @@ int board_init(void)
 #endif
                return 0;
        }
-
+#if 0
        ret = tx6_pmic_init(pmic_addr);
        if (ret) {
                printf("Failed to setup PMIC voltages: %d\n", ret);
-//             hang();
+               hang();
        }
+#endif
        return 0;
 }
 
@@ -720,8 +721,8 @@ static const struct gpio stk5_gpios[] = {
 static u16 tx6_cmap[256];
 vidinfo_t panel_info = {
        /* set to max. size supported by SoC */
-       .vl_col = 1920,
-       .vl_row = 1080,
+       .vl_col = 4096,
+       .vl_row = 1024,
 
        .vl_bpix = LCD_COLOR32,    /* Bits per pixel, 0: 1bpp, 1: 2bpp, 2: 4bpp, 3: 8bpp ... */
        .cmap = tx6_cmap,
@@ -1401,7 +1402,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                karo_fdt_enable_node(blob, "stk5led", 0);
 
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, tx6_touchpanels,
                                ARRAY_SIZE(tx6_touchpanels));