diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-28 23:45:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-28 23:45:16 +0200 |
| commit | 1911602b68f9f6cb2b11dde460aa42d17fb1f700 (patch) | |
| tree | 8f6aa78248b08b47582e00548eb5069466e0f82e /arch/powerpc/cpu/mpc512x/diu.c | |
| parent | 34d9cb5ec69ce856c3d241d9416620f721d45892 (diff) | |
| parent | ba8e76bd49a0575a2442025507882b499856af2b (diff) | |
| download | u-boot-imx-1911602b68f9f6cb2b11dde460aa42d17fb1f700.zip u-boot-imx-1911602b68f9f6cb2b11dde460aa42d17fb1f700.tar.gz u-boot-imx-1911602b68f9f6cb2b11dde460aa42d17fb1f700.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'arch/powerpc/cpu/mpc512x/diu.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc512x/diu.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/powerpc/cpu/mpc512x/diu.c b/arch/powerpc/cpu/mpc512x/diu.c index c4108af..9dc1e48 100644 --- a/arch/powerpc/cpu/mpc512x/diu.c +++ b/arch/powerpc/cpu/mpc512x/diu.c @@ -51,20 +51,10 @@ void diu_set_pixel_clock(unsigned int pixclock) debug("DIU: Modified value of CLKDVDR = 0x%08x\n", in_be32(clkdvdr)); } -int platform_diu_init(unsigned int *xres, unsigned int *yres) +int platform_diu_init(unsigned int xres, unsigned int yres, const char *port) { - unsigned int pixel_format; - -#if defined(CONFIG_VIDEO_XRES) & defined(CONFIG_VIDEO_YRES) - *xres = CONFIG_VIDEO_XRES; - *yres = CONFIG_VIDEO_YRES; -#else - *xres = 1024; - *yres = 768; -#endif - pixel_format = 0x88883316; + unsigned int pixel_format = 0x88883316; debug("mpc5121_diu_init\n"); - - return fsl_diu_init(*xres, pixel_format, 0); + return fsl_diu_init(xres, pixel_format, 0); } |