diff options
Diffstat (limited to 'board/freescale/mx53loco/mx53loco_video.c')
| -rw-r--r-- | board/freescale/mx53loco/mx53loco_video.c | 68 | 
1 files changed, 36 insertions, 32 deletions
| diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c index a4d5a6a36..c4654c9b9 100644 --- a/board/freescale/mx53loco/mx53loco_video.c +++ b/board/freescale/mx53loco/mx53loco_video.c @@ -24,7 +24,7 @@  #include <common.h>  #include <linux/list.h>  #include <asm/gpio.h> -#include <asm/arch/iomux.h> +#include <asm/arch/iomux-mx53.h>  #include <linux/fb.h>  #include <ipu_pixfmt.h> @@ -63,42 +63,46 @@ static struct fb_videomode const seiko_wvga = {  void setup_iomux_lcd(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); +	static const iomux_v3_cfg_t lcd_pads[] = { +		MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK, +		MX53_PAD_DI0_PIN15__IPU_DI0_PIN15, +		MX53_PAD_DI0_PIN2__IPU_DI0_PIN2, +		MX53_PAD_DI0_PIN3__IPU_DI0_PIN3, +		MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0, +		MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1, +		MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2, +		MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3, +		MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4, +		MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5, +		MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6, +		MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7, +		MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8, +		MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9, +		MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10, +		MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11, +		MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12, +		MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13, +		MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14, +		MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15, +		MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16, +		MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17, +		MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18, +		MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19, +		MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20, +		MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21, +		MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22, +		MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23, +	}; + +	imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));  	/* Turn on GPIO backlight */ -	mxc_request_iomux(MX53_PIN_EIM_D24, IOMUX_CONFIG_ALT1); +	imx_iomux_v3_setup_pad(MX53_PAD_EIM_D24__GPIO3_24);  	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); +	imx_iomux_v3_setup_pad(MX53_PAD_GPIO_1__GPIO1_1); +	gpio_direction_output(IMX_GPIO_NR(1, 1), 1);  }  int board_video_skip(void) |