| Message ID | 1299471468-26772-3-git-send-email-galak@kernel.crashing.org |
|---|---|
| State | Superseded |
| Delegated to: | Kumar Gala |
| Headers | show |
On Sun, Mar 6, 2011 at 10:17 PM, Kumar Gala <galak@kernel.crashing.org> wrote: > From: Jiang Yutang <b14898@freescale.com> > > Added two build configurations with DIU enabled on P1022DS and fixed the > configuration for LVDS monitors to enable backlighting. > > Signed-off-by: Jiang Yutang <b14898@freescale.com> > Signed-off-by: Kumar Gala <galak@kernel.crashing.org> > --- > board/freescale/p1022ds/diu.c | 7 +++++-- > boards.cfg | 2 ++ > include/configs/P1022DS.h | 4 +++- Just a heads-up, this will cause a merge conflict with my patch, "[v4] powerpc: clean up DIU macro definitions for Freescale reference boards", which was posted about three weeks ago.
On Mar 7, 2011, at 5:02 PM, Timur Tabi wrote: > On Sun, Mar 6, 2011 at 10:17 PM, Kumar Gala <galak@kernel.crashing.org> wrote: >> From: Jiang Yutang <b14898@freescale.com> >> >> Added two build configurations with DIU enabled on P1022DS and fixed the >> configuration for LVDS monitors to enable backlighting. >> >> Signed-off-by: Jiang Yutang <b14898@freescale.com> >> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> >> --- >> board/freescale/p1022ds/diu.c | 7 +++++-- >> boards.cfg | 2 ++ >> include/configs/P1022DS.h | 4 +++- > > Just a heads-up, this will cause a merge conflict with my patch, "[v4] > powerpc: clean up DIU macro definitions for Freescale reference > boards", which was posted about three weeks ago. I'll deal with merge issues, can you ack or provide feedback on this patch - k
Kumar Gala wrote:
> I'll deal with merge issues, can you ack or provide feedback on this patch
My patch, "[v3] powerpc: user 'video-mode' environment variable to configure DIU" ("user" should be "use") should be applied instead.
diff --git a/board/freescale/p1022ds/diu.c b/board/freescale/p1022ds/diu.c index b37e0e2..15f95c6 100644 --- a/board/freescale/p1022ds/diu.c +++ b/board/freescale/p1022ds/diu.c @@ -105,14 +105,17 @@ int platform_diu_init(unsigned int *xres, unsigned int *yres) *xres = 1024; *yres = 768; /* Enable the DFP port, disable the DVI and the backlight */ - temp &= ~(PX_BRDCFG1_DVIEN | PX_BRDCFG1_BACKLIGHT); - temp |= PX_BRDCFG1_DFPEN; + temp &= ~PX_BRDCFG1_DVIEN; + /* LVDS also needs backlight enabled, otherwise the display will be blank */ + temp |= (PX_BRDCFG1_DFPEN | PX_BRDCFG1_BACKLIGHT); + printf("DIU link to 1-LVDS\n"); } else { /* DVI */ *xres = 1280; *yres = 1024; /* Enable the DVI port, disable the DFP and the backlight */ temp &= ~(PX_BRDCFG1_DFPEN | PX_BRDCFG1_BACKLIGHT); temp |= PX_BRDCFG1_DVIEN; + printf("DIU link to 0-DVI\n"); } out_8(&pixis->brdcfg1, temp); diff --git a/boards.cfg b/boards.cfg index 2622f78..02212bb 100644 --- a/boards.cfg +++ b/boards.cfg @@ -524,6 +524,8 @@ P1020RDB_SDCARD powerpc mpc85xx p1_p2_rdb freesca P1020RDB_SPIFLASH powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,SPIFLASH P1022DS powerpc mpc85xx p1022ds freescale P1022DS_36BIT powerpc mpc85xx p1022ds freescale - P1022DS:36BIT +P1022DS_36BIT_DIU powerpc mpc85xx p1022ds freescale - P1022DS:36BIT,DIU +P1022DS_DIU powerpc mpc85xx p1022ds freescale - P1022DS:DIU P2010RDB powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P2010RDB P2010RDB_36BIT powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P2010RDB,36BIT P2010RDB_36BIT_SDCARD powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P2010RDB,36BIT,SDCARD diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index b3cb135..cac7f66 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -202,7 +202,9 @@ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* Video */ -#undef CONFIG_FSL_DIU_FB +#ifdef CONFIG_DIU +#define CONFIG_FSL_DIU_FB +#endif #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)