|
@@ -100,32 +100,7 @@ static void setup_gpmi_nand(void)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_VIDEO_MXS
|
|
|
-static iomux_v3_cfg_t const lcd_pads[] = {
|
|
|
- MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_ENABLE__LCD_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA00__LCD_DATA0 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA01__LCD_DATA1 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA02__LCD_DATA2 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA03__LCD_DATA3 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA04__LCD_DATA4 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA05__LCD_DATA5 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA06__LCD_DATA6 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA07__LCD_DATA7 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA08__LCD_DATA8 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA09__LCD_DATA9 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA10__LCD_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA11__LCD_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA12__LCD_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA13__LCD_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA14__LCD_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA15__LCD_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA16__LCD_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
- MX7D_PAD_LCD_DATA17__LCD_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL),
|
|
|
-};
|
|
|
-
|
|
|
+#ifdef CONFIG_DM_VIDEO
|
|
|
static iomux_v3_cfg_t const backlight_pads[] = {
|
|
|
/* Backlight On */
|
|
|
MX7D_PAD_SD1_WP__GPIO5_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL),
|
|
@@ -139,8 +114,6 @@ static iomux_v3_cfg_t const backlight_pads[] = {
|
|
|
|
|
|
static int setup_lcd(void)
|
|
|
{
|
|
|
- imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
|
|
|
-
|
|
|
imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads));
|
|
|
|
|
|
/* Set BL_ON */
|
|
@@ -215,10 +188,6 @@ int board_init(void)
|
|
|
setup_gpmi_nand();
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_VIDEO_MXS
|
|
|
- setup_lcd();
|
|
|
-#endif
|
|
|
-
|
|
|
#ifdef CONFIG_USB_EHCI_MX7
|
|
|
imx_iomux_v3_setup_multiple_pads(usb_cdet_pads, ARRAY_SIZE(usb_cdet_pads));
|
|
|
gpio_request(USB_CDET_GPIO, "usb-cdet-gpio");
|
|
@@ -382,4 +351,15 @@ int board_usb_phy_mode(int port)
|
|
|
return USB_INIT_HOST;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+int board_late_init(void)
|
|
|
+{
|
|
|
+#if defined(CONFIG_DM_VIDEO)
|
|
|
+ setup_lcd();
|
|
|
+
|
|
|
+ show_boot_logo();
|
|
|
+#endif
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
#endif
|