Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git] / board / toradex / colibri_imx6 / colibri_imx6.c
index 669d9123ca295bd3283d98b27edab4da89e857ae..2998a09238dc03031d8bfcc121038778d779488e 100644 (file)
@@ -28,8 +28,8 @@
 #include <dm/platform_data/serial_mxc.h>
 #include <dm/platdata.h>
 #include <fsl_esdhc.h>
-#include <g_dnl.h>
 #include <i2c.h>
+#include <input.h>
 #include <imx_thermal.h>
 #include <linux/errno.h>
 #include <malloc.h>
@@ -631,9 +631,6 @@ int board_early_init_f(void)
                                         ARRAY_SIZE(pwr_intb_pads));
        setup_iomux_uart();
 
-#if defined(CONFIG_VIDEO_IPUV3)
-       setup_display();
-#endif
        return 0;
 }
 
@@ -654,6 +651,10 @@ int board_init(void)
        setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
        setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info_loc);
 
+#if defined(CONFIG_VIDEO_IPUV3)
+       setup_display();
+#endif
+
 #ifdef CONFIG_TDX_CMD_IMX_MFGR
        (void) pmic_init();
 #endif
@@ -1108,18 +1109,6 @@ void reset_cpu(ulong addr)
 {
 }
 
-#ifdef CONFIG_SPL_USB_GADGET_SUPPORT
-int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
-{
-       unsigned short usb_pid;
-
-       usb_pid = TORADEX_USB_PRODUCT_NUM_OFFSET + 0xfff;
-       put_unaligned(usb_pid, &dev->idProduct);
-
-       return 0;
-}
-#endif
-
 #endif
 
 static struct mxc_serial_platdata mxc_serial_plat = {