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

diff --combined board/freescale/mx51evk/mx51evk.c
index 5504636,bc9d966..d1ef431
--- 1/board/freescale/mx51evk/mx51evk.c
--- 2/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@@ -30,19 -30,14 +30,14 @@@
  #include <asm/arch/sys_proto.h>
  #include <asm/arch/crm_regs.h>
  #include <asm/arch/clock.h>
+ #include <asm/imx-common/mx5_video.h>
  #include <i2c.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
 -#include <pmic.h>
 +#include <power/pmic.h>
  #include <fsl_pmic.h>
  #include <mc13892.h>
  #include <usb/ehci-fsl.h>
- #include <linux/fb.h>
- #include <ipu_pixfmt.h>
- 
- #define MX51EVK_LCD_3V3               IMX_GPIO_NR(4, 9)
- #define MX51EVK_LCD_5V                IMX_GPIO_NR(4, 10)
- #define MX51EVK_LCD_BACKLIGHT IMX_GPIO_NR(3, 4)
  
  DECLARE_GLOBAL_DATA_PTR;
  
@@@ -252,15 -247,9 +247,15 @@@ static void power_init(void
        unsigned int val;
        struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
        struct pmic *p;
 +      int ret;
  
 -      pmic_init();
 -      p = get_pmic();
 +      ret = pmic_init(I2C_PMIC);
 +      if (ret)
 +              return;
 +
 +      p = pmic_get("FSL_PMIC");
 +      if (!p)
 +              return;
  
        /* Write needed to Power Gate 2 register */
        pmic_reg_read(p, REG_POWER_MISC, &val);
@@@ -477,54 -466,6 +472,6 @@@ int board_mmc_init(bd_t *bis
  }
  #endif
  
- static struct fb_videomode const claa_wvga = {
-       .name           = "CLAA07LC0ACW",
-       .refresh        = 57,
-       .xres           = 800,
-       .yres           = 480,
-       .pixclock       = 37037,
-       .left_margin    = 40,
-       .right_margin   = 60,
-       .upper_margin   = 10,
-       .lower_margin   = 10,
-       .hsync_len      = 20,
-       .vsync_len      = 10,
-       .sync           = 0,
-       .vmode          = FB_VMODE_NONINTERLACED
- };
- 
- void lcd_iomux(void)
- {
-       /* DI2_PIN15 */
-       mxc_request_iomux(MX51_PIN_DI_GP4, IOMUX_CONFIG_ALT4);
- 
-       /* Pad settings for MX51_PIN_DI2_DISP_CLK */
-       mxc_iomux_set_pad(MX51_PIN_DI2_DISP_CLK, PAD_CTL_HYS_NONE |
-                         PAD_CTL_PKE_ENABLE | PAD_CTL_PUE_KEEPER |
-                         PAD_CTL_DRV_MAX | PAD_CTL_SRE_SLOW);
- 
-       /* Turn on 3.3V voltage for LCD */
-       mxc_request_iomux(MX51_PIN_CSI2_D12, IOMUX_CONFIG_ALT3);
-       gpio_direction_output(MX51EVK_LCD_3V3, 1);
- 
-       /* Turn on 5V voltage for LCD */
-       mxc_request_iomux(MX51_PIN_CSI2_D13, IOMUX_CONFIG_ALT3);
-       gpio_direction_output(MX51EVK_LCD_5V, 1);
- 
-       /* Turn on GPIO backlight */
-       mxc_request_iomux(MX51_PIN_DI1_D1_CS, IOMUX_CONFIG_ALT4);
-       mxc_iomux_set_input(MX51_GPIO3_IPP_IND_G_IN_4_SELECT_INPUT,
-                                                       INPUT_CTL_PATH1);
-       gpio_direction_output(MX51EVK_LCD_BACKLIGHT, 1);
- }
- 
- void lcd_enable(void)
- {
-       int ret = ipuv3_fb_init(&claa_wvga, 1, IPU_PIX_FMT_RGB565);
-       if (ret)
-               printf("LCD cannot be configured: %d\n", ret);
- }
- 
  int board_early_init_f(void)
  {
        setup_iomux_uart();
@@@ -532,7 -473,7 +479,7 @@@
  #ifdef CONFIG_USB_EHCI_MX5
        setup_usb_h1();
  #endif
-       lcd_iomux();
+       setup_iomux_lcd();
  
        return 0;
  }

diff --combined board/freescale/mx53loco/mx53loco.c
index f4a9b08,f8f0503..81c511c
--- 1/board/freescale/mx53loco/mx53loco.c
--- 2/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@@ -31,12 -31,13 +31,13 @@@
  #include <asm/arch/iomux.h>
  #include <asm/arch/clock.h>
  #include <asm/errno.h>
+ #include <asm/imx-common/mx5_video.h>
  #include <netdev.h>
  #include <i2c.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <asm/gpio.h>
 -#include <pmic.h>
 +#include <power/pmic.h>
  #include <dialog_pmic.h>
  #include <fsl_pmic.h>
  #include <linux/fb.h>
@@@ -344,16 -345,10 +345,16 @@@ static int power_init(void
        unsigned int val;
        int ret = -1;
        struct pmic *p;
 +      int retval;
  
        if (!i2c_probe(CONFIG_SYS_DIALOG_PMIC_I2C_ADDR)) {
 -              pmic_dialog_init();
 -              p = get_pmic();
 +              retval = pmic_dialog_init(I2C_PMIC);
 +              if (retval)
 +                      return retval;
 +
 +              p = pmic_get("DIALOG_PMIC");
 +              if (!p)
 +                      return -ENODEV;
  
                /* Set VDDA to 1.25V */
                val = DA9052_BUCKCORE_BCOREEN | DA_BUCKCORE_VBCORE_1_250V;
@@@ -369,13 -364,8 +370,13 @@@
        }
  
        if (!i2c_probe(CONFIG_SYS_FSL_PMIC_I2C_ADDR)) {
 -              pmic_init();
 -              p = get_pmic();
 +              retval = pmic_init(I2C_PMIC);
 +              if (retval)
 +                      return retval;
 +
 +              p = pmic_get("DIALOG_PMIC");
 +              if (!p)
 +                      return -ENODEV;
  
                /* Set VDDGP to 1.25V for 1GHz on SW1 */
                pmic_reg_read(p, REG_SW_0, &val);
@@@ -423,74 -413,11 +424,11 @@@ static void clock_1GHz(void
                printf("CPU:   Switch DDR clock to 400MHz failed\n");
  }
  
- static struct fb_videomode const claa_wvga = {
-       .name           = "CLAA07LC0ACW",
-       .refresh        = 57,
-       .xres           = 800,
-       .yres           = 480,
-       .pixclock       = 37037,
-       .left_margin    = 40,
-       .right_margin   = 60,
-       .upper_margin   = 10,
-       .lower_margin   = 10,
-       .hsync_len      = 20,
-       .vsync_len      = 10,
-       .sync           = 0,
-       .vmode          = FB_VMODE_NONINTERLACED
- };
- 
- void lcd_iomux(void)
- {
-       mxc_request_iomux(MX53_PIN_DI0_DISP_CLK, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DI0_PIN15, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DI0_PIN2, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DI0_PIN3, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT0, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT1, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT2, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT3, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT4, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT5, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT6, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT7, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT8, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT9, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT10, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT11, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT12, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT13, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT14, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT15, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT16, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT17, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT18, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT19, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT20, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT21, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT22, IOMUX_CONFIG_ALT0);
-       mxc_request_iomux(MX53_PIN_DISP0_DAT23, IOMUX_CONFIG_ALT0);
- 
-       /* Turn on GPIO backlight */
-       mxc_request_iomux(MX53_PIN_EIM_D24, IOMUX_CONFIG_ALT1);
-       gpio_direction_output(MX53LOCO_LCD_POWER, 1);
- 
-       /* Turn on display contrast */
-       mxc_request_iomux(MX53_PIN_GPIO_1, IOMUX_CONFIG_ALT1);
-       gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_GPIO_1), 1);
- }
- 
- void lcd_enable(void)
- {
-       int ret = ipuv3_fb_init(&claa_wvga, 0, IPU_PIX_FMT_RGB565);
-       if (ret)
-               printf("LCD cannot be configured: %d\n", ret);
- }
- 
  int board_early_init_f(void)
  {
        setup_iomux_uart();
        setup_iomux_fec();
-       lcd_iomux();
+       setup_iomux_lcd();
  
        return 0;
  }