Commit daecdca2 authored by Ian Ray's avatar Ian Ray Committed by Bob Beckett
Browse files

board: ge: mx53ppd: enable DM_VIDEO



Enable DM_VIDEO for mx53ppd.  This also requires DM_REGULATOR_FIXED and
DM_PWM for the backlight, and `failbootcmd' is changed to use lcdputs.

Remove unused MX53PPD_LCD_POWER.
Remove old (incorrect) setup_iomux_lcd.
Enable backlight via display enable handler.
Use cls command to initiate display in HW agnostic manner.
Signed-off-by: Ian Ray's avatarIan Ray <ian.ray@ge.com>
parent 16393fe2
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
# Jason Liu <r64343@freescale.com> # Jason Liu <r64343@freescale.com>
obj-y += mx53ppd.o obj-y += mx53ppd.o
obj-$(CONFIG_VIDEO) += mx53ppd_video.o obj-$(CONFIG_DM_VIDEO) += mx53ppd_video.o
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
#include "../../ge/common/ge_common.h" #include "../../ge/common/ge_common.h"
#include "../../ge/common/vpd_reader.h" #include "../../ge/common/vpd_reader.h"
#define MX53PPD_LCD_POWER IMX_GPIO_NR(3, 24)
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static u32 mx53_dram_size[2]; static u32 mx53_dram_size[2];
...@@ -163,7 +161,6 @@ void ppd_gpio_init(void) ...@@ -163,7 +161,6 @@ void ppd_gpio_init(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
setup_iomux_fec(); setup_iomux_fec();
setup_iomux_lcd();
ppd_gpio_init(); ppd_gpio_init();
return 0; return 0;
......
...@@ -9,69 +9,20 @@ ...@@ -9,69 +9,20 @@
*/ */
#include <common.h> #include <common.h>
#include <dm.h>
#include <linux/list.h> #include <linux/list.h>
#include <asm/gpio.h>
#include <asm/arch/iomux-mx53.h> #include <asm/arch/iomux-mx53.h>
#include <asm/mach-imx/video.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <ipu_pixfmt.h> #include <ipu_pixfmt.h>
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/io.h> #include <asm/io.h>
#include <pwm.h> #include <panel.h>
#include "ppd_gpio.h"
#define MX53PPD_LCD_POWER IMX_GPIO_NR(3, 24) static int detect_lcd(struct display_info_t const *dev)
static struct fb_videomode const nv_spwg = {
.name = "NV-SPWGRGB888",
.refresh = 60,
.xres = 800,
.yres = 480,
.pixclock = 15384,
.left_margin = 16,
.right_margin = 210,
.upper_margin = 10,
.lower_margin = 22,
.hsync_len = 30,
.vsync_len = 13,
.sync = FB_SYNC_EXT,
.vmode = FB_VMODE_NONINTERLACED
};
void setup_iomux_lcd(void)
{ {
static const iomux_v3_cfg_t lcd_pads[] = { return 1;
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));
} }
static void lcd_enable(void) static void lcd_enable(void)
...@@ -96,40 +47,49 @@ static void lcd_enable(void) ...@@ -96,40 +47,49 @@ static void lcd_enable(void)
IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT | IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT |
IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0, IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0,
&iomux->gpr[2]); &iomux->gpr[2]);
/* Enable backlights */
pwm_init(1, 0, 0);
/* duty cycle 5000000ns, period: 5000000ns */
pwm_config(1, 5000000, 5000000);
/* Backlight Power */
gpio_request(BACKLIGHT_ENABLE, "BACKLIGHT_ENABLE");
gpio_direction_output(BACKLIGHT_ENABLE, 1);
pwm_enable(1);
} }
static int do_lcd_enable(cmd_tbl_t *cmdtp, int flag, int argc, static void do_enable_backlight(struct display_info_t const *dev)
char * const argv[])
{ {
struct udevice *panel;
int ret;
lcd_enable(); lcd_enable();
return 0;
}
U_BOOT_CMD( ret = uclass_get_device(UCLASS_PANEL, 0, &panel);
ppd_lcd_enable, 1, 1, do_lcd_enable, if (ret) {
"enable PPD LCD", printf("Could not find panel: %d\n", ret);
"no parameters" return;
); }
int board_video_skip(void) panel_set_backlight(panel, 100);
{ panel_enable_backlight(panel);
int ret; }
struct display_info_t const displays[] = {
{
.bus = -1,
.addr = -1,
.pixfmt = IPU_PIX_FMT_RGB24,
.detect = detect_lcd,
.enable = do_enable_backlight,
.mode = {
.name = "NV-SPWGRGB888",
.refresh = 60,
.xres = 800,
.yres = 480,
.pixclock = 15384,
.left_margin = 16,
.right_margin = 210,
.upper_margin = 10,
.lower_margin = 22,
.hsync_len = 30,
.vsync_len = 13,
.sync = FB_SYNC_EXT,
.vmode = FB_VMODE_NONINTERLACED
}
}
};
ret = ipuv3_fb_init(&nv_spwg, 0, IPU_PIX_FMT_RGB24); size_t display_count = ARRAY_SIZE(displays);
if (ret)
printf("Display cannot be configured: %d\n", ret);
return ret;
}
...@@ -57,7 +57,6 @@ struct gpio_cfg { ...@@ -57,7 +57,6 @@ struct gpio_cfg {
#define POWER_DOWN_LVDS0_DESERIALIZER_N IMX_GPIO_NR(2, 22) #define POWER_DOWN_LVDS0_DESERIALIZER_N IMX_GPIO_NR(2, 22)
#define POWER_DOWN_LVDS1_DESERIALIZER_N IMX_GPIO_NR(2, 27) #define POWER_DOWN_LVDS1_DESERIALIZER_N IMX_GPIO_NR(2, 27)
#define ENABLE_PWR_TO_LCD_AND_UI_INTERFACE IMX_GPIO_NR(2, 17) #define ENABLE_PWR_TO_LCD_AND_UI_INTERFACE IMX_GPIO_NR(2, 17)
#define BACKLIGHT_ENABLE IMX_GPIO_NR(5, 29)
#define RESET_I2C1_BUS_SEGMENT_MUX_N IMX_GPIO_NR(2, 18) #define RESET_I2C1_BUS_SEGMENT_MUX_N IMX_GPIO_NR(2, 18)
#define ECSPI1_CS0 IMX_GPIO_NR(5, 17) #define ECSPI1_CS0 IMX_GPIO_NR(5, 17)
#define ECSPI1_CS1 IMX_GPIO_NR(4, 10) #define ECSPI1_CS1 IMX_GPIO_NR(4, 10)
...@@ -87,7 +86,6 @@ static const struct gpio_cfg ppd_gpios[] = { ...@@ -87,7 +86,6 @@ static const struct gpio_cfg ppd_gpios[] = {
{ POWER_DOWN_LVDS0_DESERIALIZER_N, 1 }, { POWER_DOWN_LVDS0_DESERIALIZER_N, 1 },
{ POWER_DOWN_LVDS1_DESERIALIZER_N, 1 }, { POWER_DOWN_LVDS1_DESERIALIZER_N, 1 },
{ ENABLE_PWR_TO_LCD_AND_UI_INTERFACE, 1 }, { ENABLE_PWR_TO_LCD_AND_UI_INTERFACE, 1 },
{ BACKLIGHT_ENABLE, 0 },
{ RESET_I2C1_BUS_SEGMENT_MUX_N, 1 }, { RESET_I2C1_BUS_SEGMENT_MUX_N, 1 },
{ ECSPI1_CS0, 1 }, { ECSPI1_CS0, 1 },
{ ECSPI1_CS1, 1 }, { ECSPI1_CS1, 1 },
......
...@@ -24,6 +24,7 @@ CONFIG_CMD_DHCP=y ...@@ -24,6 +24,7 @@ CONFIG_CMD_DHCP=y
CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_BOOTCOUNT=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
CONFIG_CMD_CLS=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_EXT4_WRITE=y
...@@ -57,7 +58,6 @@ CONFIG_RTC_S35392A=y ...@@ -57,7 +58,6 @@ CONFIG_RTC_S35392A=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_MX5=y CONFIG_USB_EHCI_MX5=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
...@@ -65,5 +65,9 @@ CONFIG_WDT=y ...@@ -65,5 +65,9 @@ CONFIG_WDT=y
CONFIG_SYSRESET=y CONFIG_SYSRESET=y
CONFIG_SYSRESET_WATCHDOG=y CONFIG_SYSRESET_WATCHDOG=y
CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR=y
CONFIG_DM_REGULATOR_FIXED=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_DM_PWM=y
...@@ -91,13 +91,10 @@ ...@@ -91,13 +91,10 @@
"/boot/bootcause/firstboot\0" \ "/boot/bootcause/firstboot\0" \
"swappartitions=setexpr partnum 3 - ${partnum}\0" \ "swappartitions=setexpr partnum 3 - ${partnum}\0" \
"failbootcmd=" \ "failbootcmd=" \
"ppd_lcd_enable; " \ "cls; " \
"msg=\"Monitor failed to start. " \ "setcurs 5 4; " \
"Try again, or contact GE Service for support.\"; " \ "lcdputs \"Monitor failed to start. " \
"echo $msg; " \ "Try again, or contact GE Service for support.\"; " \
"setenv stdout vga; " \
"echo \"\n\n\n\n \" $msg; " \
"setenv stdout serial; " \
"bootcount reset; \0" \ "bootcount reset; \0" \
"altbootcmd=" \ "altbootcmd=" \
"run doquiet; " \ "run doquiet; " \
...@@ -172,4 +169,6 @@ ...@@ -172,4 +169,6 @@
/* Backlight Control */ /* Backlight Control */
#define CONFIG_IMX6_PWM_PER_CLK 66666000 #define CONFIG_IMX6_PWM_PER_CLK 66666000
#define CONFIG_IMX_VIDEO_SKIP
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment